From 2dff10564c66ceb9f199d4edc936a542c28f5104 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 23 Apr 2018 21:12:31 +0200 Subject: possible fix for issue #1101 --- Zotlabs/Module/Ping.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 87f9ee78a..206b8c3d1 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -143,7 +143,7 @@ class Ping extends \Zotlabs\Web\Controller { $sql_extra = ''; if(! ($vnotify & VNOTIFY_LIKE)) - $sql_extra = ' AND verb NOT IN ("' . dbesc(ACTIVITY_LIKE) . '", "' . dbesc(ACTIVITY_DISLIKE) . '") '; + $sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') "; $discover_tab_on = can_view_public_stream(); -- cgit v1.2.3 From 97308ad2fbb31ec90644e6145ec6e17bc9663c22 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 23 Apr 2018 16:05:55 -0700 Subject: provide a short term compatibility mapping between social_party and social_federation --- Zotlabs/Module/Settings/Channel.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 3e928ec58..65b9b197e 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -21,6 +21,10 @@ class Channel { $role = ((x($_POST,'permissions_role')) ? notags(trim($_POST['permissions_role'])) : ''); $oldrole = get_pconfig(local_channel(),'system','permissions_role'); + // This mapping can be removed after 3.4 release + if($oldrole === 'social_party') { + $oldrole = 'social_federation'; + } if(($role != $oldrole) || ($role === 'custom')) { @@ -471,6 +475,10 @@ class Channel { $permissions_role = get_pconfig(local_channel(),'system','permissions_role'); if(! $permissions_role) $permissions_role = 'custom'; + // compatibility mapping - can be removed after 3.4 release + if($permissions_role === 'social_party') + $permissions_role = 'social_federation'; + $permissions_set = (($permissions_role != 'custom') ? true : false); -- cgit v1.2.3 From b688dc3995a679fe58cfcc636806248026910d9d Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 23 Apr 2018 19:10:35 -0700 Subject: minor tweak to utf8 usernames after some testing of the underlying encode/decode funations. This probably isn't critical and I do not have a failure case but just trying to cover all bases. --- include/channel.php | 5 +++++ include/text.php | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/include/channel.php b/include/channel.php index 4bf490bf0..42a392e8e 100644 --- a/include/channel.php +++ b/include/channel.php @@ -2240,6 +2240,11 @@ function get_zcard_embed($channel, $observer_hash = '', $args = array()) { * - false if no channel with $nick was found */ function channelx_by_nick($nick) { + + // If we are provided a Unicode nickname convert to IDN + + $nick = punify($nick); + $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_address = '%s' and channel_removed = 0 LIMIT 1", dbesc($nick) ); diff --git a/include/text.php b/include/text.php index 55fc49560..411576fa6 100644 --- a/include/text.php +++ b/include/text.php @@ -3344,6 +3344,9 @@ function featured_sort($a,$b) { } +// Be aware that punify will convert domain names and pathnames + + function punify($s) { require_once('vendor/simplepie/simplepie/idn/idna_convert.class.php'); $x = new idna_convert(['encoding' => 'utf8']); @@ -3351,6 +3354,8 @@ function punify($s) { } +// Be aware that unpunify will only convert domain names and not pathnames + function unpunify($s) { require_once('vendor/simplepie/simplepie/idn/idna_convert.class.php'); $x = new idna_convert(['encoding' => 'utf8']); -- cgit v1.2.3 From a6c42e875633e8e67bbf93425182cce4de3eb653 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 23 Apr 2018 21:55:16 -0700 Subject: added variable to store the raw json string as received, since this is signed and we may need to forward the signed data. --- Zotlabs/Lib/ActivityStreams.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php index 2e9bb0703..3a99e7b49 100644 --- a/Zotlabs/Lib/ActivityStreams.php +++ b/Zotlabs/Lib/ActivityStreams.php @@ -9,6 +9,7 @@ namespace Zotlabs\Lib; */ class ActivityStreams { + public $raw = null; public $data; public $valid = false; public $id = ''; @@ -33,6 +34,7 @@ class ActivityStreams { */ function __construct($string) { + $this->raw = $string; $this->data = json_decode($string, true); if($this->data) { $this->valid = true; -- cgit v1.2.3 From 2ea87b65ca4aeab08e68a4e5cd1fd940ae470146 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 24 Apr 2018 15:41:35 +0200 Subject: fix php warnings --- Zotlabs/Module/Photos.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index fa22c3f26..a143c4d4c 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -1148,10 +1148,10 @@ class Photos extends \Zotlabs\Web\Controller { builtin_activity_puller($item, $conv_responses); } - $like_count = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid']] : ''); $like_list = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : ''); - if (count($like_list) > MAX_LIKERS) { + + if(is_array($like_list) && (count($like_list) > MAX_LIKERS)) { $like_list_part = array_slice($like_list, 0, MAX_LIKERS); array_push($like_list_part, '' . t('View all') . ''); } else { @@ -1163,7 +1163,7 @@ class Photos extends \Zotlabs\Web\Controller { $dislike_count = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid']] : ''); $dislike_list = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid'] . '-l'] : ''); $dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun'); - if (count($dislike_list) > MAX_LIKERS) { + if (is_array($dislike_list) && (count($dislike_list) > MAX_LIKERS)) { $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS); array_push($dislike_list_part, '' . t('View all') . ''); } else { -- cgit v1.2.3 From e11e99b2d1e2d94417e9f9934b759c88a70177ac Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 24 Apr 2018 17:09:51 +0200 Subject: fix regression with forum widget unseen count --- Zotlabs/Widget/Forums.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php index f65a639ff..7415c0f0a 100644 --- a/Zotlabs/Widget/Forums.php +++ b/Zotlabs/Widget/Forums.php @@ -66,8 +66,8 @@ class Forums { for($x = 0; $x < count($r1); $x ++) { $r = q("select sum(item_unseen) as unseen from item where uid = %d and owner_xchan = '%s' and item_unseen = 1 $perms_sql ", - dbesc($r1[$x]['xchan_hash']), - intval(local_channel()) + intval(local_channel()), + dbesc($r1[$x]['xchan_hash']) ); if($r) $r1[$x]['unseen'] = $r[0]['unseen']; -- cgit v1.2.3 From c5b32032a74dfc4165b41be11b3d75ae75a45d93 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 24 Apr 2018 22:30:17 +0200 Subject: changelog --- CHANGELOG | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index ad5e004c8..fa28aefc6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,73 @@ +Hubzilla 3.4 (????-??-??) + + - Implement trending tags for mod pubstream + - Relax restrictions to the design tools menu to allow those with write_pages permission + - Add alt pager to mod moderate + - Show existing cover photo when changing it + - Update to bootstrap lib to version 4.1 + - Provide a higher accuracy method for active channels information + - Provide visible star status for starred posts + - Move the thread author menu to the wall item photo + - Accept system_language through either get or post + - Remove recipient name from stored notifications but keep them in emails + - Fix issue of being forced to log back in after leaving a delegated channel + - Implement last commented expiration setting in mod admin + - Create catcloud widget and provide a type option which can include 'cards' or 'articles' + - Modified notifications widget to add the public stream when the current user is allowed to see it only + - Don't provide a connect button for transient identities + - Merge techlevels and features + - Implement auto-save posts and comments in browser using localStorage + - Display directory server in siteinfo.json + - Bring back the dnt policy document + - Implement OAuth2 + - Add basic structure for additional features documentation + - Community tag refactor + - Obscurify chats + - Provide a way to share wiki pages + - Update folder timestamp on uploaded files + - Code optimisations and de-duplication on updating parent commented timestamp + - Turn newmember widget into a feature + - Make list mode work in cards and articles + - Make alt pager work for articles and cards + - Initial support for alternative sort orders on the cloud pages + - Add Ochannel module for testing OStatus bad behaviour + - Add the social - federation permission role + - Update justified gallery lib from 3.6.3 to 3.6.5 + + Bugfixes + - Fix regression with forum widget unseen count + - Fix issue with imagemagick exif info + - Aonymous comments in StdLimits shouldn't be allowed + - Fix wiki pages not syncing + - Show "Unseen public activity" channel setting when site only public streams are activated + - Fix channel import failing to provide channel_password value + - Fix permalinks to children of articles and cards + - Fix missing year on profile birthday input + - Fix missing login/out buttons for medium screensize + - Preserve existing categories when updating an app from an embed source + - Fix app sellpage not being stored + - Fix tagadelic being overly protective of permissions + - Fix comments not displayed in single card/article view + - Fix anonymous comments bump thread + - Fix pending registrations visible in admin accounts + + Addons + Pubcrawl: fix issues with postgresql + Fuzzloc: new addon to blur your browser location + Pubcrawl: implement follow by webfinger + Cart: new addon which provides online shop functionalities (experimental) + Pubcrawl: implement two-way summary functionality + Wordpress: upgrade incutio xmlrpc library to use hubzilla curl wrapper + Hzfiles: various fixes + Diaspora: support full_name attribute in profile messages + Frphotos: deprecate plugin (keep it for reference) + Webmention: require html5 parser + GNU-Social: provide alternative xchan_url + Diaspora: fix wrong callback function + Diaspora: fix conversion of forum mentions to markdown by providing a !{forum@host} link syntax + Diaspora: fix item title not transferred + + Hubzilla 3.2 (2018-03-09) - Improve rendering of Readme files in plugin settings - Add pdl file for mod moderate -- cgit v1.2.3 From 8face5a66c82e7086c379ca4b07f178a85a781b3 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 24 Apr 2018 15:32:24 -0700 Subject: make tag autocomplete less scary looking in the editor. If this works out we can simplify and get rid of a huge amount of spaghetti tag logic. --- Zotlabs/Module/Acl.php | 4 +- include/text.php | 112 ++++++++++++++++++++++++++++++++---------------- view/js/autocomplete.js | 7 +-- 3 files changed, 77 insertions(+), 46 deletions(-) diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 4c5883e88..35594ae9f 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -354,7 +354,7 @@ class Acl extends \Zotlabs\Web\Controller { "name" => $g['name'] . (($type === 'f') ? '' : '+'), "id" => urlencode($g['id']) . (($type === 'f') ? '' : '+'), "xid" => $g['hash'], - "link" => $g['nick'], + "link" => (($g['nick']) ? $g['nick'] : $g['url']), "nick" => substr($g['nick'],0,strpos($g['nick'],'@')), "self" => (intval($g['abook_self']) ? 'abook-self' : ''), "taggable" => 'taggable', @@ -368,7 +368,7 @@ class Acl extends \Zotlabs\Web\Controller { "name" => $g['name'], "id" => urlencode($g['id']), "xid" => $g['hash'], - "link" => $g['nick'], + "link" => (($g['nick']) ? $g['nick'] : $g['url']), "nick" => (($g['nick']) ? substr($g['nick'],0,strpos($g['nick'],'@')) : $g['nick']), "self" => (intval($g['abook_self']) ? 'abook-self' : ''), "taggable" => '', diff --git a/include/text.php b/include/text.php index 411576fa6..4d6d0ffb5 100644 --- a/include/text.php +++ b/include/text.php @@ -822,6 +822,14 @@ function get_tags($s) { } } + // match bracket mentions + + if(preg_match_all('/([@!]\{.*?\})/',$s,$match)) { + foreach($match[1] as $mtch) { + $ret[] = $mtch; + } + } + // Match full names against @tags including the space between first and last // We will look these up afterward to see if they are full names or not recognisable. @@ -2029,18 +2037,33 @@ function undo_post_tagging($s) { $cnt = preg_match_all('/([@#])(\!*)\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { - $s = str_replace($mtch[0], $mtch[1] . $mtch[2] . quote_tag($mtch[4]),$s); + $x = q("select xchan_addr, xchan_url from xchan where xchan_url = '%s' limit 1", + dbesc($mtch[3]) + ); + if($x) { + $s = str_replace($mtch[0], $mtch[1] . $mtch[2] . '{' . (($x[0]['xchan_addr']) ? $x[0]['xchan_addr'] : $x[0]['xchan_url']) . '}', $s); + } + else { + $s = str_replace($mtch[0], $mtch[1] . $mtch[2] . quote_tag($mtch[4]),$s); + } } } // undo forum tags $cnt = preg_match_all('/\!\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { - $s = str_replace($mtch[0], '!' . quote_tag($mtch[2]),$s); + $x = q("select xchan_addr, xchan_url from xchan where xchan_url = '%s' limit 1", + dbesc($mtch[1]) + ); + if($x) { + $s = str_replace($mtch[0], '!' . '{' . (($x[0]['xchan_addr']) ? $x[0]['xchan_addr'] : $x[0]['xchan_url']) . '}', $s); + } + else { + $s = str_replace($mtch[0], '!' . quote_tag($mtch[2]),$s); + } } } - return $s; } @@ -2615,53 +2638,66 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d $forum = false; $trailing_plus_name = false; - // @channel+ is a forum or network delivery tag - - if(substr($newname,-1,1) === '+') { - $forum = true; + if(substr($name,0,1) === '{' && substr($name,-1,1) === '}') { + $newname = substr($name,1); $newname = substr($newname,0,-1); + + $r = q("select * from xchan where xchan_addr = '%s' or xchan_url = '%s' limit 1", + dbesc($newname), + dbesc($newname) + ); } - // Here we're looking for an address book entry as provided by the auto-completer - // of the form something+nnn where nnn is an abook_id or the first chars of xchan_hash + if(! $r) { + // @channel+ is a forum or network delivery tag - // If there's a +nnn in the string make sure there isn't a space preceding it + if(substr($newname,-1,1) === '+') { + $forum = true; + $newname = substr($newname,0,-1); + } - $t1 = strpos($newname,' '); - $t2 = strrpos($newname,'+'); + // Here we're looking for an address book entry as provided by the auto-completer + // of the form something+nnn where nnn is an abook_id or the first chars of xchan_hash - if($t1 && $t2 && $t1 < $t2) - $t2 = 0; - if(($t2) && (! $diaspora)) { - //get the id + // If there's a +nnn in the string make sure there isn't a space preceding it - $tagcid = urldecode(substr($newname,$t2 + 1)); + $t1 = strpos($newname,' '); + $t2 = strrpos($newname,'+'); + + if($t1 && $t2 && $t1 < $t2) + $t2 = 0; - if(strrpos($tagcid,' ')) - $tagcid = substr($tagcid,0,strrpos($tagcid,' ')); + if(($t2) && (! $diaspora)) { + //get the id - if(strlen($tagcid) < 16) - $abook_id = intval($tagcid); - //remove the next word from tag's name - if(strpos($name,' ')) { - $name = substr($name,0,strpos($name,' ')); - } + $tagcid = urldecode(substr($newname,$t2 + 1)); - if($abook_id) { // if there was an id - // select channel with that id from the logged in user's address book - $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_id = %d AND abook_channel = %d LIMIT 1", - intval($abook_id), - intval($profile_uid) - ); - } - else { - $r = q("SELECT * FROM xchan - WHERE xchan_hash like '%s%%' LIMIT 1", - dbesc($tagcid) - ); + if(strrpos($tagcid,' ')) + $tagcid = substr($tagcid,0,strrpos($tagcid,' ')); + + if(strlen($tagcid) < 16) + $abook_id = intval($tagcid); + //remove the next word from tag's name + if(strpos($name,' ')) { + $name = substr($name,0,strpos($name,' ')); + } + + if($abook_id) { // if there was an id + // select channel with that id from the logged in user's address book + $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_id = %d AND abook_channel = %d LIMIT 1", + intval($abook_id), + intval($profile_uid) + ); + } + else { + $r = q("SELECT * FROM xchan + WHERE xchan_hash like '%s%%' LIMIT 1", + dbesc($tagcid) + ); + } } } diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index be632a07e..76c3fb69e 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -84,13 +84,8 @@ function editor_replace(item) { } // $2 ensures that prefix (@,@!) is preserved - var id = item.id; - // 16 chars of hash should be enough. Full hash could be used if it can be done in a visually appealing way. - // 16 chars is also the minimum length in the backend (otherwise it's interpreted as a local id). - if(id.length > 16) - id = item.id.substring(0,16); - return '$1$2' + item.nick.replace(' ', '') + '+' + id + ' '; + return '$1$2{' + item.link + '} '; } function basic_replace(item) { -- cgit v1.2.3 From 9ffad65b6591d22800664d87cc6f75f2932f8a49 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Wed, 25 Apr 2018 09:40:40 +0200 Subject: Create /doc/fr/project.bb --- doc/fr/project.bb | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 doc/fr/project.bb diff --git a/doc/fr/project.bb b/doc/fr/project.bb new file mode 100644 index 000000000..b62c3bd25 --- /dev/null +++ b/doc/fr/project.bb @@ -0,0 +1,179 @@ +[h3]La gouvernance de $Projectname [/h3] +La gouvernance est liée à la gestion d'un projet et plus particulièrement à la résolution des conflits. + +[h4]Gouvernance communautaire[/h4] +Le projet est maintenu et les décisions sont prises par la " communauté ". La structure de gouvernance continue d'évoluer. Jusqu'à ce que la structure soit finalisée, les décisions sont prises dans l'ordre suivant : + +[ol] +[*] Consensus paresseux + +Si une proposition de projet est soumise à l'un des forums de gouvernance communautaire et qu'il n'y a pas d'objections sérieuses dans un délai "raisonnable" à partir de la date de la proposition (nous accordons généralement 2 à 3 jours pour que toutes les parties intéressées puissent intervenir), aucun vote n'est nécessaire et la proposition sera considérée comme approuvée. Certaines préoccupations peuvent être soulevées à ce moment-là, mais si elles sont abordées au cours de la discussion et des solutions de rechange fournies, elles seront quand même considérées comme approuvées. + +[*] Veto + +Les promoteurs principaux ayant un historique important d'engagements de projet peuvent opposer leur veto à toute décision. La décision ne peut être prise tant que le veto n'a pas été levé ou qu'une autre proposition n'a pas été présentée. + +[*] Vote de la communauté + +Une décision qui n'a pas de mandat clair ou de consensus clair, mais qui ne fait pas l'objet d'un veto, peut être soumise au vote de la communauté. Actuellement, il s'agit d'un simple vote populaire dans l'un des forums communautaires applicables. À ce moment-là, c'est le vote populaire qui décide du résultat. Cela pourrait changer à l'avenir si la communauté adopte un modèle de gouvernance de " conseil ". Ce document sera mis à jour à ce moment-là avec les règles de gouvernance mises à jour. +[/ol] + +Le vote communautaire n'offre pas toujours un résultat agréable et peut générer des factions polarisées au sein de la communauté (d'où la raison pour laquelle d'autres modèles sont à l'étude). Si la proposition est rejetée, il y a encore plusieurs choses qui peuvent être faites et la proposition peut être soumise à nouveau avec des paramètres légèrement différents (conversion vers un module complémentaire, conversion vers un module optionnel qui est désactivé par défaut, etc. Si l'intérêt pour le dispositif est élevé et que le vote est " serré ", cela peut générer beaucoup de mauvais sentiments parmi les électeurs perdants. Lors de ces votes serrés, il est [b]fortement recommandé[/b] que l'auteur de la proposition prenne des mesures pour répondre à toute préoccupation soulevée et la soumettre de nouveau. + +[h4]Politique de confidentialité[/h4] + +Q: Qui peut voir mon contenu ? + +R : Par défaut, N'IMPORTE QUELLE personne sur Internet, à MOINS que vous le restreigniez. Nom du projet vous permet de choisir le niveau de confidentialité que vous désirez. Le contenu restreint ne sera PAS visible pour les "réseaux d'espionnage" et les annonceurs. Il sera protégé contre les écoutes de l'extérieur - au mieux de nos capacités. Les administrateurs de Hub ayant suffisamment de compétences et de patience PEUVENT être en mesure d'écouter certaines communications privées, mais ils doivent déployer des trésors d'efforts pour le faire. Des modes de confidentialité existent au sein de $Projectname qui résistent même à l'écoute par des administrateurs de hub qualifiés et déterminés. + +Q : Mon contenu peut-il être censuré ? + +R : $Nom du projet (le réseau) NE PEUT PAS censurer votre contenu. Les administrateurs de serveur et de hub sont soumis aux lois locales et PEUVENT supprimer le contenu répréhensible de leur site/hub. N'importe qui PEUT devenir un administrateur de hub, y compris vous ; et donc publier du contenu qui pourrait autrement être censuré. Vous POUVEZ toujours être soumis aux lois locales. + + +[h5]Définitions[/h5]. + +**$Nom du projet**** + +Autrement appelé "le réseau", $Projectname est une collection d'ordinateurs/serveurs individuels (aka **hubs**) qui se connectent ensemble pour former un plus grand réseau coopératif. + +**hub** + +Un ordinateur individuel ou un serveur connecté à $Projectname. Ces services sont fournis par un **administrateur de hub** et peuvent être publics ou privés, payants ou gratuits. + +**administrateur de hub**** + +Gérant du système d'un hub individuel. + +[h5]Politiques[/h5] + +**Information publique** + +Toute information ou tout ce que vous affichez dans $Projectname PEUT être public ou visible par quiconque sur Internet. Dans la mesure du possible, $Projectname vous permet de protéger le contenu et de restreindre qui peut le consulter. + +La photo de votre profil, le nom de votre canal et l'emplacement (URL ou adresse réseau) de votre canal sont visibles par tous sur Internet et les contrôles de confidentialité n'affecteront pas l'affichage de ces éléments. + +Vous POUVEZ fournir en plus d'autres informations de profil. Toute information que vous fournissez dans votre profil "par défaut" ou **profil public** PEUT être transmise à d'autres hubs dans $Projectname et peut également être affichée dans le répertoire des canaux. Vous pouvez limiter l'affichage de ces informations de profil. Il peut être limité aux seuls membres de votre hub, ou seulement aux connexions (amis), ou à d'autres groupes limités de visionneurs comme vous le souhaitez. Si vous souhaitez que votre profil soit restreint, vous devez définir le paramètre de confidentialité approprié ou simplement NE PAS fournir d'informations supplémentaires. + +**Contenu** + +Le contenu que vous fournissez (messages de statut, photos, fichiers, etc.) vous appartient. Par défaut, $Projectname publie le contenu ouvertement et visible par tout le monde sur Internet (PUBLIC). Vous POUVEZ contrôler cela dans les paramètres de votre canal et restreindre les permissions par défaut ou vous POUVEZ restreindre la visibilité de n'importe quel élément publié séparément (PRIVÉ). Les développeurs de noms de projet s'assureront que le contenu restreint est visible SEULEMENT pour ceux qui figurent dans la liste des restrictions - au mieux de leurs capacités. + +Les contenus (en particulier les messages de statut) que vous partagez avec d'autres réseaux ou que vous avez rendus visibles à quiconque sur Internet (PUBLIC) ne peuvent pas être facilement repris une fois qu'ils ont été publiés. Il PEUT être partagé avec d'autres réseaux et rendu disponible par le biais de flux RSS/Atom. Il peut aussi être syndiqué sur d'autres sites $Projectname. Il PEUT apparaître sur d'autres réseaux et sites Web et être visible dans les recherches sur Internet. Si vous ne souhaitez pas ce comportement par défaut, veuillez ajuster les paramètres de votre canal et restreindre le nombre de personnes qui peuvent voir votre contenu. + +**Commentaires et posts du Forum** + +Les commentaires sur les posts qui ont été créés par d'autres et les posts qui sont désignés comme posts du forum vous appartiennent en tant que créateur/auteur, mais la distribution de ces posts n'est pas sous votre contrôle direct, et vous renoncez à certains droits sur ces items. Ces messages/commentaires PEUVENT être redistribués à d'autres, et PEUVENT être visibles pour n'importe qui sur Internet. Dans le cas de commentaires, le créateur du "premier message" dans le fil de discussion (conversation) auquel vous répondez contrôle la distribution de tous les commentaires et réponses à ce message. Ils "possèdent" et ont donc certains droits sur l'ensemble de la conversation (y compris tous les commentaires qu'elle contient). Vous pouvez toujours modifier ou supprimer le commentaire, mais le propriétaire de la conversation a également le droit de modifier, supprimer, redistribuer et sauvegarder/restaurer tout ou partie du contenu de la conversation. + +**Les informations privées** + +Les développeurs de $Projectname s'assureront que tout contenu que vous fournissez et qui est désigné comme PRIVÉ seront protégés contre les écoutes - au mieux de leurs capacités. Le contenu des canaux privés PEUT être vu dans la base de données de chaque administrateur de hub impliqué, mais les messages privés sont masqués dans la base de données. Cette dernière signifie qu'il est très difficile, mais PAS impossible que ce contenu soit vu par un administrateur de hub. Le contenu du canal privé et les messages privés sont également éliminés des notifications par courriel. Le cryptage de bout en bout est fourni en option et ceci NE PEUT PAS être vu, même par un administrateur déterminé. + +[h5]Confidentialité de l'identité[/h5]. + +La confidentialité de votre identité est un autre aspect. Parce que vous avez une identité décentralisée dans $Projectname, votre vie privée s'étend au-delà de votre hub d'origine. Si vous voulez avoir le contrôle total de votre vie privée et de la sécurité, vous devriez faire fonctionner votre propre concentrateur sur un serveur dédié. Pour beaucoup de gens, c'est compliqué et cela peut mettre à l'épreuve leurs capacités techniques. Énumérons donc quelques précautions que vous pouvez prendre pour assurer votre vie privée autant que possible. + +Une identité décentralisée a beaucoup d'avantages et vous donne beaucoup de fonctionnalités intéressantes, mais vous devez être conscient du fait que votre identité est connue par d'autres hubs dans le réseau $Projectname. L'un de ces avantages est que d'autres canaux peuvent vous servir du contenu personnalisé et vous permettre de voir des choses privées (comme des photos privées que d'autres souhaitent partager avec vous). Pour cette raison, ces canaux ont besoin de savoir qui vous êtes. Mais nous comprenons que parfois, ces autres canaux en savent plus de vous que vous ne le souhaiteriez. Par exemple, le plug-in Visage qui peut indiquer au propriétaire d'un canal la dernière fois que vous avez visité son profil. Vous pouvez facilement OPT-OUT de ce bas niveau et nous pensons, le suivi inoffensif. + +Vous pouvez activer [Ne pas suivre (DNT)](http://donottrack.us/) dans votre navigateur Web. Nous respectons cette nouvelle proposition de politique de confidentialité. Tous les navigateurs modernes supportent le DNT. Vous le trouverez dans les paramètres de confidentialité de vos navigateurs ou bien vous pouvez consulter le manuel du navigateur Web. Cela n'affectera pas la fonctionnalité de $Projectname. Ce réglage est probablement suffisant pour la plupart des gens. + +*Vous pouvez [désactiver la publication](settings) de votre chaîne dans notre répertoire de chaînes. Si vous voulez que les gens trouvent votre canal, vous devriez leur donner l'adresse de votre canal directement. Nous pensons que c'est une bonne indication que vous préférez une vie privée supplémentaire et que vous activez automatiquement l'option "Ne pas suivre" si c'est le cas. + +*Vous pouvez avoir un hub bloqué. Cela signifie que tous les canaux et le contenu de cette hub ne sont pas publics et ne sont pas visibles pour le monde extérieur. C'est quelque chose que seul votre administrateur de hub peut faire. Nous respectons également ce principe et activons automatiquement l'option "Ne pas suivre" si elle est définie. + +[h5]La Censure[/h5] + +$Projectname est un réseau mondial qui inclut toutes les religions et toutes les cultures. Cela n'implique pas que tous les membres du réseau ressentent la même chose que vous sur les questions litigieuses, et certaines personnes peuvent être FORTEMENT opposées au contenu que vous publiez. En général, si vous souhaitez publier quelque chose que vous savez ne pas être universellement acceptable, la meilleure approche est de limiter l'audience en utilisant les contrôles de confidentialité à un petit cercle d'amis. + +$Projectname en tant que fournisseur de réseau n'est pas en mesure de censurer le contenu. Cependant, les administrateurs du hub PEUVENT censurer tout contenu qui apparaît sur leur hub pour se conformer aux lois locales ou même au jugement personnel. Leur décision est finale. Si vous avez des problèmes avec un administrateur de hub, vous pouvez déplacer votre compte et vos messages sur un autre site qui correspond mieux à vos attentes. Veuillez vérifier (périodiquement) les[Conditions d'utilisation](help/TermsOfService) de votre hub pour connaître les règles ou directives. Si votre contenu se compose de matériel qui est illégal ou qui peut causer des problèmes, vous êtes FORTEMENT encouragé à héberger le vôtre (devenez un administrateur de hub). Vous pouvez toujours trouver que votre contenu est bloqué sur certains hubs, mais $Projectname en tant que réseau ne peut pas l'empêcher d'être posté. + +$Projectname RECOMMANDE que les administrateurs du concentrateur accordent un délai de grâce de 1 à 2 jours entre l'avertissement au titulaire du compte du contenu qui doit être supprimé et la suppression ou la désactivation physique du compte. Cela donnera au propriétaire du contenu la possibilité d'exporter les métadonnées de son canal et de les importer sur un autre site. Dans de rares cas, le contenu peut être de nature à justifier la résiliation immédiate du compte. Il s'agit d'une décision de hub, pas d'une décision de $Projectname. + +Si vous publiez régulièrement des contenus à caractère adulte ou offensant, nous vous encourageons fortement à marquer votre compte "NSFW" (Not Safe For Work). Ceci empêchera l'affichage de votre photo de profil dans le répertoire, sauf pour les visiteurs qui ont choisi de désactiver le "safe mode". Si votre photo de profil est trouvée par les administrateurs d'annuaire comme étant adulte ou offensante, l'administrateur d'annuaire PEUT marquer votre photo de profil comme NSFW. Il n'existe actuellement aucun mécanisme officiel pour contester ou renverser cette décision, c'est pourquoi vous DEVEZ marquer votre propre compte NSFW s'il est susceptible d'être inapproprié pour le grand public. + +[h3]Remerciements[/h3] + +Merci à tous ceux qui ont aidé et contribué au projet et à ses prédécesseurs au fil des ans. +Il est possible que votre nom nous ait échappé, mais ce n'est pas intentionnel. Nous remercions également la collectivité et ses membres pour leur précieuse contribution et sans qui tout cet effort n'aurait pas de sens. + +Il convient également de reconnaître les contributions et les solutions aux problèmes qui sont apparus à la suite de des discussions entre les membres et les développeurs d'autres projets quelque peu liés et concurrents ; même si nous avons eu nos désaccords occasionnels. + +[list] +[li]Mike Macgirvin[/li] +[li]Fabio Comuni[/li] +[li]Simon L'nu[/li] +[li]marijus[/li] +[li]Tobias Diekershoff[/li] +[li]fabrixxm[/li] +[li]tommy tomson[/li] +[li]Simon[/li] +[li]zottel[/li] +[li]Christian Vogeley[/li] +[li]jeroenpraat[/li] +[li]Michael Vogel[/li] +[li]erik[/li] +[li]Zach Prezkuta[/li] +[li]Paolo T[/li] +[li]Michael Meer[/li] +[li]Michael[/li] +[li]Abinoam P. Marques Jr[/li] +[li]Tobias Hößl[/li] +[li]Alexander Kampmann[/li] +[li]Olaf Conradi[/li] +[li]Paolo Tacconi[/li] +[li]tobiasd[/li] +[li]Devlon Duthie[/li] +[li]Zvi ben Yaakov (a.k.a rdc)[/li] +[li]Alexandre Hannud Abdo[/li] +[li]Olivier Migeot[/li] +[li]Chris Case[/li] +[li]Klaus Weidenbach[/li] +[li]Michael Johnston[/li] +[li]olivierm[/li] +[li]Vasudev Kamath[/li] +[li]pixelroot[/li] +[li]Max Weller[/li] +[li]duthied[/li] +[li]Martin Schmitt[/li] +[li]Sebastian Egbers[/li] +[li]Erkan Yilmaz[/li] +[li]sasiflo[/li] +[li]Stefan Parviainen[/li] +[li]Haakon Meland Eriksen[/li] +[li]Oliver Hartmann (23n)[/li] +[li]Erik Lundin[/li] +[li]habeascodice[/li] +[li]sirius[/li] +[li]Charles[/li] +[li]Tony Baldwin[/li] +[li]Hauke Zuehl[/li] +[li]Keith Fernie[/li] +[li]Anne Walk[/li] +[li]toclimb[/li] +[li]Daniel Frank[/li] +[li]Matthew Exon[/li] +[li]Michal Supler[/li] +[li]Tobias Luther[/li] +[li]U-SOUND\mike[/li] +[li]mrjive[/li] +[li]nostupidzone[/li] +[li]tonnerkiller[/li] +[li]Antoine G[/li] +[li]Christian Drechsler[/li] +[li]Ludovic Grossard[/li] +[li]RedmatrixCanada[/li] +[li]Stanislav Lechev [0xAF][/li] +[li]aweiher[/li] +[li]bufalo1973[/li] +[li]dsp1986[/li] +[li]felixgilles[/li] +[li]ike[/li] +[li]maase2[/li] +[li]mycocham[/li] +[li]ndurchx[/li] +[li]pafcu[/li] +[li]Simó Albert i Beltran[/li] +[li]Manuel Reva[/li] +[li]Manuel Jiménez Friaza[/li] +[li]Gustav Wall aka "neue medienordnung plus"[/li] +[/list] -- cgit v1.2.3 From 0a51ea1bfa85d770f5dd2c7fd1428b785c17e125 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Apr 2018 09:56:21 +0200 Subject: show caret-down on item-photo hover to indicate a dropdown menu --- view/css/conversation.css | 17 +++++++++++++++++ view/tpl/conv_item.tpl | 1 + view/tpl/conv_list.tpl | 1 + 3 files changed, 19 insertions(+) diff --git a/view/css/conversation.css b/view/css/conversation.css index c239a665b..c0d6712a9 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -87,6 +87,23 @@ margin-left:10px; } +.wall-item-photo-wrapper { + position: relative; +} + +.wall-item-photo-caret { + position: absolute; + left: 3px; + bottom: 0px; + color: #fff; + text-shadow: 1px 1px 3px rgba(0,0,0,0.5);; + display: none; +} + +.wall-item-photo-wrapper:hover .wall-item-photo-caret { + display: block; +} + .wall-item-divider { margin: 5px; } diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index a1d287f26..a408a83d2 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -31,6 +31,7 @@
{{$item.name}} {{if $item.thread_author_menu}} +
{{foreach $item.thread_author_menu as $mitem}} {{$mitem.title}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index c42751057..f94a2f24f 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -31,6 +31,7 @@
{{$item.name}} {{if $item.thread_author_menu}} +
{{foreach $item.thread_author_menu as $mitem}} {{$mitem.title}} -- cgit v1.2.3 From 0773b9bf920dbf4d3ba3110079adc39d7a0c0874 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Apr 2018 10:58:08 +0200 Subject: css fixes for bs-default schema --- view/theme/redbasic/schema/BS-Default.css | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/view/theme/redbasic/schema/BS-Default.css b/view/theme/redbasic/schema/BS-Default.css index 9045d3b97..47e93edc3 100644 --- a/view/theme/redbasic/schema/BS-Default.css +++ b/view/theme/redbasic/schema/BS-Default.css @@ -1,7 +1,4 @@ -.navbar-dark .navbar-toggler { - color: rgba(0,0,0,0.7); -} - -#notifications-btn.text-white { - color: #777 !important; +.navbar-dark .navbar-toggler, +.nav-link.active { + color: rgba(0,0,0,0.7) !important; } -- cgit v1.2.3 From 1bb2d0b954cdd817dcb85fe15dcbabdf996d8518 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Apr 2018 11:02:14 +0200 Subject: more css fixes for bs-default schema --- view/theme/redbasic/schema/BS-Default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/schema/BS-Default.css b/view/theme/redbasic/schema/BS-Default.css index 47e93edc3..d23fc0fd8 100644 --- a/view/theme/redbasic/schema/BS-Default.css +++ b/view/theme/redbasic/schema/BS-Default.css @@ -1,4 +1,4 @@ .navbar-dark .navbar-toggler, -.nav-link.active { +.navbar-dark .nav-link.active { color: rgba(0,0,0,0.7) !important; } -- cgit v1.2.3 From a3f77409a4b59cce2be515422da3f38c7493ffd1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Apr 2018 11:14:45 +0200 Subject: mark simple_* schemas unmaintained and deprecated --- .../redbasic/schema/simple_black_on_white.css | 322 ---------------- .../redbasic/schema/simple_black_on_white.php | 42 --- ...le_black_on_white_(unmaintained,deprecated).css | 322 ++++++++++++++++ ...le_black_on_white_(unmaintained,deprecated).php | 42 +++ .../redbasic/schema/simple_green_on_black.css | 408 --------------------- .../redbasic/schema/simple_green_on_black.php | 38 -- ...le_green_on_black_(unmaintained,deprecated).css | 408 +++++++++++++++++++++ ...le_green_on_black_(unmaintained,deprecated).php | 38 ++ .../redbasic/schema/simple_white_on_black.css | 382 ------------------- .../redbasic/schema/simple_white_on_black.php | 38 -- ...le_white_on_black_(unmaintained,deprecated).css | 382 +++++++++++++++++++ ...le_white_on_black_(unmaintained,deprecated).php | 38 ++ 12 files changed, 1230 insertions(+), 1230 deletions(-) delete mode 100644 view/theme/redbasic/schema/simple_black_on_white.css delete mode 100644 view/theme/redbasic/schema/simple_black_on_white.php create mode 100644 view/theme/redbasic/schema/simple_black_on_white_(unmaintained,deprecated).css create mode 100644 view/theme/redbasic/schema/simple_black_on_white_(unmaintained,deprecated).php delete mode 100644 view/theme/redbasic/schema/simple_green_on_black.css delete mode 100644 view/theme/redbasic/schema/simple_green_on_black.php create mode 100644 view/theme/redbasic/schema/simple_green_on_black_(unmaintained,deprecated).css create mode 100644 view/theme/redbasic/schema/simple_green_on_black_(unmaintained,deprecated).php delete mode 100644 view/theme/redbasic/schema/simple_white_on_black.css delete mode 100644 view/theme/redbasic/schema/simple_white_on_black.php create mode 100644 view/theme/redbasic/schema/simple_white_on_black_(unmaintained,deprecated).css create mode 100644 view/theme/redbasic/schema/simple_white_on_black_(unmaintained,deprecated).php diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css deleted file mode 100644 index ab819d774..000000000 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ /dev/null @@ -1,322 +0,0 @@ -.generic-content-wrapper { - border: 1px solid #fff; - background-color: transparent; -} - -.vcard, #contact-block, .widget { - background-color: transparent; - border: none; - border-bottom: 1px solid #fff; -} - -.abook-pending-contact, .abook-permschange { - background: #fff; -} - -#cboxContent a { - color: #fff; -} - -#cboxContent { - color: #fff; -} - -#adminpage table tr:hover { - background-color: #fff; -} - -#colorbox { - border: 0px solid #fff; - background-color: #fff; -} - -.chat-item-text { - background-color: #fff; -} - -.fc-state-highlight { - background: none repeat scroll 0% 0% #fff !important; -} - -.well { - background-color: #fff; - border: 1px solid #000; - background-image: linear-gradient(to bottom, #fff 0px, #fff 100%); -} - -.alert-info { - color: #000; - background-color:#fff; - border-color: #000; - background-image: linear-gradient(to bottom, #fff 0px, #fff 100%); -} - -#acl-select { - border: 1px solid #000; - color: #000; -} - -.acl-list-item { - border: 1px solid #000; - background-color: #FFF; - -} - -.abook-self { - border: 1px solid #EEE; - color: #ccc; - background-color: #EEE; -} - -.acl-button-show, -.acl-button-hide { - color: #000; -} - -#acl-list { - border: 1px solid #fff; -} - -.modal-content { - background-color: #fff; -} - -a.btn, aside a { - font-weight: 400 !important; -} - -.btn-default { - background-color: #fff; - border-color: #000; - color: #111; - text-shadow: none; - box-shadow: none; -} - -.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { - background-color: #fff; - border-color: #000; - color: #000; - text-decoration: underline; -} - -.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { - text-decoration: none; -} - -.pager_first, -.pager_last, -.pager_prev, -.pager_next, -.pager-prev, -.pager-next, -.pager_n { - border: 1px solid #000; - background: #fff; -} - -input { - border: 1px solid #000; -} - -input[type="submit"] { - background-color: #fff; - color: #000; -} - -.notify-seen a { - background: #fff; - color: #fff !important; -} - -.notify-seen a:hover { - background: #fff; - color: #000 !important; -} - -nav .dropdown-menu>li>a{ - color: #000; -} - -nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ - color: #000; - background-color: #F5F5F5; - background-image: none; -} - -nav .dropdown-menu .divider{ - background-color: #F5F5F5; -} - -nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ - color: #000; - background-color: #F5F5F5; - background-image: none; -} - -nav .dropdown-menu { - background-color: #fff; -} - -a.rateme, div.rateme { - border: 1px solid #fff; -} - -#nav-search-text { - background-color: #F5F5F5; -} - -.autocomplete .selected { - background: #F5F5F5; -} - -.nav-tabs{ - border-bottom:1px solid #000; -} - -.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ - border:1px solid #000; -} - -.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { - color: #000; - background-color: #fff; -} - -.nav-tabs.nav-justified > li > a { - color: #000; -} - -.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { - text-decoration: underline; - background-color: #fff; - color: #000; -} - -aside .nav > li > a:hover, aside .nav > li > a:focus { - text-decoration: underline; - background-color: #F5F5F5; -} - -.list-group-item { - background-color: #F5F5F5; -} - -a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { - font-weight: bold; -} - -.group-selected, .fileas-selected, .categories-selected, .search-selected, a.active { - color: #000 !important; - text-decoration: underline !important; -} - -.generic-content-wrapper-styled { - background-color: rgba(255,255,255,0.8); -} - -.autocomplete { - background: #fff; -} - -blockquote { - background-color: #fff; - border-left: 3px solid #000; - color: #111; -} - -code { - border: 1px solid #000; - background: #fff; - color: #000; -} - -pre { - background: #fff; - color: #111; - border:1px solid #000; -} - -.notif-item a { - color: #000; -} - -.notif-item a:hover { - color: #000; -} - -.dropdown-menu { - background-color: #fff; -} - -.dropdown-menu >li > a { - color: #000; -} - -.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { - color: #000; - background-color: #F5F5F5; - background-image: none; -} - -.open .dropdown-toggle.btn-default { - color: #000; - background-color: #fff; - border-color: #fff; -} - -.preview { - background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); -} - -@media (min-width: 768px) { - .nav-tabs.nav-justified > li > a { - border-bottom: 1px solid #000; - } -} - -#profile-jot-wrapper { - background-color: inherit; - border: none; -} - -.nav-tabs.nav-justified { - background-color: inherit; - border: none; -} - -.help-content { - border-bottom: #000 thin solid; -} - -.help-content-open { - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} - - -.contextual-help-content-open { - background: #FFF; -} - -.profile-match-wrapper { - width: 150px; - height: 120px; - border: none; -} - -.profile-match-name { - width: 144px; - white-space: nowrap; - text-overflow: ellipsis; -} - -.widget-nav-pills-icons:hover + a { - background-color: #F5F5F5; -} - -.widget-nav-pills-checkbox:hover + a { - background-color: #F5F5F5; -} - diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php deleted file mode 100644 index 554e832f0..000000000 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ /dev/null @@ -1,42 +0,0 @@ -li>a{ + color: #000; +} + +nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ + color: #000; + background-color: #F5F5F5; + background-image: none; +} + +nav .dropdown-menu .divider{ + background-color: #F5F5F5; +} + +nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ + color: #000; + background-color: #F5F5F5; + background-image: none; +} + +nav .dropdown-menu { + background-color: #fff; +} + +a.rateme, div.rateme { + border: 1px solid #fff; +} + +#nav-search-text { + background-color: #F5F5F5; +} + +.autocomplete .selected { + background: #F5F5F5; +} + +.nav-tabs{ + border-bottom:1px solid #000; +} + +.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ + border:1px solid #000; +} + +.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { + color: #000; + background-color: #fff; +} + +.nav-tabs.nav-justified > li > a { + color: #000; +} + +.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { + text-decoration: underline; + background-color: #fff; + color: #000; +} + +aside .nav > li > a:hover, aside .nav > li > a:focus { + text-decoration: underline; + background-color: #F5F5F5; +} + +.list-group-item { + background-color: #F5F5F5; +} + +a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { + font-weight: bold; +} + +.group-selected, .fileas-selected, .categories-selected, .search-selected, a.active { + color: #000 !important; + text-decoration: underline !important; +} + +.generic-content-wrapper-styled { + background-color: rgba(255,255,255,0.8); +} + +.autocomplete { + background: #fff; +} + +blockquote { + background-color: #fff; + border-left: 3px solid #000; + color: #111; +} + +code { + border: 1px solid #000; + background: #fff; + color: #000; +} + +pre { + background: #fff; + color: #111; + border:1px solid #000; +} + +.notif-item a { + color: #000; +} + +.notif-item a:hover { + color: #000; +} + +.dropdown-menu { + background-color: #fff; +} + +.dropdown-menu >li > a { + color: #000; +} + +.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { + color: #000; + background-color: #F5F5F5; + background-image: none; +} + +.open .dropdown-toggle.btn-default { + color: #000; + background-color: #fff; + border-color: #fff; +} + +.preview { + background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); +} + +@media (min-width: 768px) { + .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid #000; + } +} + +#profile-jot-wrapper { + background-color: inherit; + border: none; +} + +.nav-tabs.nav-justified { + background-color: inherit; + border: none; +} + +.help-content { + border-bottom: #000 thin solid; +} + +.help-content-open { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} + + +.contextual-help-content-open { + background: #FFF; +} + +.profile-match-wrapper { + width: 150px; + height: 120px; + border: none; +} + +.profile-match-name { + width: 144px; + white-space: nowrap; + text-overflow: ellipsis; +} + +.widget-nav-pills-icons:hover + a { + background-color: #F5F5F5; +} + +.widget-nav-pills-checkbox:hover + a { + background-color: #F5F5F5; +} + diff --git a/view/theme/redbasic/schema/simple_black_on_white_(unmaintained,deprecated).php b/view/theme/redbasic/schema/simple_black_on_white_(unmaintained,deprecated).php new file mode 100644 index 000000000..554e832f0 --- /dev/null +++ b/view/theme/redbasic/schema/simple_black_on_white_(unmaintained,deprecated).php @@ -0,0 +1,42 @@ +li>a { - color: #50f148; -} - -nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus { - color: #50f148; - background-color: #143D12; - background-image: none; -} - - -nav .dropdown-menu .divider { - background-color: #143D12; -} - -nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus { - color: #50f148; - background-color: #143D12; - background-image: none; -} - -nav .dropdown-menu { - background-color: #000; -} - -.rconnect { - color: #50f148; -} - -a.rateme, div.rateme { - color: #50f148; - border: 1px solid #000; -} - -a.rconnect, a.rateme, div.rateme { - color: #50f148; -} - -.navbar-inverse .navbar-nav > .open > a, -.navbar-inverse .navbar-nav > .open > a:hover, -.navbar-inverse .navbar-nav > .open > a:focus { - color: #50f148; -} - -#nav-search-text { - background-color: #000; -} - -.autocomplete .selected { - background: #000; -} - -.nav-tabs{ - border-bottom:1px solid #143D12; -} - -.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ - border:1px solid #143D12; -} - -.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { - color: #46D43F; - background-color: #000; -} - -.nav-tabs.nav-justified > li > a { - color: #50f148; -} - -.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { - text-decoration: underline; - background-color: #000; - color: #50f148; - border-color: #143D12; -} - -aside .nav > li > a:hover, aside .nav > li > a:focus { - text-decoration: underline; - background-color: #143D12; -} - -.list-group-item { - background-color: #143D12; -} - -a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { - font-weight: bold; -} - -.group-selected, .fileas-selected, .categories-selected, .search-selected, a.active { - color: #50f148 !important; - text-decoration: underline !important; -} - -.generic-content-wrapper-styled { - background-color: rgba(0,0,0,0.8); -} - -.autocomplete { - background: #000; -} - -blockquote { - background-color: #000; - border-left: 3px solid #143D12; - color: #32962D; -} - -code { - border: 1px solid #143D12; - background: #000; - color: #32962D; -} - -pre { - background: #000; - color: #32962D; - border:1px solid #143D12; -} - -.notif-item a { - color: #50f148; -} - -.notif-item a:hover { - color: #50f148; -} - -.dropdown-menu { - background-color: #000; -} - -.dropdown-menu >li > a { - color: #32962D; -} - -.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { - color: #50f148; - background-color: #143D12; - background-image: none; -} - -.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus { - color: #50f148; - background-color: #000; - border-color: #143D12; -} - -.preview { - background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif'); -} - - -@media (min-width: 768px) { - .nav-tabs.nav-justified > li > a { - border-bottom: 1px solid #143D12; - } -} - -#profile-jot-wrapper { - background-color: inherit; - border: none; -} - -.nav-tabs.nav-justified { - background-color: inherit; - border: none; -} - -.table-striped > tbody > tr:nth-of-type(2n+1) { - background-color: #000; -} - -.table-hover > tbody > tr:hover { - background-color: #143D12; -} - -.table > tbody > tr > td { - border-color: #143D12; -} - -.help-content { - border-bottom: #143D12 thin solid; -} - -.help-content-open { - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} - -.contextual-help-content-open { - background: $nav_bg; - border-bottom: #1C5419 1px solid; - box-shadow: 0px 3px 3px rgba(28,84,25,0.2); -} - -.contextual-help-tool { - opacity: 0.5; -} - -.contextual-help-tool:hover { - opacity: 1; -} - -.contextual-help-tool i { - color: $link_colour; -} - -.profile-match-wrapper { - width: 150px; - height: 120px; - border: none; -} - -.profile-match-name { - width: 144px; - white-space: nowrap; - text-overflow: ellipsis; -} - -.widget-nav-pills-icons:hover + a { - background-color: #143D12; -} - -.widget-nav-pills-checkbox:hover + a { - background-color: #143D12; -} diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php deleted file mode 100644 index 8192180db..000000000 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ /dev/null @@ -1,38 +0,0 @@ -li>a { + color: #50f148; +} + +nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus { + color: #50f148; + background-color: #143D12; + background-image: none; +} + + +nav .dropdown-menu .divider { + background-color: #143D12; +} + +nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus { + color: #50f148; + background-color: #143D12; + background-image: none; +} + +nav .dropdown-menu { + background-color: #000; +} + +.rconnect { + color: #50f148; +} + +a.rateme, div.rateme { + color: #50f148; + border: 1px solid #000; +} + +a.rconnect, a.rateme, div.rateme { + color: #50f148; +} + +.navbar-inverse .navbar-nav > .open > a, +.navbar-inverse .navbar-nav > .open > a:hover, +.navbar-inverse .navbar-nav > .open > a:focus { + color: #50f148; +} + +#nav-search-text { + background-color: #000; +} + +.autocomplete .selected { + background: #000; +} + +.nav-tabs{ + border-bottom:1px solid #143D12; +} + +.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ + border:1px solid #143D12; +} + +.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { + color: #46D43F; + background-color: #000; +} + +.nav-tabs.nav-justified > li > a { + color: #50f148; +} + +.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { + text-decoration: underline; + background-color: #000; + color: #50f148; + border-color: #143D12; +} + +aside .nav > li > a:hover, aside .nav > li > a:focus { + text-decoration: underline; + background-color: #143D12; +} + +.list-group-item { + background-color: #143D12; +} + +a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { + font-weight: bold; +} + +.group-selected, .fileas-selected, .categories-selected, .search-selected, a.active { + color: #50f148 !important; + text-decoration: underline !important; +} + +.generic-content-wrapper-styled { + background-color: rgba(0,0,0,0.8); +} + +.autocomplete { + background: #000; +} + +blockquote { + background-color: #000; + border-left: 3px solid #143D12; + color: #32962D; +} + +code { + border: 1px solid #143D12; + background: #000; + color: #32962D; +} + +pre { + background: #000; + color: #32962D; + border:1px solid #143D12; +} + +.notif-item a { + color: #50f148; +} + +.notif-item a:hover { + color: #50f148; +} + +.dropdown-menu { + background-color: #000; +} + +.dropdown-menu >li > a { + color: #32962D; +} + +.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { + color: #50f148; + background-color: #143D12; + background-image: none; +} + +.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus { + color: #50f148; + background-color: #000; + border-color: #143D12; +} + +.preview { + background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif'); +} + + +@media (min-width: 768px) { + .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid #143D12; + } +} + +#profile-jot-wrapper { + background-color: inherit; + border: none; +} + +.nav-tabs.nav-justified { + background-color: inherit; + border: none; +} + +.table-striped > tbody > tr:nth-of-type(2n+1) { + background-color: #000; +} + +.table-hover > tbody > tr:hover { + background-color: #143D12; +} + +.table > tbody > tr > td { + border-color: #143D12; +} + +.help-content { + border-bottom: #143D12 thin solid; +} + +.help-content-open { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.contextual-help-content-open { + background: $nav_bg; + border-bottom: #1C5419 1px solid; + box-shadow: 0px 3px 3px rgba(28,84,25,0.2); +} + +.contextual-help-tool { + opacity: 0.5; +} + +.contextual-help-tool:hover { + opacity: 1; +} + +.contextual-help-tool i { + color: $link_colour; +} + +.profile-match-wrapper { + width: 150px; + height: 120px; + border: none; +} + +.profile-match-name { + width: 144px; + white-space: nowrap; + text-overflow: ellipsis; +} + +.widget-nav-pills-icons:hover + a { + background-color: #143D12; +} + +.widget-nav-pills-checkbox:hover + a { + background-color: #143D12; +} diff --git a/view/theme/redbasic/schema/simple_green_on_black_(unmaintained,deprecated).php b/view/theme/redbasic/schema/simple_green_on_black_(unmaintained,deprecated).php new file mode 100644 index 000000000..8192180db --- /dev/null +++ b/view/theme/redbasic/schema/simple_green_on_black_(unmaintained,deprecated).php @@ -0,0 +1,38 @@ +li>a{ - color: #fff; -} - -nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ - color: #fff; - background-color: #030303; - background-image: none; -} - -nav .dropdown-menu .divider{ - background-color: #030303; -} - -nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ - color: #fff; - background-color: #030303; - background-image: none; -} - -nav .dropdown-menu { - background-color: #000; -} - -a.rateme, div.rateme { - border: 1px solid #000; -} - -#nav-search-text { - background-color: #000; -} - -.autocomplete .selected { - background: #000; -} - -.nav-tabs{ - border-bottom:1px solid #fff; -} - -.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ - border:1px solid #fff; -} - -.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { - color: #fff; - background-color: #000; -} - -.nav-tabs.nav-justified > li > a { - color: #fff; -} - -.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { - text-decoration: underline; - background-color: #000; - color: #fff; -} - -aside .nav > li > a:hover, aside .nav > li > a:focus { - text-decoration: underline; - background-color: #030303; -} - -.list-group-item { - background-color: #030303; -} - -a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { - font-weight: bold; -} - -.group-selected, .fileas-selected, .categories-selected, .search-selected, a.active { - color: #fff !important; - text-decoration: underline !important; -} - -.generic-content-wrapper-styled { - background-color: rgba(0,0,0,0.8); -} - -.autocomplete { - background: #000; -} - -blockquote { - background-color: #000; - border-left: 3px solid #fff; - color: #eee; -} - -code { - border: 1px solid #eee; - background: #000; - color: #eee; -} - -pre { - background: #000; - color: #eee; - border:1px solid #fff; -} - -.notif-item a { - color: #fff; -} - -.notif-item a:hover { - color: #fff; -} - -.dropdown-menu { - background-color: #000; -} - -.dropdown-menu >li > a { - color: #fff; -} - -.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { - color: #fff; - background-color: #030303; - background-image: none; -} - -.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus { - color: #fff; - background-color: #000; - border-color: #fff; -} - -.preview { - background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif'); -} - -@media (min-width: 768px) { - .nav-tabs.nav-justified > li > a { - border-bottom: 1px solid #fff; - } -} - -#profile-jot-wrapper { - background-color: inherit; - border: none; -} - -.nav-tabs.nav-justified { - background-color: inherit; - border: none; -} - -.table-striped > tbody > tr:nth-of-type(2n+1), .table-hover > tbody > tr:hover { - background-color: #030303; -} - -.table > tbody > tr > td { - border-color: #FFF; -} - -.help-content { - border-bottom: #FFF thin solid; -} - -.help-content-open { - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} - -.contextual-help-content-open { - background: $nav_bg; - border-bottom: #FFF 1px solid; - box-shadow: 0px 3px 3px rgba(255,255,255,0.2); -} - -.contextual-help-tool { - opacity: 0.5; -} - -.contextual-help-tool:hover { - opacity: 1; -} - -.contextual-help-tool i { - color: $link_colour; -} - -.profile-match-wrapper { - width: 150px; - height: 120px; - border: none; -} - -.profile-match-name { - width: 144px; - white-space: nowrap; - text-overflow: ellipsis; -} - -.widget-nav-pills-icons:hover + a { - background-color: #030303; -} - -.widget-nav-pills-checkbox:hover + a { - background-color: #030303; -} - diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php deleted file mode 100644 index b64f60bbe..000000000 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ /dev/null @@ -1,38 +0,0 @@ -li>a{ + color: #fff; +} + +nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ + color: #fff; + background-color: #030303; + background-image: none; +} + +nav .dropdown-menu .divider{ + background-color: #030303; +} + +nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ + color: #fff; + background-color: #030303; + background-image: none; +} + +nav .dropdown-menu { + background-color: #000; +} + +a.rateme, div.rateme { + border: 1px solid #000; +} + +#nav-search-text { + background-color: #000; +} + +.autocomplete .selected { + background: #000; +} + +.nav-tabs{ + border-bottom:1px solid #fff; +} + +.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ + border:1px solid #fff; +} + +.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { + color: #fff; + background-color: #000; +} + +.nav-tabs.nav-justified > li > a { + color: #fff; +} + +.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { + text-decoration: underline; + background-color: #000; + color: #fff; +} + +aside .nav > li > a:hover, aside .nav > li > a:focus { + text-decoration: underline; + background-color: #030303; +} + +.list-group-item { + background-color: #030303; +} + +a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { + font-weight: bold; +} + +.group-selected, .fileas-selected, .categories-selected, .search-selected, a.active { + color: #fff !important; + text-decoration: underline !important; +} + +.generic-content-wrapper-styled { + background-color: rgba(0,0,0,0.8); +} + +.autocomplete { + background: #000; +} + +blockquote { + background-color: #000; + border-left: 3px solid #fff; + color: #eee; +} + +code { + border: 1px solid #eee; + background: #000; + color: #eee; +} + +pre { + background: #000; + color: #eee; + border:1px solid #fff; +} + +.notif-item a { + color: #fff; +} + +.notif-item a:hover { + color: #fff; +} + +.dropdown-menu { + background-color: #000; +} + +.dropdown-menu >li > a { + color: #fff; +} + +.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { + color: #fff; + background-color: #030303; + background-image: none; +} + +.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus { + color: #fff; + background-color: #000; + border-color: #fff; +} + +.preview { + background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif'); +} + +@media (min-width: 768px) { + .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid #fff; + } +} + +#profile-jot-wrapper { + background-color: inherit; + border: none; +} + +.nav-tabs.nav-justified { + background-color: inherit; + border: none; +} + +.table-striped > tbody > tr:nth-of-type(2n+1), .table-hover > tbody > tr:hover { + background-color: #030303; +} + +.table > tbody > tr > td { + border-color: #FFF; +} + +.help-content { + border-bottom: #FFF thin solid; +} + +.help-content-open { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.contextual-help-content-open { + background: $nav_bg; + border-bottom: #FFF 1px solid; + box-shadow: 0px 3px 3px rgba(255,255,255,0.2); +} + +.contextual-help-tool { + opacity: 0.5; +} + +.contextual-help-tool:hover { + opacity: 1; +} + +.contextual-help-tool i { + color: $link_colour; +} + +.profile-match-wrapper { + width: 150px; + height: 120px; + border: none; +} + +.profile-match-name { + width: 144px; + white-space: nowrap; + text-overflow: ellipsis; +} + +.widget-nav-pills-icons:hover + a { + background-color: #030303; +} + +.widget-nav-pills-checkbox:hover + a { + background-color: #030303; +} + diff --git a/view/theme/redbasic/schema/simple_white_on_black_(unmaintained,deprecated).php b/view/theme/redbasic/schema/simple_white_on_black_(unmaintained,deprecated).php new file mode 100644 index 000000000..b64f60bbe --- /dev/null +++ b/view/theme/redbasic/schema/simple_white_on_black_(unmaintained,deprecated).php @@ -0,0 +1,38 @@ + Date: Wed, 25 Apr 2018 02:26:37 -0700 Subject: undo_post_tagging - don't waste a connection query if we're undoing a hashtag and not a mention. --- include/text.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/text.php b/include/text.php index 4d6d0ffb5..60f6ff383 100644 --- a/include/text.php +++ b/include/text.php @@ -2033,13 +2033,16 @@ function item_post_type($item) { function undo_post_tagging($s) { $matches = null; + $x = null; // undo tags and mentions $cnt = preg_match_all('/([@#])(\!*)\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { - $x = q("select xchan_addr, xchan_url from xchan where xchan_url = '%s' limit 1", - dbesc($mtch[3]) - ); + if($mtch[1] === '@') { + $x = q("select xchan_addr, xchan_url from xchan where xchan_url = '%s' limit 1", + dbesc($mtch[3]) + ); + } if($x) { $s = str_replace($mtch[0], $mtch[1] . $mtch[2] . '{' . (($x[0]['xchan_addr']) ? $x[0]['xchan_addr'] : $x[0]['xchan_url']) . '}', $s); } -- cgit v1.2.3 From ddb9db188b2c3e85eec6c539adcb250e653b5353 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Apr 2018 11:31:10 +0200 Subject: rename boxy schema to focus-boxy and bs-default to focus-light --- view/theme/redbasic/schema/BS-Default.css | 4 ---- view/theme/redbasic/schema/BS-Default.php | 12 ------------ view/theme/redbasic/schema/Focus-Boxy.css | 15 +++++++++++++++ view/theme/redbasic/schema/Focus-Boxy.php | 6 ++++++ view/theme/redbasic/schema/Focus-Light.css | 4 ++++ view/theme/redbasic/schema/Focus-Light.php | 12 ++++++++++++ view/theme/redbasic/schema/boxy.css | 7 ------- view/theme/redbasic/schema/boxy.php | 6 ------ 8 files changed, 37 insertions(+), 29 deletions(-) delete mode 100644 view/theme/redbasic/schema/BS-Default.css delete mode 100644 view/theme/redbasic/schema/BS-Default.php create mode 100644 view/theme/redbasic/schema/Focus-Boxy.css create mode 100644 view/theme/redbasic/schema/Focus-Boxy.php create mode 100644 view/theme/redbasic/schema/Focus-Light.css create mode 100644 view/theme/redbasic/schema/Focus-Light.php delete mode 100644 view/theme/redbasic/schema/boxy.css delete mode 100644 view/theme/redbasic/schema/boxy.php diff --git a/view/theme/redbasic/schema/BS-Default.css b/view/theme/redbasic/schema/BS-Default.css deleted file mode 100644 index d23fc0fd8..000000000 --- a/view/theme/redbasic/schema/BS-Default.css +++ /dev/null @@ -1,4 +0,0 @@ -.navbar-dark .navbar-toggler, -.navbar-dark .nav-link.active { - color: rgba(0,0,0,0.7) !important; -} diff --git a/view/theme/redbasic/schema/BS-Default.php b/view/theme/redbasic/schema/BS-Default.php deleted file mode 100644 index 14ee130d9..000000000 --- a/view/theme/redbasic/schema/BS-Default.php +++ /dev/null @@ -1,12 +0,0 @@ - Date: Wed, 25 Apr 2018 12:46:50 +0200 Subject: New strings: Spanish translation --- view/es-es/hmessages.po | 186 ++++++++++++++++++++++++++++-------------------- 1 file changed, 109 insertions(+), 77 deletions(-) diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 7089c2eab..ec03b4c2c 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-18 08:37+0200\n" -"PO-Revision-Date: 2018-04-20 09:32+0000\n" +"POT-Creation-Date: 2018-04-23 11:34+0200\n" +"PO-Revision-Date: 2018-04-24 09:02+0000\n" "Last-Translator: Manuel Jiménez Friaza \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -101,8 +101,8 @@ msgid "Social Networking" msgstr "Redes sociales" #: ../../Zotlabs/Access/PermissionRoles.php:284 -msgid "Social - Party" -msgstr "Social - Extra público" +msgid "Social - Federation" +msgstr "Social - Federación" #: ../../Zotlabs/Access/PermissionRoles.php:285 msgid "Social - Mostly Public" @@ -461,15 +461,16 @@ msgstr "3. Pulse [conectar]" #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:823 +#: ../../addon/diaspora/diaspora.php:825 #: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84 #: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161 #: ../../addon/mailtest/mailtest.php:100 #: ../../addon/openstreetmap/openstreetmap.php:168 -#: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371 +#: ../../addon/fuzzloc/fuzzloc.php:191 ../../addon/rtof/rtof.php:101 +#: ../../addon/jappixmini/jappixmini.php:371 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1069 +#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1072 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 @@ -569,7 +570,7 @@ msgstr "Resumen: " #: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273 #: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:878 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891 #: ../../include/conversation.php:1160 msgid "Unknown" msgstr "Desconocido" @@ -731,7 +732,7 @@ msgstr "Teléfono" #: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1769 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1770 msgid "Email" msgstr "Correo electrónico" @@ -1093,8 +1094,8 @@ msgstr "Usar la autenticación mágica si está disponible" #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 #: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 #: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 -#: ../../addon/rtof/rtof.php:81 ../../addon/rtof/rtof.php:85 -#: ../../addon/jappixmini/jappixmini.php:309 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 +#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 #: ../../addon/jappixmini/jappixmini.php:351 @@ -1145,8 +1146,8 @@ msgstr "No" #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 #: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 #: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 -#: ../../addon/rtof/rtof.php:81 ../../addon/rtof/rtof.php:85 -#: ../../addon/jappixmini/jappixmini.php:309 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 +#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 #: ../../addon/jappixmini/jappixmini.php:351 @@ -1463,13 +1464,13 @@ msgstr "Servidor no encontrado" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 #: ../../Zotlabs/Module/Like.php:384 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1388 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 #: ../../include/conversation.php:116 ../../include/text.php:2005 msgid "photo" msgstr "foto" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 -#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1388 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 #: ../../include/conversation.php:144 ../../include/text.php:2011 msgid "status" msgstr "el mensaje de estado" @@ -1577,6 +1578,7 @@ msgid "" msgstr "Su alias se usará para crear una dirección de canal fácil de recordar, p. ej.: alias%s" #: ../../Zotlabs/Module/New_channel.php:149 +#: ../../Zotlabs/Module/Settings/Channel.php:539 #: ../../Zotlabs/Module/Register.php:257 msgid "Channel role and privacy" msgstr "Clase de canal y privacidad" @@ -1597,10 +1599,18 @@ msgstr "Crear un canal" #: ../../Zotlabs/Module/New_channel.php:153 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 "Un canal es su identidad en esta red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con una gama de permisos extremadamente detallada." +"A channel is a unique network identity. It can represent a person (social " +"network profile), a forum (group), a business or celebrity page, a newsfeed," +" and many other things. Channels can make connections with other channels to" +" share information with each other." +msgstr "Un canal es una identidad única en la red. Puede representar a una persona (un perfil de una red social), un foro o grupo, un negocio o una página de una celebridad, un \"feed\" de noticias, y muchas otras cosas. Los canales pueden conectarse con otros canales para compartir información unos con otros." + +#: ../../Zotlabs/Module/New_channel.php:153 +msgid "" +"The type of channel you create affects the basic privacy settings, the " +"permissions that are granted to connections/friends, and also the channel's " +"visibility across the network." +msgstr "El tipo de canal que cree afecta a la configuración básica de privacidad, a los permisos que se conceden a las conexiones/amigos y también a la visibilidad del canal en la red." #: ../../Zotlabs/Module/New_channel.php:154 msgid "" @@ -3365,11 +3375,11 @@ msgctxt "acl" msgid "Profile" msgstr "Perfil" -#: ../../Zotlabs/Module/Moderate.php:62 +#: ../../Zotlabs/Module/Moderate.php:65 msgid "Comment approved" msgstr "El comentario ha sido aprobado" -#: ../../Zotlabs/Module/Moderate.php:66 +#: ../../Zotlabs/Module/Moderate.php:69 msgid "Comment deleted" msgstr "Se ha eliminado el comentario" @@ -3633,10 +3643,6 @@ msgstr "Usar los ajustes de mi audiencia predeterminada para el tipo de publicac msgid "Profile to assign new connections" msgstr "Perfil para asignar a las nuevas conexiones" -#: ../../Zotlabs/Module/Settings/Channel.php:539 -msgid "Channel permissions category:" -msgstr "Categoría de los permisos del canal:" - #: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Default Permissions Group" msgstr "Grupo de permisos predeterminados" @@ -4910,7 +4916,7 @@ msgstr "Ver todo" #: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205 #: ../../include/conversation.php:1981 ../../include/channel.php:1539 -#: ../../include/taxonomy.php:660 +#: ../../include/taxonomy.php:661 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -4953,7 +4959,7 @@ msgid "Close" msgstr "Cerrar" #: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378 -#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:663 +#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:667 msgid "Recent Photos" msgstr "Fotos recientes" @@ -5266,7 +5272,7 @@ msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. " #: ../../Zotlabs/Module/Profile_photo.php:120 #: ../../Zotlabs/Module/Profile_photo.php:248 -#: ../../include/photo/photo_driver.php:740 +#: ../../include/photo/photo_driver.php:741 msgid "Profile Photos" msgstr "Fotos del perfil" @@ -6839,12 +6845,12 @@ msgid "Previous action reversed." msgstr "Acción anterior revocada." #: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529 -#: ../../addon/pubcrawl/as.php:1423 ../../include/conversation.php:160 +#: ../../addon/pubcrawl/as.php:1440 ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "A %1$s le gusta %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1425 +#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442 #: ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" @@ -8351,11 +8357,11 @@ msgstr "Firma de mensaje incorrecta" msgid "Add Tag" msgstr "Añadir etiqueta" -#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:574 +#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575 msgid "like" msgstr "me gusta" -#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:575 +#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576 msgid "dislike" msgstr "no me gusta" @@ -8657,9 +8663,9 @@ msgstr "Seleccionar una agenda para importarla" #: ../../Zotlabs/Widget/Appcategories.php:40 #: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141 -#: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:408 -#: ../../include/taxonomy.php:490 ../../include/taxonomy.php:510 -#: ../../include/taxonomy.php:531 +#: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:409 +#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 +#: ../../include/taxonomy.php:532 msgid "Categories" msgstr "Temas" @@ -8847,8 +8853,8 @@ msgstr "Carpetas guardadas" msgid "Click to show more" msgstr "Hacer clic para ver más" -#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:319 -#: ../../include/taxonomy.php:448 ../../include/taxonomy.php:469 +#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320 +#: ../../include/taxonomy.php:449 ../../include/taxonomy.php:470 msgid "Tags" msgstr "Etiquetas" @@ -10166,39 +10172,39 @@ msgstr "una declaración de amor eterno" msgid "declared undying love for" msgstr "ha declarado amor eterno a" -#: ../../addon/diaspora/diaspora.php:779 +#: ../../addon/diaspora/diaspora.php:781 msgid "Diaspora Protocol Settings updated." msgstr "Los ajustes del protocolo de Diaspora se han actualizado." -#: ../../addon/diaspora/diaspora.php:798 +#: ../../addon/diaspora/diaspora.php:800 msgid "" "The Diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos." -#: ../../addon/diaspora/diaspora.php:801 +#: ../../addon/diaspora/diaspora.php:803 msgid "Enable the Diaspora protocol for this channel" msgstr "Activar el protocolo de Diaspora para este canal" -#: ../../addon/diaspora/diaspora.php:805 +#: ../../addon/diaspora/diaspora.php:807 msgid "Allow any Diaspora member to comment on your public posts" msgstr "Permitir a cualquier miembro de Diaspora comentar sus entradas públicas" -#: ../../addon/diaspora/diaspora.php:809 +#: ../../addon/diaspora/diaspora.php:811 msgid "Prevent your hashtags from being redirected to other sites" msgstr "Impedir que sus \"hashtags\" sean redirigidos a otros sitios " -#: ../../addon/diaspora/diaspora.php:813 +#: ../../addon/diaspora/diaspora.php:815 msgid "" "Sign and forward posts and comments with no existing Diaspora signature" msgstr "Firmar y enviar entradas y comentarios sin firma de Diaspora" -#: ../../addon/diaspora/diaspora.php:818 +#: ../../addon/diaspora/diaspora.php:820 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "\"Hashtags\" seguidos (separados por comas, sin incluir #)" -#: ../../addon/diaspora/diaspora.php:823 +#: ../../addon/diaspora/diaspora.php:825 msgid "Diaspora Protocol Settings" msgstr "Ajustes del protocolo de Diaspora" @@ -10441,6 +10447,32 @@ msgstr "Incluir un marcador en el mapa." msgid "text to include in all outgoing posts from this site" msgstr "texto a incluir en todos los mensajes salientes de este sitio" +#: ../../addon/fuzzloc/fuzzloc.php:148 +msgid "Fuzzloc Settings updated." +msgstr "Los ajustes de Fuzzloc se han actualizado." + +#: ../../addon/fuzzloc/fuzzloc.php:175 +msgid "" +"Fuzzloc allows you to blur your precise location if your channel uses " +"browser location mapping." +msgstr "Fuzzloc le permite desdibujar su ubicación precisa si su canal utiliza la asignación de ubicación del navegador." + +#: ../../addon/fuzzloc/fuzzloc.php:178 +msgid "Enable Fuzzloc Plugin" +msgstr "Habilitar el plugin Fuzzloc" + +#: ../../addon/fuzzloc/fuzzloc.php:182 +msgid "Minimum offset in meters" +msgstr "Offset mínimo en metros" + +#: ../../addon/fuzzloc/fuzzloc.php:186 +msgid "Maximum offset in meters" +msgstr "Offset máximo en metros" + +#: ../../addon/fuzzloc/fuzzloc.php:191 +msgid "Fuzzloc Settings" +msgstr "Ajustes de Fuzzloc" + #: ../../addon/rtof/rtof.php:45 msgid "Post to Friendica" msgstr "Publicar en Friendica" @@ -10643,35 +10675,35 @@ msgstr "Nombre de inicio de sesión en Friendica" msgid "Friendica Login Password" msgstr "Contraseña de inicio de sesión en Friendica" -#: ../../addon/pubcrawl/as.php:1129 ../../addon/pubcrawl/as.php:1256 -#: ../../addon/pubcrawl/as.php:1432 ../../include/network.php:1768 +#: ../../addon/pubcrawl/as.php:1146 ../../addon/pubcrawl/as.php:1273 +#: ../../addon/pubcrawl/as.php:1449 ../../include/network.php:1769 msgid "ActivityPub" msgstr "ActivityPub" -#: ../../addon/pubcrawl/pubcrawl.php:1050 +#: ../../addon/pubcrawl/pubcrawl.php:1053 msgid "ActivityPub Protocol Settings updated." msgstr "Se han actualizado los ajustes del protocolo ActivityPub." -#: ../../addon/pubcrawl/pubcrawl.php:1059 +#: ../../addon/pubcrawl/pubcrawl.php:1062 msgid "" "The ActivityPub protocol does not support location independence. Connections" " you make within that network may be unreachable from alternate channel " "locations." msgstr "El protocolo ActivityPub no soporta la independencia de ubicación. Las conexiones que realice dentro de esa red pueden no ser accesibles desde ubicaciones de canales alternativos." -#: ../../addon/pubcrawl/pubcrawl.php:1062 +#: ../../addon/pubcrawl/pubcrawl.php:1065 msgid "Enable the ActivityPub protocol for this channel" msgstr "Activar el protocolo ActivityPub para este canal" -#: ../../addon/pubcrawl/pubcrawl.php:1065 +#: ../../addon/pubcrawl/pubcrawl.php:1068 msgid "Send multi-media HTML articles" msgstr "Enviar artículos multimedia en HTML" -#: ../../addon/pubcrawl/pubcrawl.php:1065 +#: ../../addon/pubcrawl/pubcrawl.php:1068 msgid "Not supported by some microblog services such as Mastodon" msgstr "No soportado por algunos servicios de microblog como Mastodon" -#: ../../addon/pubcrawl/pubcrawl.php:1069 +#: ../../addon/pubcrawl/pubcrawl.php:1072 msgid "ActivityPub Protocol Settings" msgstr "Ajustes del protocolo ActivityPub" @@ -12232,7 +12264,7 @@ msgid "Profile Details" msgstr "Detalles del perfil" #: ../../include/conversation.php:1837 ../../include/nav.php:404 -#: ../../include/photos.php:662 +#: ../../include/photos.php:666 msgid "Photo Albums" msgstr "Álbumes de fotos" @@ -13414,43 +13446,43 @@ msgstr "Fax de trabajo" msgid "view full size" msgstr "Ver en el tamaño original" -#: ../../include/network.php:1763 ../../include/network.php:1764 +#: ../../include/network.php:1764 ../../include/network.php:1765 msgid "Friendica" msgstr "Friendica" -#: ../../include/network.php:1765 +#: ../../include/network.php:1766 msgid "OStatus" msgstr "OStatus" -#: ../../include/network.php:1766 +#: ../../include/network.php:1767 msgid "GNU-Social" msgstr "GNU Social" -#: ../../include/network.php:1767 +#: ../../include/network.php:1768 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:1770 +#: ../../include/network.php:1771 msgid "Diaspora" msgstr "Diaspora" -#: ../../include/network.php:1771 +#: ../../include/network.php:1772 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:1772 +#: ../../include/network.php:1773 msgid "Zot" msgstr "Zot" -#: ../../include/network.php:1773 +#: ../../include/network.php:1774 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:1774 +#: ../../include/network.php:1775 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1775 +#: ../../include/network.php:1776 msgid "MySpace" msgstr "MySpace" @@ -13922,35 +13954,35 @@ msgstr "Nube de etiquetas" msgid "Provide a personal tag cloud on your channel page" msgstr "Proveer nube de etiquetas personal en su página de canal" -#: ../../include/taxonomy.php:319 +#: ../../include/taxonomy.php:320 msgid "Trending" msgstr "Populares" -#: ../../include/taxonomy.php:551 +#: ../../include/taxonomy.php:552 msgid "Keywords" msgstr "Palabras clave" -#: ../../include/taxonomy.php:572 +#: ../../include/taxonomy.php:573 msgid "have" msgstr "tener" -#: ../../include/taxonomy.php:572 +#: ../../include/taxonomy.php:573 msgid "has" msgstr "tiene" -#: ../../include/taxonomy.php:573 +#: ../../include/taxonomy.php:574 msgid "want" msgstr "quiero" -#: ../../include/taxonomy.php:573 +#: ../../include/taxonomy.php:574 msgid "wants" msgstr "quiere" -#: ../../include/taxonomy.php:574 +#: ../../include/taxonomy.php:575 msgid "likes" msgstr "gusta de" -#: ../../include/taxonomy.php:575 +#: ../../include/taxonomy.php:576 msgid "dislikes" msgstr "no gusta de" @@ -14188,21 +14220,21 @@ msgstr "La imagen excede el límite de %lu bytes del sitio" msgid "Image file is empty." msgstr "El fichero de imagen está vacío. " -#: ../../include/photos.php:322 +#: ../../include/photos.php:326 msgid "Photo storage failed." msgstr "La foto no ha podido ser guardada." -#: ../../include/photos.php:371 +#: ../../include/photos.php:375 msgid "a new photo" msgstr "una nueva foto" -#: ../../include/photos.php:375 +#: ../../include/photos.php:379 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "%1$s ha publicado %2$s en %3$s" -#: ../../include/photos.php:667 +#: ../../include/photos.php:671 msgid "Upload New Photos" msgstr "Subir nuevas fotos" @@ -14219,7 +14251,7 @@ msgstr "No ha sido posible de verificar la firma del canal" msgid "Unable to verify site signature for %s" msgstr "No ha sido posible de verificar la firma del sitio para %s" -#: ../../include/zot.php:4217 +#: ../../include/zot.php:4219 msgid "invalid target signature" msgstr "La firma recibida no es válida" -- cgit v1.2.3 From c0bf3c8af1b220f409cff2577f35cb768c7ef42c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Apr 2018 12:48:08 +0200 Subject: changelog --- CHANGELOG | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index fa28aefc6..e7ffb00a7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ Hubzilla 3.4 (????-??-??) - + - Rename boxy schema to Focus-Boxy + - Rename BS-Default schema to Focus-Light + - Mark simple_* schemas unmaintained and deprecated - they will be removed in next release if nobody steps up to maintain them. - Implement trending tags for mod pubstream - Relax restrictions to the design tools menu to allow those with write_pages permission - Add alt pager to mod moderate -- cgit v1.2.3 From 2ede8e3675b5c38f3b8fa050f9d3ab1b76090a51 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Apr 2018 14:11:41 +0200 Subject: drop box-shadow from generic-content-wrapper (it's probably too 90') and use transparent colors for borders to work better with alternate background colors --- view/css/conversation.css | 8 ++++---- view/css/widgets.css | 1 + view/theme/redbasic/css/style.css | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/view/css/conversation.css b/view/css/conversation.css index c0d6712a9..cff59aecb 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -15,11 +15,11 @@ #jot-title-wrap, #jot-pagetitle-wrap, #jot-category-wrap { - border-bottom: 1px solid #ccc; + border-bottom: 1px solid rgba(0, 0, 0, .2); } #jot-attachment-wrap { - border-top: 1px solid #ccc; + border-top: 1px solid rgba(0, 0, 0, .2); } #jot-title-wrap input, @@ -65,7 +65,7 @@ } #profile-jot-submit-wrapper { - border-top: 1px solid #ccc; + border-top: 1px solid rgba(0, 0, 0, .2); } /* conversation */ @@ -96,7 +96,7 @@ left: 3px; bottom: 0px; color: #fff; - text-shadow: 1px 1px 3px rgba(0,0,0,0.5);; + text-shadow: 1px 1px 3px rgba(0, 0, 0, .5); display: none; } diff --git a/view/css/widgets.css b/view/css/widgets.css index 48df1811f..9730d6915 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -41,6 +41,7 @@ li:hover .widget-nav-pills-icons { /* notes */ #note-text { + border: 1px solid rgba(0,0,0,.125); padding: 5px; width: 100%; resize: none; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6e516b21e..0bb523457 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1051,12 +1051,14 @@ img.mail-conv-sender-photo { } #profile-jot-wrapper { - background-color: rgba(254,254,254,1); - border: 1px solid #ccc; + background-color: rgba(254, 254, 254, 1); + border: 1px solid rgba(0, 0, 0, .2); border-radius: $radius; } +#jot-title, +#jot-pagetitle, #profile-jot-text { border-radius: $radius; } @@ -1208,7 +1210,6 @@ img.mail-conv-sender-photo { } #note-text { - border: 1px solid #ccc; border-radius: $radius; } @@ -1303,8 +1304,7 @@ img.mail-conv-sender-photo { } .generic-content-wrapper { - border: 1px solid #ccc; - box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2); + border: 1px solid rgba(0, 0, 0, .2); border-radius: $radius; margin-bottom: 1.5rem; } -- cgit v1.2.3 From d5c3363909309dd7ae2925fff8c1235524cf9f6b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Apr 2018 14:16:47 +0200 Subject: bump version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index eb2c1ddff..d79f14617 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.5' ); +define ( 'STD_VERSION', '3.5.1' ); define ( 'ZOT_REVISION', '6.0a' ); -- cgit v1.2.3 From 2e758f11e71ed28e148887fd436ad35024f7d6a3 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Wed, 25 Apr 2018 18:08:55 +0200 Subject: Update project.bb and place in correct folder FR toc.html needs editing --- doc/fr/about/project.bb | 175 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 doc/fr/about/project.bb diff --git a/doc/fr/about/project.bb b/doc/fr/about/project.bb new file mode 100644 index 000000000..02ee07103 --- /dev/null +++ b/doc/fr/about/project.bb @@ -0,0 +1,175 @@ +[h3]La gouvernance de $Projectname [/h3] +La gouvernance est liée à la gestion d'un projet et plus particulièrement à la résolution des conflits. + +[h4]Gouvernance communautaire[/h4] +Le projet est maintenu et les décisions sont prises par la "communauté". La structure de gouvernance continue d'évoluer. Jusqu'à ce que la structure soit finalisée, les décisions sont prises dans l'ordre suivant : + +[ol] +[*] Consensus paresseux + +Si une proposition de projet est soumise à l'un des forums de gouvernance communautaire et qu'il n'y a pas d'objections sérieuses dans un délai "raisonnable" à partir de la date de la proposition (nous accordons généralement 2 à 3 jours pour que toutes les parties intéressées puissent intervenir), aucun vote n'est nécessaire et la proposition sera considérée comme approuvée. Certaines préoccupations peuvent être soulevées à ce moment-là, mais si elles sont abordées au cours de la discussion et des solutions de rechange fournies, elles seront quand même considérées comme approuvées. + +[*] Veto + +Les promoteurs principaux ayant un historique important d'engagements de projet peuvent opposer leur veto à toute décision. La décision ne peut être prise tant que le veto n'a pas été levé ou qu'une autre proposition n'a pas été présentée. + +[*] Vote de la communauté + +Une décision qui n'a pas de mandat clair ou de consensus clair, mais qui ne fait pas l'objet d'un veto, peut être soumise au vote de la communauté. Actuellement, il s'agit d'un simple vote populaire dans l'un des forums communautaires applicables. À ce moment-là, c'est le vote populaire qui décide du résultat. Cela pourrait changer à l'avenir si la communauté adopte un modèle de gouvernance de "conseil". Ce document sera mis à jour à ce moment-là avec les règles de gouvernance mises à jour. +[/ol] + +Le vote communautaire n'offre pas toujours un résultat agréable et peut générer des factions polarisées au sein de la communauté (d'où la raison pour laquelle d'autres modèles sont à l'étude). Si la proposition est rejetée, il y a encore plusieurs choses qui peuvent être faites et la proposition peut être soumise à nouveau avec des paramètres légèrement différents (conversion vers un module complémentaire, conversion vers un module optionnel qui est désactivé par défaut, etc. Si l'intérêt pour le dispositif est élevé et que le vote est "serré", cela peut générer beaucoup de mauvais sentiments parmi les électeurs perdants. Lors de ces votes serrés, il est [b]fortement recommandé[/b] que l'auteur de la proposition prenne des mesures pour répondre à toute préoccupation soulevée et la soumettre de nouveau. + +[h3]Politique de confidentialité[/h3] + +Q : Qui peut voir mon contenu ? + +R : Par défaut, N'IMPORTE QUELLE personne sur Internet, à MOINS que vous le restreigniez. Nom du projet vous permet de choisir le niveau de confidentialité que vous désirez. Le contenu restreint ne sera PAS visible pour les "réseaux d'espionnage" et les annonceurs. Il sera protégé contre les écoutes de l'extérieur - au mieux de nos capacités. Les administrateurs de Hub ayant suffisamment de compétences et de patience PEUVENT être en mesure d'écouter certaines communications privées, mais ils doivent déployer des trésors d'efforts pour le faire. Des modes de confidentialité existent au sein de $Projectname qui résistent même à l'écoute par des administrateurs de hub qualifiés et déterminés. + +Q : Mon contenu peut-il être censuré ? + +R : $Projectname (le réseau) NE PEUT PAS censurer votre contenu. Les administrateurs de serveur et de hub sont soumis aux lois locales et PEUVENT supprimer le contenu répréhensible de leur site/hub. N'importe qui PEUT devenir un administrateur de hub, y compris vous ; et donc publier du contenu qui pourrait autrement être censuré. Vous POUVEZ toujours être soumis aux lois locales. + +[h3]Définitions[/h3] + +[h4]$Projectname[/h4] +Autrement appelé "le réseau", $Projectname est une collection d'ordinateurs/serveurs individuels (aka [b]hubs[/b]) qui se connectent ensemble pour former un plus grand réseau coopératif. + +[h4]Hub[/h4] +Un ordinateur individuel ou un serveur connecté à $Projectname. Ces services sont fournis par un [b]administrateur de hub[/b] et peuvent être publics ou privés, payants ou gratuits. + +[h4]Administrateur de hub[/h4] +Gérant du système d'un hub individuel. + +[h3]Politiques[/h3] + +[h4]Information publique[/h4] + +Toute information ou tout ce que vous affichez dans $Projectname PEUT être public ou visible par quiconque sur Internet. Dans la mesure du possible, $Projectname vous permet de protéger le contenu et de restreindre qui peut le consulter. + +La photo de votre profil, le nom de votre canal et l'emplacement (URL ou adresse réseau) de votre canal sont visibles par tous sur Internet et les contrôles de confidentialité n'affecteront pas l'affichage de ces éléments. + +Vous POUVEZ fournir en plus d'autres informations de profil. Toute information que vous fournissez dans votre profil "par défaut" ou [b]profil public[/b] PEUT être transmise à d'autres hubs dans $Projectname et peut également être affichée dans le répertoire des canaux. Vous pouvez limiter l'affichage de ces informations de profil. Il peut être limité aux seuls membres de votre hub, ou seulement aux connexions (amis), ou à d'autres groupes limités de visionneurs comme vous le souhaitez. Si vous souhaitez que votre profil soit restreint, vous devez définir le paramètre de confidentialité approprié ou simplement NE PAS fournir d'informations supplémentaires. + +[h4]Contenu[/h4] + +Le contenu que vous fournissez (messages de statut, photos, fichiers, etc.) vous appartient. Par défaut, $Projectname publie le contenu ouvertement et visible par tout le monde sur Internet (PUBLIC). Vous POUVEZ contrôler cela dans les paramètres de votre canal et restreindre les permissions par défaut ou vous POUVEZ restreindre la visibilité de n'importe quel élément publié séparément (PRIVÉ). Les développeurs de noms de projet s'assureront que le contenu restreint est visible SEULEMENT pour ceux qui figurent dans la liste des restrictions - au mieux de leurs capacités. + +Les contenus (en particulier les messages de statut) que vous partagez avec d'autres réseaux ou que vous avez rendus visibles à quiconque sur Internet (PUBLIC) ne peuvent pas être facilement repris une fois qu'ils ont été publiés. Il PEUT être partagé avec d'autres réseaux et rendu disponible par le biais de flux RSS/Atom. Il peut aussi être syndiqué sur d'autres sites $Projectname. Il PEUT apparaître sur d'autres réseaux et sites Web et être visible dans les recherches sur Internet. Si vous ne souhaitez pas ce comportement par défaut, veuillez ajuster les paramètres de votre canal et restreindre le nombre de personnes qui peuvent voir votre contenu. + +[h4]Commentaires et posts du Forum[/h4] + +Les commentaires sur les posts qui ont été créés par d'autres et les posts qui sont désignés comme posts du forum vous appartiennent en tant que créateur/auteur, mais la distribution de ces posts n'est pas sous votre contrôle direct, et vous renoncez à certains droits sur ces items. Ces messages/commentaires PEUVENT être redistribués à d'autres, et PEUVENT être visibles pour n'importe qui sur Internet. Dans le cas de commentaires, le créateur du "premier message" dans le fil de discussion (conversation) auquel vous répondez contrôle la distribution de tous les commentaires et réponses à ce message. Ils "possèdent" et ont donc certains droits sur l'ensemble de la conversation (y compris tous les commentaires qu'elle contient). Vous pouvez toujours modifier ou supprimer le commentaire, mais le propriétaire de la conversation a également le droit de modifier, supprimer, redistribuer et sauvegarder/restaurer tout ou partie du contenu de la conversation. + +[h4]Les informations privées[/h4] + +Les développeurs de $Projectname s'assureront que tout contenu que vous fournissez et qui est désigné comme PRIVÉ seront protégés contre les écoutes - au mieux de leurs capacités. Le contenu des canaux privés PEUT être vu dans la base de données de chaque administrateur de hub impliqué, mais les messages privés sont masqués dans la base de données. Cette dernière signifie qu'il est très difficile, mais PAS impossible que ce contenu soit vu par un administrateur de hub. Le contenu du canal privé et les messages privés sont également éliminés des notifications par courriel. Le cryptage de bout en bout est fourni en option et ceci NE PEUT PAS être vu, même par un administrateur déterminé. + +[h3]Confidentialité de l'identité[/h3] + +La confidentialité de votre identité est un autre aspect. Parce que vous avez une identité décentralisée dans $Projectname, votre vie privée s'étend au-delà de votre hub d'origine. Si vous voulez avoir le contrôle total de votre vie privée et de la sécurité, vous devriez faire fonctionner votre propre concentrateur sur un serveur dédié. Pour beaucoup de gens, c'est compliqué et cela peut mettre à l'épreuve leurs capacités techniques. Énumérons donc quelques précautions que vous pouvez prendre pour assurer votre vie privée autant que possible. + +Une identité décentralisée a beaucoup d'avantages et vous donne beaucoup de fonctionnalités intéressantes, mais vous devez être conscient du fait que votre identité est connue par d'autres hubs dans le réseau $Projectname. L'un de ces avantages est que d'autres canaux peuvent vous servir du contenu personnalisé et vous permettre de voir des choses privées (comme des photos privées que d'autres souhaitent partager avec vous). Pour cette raison, ces canaux ont besoin de savoir qui vous êtes. Mais nous comprenons que parfois, ces autres canaux en savent plus de vous que vous ne le souhaiteriez. Par exemple, le plug-in Visage qui peut indiquer au propriétaire d'un canal la dernière fois que vous avez visité son profil. Vous pouvez facilement OPT-OUT de ce bas niveau et nous pensons, le suivi inoffensif. + +Vous pouvez activer [Ne pas suivre (DNT)](http://donottrack.us/) dans votre navigateur Web. Nous respectons cette nouvelle proposition de politique de confidentialité. Tous les navigateurs modernes supportent le DNT. Vous le trouverez dans les paramètres de confidentialité de vos navigateurs ou bien vous pouvez consulter le manuel du navigateur Web. Cela n'affectera pas la fonctionnalité de $Projectname. Ce réglage est probablement suffisant pour la plupart des gens. + +Vous pouvez [désactiver la publication](settings) de votre chaîne dans notre répertoire de chaînes. Si vous voulez que les gens trouvent votre canal, vous devriez leur donner l'adresse de votre canal directement. Nous pensons que c'est une bonne indication que vous préférez une vie privée supplémentaire et que vous activez automatiquement l'option "Ne pas suivre" si c'est le cas. + +Vous pouvez avoir un hub bloqué. Cela signifie que tous les canaux et le contenu de cette hub ne sont pas publics et ne sont pas visibles pour le monde extérieur. C'est quelque chose que seul votre administrateur de hub peut faire. Nous respectons également ce principe et activons automatiquement l'option "Ne pas suivre" si elle est définie. + +[h3]La Censure[/h3] + +$Projectname est un réseau mondial qui inclut toutes les religions et toutes les cultures. Cela n'implique pas que tous les membres du réseau ressentent la même chose que vous sur les questions litigieuses, et certaines personnes peuvent être FORTEMENT opposées au contenu que vous publiez. En général, si vous souhaitez publier quelque chose que vous savez ne pas être universellement acceptable, la meilleure approche est de limiter l'audience en utilisant les contrôles de confidentialité à un petit cercle d'amis. + +$Projectname en tant que fournisseur de réseau n'est pas en mesure de censurer le contenu. Cependant, les administrateurs du hub PEUVENT censurer tout contenu qui apparaît sur leur hub pour se conformer aux lois locales ou même au jugement personnel. Leur décision est finale. Si vous avez des problèmes avec un administrateur de hub, vous pouvez déplacer votre compte et vos messages sur un autre site qui correspond mieux à vos attentes. Veuillez vérifier (périodiquement) les[Conditions d'utilisation](help/TermsOfService) de votre hub pour connaître les règles ou directives. Si votre contenu se compose de matériel qui est illégal ou qui peut causer des problèmes, vous êtes FORTEMENT encouragé à héberger le vôtre (devenez un administrateur de hub). Vous pouvez toujours trouver que votre contenu est bloqué sur certains hubs, mais $Projectname en tant que réseau ne peut pas l'empêcher d'être posté. + +$Projectname RECOMMANDE que les administrateurs du concentrateur accordent un délai de grâce de 1 à 2 jours entre l'avertissement au titulaire du compte du contenu qui doit être supprimé et la suppression ou la désactivation physique du compte. Cela donnera au propriétaire du contenu la possibilité d'exporter les métadonnées de son canal et de les importer sur un autre site. Dans de rares cas, le contenu peut être de nature à justifier la résiliation immédiate du compte. Il s'agit d'une décision de hub, pas d'une décision de $Projectname. + +Si vous publiez régulièrement des contenus à caractère adulte ou offensant, nous vous encourageons fortement à marquer votre compte "NSFW" (Not Safe For Work). Ceci empêchera l'affichage de votre photo de profil dans le répertoire, sauf pour les visiteurs qui ont choisi de désactiver le "safe mode". Si votre photo de profil est trouvée par les administrateurs d'annuaire comme étant adulte ou offensante, l'administrateur d'annuaire PEUT marquer votre photo de profil comme NSFW. Il n'existe actuellement aucun mécanisme officiel pour contester ou renverser cette décision, c'est pourquoi vous DEVEZ marquer votre propre compte NSFW s'il est susceptible d'être inapproprié pour le grand public. + +[h3]Remerciements[/h3] + +Merci à tous ceux qui ont aidé et contribué au projet et à ses prédécesseurs au fil des ans. +Il est possible que votre nom nous ait échappé, mais ce n'est pas intentionnel. Nous remercions également la collectivité et ses membres pour leur précieuse contribution et sans qui tout cet effort n'aurait pas de sens. + +Il convient également de reconnaître les contributions et les solutions aux problèmes qui sont apparus à la suite de des discussions entre les membres et les développeurs d'autres projets quelque peu liés et concurrents ; même si nous avons eu nos désaccords occasionnels. + +[list] +[li]Mike Macgirvin[/li] +[li]Fabio Comuni[/li] +[li]Simon L'nu[/li] +[li]marijus[/li] +[li]Tobias Diekershoff[/li] +[li]fabrixxm[/li] +[li]tommy tomson[/li] +[li]Simon[/li] +[li]zottel[/li] +[li]Christian Vogeley[/li] +[li]jeroenpraat[/li] +[li]Michael Vogel[/li] +[li]erik[/li] +[li]Zach Prezkuta[/li] +[li]Paolo T[/li] +[li]Michael Meer[/li] +[li]Michael[/li] +[li]Abinoam P. Marques Jr[/li] +[li]Tobias Hößl[/li] +[li]Alexander Kampmann[/li] +[li]Olaf Conradi[/li] +[li]Paolo Tacconi[/li] +[li]tobiasd[/li] +[li]Devlon Duthie[/li] +[li]Zvi ben Yaakov (a.k.a rdc)[/li] +[li]Alexandre Hannud Abdo[/li] +[li]Olivier Migeot[/li] +[li]Chris Case[/li] +[li]Klaus Weidenbach[/li] +[li]Michael Johnston[/li] +[li]olivierm[/li] +[li]Vasudev Kamath[/li] +[li]pixelroot[/li] +[li]Max Weller[/li] +[li]duthied[/li] +[li]Martin Schmitt[/li] +[li]Sebastian Egbers[/li] +[li]Erkan Yilmaz[/li] +[li]sasiflo[/li] +[li]Stefan Parviainen[/li] +[li]Haakon Meland Eriksen[/li] +[li]Oliver Hartmann (23n)[/li] +[li]Erik Lundin[/li] +[li]habeascodice[/li] +[li]sirius[/li] +[li]Charles[/li] +[li]Tony Baldwin[/li] +[li]Hauke Zuehl[/li] +[li]Keith Fernie[/li] +[li]Anne Walk[/li] +[li]toclimb[/li] +[li]Daniel Frank[/li] +[li]Matthew Exon[/li] +[li]Michal Supler[/li] +[li]Tobias Luther[/li] +[li]U-SOUND\mike[/li] +[li]mrjive[/li] +[li]nostupidzone[/li] +[li]tonnerkiller[/li] +[li]Antoine G[/li] +[li]Christian Drechsler[/li] +[li]Ludovic Grossard[/li] +[li]RedmatrixCanada[/li] +[li]Stanislav Lechev [0xAF][/li] +[li]aweiher[/li] +[li]bufalo1973[/li] +[li]dsp1986[/li] +[li]felixgilles[/li] +[li]ike[/li] +[li]maase2[/li] +[li]mycocham[/li] +[li]ndurchx[/li] +[li]pafcu[/li] +[li]Simó Albert i Beltran[/li] +[li]Manuel Reva[/li] +[li]Manuel Jiménez Friaza[/li] +[li]Gustav Wall aka "neue medienordnung plus"[/li] +[/list] -- cgit v1.2.3 From ef3994da30a2bb3a7b75642c40282a5ec191aa44 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Wed, 25 Apr 2018 18:11:10 +0200 Subject: Delete FR project.bb from wrong folder apologies --- doc/fr/project.bb | 179 ------------------------------------------------------ 1 file changed, 179 deletions(-) delete mode 100644 doc/fr/project.bb diff --git a/doc/fr/project.bb b/doc/fr/project.bb deleted file mode 100644 index b62c3bd25..000000000 --- a/doc/fr/project.bb +++ /dev/null @@ -1,179 +0,0 @@ -[h3]La gouvernance de $Projectname [/h3] -La gouvernance est liée à la gestion d'un projet et plus particulièrement à la résolution des conflits. - -[h4]Gouvernance communautaire[/h4] -Le projet est maintenu et les décisions sont prises par la " communauté ". La structure de gouvernance continue d'évoluer. Jusqu'à ce que la structure soit finalisée, les décisions sont prises dans l'ordre suivant : - -[ol] -[*] Consensus paresseux - -Si une proposition de projet est soumise à l'un des forums de gouvernance communautaire et qu'il n'y a pas d'objections sérieuses dans un délai "raisonnable" à partir de la date de la proposition (nous accordons généralement 2 à 3 jours pour que toutes les parties intéressées puissent intervenir), aucun vote n'est nécessaire et la proposition sera considérée comme approuvée. Certaines préoccupations peuvent être soulevées à ce moment-là, mais si elles sont abordées au cours de la discussion et des solutions de rechange fournies, elles seront quand même considérées comme approuvées. - -[*] Veto - -Les promoteurs principaux ayant un historique important d'engagements de projet peuvent opposer leur veto à toute décision. La décision ne peut être prise tant que le veto n'a pas été levé ou qu'une autre proposition n'a pas été présentée. - -[*] Vote de la communauté - -Une décision qui n'a pas de mandat clair ou de consensus clair, mais qui ne fait pas l'objet d'un veto, peut être soumise au vote de la communauté. Actuellement, il s'agit d'un simple vote populaire dans l'un des forums communautaires applicables. À ce moment-là, c'est le vote populaire qui décide du résultat. Cela pourrait changer à l'avenir si la communauté adopte un modèle de gouvernance de " conseil ". Ce document sera mis à jour à ce moment-là avec les règles de gouvernance mises à jour. -[/ol] - -Le vote communautaire n'offre pas toujours un résultat agréable et peut générer des factions polarisées au sein de la communauté (d'où la raison pour laquelle d'autres modèles sont à l'étude). Si la proposition est rejetée, il y a encore plusieurs choses qui peuvent être faites et la proposition peut être soumise à nouveau avec des paramètres légèrement différents (conversion vers un module complémentaire, conversion vers un module optionnel qui est désactivé par défaut, etc. Si l'intérêt pour le dispositif est élevé et que le vote est " serré ", cela peut générer beaucoup de mauvais sentiments parmi les électeurs perdants. Lors de ces votes serrés, il est [b]fortement recommandé[/b] que l'auteur de la proposition prenne des mesures pour répondre à toute préoccupation soulevée et la soumettre de nouveau. - -[h4]Politique de confidentialité[/h4] - -Q: Qui peut voir mon contenu ? - -R : Par défaut, N'IMPORTE QUELLE personne sur Internet, à MOINS que vous le restreigniez. Nom du projet vous permet de choisir le niveau de confidentialité que vous désirez. Le contenu restreint ne sera PAS visible pour les "réseaux d'espionnage" et les annonceurs. Il sera protégé contre les écoutes de l'extérieur - au mieux de nos capacités. Les administrateurs de Hub ayant suffisamment de compétences et de patience PEUVENT être en mesure d'écouter certaines communications privées, mais ils doivent déployer des trésors d'efforts pour le faire. Des modes de confidentialité existent au sein de $Projectname qui résistent même à l'écoute par des administrateurs de hub qualifiés et déterminés. - -Q : Mon contenu peut-il être censuré ? - -R : $Nom du projet (le réseau) NE PEUT PAS censurer votre contenu. Les administrateurs de serveur et de hub sont soumis aux lois locales et PEUVENT supprimer le contenu répréhensible de leur site/hub. N'importe qui PEUT devenir un administrateur de hub, y compris vous ; et donc publier du contenu qui pourrait autrement être censuré. Vous POUVEZ toujours être soumis aux lois locales. - - -[h5]Définitions[/h5]. - -**$Nom du projet**** - -Autrement appelé "le réseau", $Projectname est une collection d'ordinateurs/serveurs individuels (aka **hubs**) qui se connectent ensemble pour former un plus grand réseau coopératif. - -**hub** - -Un ordinateur individuel ou un serveur connecté à $Projectname. Ces services sont fournis par un **administrateur de hub** et peuvent être publics ou privés, payants ou gratuits. - -**administrateur de hub**** - -Gérant du système d'un hub individuel. - -[h5]Politiques[/h5] - -**Information publique** - -Toute information ou tout ce que vous affichez dans $Projectname PEUT être public ou visible par quiconque sur Internet. Dans la mesure du possible, $Projectname vous permet de protéger le contenu et de restreindre qui peut le consulter. - -La photo de votre profil, le nom de votre canal et l'emplacement (URL ou adresse réseau) de votre canal sont visibles par tous sur Internet et les contrôles de confidentialité n'affecteront pas l'affichage de ces éléments. - -Vous POUVEZ fournir en plus d'autres informations de profil. Toute information que vous fournissez dans votre profil "par défaut" ou **profil public** PEUT être transmise à d'autres hubs dans $Projectname et peut également être affichée dans le répertoire des canaux. Vous pouvez limiter l'affichage de ces informations de profil. Il peut être limité aux seuls membres de votre hub, ou seulement aux connexions (amis), ou à d'autres groupes limités de visionneurs comme vous le souhaitez. Si vous souhaitez que votre profil soit restreint, vous devez définir le paramètre de confidentialité approprié ou simplement NE PAS fournir d'informations supplémentaires. - -**Contenu** - -Le contenu que vous fournissez (messages de statut, photos, fichiers, etc.) vous appartient. Par défaut, $Projectname publie le contenu ouvertement et visible par tout le monde sur Internet (PUBLIC). Vous POUVEZ contrôler cela dans les paramètres de votre canal et restreindre les permissions par défaut ou vous POUVEZ restreindre la visibilité de n'importe quel élément publié séparément (PRIVÉ). Les développeurs de noms de projet s'assureront que le contenu restreint est visible SEULEMENT pour ceux qui figurent dans la liste des restrictions - au mieux de leurs capacités. - -Les contenus (en particulier les messages de statut) que vous partagez avec d'autres réseaux ou que vous avez rendus visibles à quiconque sur Internet (PUBLIC) ne peuvent pas être facilement repris une fois qu'ils ont été publiés. Il PEUT être partagé avec d'autres réseaux et rendu disponible par le biais de flux RSS/Atom. Il peut aussi être syndiqué sur d'autres sites $Projectname. Il PEUT apparaître sur d'autres réseaux et sites Web et être visible dans les recherches sur Internet. Si vous ne souhaitez pas ce comportement par défaut, veuillez ajuster les paramètres de votre canal et restreindre le nombre de personnes qui peuvent voir votre contenu. - -**Commentaires et posts du Forum** - -Les commentaires sur les posts qui ont été créés par d'autres et les posts qui sont désignés comme posts du forum vous appartiennent en tant que créateur/auteur, mais la distribution de ces posts n'est pas sous votre contrôle direct, et vous renoncez à certains droits sur ces items. Ces messages/commentaires PEUVENT être redistribués à d'autres, et PEUVENT être visibles pour n'importe qui sur Internet. Dans le cas de commentaires, le créateur du "premier message" dans le fil de discussion (conversation) auquel vous répondez contrôle la distribution de tous les commentaires et réponses à ce message. Ils "possèdent" et ont donc certains droits sur l'ensemble de la conversation (y compris tous les commentaires qu'elle contient). Vous pouvez toujours modifier ou supprimer le commentaire, mais le propriétaire de la conversation a également le droit de modifier, supprimer, redistribuer et sauvegarder/restaurer tout ou partie du contenu de la conversation. - -**Les informations privées** - -Les développeurs de $Projectname s'assureront que tout contenu que vous fournissez et qui est désigné comme PRIVÉ seront protégés contre les écoutes - au mieux de leurs capacités. Le contenu des canaux privés PEUT être vu dans la base de données de chaque administrateur de hub impliqué, mais les messages privés sont masqués dans la base de données. Cette dernière signifie qu'il est très difficile, mais PAS impossible que ce contenu soit vu par un administrateur de hub. Le contenu du canal privé et les messages privés sont également éliminés des notifications par courriel. Le cryptage de bout en bout est fourni en option et ceci NE PEUT PAS être vu, même par un administrateur déterminé. - -[h5]Confidentialité de l'identité[/h5]. - -La confidentialité de votre identité est un autre aspect. Parce que vous avez une identité décentralisée dans $Projectname, votre vie privée s'étend au-delà de votre hub d'origine. Si vous voulez avoir le contrôle total de votre vie privée et de la sécurité, vous devriez faire fonctionner votre propre concentrateur sur un serveur dédié. Pour beaucoup de gens, c'est compliqué et cela peut mettre à l'épreuve leurs capacités techniques. Énumérons donc quelques précautions que vous pouvez prendre pour assurer votre vie privée autant que possible. - -Une identité décentralisée a beaucoup d'avantages et vous donne beaucoup de fonctionnalités intéressantes, mais vous devez être conscient du fait que votre identité est connue par d'autres hubs dans le réseau $Projectname. L'un de ces avantages est que d'autres canaux peuvent vous servir du contenu personnalisé et vous permettre de voir des choses privées (comme des photos privées que d'autres souhaitent partager avec vous). Pour cette raison, ces canaux ont besoin de savoir qui vous êtes. Mais nous comprenons que parfois, ces autres canaux en savent plus de vous que vous ne le souhaiteriez. Par exemple, le plug-in Visage qui peut indiquer au propriétaire d'un canal la dernière fois que vous avez visité son profil. Vous pouvez facilement OPT-OUT de ce bas niveau et nous pensons, le suivi inoffensif. - -Vous pouvez activer [Ne pas suivre (DNT)](http://donottrack.us/) dans votre navigateur Web. Nous respectons cette nouvelle proposition de politique de confidentialité. Tous les navigateurs modernes supportent le DNT. Vous le trouverez dans les paramètres de confidentialité de vos navigateurs ou bien vous pouvez consulter le manuel du navigateur Web. Cela n'affectera pas la fonctionnalité de $Projectname. Ce réglage est probablement suffisant pour la plupart des gens. - -*Vous pouvez [désactiver la publication](settings) de votre chaîne dans notre répertoire de chaînes. Si vous voulez que les gens trouvent votre canal, vous devriez leur donner l'adresse de votre canal directement. Nous pensons que c'est une bonne indication que vous préférez une vie privée supplémentaire et que vous activez automatiquement l'option "Ne pas suivre" si c'est le cas. - -*Vous pouvez avoir un hub bloqué. Cela signifie que tous les canaux et le contenu de cette hub ne sont pas publics et ne sont pas visibles pour le monde extérieur. C'est quelque chose que seul votre administrateur de hub peut faire. Nous respectons également ce principe et activons automatiquement l'option "Ne pas suivre" si elle est définie. - -[h5]La Censure[/h5] - -$Projectname est un réseau mondial qui inclut toutes les religions et toutes les cultures. Cela n'implique pas que tous les membres du réseau ressentent la même chose que vous sur les questions litigieuses, et certaines personnes peuvent être FORTEMENT opposées au contenu que vous publiez. En général, si vous souhaitez publier quelque chose que vous savez ne pas être universellement acceptable, la meilleure approche est de limiter l'audience en utilisant les contrôles de confidentialité à un petit cercle d'amis. - -$Projectname en tant que fournisseur de réseau n'est pas en mesure de censurer le contenu. Cependant, les administrateurs du hub PEUVENT censurer tout contenu qui apparaît sur leur hub pour se conformer aux lois locales ou même au jugement personnel. Leur décision est finale. Si vous avez des problèmes avec un administrateur de hub, vous pouvez déplacer votre compte et vos messages sur un autre site qui correspond mieux à vos attentes. Veuillez vérifier (périodiquement) les[Conditions d'utilisation](help/TermsOfService) de votre hub pour connaître les règles ou directives. Si votre contenu se compose de matériel qui est illégal ou qui peut causer des problèmes, vous êtes FORTEMENT encouragé à héberger le vôtre (devenez un administrateur de hub). Vous pouvez toujours trouver que votre contenu est bloqué sur certains hubs, mais $Projectname en tant que réseau ne peut pas l'empêcher d'être posté. - -$Projectname RECOMMANDE que les administrateurs du concentrateur accordent un délai de grâce de 1 à 2 jours entre l'avertissement au titulaire du compte du contenu qui doit être supprimé et la suppression ou la désactivation physique du compte. Cela donnera au propriétaire du contenu la possibilité d'exporter les métadonnées de son canal et de les importer sur un autre site. Dans de rares cas, le contenu peut être de nature à justifier la résiliation immédiate du compte. Il s'agit d'une décision de hub, pas d'une décision de $Projectname. - -Si vous publiez régulièrement des contenus à caractère adulte ou offensant, nous vous encourageons fortement à marquer votre compte "NSFW" (Not Safe For Work). Ceci empêchera l'affichage de votre photo de profil dans le répertoire, sauf pour les visiteurs qui ont choisi de désactiver le "safe mode". Si votre photo de profil est trouvée par les administrateurs d'annuaire comme étant adulte ou offensante, l'administrateur d'annuaire PEUT marquer votre photo de profil comme NSFW. Il n'existe actuellement aucun mécanisme officiel pour contester ou renverser cette décision, c'est pourquoi vous DEVEZ marquer votre propre compte NSFW s'il est susceptible d'être inapproprié pour le grand public. - -[h3]Remerciements[/h3] - -Merci à tous ceux qui ont aidé et contribué au projet et à ses prédécesseurs au fil des ans. -Il est possible que votre nom nous ait échappé, mais ce n'est pas intentionnel. Nous remercions également la collectivité et ses membres pour leur précieuse contribution et sans qui tout cet effort n'aurait pas de sens. - -Il convient également de reconnaître les contributions et les solutions aux problèmes qui sont apparus à la suite de des discussions entre les membres et les développeurs d'autres projets quelque peu liés et concurrents ; même si nous avons eu nos désaccords occasionnels. - -[list] -[li]Mike Macgirvin[/li] -[li]Fabio Comuni[/li] -[li]Simon L'nu[/li] -[li]marijus[/li] -[li]Tobias Diekershoff[/li] -[li]fabrixxm[/li] -[li]tommy tomson[/li] -[li]Simon[/li] -[li]zottel[/li] -[li]Christian Vogeley[/li] -[li]jeroenpraat[/li] -[li]Michael Vogel[/li] -[li]erik[/li] -[li]Zach Prezkuta[/li] -[li]Paolo T[/li] -[li]Michael Meer[/li] -[li]Michael[/li] -[li]Abinoam P. Marques Jr[/li] -[li]Tobias Hößl[/li] -[li]Alexander Kampmann[/li] -[li]Olaf Conradi[/li] -[li]Paolo Tacconi[/li] -[li]tobiasd[/li] -[li]Devlon Duthie[/li] -[li]Zvi ben Yaakov (a.k.a rdc)[/li] -[li]Alexandre Hannud Abdo[/li] -[li]Olivier Migeot[/li] -[li]Chris Case[/li] -[li]Klaus Weidenbach[/li] -[li]Michael Johnston[/li] -[li]olivierm[/li] -[li]Vasudev Kamath[/li] -[li]pixelroot[/li] -[li]Max Weller[/li] -[li]duthied[/li] -[li]Martin Schmitt[/li] -[li]Sebastian Egbers[/li] -[li]Erkan Yilmaz[/li] -[li]sasiflo[/li] -[li]Stefan Parviainen[/li] -[li]Haakon Meland Eriksen[/li] -[li]Oliver Hartmann (23n)[/li] -[li]Erik Lundin[/li] -[li]habeascodice[/li] -[li]sirius[/li] -[li]Charles[/li] -[li]Tony Baldwin[/li] -[li]Hauke Zuehl[/li] -[li]Keith Fernie[/li] -[li]Anne Walk[/li] -[li]toclimb[/li] -[li]Daniel Frank[/li] -[li]Matthew Exon[/li] -[li]Michal Supler[/li] -[li]Tobias Luther[/li] -[li]U-SOUND\mike[/li] -[li]mrjive[/li] -[li]nostupidzone[/li] -[li]tonnerkiller[/li] -[li]Antoine G[/li] -[li]Christian Drechsler[/li] -[li]Ludovic Grossard[/li] -[li]RedmatrixCanada[/li] -[li]Stanislav Lechev [0xAF][/li] -[li]aweiher[/li] -[li]bufalo1973[/li] -[li]dsp1986[/li] -[li]felixgilles[/li] -[li]ike[/li] -[li]maase2[/li] -[li]mycocham[/li] -[li]ndurchx[/li] -[li]pafcu[/li] -[li]Simó Albert i Beltran[/li] -[li]Manuel Reva[/li] -[li]Manuel Jiménez Friaza[/li] -[li]Gustav Wall aka "neue medienordnung plus"[/li] -[/list] -- cgit v1.2.3 From 33503349ecc4ee998bcc4a346b6903b572256e08 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Wed, 25 Apr 2018 18:12:51 +0200 Subject: Update FR toc.html --- doc/fr/toc.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/fr/toc.html b/doc/fr/toc.html index 95b9454c7..35edcd96d 100644 --- a/doc/fr/toc.html +++ b/doc/fr/toc.html @@ -7,9 +7,9 @@
-- cgit v1.2.3 From c7c04aba3db00dd9ff397887e1cd48f30f403f7d Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Wed, 25 Apr 2018 18:42:46 +0200 Subject: Update project.bb --- doc/fr/about/project.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/fr/about/project.bb b/doc/fr/about/project.bb index 02ee07103..e9bf11cb4 100644 --- a/doc/fr/about/project.bb +++ b/doc/fr/about/project.bb @@ -6,15 +6,14 @@ Le projet est maintenu et les décisions sont prises par la "communauté". La st [ol] [*] Consensus paresseux - Si une proposition de projet est soumise à l'un des forums de gouvernance communautaire et qu'il n'y a pas d'objections sérieuses dans un délai "raisonnable" à partir de la date de la proposition (nous accordons généralement 2 à 3 jours pour que toutes les parties intéressées puissent intervenir), aucun vote n'est nécessaire et la proposition sera considérée comme approuvée. Certaines préoccupations peuvent être soulevées à ce moment-là, mais si elles sont abordées au cours de la discussion et des solutions de rechange fournies, elles seront quand même considérées comme approuvées. -[*] Veto +[*] Veto Les promoteurs principaux ayant un historique important d'engagements de projet peuvent opposer leur veto à toute décision. La décision ne peut être prise tant que le veto n'a pas été levé ou qu'une autre proposition n'a pas été présentée. -[*] Vote de la communauté +[*] Vote de la communauté Une décision qui n'a pas de mandat clair ou de consensus clair, mais qui ne fait pas l'objet d'un veto, peut être soumise au vote de la communauté. Actuellement, il s'agit d'un simple vote populaire dans l'un des forums communautaires applicables. À ce moment-là, c'est le vote populaire qui décide du résultat. Cela pourrait changer à l'avenir si la communauté adopte un modèle de gouvernance de "conseil". Ce document sera mis à jour à ce moment-là avec les règles de gouvernance mises à jour. [/ol] @@ -24,7 +23,7 @@ Le vote communautaire n'offre pas toujours un résultat agréable et peut géné Q : Qui peut voir mon contenu ? -R : Par défaut, N'IMPORTE QUELLE personne sur Internet, à MOINS que vous le restreigniez. Nom du projet vous permet de choisir le niveau de confidentialité que vous désirez. Le contenu restreint ne sera PAS visible pour les "réseaux d'espionnage" et les annonceurs. Il sera protégé contre les écoutes de l'extérieur - au mieux de nos capacités. Les administrateurs de Hub ayant suffisamment de compétences et de patience PEUVENT être en mesure d'écouter certaines communications privées, mais ils doivent déployer des trésors d'efforts pour le faire. Des modes de confidentialité existent au sein de $Projectname qui résistent même à l'écoute par des administrateurs de hub qualifiés et déterminés. +R : Par défaut, N'IMPORTE QUELLE personne sur Internet, à MOINS que vous le restreigniez. $Projectname vous permet de choisir le niveau de confidentialité que vous désirez. Le contenu restreint ne sera PAS visible pour les "réseaux d'espionnage" et les annonceurs. Il sera protégé contre les écoutes de l'extérieur - au mieux de nos capacités. Les administrateurs de Hub ayant suffisamment de compétences et de patience PEUVENT être en mesure d'écouter certaines communications privées, mais ils doivent déployer des trésors d'efforts pour le faire. Des modes de confidentialité existent au sein de $Projectname qui résistent même à l'écoute par des administrateurs de hub qualifiés et déterminés. Q : Mon contenu peut-il être censuré ? @@ -71,9 +70,9 @@ La confidentialité de votre identité est un autre aspect. Parce que vous avez Une identité décentralisée a beaucoup d'avantages et vous donne beaucoup de fonctionnalités intéressantes, mais vous devez être conscient du fait que votre identité est connue par d'autres hubs dans le réseau $Projectname. L'un de ces avantages est que d'autres canaux peuvent vous servir du contenu personnalisé et vous permettre de voir des choses privées (comme des photos privées que d'autres souhaitent partager avec vous). Pour cette raison, ces canaux ont besoin de savoir qui vous êtes. Mais nous comprenons que parfois, ces autres canaux en savent plus de vous que vous ne le souhaiteriez. Par exemple, le plug-in Visage qui peut indiquer au propriétaire d'un canal la dernière fois que vous avez visité son profil. Vous pouvez facilement OPT-OUT de ce bas niveau et nous pensons, le suivi inoffensif. -Vous pouvez activer [Ne pas suivre (DNT)](http://donottrack.us/) dans votre navigateur Web. Nous respectons cette nouvelle proposition de politique de confidentialité. Tous les navigateurs modernes supportent le DNT. Vous le trouverez dans les paramètres de confidentialité de vos navigateurs ou bien vous pouvez consulter le manuel du navigateur Web. Cela n'affectera pas la fonctionnalité de $Projectname. Ce réglage est probablement suffisant pour la plupart des gens. +Vous pouvez activer [url=http://donottrack.us/]Ne pas suivre (DNT)[/url] dans votre navigateur Web. Nous respectons cette nouvelle proposition de politique de confidentialité. Tous les navigateurs modernes supportent le DNT. Vous le trouverez dans les paramètres de confidentialité de vos navigateurs ou bien vous pouvez consulter le manuel du navigateur Web. Cela n'affectera pas la fonctionnalité de $Projectname. Ce réglage est probablement suffisant pour la plupart des gens. -Vous pouvez [désactiver la publication](settings) de votre chaîne dans notre répertoire de chaînes. Si vous voulez que les gens trouvent votre canal, vous devriez leur donner l'adresse de votre canal directement. Nous pensons que c'est une bonne indication que vous préférez une vie privée supplémentaire et que vous activez automatiquement l'option "Ne pas suivre" si c'est le cas. +Vous pouvez [url=settings]désactiver la publication[/url] de votre chaîne dans notre répertoire de chaînes. Si vous voulez que les gens trouvent votre canal, vous devriez leur donner l'adresse de votre canal directement. Nous pensons que c'est une bonne indication que vous préférez une vie privée supplémentaire et que vous activez automatiquement l'option "Ne pas suivre" si c'est le cas. Vous pouvez avoir un hub bloqué. Cela signifie que tous les canaux et le contenu de cette hub ne sont pas publics et ne sont pas visibles pour le monde extérieur. C'est quelque chose que seul votre administrateur de hub peut faire. Nous respectons également ce principe et activons automatiquement l'option "Ne pas suivre" si elle est définie. @@ -85,7 +84,7 @@ $Projectname en tant que fournisseur de réseau n'est pas en mesure de censurer $Projectname RECOMMANDE que les administrateurs du concentrateur accordent un délai de grâce de 1 à 2 jours entre l'avertissement au titulaire du compte du contenu qui doit être supprimé et la suppression ou la désactivation physique du compte. Cela donnera au propriétaire du contenu la possibilité d'exporter les métadonnées de son canal et de les importer sur un autre site. Dans de rares cas, le contenu peut être de nature à justifier la résiliation immédiate du compte. Il s'agit d'une décision de hub, pas d'une décision de $Projectname. -Si vous publiez régulièrement des contenus à caractère adulte ou offensant, nous vous encourageons fortement à marquer votre compte "NSFW" (Not Safe For Work). Ceci empêchera l'affichage de votre photo de profil dans le répertoire, sauf pour les visiteurs qui ont choisi de désactiver le "safe mode". Si votre photo de profil est trouvée par les administrateurs d'annuaire comme étant adulte ou offensante, l'administrateur d'annuaire PEUT marquer votre photo de profil comme NSFW. Il n'existe actuellement aucun mécanisme officiel pour contester ou renverser cette décision, c'est pourquoi vous DEVEZ marquer votre propre compte NSFW s'il est susceptible d'être inapproprié pour le grand public. +Si vous publiez régulièrement des contenus à caractère adulte ou offensant, nous vous encourageons fortement à marquer votre compte "NSFW" (Not Safe For Work). Ceci empêchera l'affichage de votre photo de profil dans le répertoire, sauf pour les visiteurs qui ont choisi de désactiver le "mode sans échec". Si votre photo de profil est trouvée par les administrateurs d'annuaire comme étant adulte ou offensante, l'administrateur d'annuaire PEUT marquer votre photo de profil comme NSFW. Il n'existe actuellement aucun mécanisme officiel pour contester ou renverser cette décision, c'est pourquoi vous DEVEZ marquer votre propre compte NSFW s'il est susceptible d'être inapproprié pour le grand public. [h3]Remerciements[/h3] -- cgit v1.2.3 From 5a9e9284c260c8bb880987c0942a9fe040442a2b Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 25 Apr 2018 14:10:11 -0700 Subject: generating random numbers too large for 32-bit systems --- Zotlabs/Lib/Enotify.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 05ea67ea5..cfb0bd344 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -747,8 +747,8 @@ class Enotify { // generate a mime boundary $mimeBoundary = rand(0, 9) . "-" - .rand(10000000000, 9999999999) . "-" - .rand(10000000000, 9999999999) . "=:" + .rand(100000000, 999999999) . "-" + .rand(100000000, 999999999) . "=:" .rand(10000, 99999); // generate a multipart/alternative message header -- cgit v1.2.3 From f923d21df341546e054eb0f9628891365c4c2d62 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 25 Apr 2018 18:41:19 -0700 Subject: some tagging work --- Zotlabs/Module/Acl.php | 18 +++++++++--------- include/text.php | 15 +++++++++++++++ view/js/autocomplete.js | 30 +++++++++++++++--------------- 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 35594ae9f..b1f75263d 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -268,15 +268,15 @@ class Acl extends \Zotlabs\Web\Controller { }); } } - if(intval(get_config('system','taganyone')) || intval(get_pconfig(local_channel(),'system','taganyone'))) { - if((count($r) < 100) && $type == 'c') { - $r2 = q("SELECT substr(xchan_hash,1,18) as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags, 0 as abook_self - FROM xchan - WHERE xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" - ); - if($r2) - $r = array_merge($r,$r2); - } + if((count($r) < 100) && $type == 'c') { + $r2 = q("SELECT substr(xchan_hash,1,18) as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags, 0 as abook_self + FROM xchan + WHERE xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" + ); + if($r2) { + $r = array_merge($r,$r2); + $r = unique_multidim_array($r,'hash'); + } } } elseif($type == 'm') { diff --git a/include/text.php b/include/text.php index 60f6ff383..645c15df0 100644 --- a/include/text.php +++ b/include/text.php @@ -3402,3 +3402,18 @@ function unpunify($s) { } + +function unique_multidim_array($array, $key) { + $temp_array = array(); + $i = 0; + $key_array = array(); + + foreach($array as $val) { + if (!in_array($val[$key], $key_array)) { + $key_array[$i] = $val[$key]; + $temp_array[$i] = $val; + } + $i++; + } + return $temp_array; +} \ No newline at end of file diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 76c3fb69e..0a440aa90 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -8,20 +8,20 @@ function contact_search(term, callback, backend_url, type, extra_channels, spine $(spinelement).show(); } // Check if there is a cached result that contains the same information we would get with a full server-side search - var bt = backend_url+type; - if(!(bt in contact_search.cache)) contact_search.cache[bt] = {}; +// var bt = backend_url+type; +// if(!(bt in contact_search.cache)) contact_search.cache[bt] = {}; - var lterm = term.toLowerCase(); // Ignore case - for(var t in contact_search.cache[bt]) { - if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results - $(spinelement).hide(); +// var lterm = term.toLowerCase(); // Ignore case +// for(var t in contact_search.cache[bt]) { +// if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results +// $(spinelement).hide(); // Filter old results locally - var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one - matching.unshift({taggable:false, text: term, replace: term}); - setTimeout(function() { callback(matching); } , 1); // Use "pseudo-thread" to avoid some problems - return; - } - } +// var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one +// matching.unshift({taggable:false, text: term, replace: term}); +// setTimeout(function() { callback(matching); } , 1); // Use "pseudo-thread" to avoid some problems +// return; +// } +// } var postdata = { start:0, @@ -41,9 +41,9 @@ function contact_search(term, callback, backend_url, type, extra_channels, spine success: function(data){ // Cache results if we got them all (more information would not improve results) // data.count represents the maximum number of items - if(data.items.length -1 < data.count) { - contact_search.cache[bt][lterm] = data.items; - } +// if(data.items.length -1 < data.count) { +// contact_search.cache[bt][lterm] = data.items; +// } var items = data.items.slice(0); items.unshift({taggable:false, text: term, replace: term}); callback(items); -- cgit v1.2.3 From 5f8b093d791e88041602c0b41a13112ad8e45688 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 25 Apr 2018 18:51:30 -0700 Subject: fine tuning --- Zotlabs/Module/Acl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index b1f75263d..92e7d176d 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -271,7 +271,7 @@ class Acl extends \Zotlabs\Web\Controller { if((count($r) < 100) && $type == 'c') { $r2 = q("SELECT substr(xchan_hash,1,18) as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags, 0 as abook_self FROM xchan - WHERE xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" + WHERE xchan_deleted = 0 and not xchan_network in ('rss','anon','unknown') $sql_extra2 order by $order_extra2 xchan_name asc" ); if($r2) { $r = array_merge($r,$r2); -- cgit v1.2.3 From 953d02e4b7c8ae7e1ccbecb37751936cd23710e0 Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Thu, 26 Apr 2018 13:21:14 +1000 Subject: Update CHANGELOG more than oauth2 --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index e7ffb00a7..472dad3e6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,7 +21,7 @@ Hubzilla 3.4 (????-??-??) - Implement auto-save posts and comments in browser using localStorage - Display directory server in siteinfo.json - Bring back the dnt policy document - - Implement OAuth2 + - Implement OAuth2/OpenIDConnect server - Add basic structure for additional features documentation - Community tag refactor - Obscurify chats -- cgit v1.2.3 From 33f446fcd0992ad1bf1cb9fc04b6874101461e67 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 25 Apr 2018 20:47:30 -0700 Subject: malformed embeds from gfycat hubzilla issue #1108 --- include/oembed.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/oembed.php b/include/oembed.php index eee53b6c1..e677087a2 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -234,9 +234,11 @@ function oembed_fetch_url($embedurl){ if(preg_match('#\ Date: Wed, 25 Apr 2018 21:32:34 -0700 Subject: don't load jot autosave content into other document types or edits of other items, but do save these edits in case you need to recover them --- view/tpl/jot-header.tpl | 23 ++++++++++++++--------- view/tpl/jot.tpl | 4 ++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 991a4c8b1..df67e9b2d 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -568,11 +568,14 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del function postSaveChanges(action, type) { if({{$auto_save_draft}}) { + var doctype = $('#jot-webpage').val(); + var postid = '-' + doctype + '-' + $('#jot-postid').val(); + if(action != 'clean') { - localStorage.setItem("post_title", $("#jot-title").val()); - localStorage.setItem("post_body", $("#profile-jot-text").val()); + localStorage.setItem("post_title" + postid, $("#jot-title").val()); + localStorage.setItem("post_body" + postid, $("#profile-jot-text").val()); if($("#jot-category").length) - localStorage.setItem("post_category", $("#jot-category").val()); + localStorage.setItem("post_category + postid", $("#jot-category").val()); } if(action == 'start') { @@ -589,9 +592,9 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del if(action == 'clean') { clearTimeout(postSaveTimer); postSaveTimer = null; - localStorage.removeItem("post_title"); - localStorage.removeItem("post_body"); - localStorage.removeItem("post_category"); + localStorage.removeItem("post_title" + postid); + localStorage.removeItem("post_body" + postid); + localStorage.removeItem("post_category" + postid); } } @@ -602,9 +605,11 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del var cleaned = false; if({{$auto_save_draft}}) { - var postTitle = localStorage.getItem("post_title"); - var postBody = localStorage.getItem("post_body"); - var postCategory = (($("#jot-category").length) ? localStorage.getItem("post_category") : ''); + var doctype = $('#jot-webpage').val(); + var postid = '-' + doctype + '-' + $('#jot-postid').val(); + var postTitle = localStorage.getItem("post_title" + postid); + var postBody = localStorage.getItem("post_body" + postid); + var postCategory = (($("#jot-category").length) ? localStorage.getItem("post_category" + postid) : ''); var openEditor = false; if(postTitle) { diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index bc9339d4c..9aa330c40 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -21,8 +21,8 @@ - - + + -- cgit v1.2.3 From fe724acc3b78af5ed86b4bf0ff58bdd9b56356e2 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 25 Apr 2018 22:53:20 -0700 Subject: mod_network: privacy group query returning results when group is empty. Notification that the group is empty was also displayed twice. --- Zotlabs/Module/Network.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 8d017207b..e97ebf1d0 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -218,15 +218,13 @@ class Network extends \Zotlabs\Web\Controller { $contact_str = ''; $contacts = group_get_members($group); if($contacts) { - foreach($contacts as $c) { - if($contact_str) - $contact_str .= ','; - $contact_str .= "'" . $c['xchan'] . "'"; - } + $contact_str = ids_to_querystr($contacts,'xchan',true); } else { - $contact_str = ' 0 '; - info( t('Privacy group is empty')); + $contact_str = " '0' "; + if(! $update) { + info( t('Privacy group is empty')); + } } $item_thread_top = ''; $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) "; @@ -480,7 +478,6 @@ class Network extends \Zotlabs\Web\Controller { $ordering = "commented"; if($load) { - // Fetch a page full of parent items for this page $r = q("SELECT item.parent AS item_id FROM item left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) -- cgit v1.2.3 From 7b9946079f94edd0768f0db38e09034017cb544d Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 25 Apr 2018 23:10:08 -0700 Subject: function doc update --- include/text.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/text.php b/include/text.php index 645c15df0..ede62f582 100644 --- a/include/text.php +++ b/include/text.php @@ -2213,6 +2213,7 @@ function ids_to_querystr($arr,$idx = 'id',$quote = false) { * @param $arr array * @param $elm array key to extract from sub-array * @param $delim string default ',' + * @param $each filter function to apply to each element before evaluation, default is 'trim'. * @returns string */ -- cgit v1.2.3 From f32ba0656430929ba5af3d1ef730d7ada98c0ea7 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 26 Apr 2018 02:42:48 -0700 Subject: work through a few more autocomplete minor nits --- Zotlabs/Module/Acl.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 92e7d176d..2678aeb7a 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -337,22 +337,21 @@ class Acl extends \Zotlabs\Web\Controller { if($r) { foreach($r as $g) { - if(($g['network'] === 'rss') && ($type != 'a')) + if(in_array($g['network'],['rss','anon','unknown']) && ($type != 'a')) continue; $g['hash'] = urlencode($g['hash']); if(! $g['nick']) { - $t = explode(' ',strtolower($g['name'])); - $g['nick'] = $t[0] . '@'; + $g['nick'] = $g['url']; } - if(in_array($g['hash'],$permitted) && in_array($type, [ 'c', 'f' ]) && (! $noforums)) { + if(in_array($g['hash'],$permitted) && $type === 'f' && (! $noforums)) { $contacts[] = array( "type" => "c", "photo" => "images/twopeople.png", - "name" => $g['name'] . (($type === 'f') ? '' : '+'), - "id" => urlencode($g['id']) . (($type === 'f') ? '' : '+'), + "name" => $g['name'], + "id" => urlencode($g['id']), "xid" => $g['hash'], "link" => (($g['nick']) ? $g['nick'] : $g['url']), "nick" => substr($g['nick'],0,strpos($g['nick'],'@')), @@ -369,7 +368,7 @@ class Acl extends \Zotlabs\Web\Controller { "id" => urlencode($g['id']), "xid" => $g['hash'], "link" => (($g['nick']) ? $g['nick'] : $g['url']), - "nick" => (($g['nick']) ? substr($g['nick'],0,strpos($g['nick'],'@')) : $g['nick']), + "nick" => ((strpos($g['nick'],'@')) ? substr($g['nick'],0,strpos($g['nick'],'@')) : $g['nick']), "self" => (intval($g['abook_self']) ? 'abook-self' : ''), "taggable" => '', "label" => '', -- cgit v1.2.3 From fe4defe752a7a22e7d59483fde75b779ee78c3a4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Apr 2018 12:38:25 +0200 Subject: upgrade to textcomplete (jquery.textcomplete is discontinued), enable built-in cache and unify to start lookup after 3 characters --- library/jquery-textcomplete/jquery.textcomplete.js | 1488 ------------ .../jquery-textcomplete/jquery.textcomplete.min.js | 3 - .../jquery.textcomplete.min.map | 1 - library/textcomplete/textcomplete.js | 2409 ++++++++++++++++++++ library/textcomplete/textcomplete.js.map | 1 + library/textcomplete/textcomplete.min.js | 2 + library/textcomplete/textcomplete.min.js.map | 1 + view/js/autocomplete.js | 70 +- view/php/theme_init.php | 3 +- 9 files changed, 2467 insertions(+), 1511 deletions(-) delete mode 100644 library/jquery-textcomplete/jquery.textcomplete.js delete mode 100644 library/jquery-textcomplete/jquery.textcomplete.min.js delete mode 100644 library/jquery-textcomplete/jquery.textcomplete.min.map create mode 100644 library/textcomplete/textcomplete.js create mode 100644 library/textcomplete/textcomplete.js.map create mode 100644 library/textcomplete/textcomplete.min.js create mode 100644 library/textcomplete/textcomplete.min.js.map diff --git a/library/jquery-textcomplete/jquery.textcomplete.js b/library/jquery-textcomplete/jquery.textcomplete.js deleted file mode 100644 index 0dd9fd827..000000000 --- a/library/jquery-textcomplete/jquery.textcomplete.js +++ /dev/null @@ -1,1488 +0,0 @@ -(function (factory) { - if (typeof define === 'function' && define.amd) { - // AMD. Register as an anonymous module. - define(['jquery'], factory); - } else if (typeof module === "object" && module.exports) { - var $ = require('jquery'); - module.exports = factory($); - } else { - // Browser globals - factory(jQuery); - } -}(function (jQuery) { - -/*! - * jQuery.textcomplete - * - * Repository: https://github.com/yuku-t/jquery-textcomplete - * License: MIT (https://github.com/yuku-t/jquery-textcomplete/blob/master/LICENSE) - * Author: Yuku Takahashi - */ - -if (typeof jQuery === 'undefined') { - throw new Error('jQuery.textcomplete requires jQuery'); -} - -+function ($) { - 'use strict'; - - var warn = function (message) { - if (console.warn) { console.warn(message); } - }; - - var id = 1; - - $.fn.textcomplete = function (strategies, option) { - var args = Array.prototype.slice.call(arguments); - return this.each(function () { - var self = this; - var $this = $(this); - var completer = $this.data('textComplete'); - if (!completer) { - option || (option = {}); - option._oid = id++; // unique object id - completer = new $.fn.textcomplete.Completer(this, option); - $this.data('textComplete', completer); - } - if (typeof strategies === 'string') { - if (!completer) return; - args.shift() - completer[strategies].apply(completer, args); - if (strategies === 'destroy') { - $this.removeData('textComplete'); - } - } else { - // For backward compatibility. - // TODO: Remove at v0.4 - $.each(strategies, function (obj) { - $.each(['header', 'footer', 'placement', 'maxCount'], function (name) { - if (obj[name]) { - completer.option[name] = obj[name]; - warn(name + 'as a strategy param is deprecated. Use option.'); - delete obj[name]; - } - }); - }); - completer.register($.fn.textcomplete.Strategy.parse(strategies, { - el: self, - $el: $this - })); - } - }); - }; - -}(jQuery); - -+function ($) { - 'use strict'; - - // Exclusive execution control utility. - // - // func - The function to be locked. It is executed with a function named - // `free` as the first argument. Once it is called, additional - // execution are ignored until the free is invoked. Then the last - // ignored execution will be replayed immediately. - // - // Examples - // - // var lockedFunc = lock(function (free) { - // setTimeout(function { free(); }, 1000); // It will be free in 1 sec. - // console.log('Hello, world'); - // }); - // lockedFunc(); // => 'Hello, world' - // lockedFunc(); // none - // lockedFunc(); // none - // // 1 sec past then - // // => 'Hello, world' - // lockedFunc(); // => 'Hello, world' - // lockedFunc(); // none - // - // Returns a wrapped function. - var lock = function (func) { - var locked, queuedArgsToReplay; - - return function () { - // Convert arguments into a real array. - var args = Array.prototype.slice.call(arguments); - if (locked) { - // Keep a copy of this argument list to replay later. - // OK to overwrite a previous value because we only replay - // the last one. - queuedArgsToReplay = args; - return; - } - locked = true; - var self = this; - args.unshift(function replayOrFree() { - if (queuedArgsToReplay) { - // Other request(s) arrived while we were locked. - // Now that the lock is becoming available, replay - // the latest such request, then call back here to - // unlock (or replay another request that arrived - // while this one was in flight). - var replayArgs = queuedArgsToReplay; - queuedArgsToReplay = undefined; - replayArgs.unshift(replayOrFree); - func.apply(self, replayArgs); - } else { - locked = false; - } - }); - func.apply(this, args); - }; - }; - - var isString = function (obj) { - return Object.prototype.toString.call(obj) === '[object String]'; - }; - - var uniqueId = 0; - - function Completer(element, option) { - this.$el = $(element); - this.id = 'textcomplete' + uniqueId++; - this.strategies = []; - this.views = []; - this.option = $.extend({}, Completer.defaults, option); - - if (!this.$el.is('input[type=text]') && !this.$el.is('input[type=search]') && !this.$el.is('textarea') && !element.isContentEditable && element.contentEditable != 'true') { - throw new Error('textcomplete must be called on a Textarea or a ContentEditable.'); - } - - // use ownerDocument to fix iframe / IE issues - if (element === element.ownerDocument.activeElement) { - // element has already been focused. Initialize view objects immediately. - this.initialize() - } else { - // Initialize view objects lazily. - var self = this; - this.$el.one('focus.' + this.id, function () { self.initialize(); }); - - // Special handling for CKEditor: lazy init on instance load - if ((!this.option.adapter || this.option.adapter == 'CKEditor') && typeof CKEDITOR != 'undefined' && (this.$el.is('textarea'))) { - CKEDITOR.on("instanceReady", function(event) { - event.editor.once("focus", function(event2) { - // replace the element with the Iframe element and flag it as CKEditor - self.$el = $(event.editor.editable().$); - if (!self.option.adapter) { - self.option.adapter = $.fn.textcomplete['CKEditor']; - self.option.ckeditor_instance = event.editor; - } - self.initialize(); - }); - }); - } - } - } - - Completer.defaults = { - appendTo: 'body', - className: '', // deprecated option - dropdownClassName: 'dropdown-menu textcomplete-dropdown', - maxCount: 10, - zIndex: '100', - rightEdgeOffset: 30 - }; - - $.extend(Completer.prototype, { - // Public properties - // ----------------- - - id: null, - option: null, - strategies: null, - adapter: null, - dropdown: null, - $el: null, - $iframe: null, - - // Public methods - // -------------- - - initialize: function () { - var element = this.$el.get(0); - - // check if we are in an iframe - // we need to alter positioning logic if using an iframe - if (this.$el.prop('ownerDocument') !== document && window.frames.length) { - for (var iframeIndex = 0; iframeIndex < window.frames.length; iframeIndex++) { - if (this.$el.prop('ownerDocument') === window.frames[iframeIndex].document) { - this.$iframe = $(window.frames[iframeIndex].frameElement); - break; - } - } - } - - - // Initialize view objects. - this.dropdown = new $.fn.textcomplete.Dropdown(element, this, this.option); - var Adapter, viewName; - if (this.option.adapter) { - Adapter = this.option.adapter; - } else { - if (this.$el.is('textarea') || this.$el.is('input[type=text]') || this.$el.is('input[type=search]')) { - viewName = typeof element.selectionEnd === 'number' ? 'Textarea' : 'IETextarea'; - } else { - viewName = 'ContentEditable'; - } - Adapter = $.fn.textcomplete[viewName]; - } - this.adapter = new Adapter(element, this, this.option); - }, - - destroy: function () { - this.$el.off('.' + this.id); - if (this.adapter) { - this.adapter.destroy(); - } - if (this.dropdown) { - this.dropdown.destroy(); - } - this.$el = this.adapter = this.dropdown = null; - }, - - deactivate: function () { - if (this.dropdown) { - this.dropdown.deactivate(); - } - }, - - // Invoke textcomplete. - trigger: function (text, skipUnchangedTerm) { - if (!this.dropdown) { this.initialize(); } - text != null || (text = this.adapter.getTextFromHeadToCaret()); - var searchQuery = this._extractSearchQuery(text); - if (searchQuery.length) { - var term = searchQuery[1]; - // Ignore shift-key, ctrl-key and so on. - if (skipUnchangedTerm && this._term === term && term !== "") { return; } - this._term = term; - this._search.apply(this, searchQuery); - } else { - this._term = null; - this.dropdown.deactivate(); - } - }, - - fire: function (eventName) { - var args = Array.prototype.slice.call(arguments, 1); - this.$el.trigger(eventName, args); - return this; - }, - - register: function (strategies) { - Array.prototype.push.apply(this.strategies, strategies); - }, - - // Insert the value into adapter view. It is called when the dropdown is clicked - // or selected. - // - // value - The selected element of the array callbacked from search func. - // strategy - The Strategy object. - // e - Click or keydown event object. - select: function (value, strategy, e) { - this._term = null; - this.adapter.select(value, strategy, e); - this.fire('change').fire('textComplete:select', value, strategy); - this.adapter.focus(); - }, - - // Private properties - // ------------------ - - _clearAtNext: true, - _term: null, - - // Private methods - // --------------- - - // Parse the given text and extract the first matching strategy. - // - // Returns an array including the strategy, the query term and the match - // object if the text matches an strategy; otherwise returns an empty array. - _extractSearchQuery: function (text) { - for (var i = 0; i < this.strategies.length; i++) { - var strategy = this.strategies[i]; - var context = strategy.context(text); - if (context || context === '') { - var matchRegexp = $.isFunction(strategy.match) ? strategy.match(text) : strategy.match; - if (isString(context)) { text = context; } - var match = text.match(matchRegexp); - if (match) { return [strategy, match[strategy.index], match]; } - } - } - return [] - }, - - // Call the search method of selected strategy.. - _search: lock(function (free, strategy, term, match) { - var self = this; - strategy.search(term, function (data, stillSearching) { - if (!self.dropdown.shown) { - self.dropdown.activate(); - } - if (self._clearAtNext) { - // The first callback in the current lock. - self.dropdown.clear(); - self._clearAtNext = false; - } - self.dropdown.setPosition(self.adapter.getCaretPosition()); - self.dropdown.render(self._zip(data, strategy, term)); - if (!stillSearching) { - // The last callback in the current lock. - free(); - self._clearAtNext = true; // Call dropdown.clear at the next time. - } - }, match); - }), - - // Build a parameter for Dropdown#render. - // - // Examples - // - // this._zip(['a', 'b'], 's'); - // //=> [{ value: 'a', strategy: 's' }, { value: 'b', strategy: 's' }] - _zip: function (data, strategy, term) { - return $.map(data, function (value) { - return { value: value, strategy: strategy, term: term }; - }); - } - }); - - $.fn.textcomplete.Completer = Completer; -}(jQuery); - -+function ($) { - 'use strict'; - - var $window = $(window); - - var include = function (zippedData, datum) { - var i, elem; - var idProperty = datum.strategy.idProperty - for (i = 0; i < zippedData.length; i++) { - elem = zippedData[i]; - if (elem.strategy !== datum.strategy) continue; - if (idProperty) { - if (elem.value[idProperty] === datum.value[idProperty]) return true; - } else { - if (elem.value === datum.value) return true; - } - } - return false; - }; - - var dropdownViews = {}; - $(document).on('click', function (e) { - var id = e.originalEvent && e.originalEvent.keepTextCompleteDropdown; - $.each(dropdownViews, function (key, view) { - if (key !== id) { view.deactivate(); } - }); - }); - - var commands = { - SKIP_DEFAULT: 0, - KEY_UP: 1, - KEY_DOWN: 2, - KEY_ENTER: 3, - KEY_PAGEUP: 4, - KEY_PAGEDOWN: 5, - KEY_ESCAPE: 6 - }; - - // Dropdown view - // ============= - - // Construct Dropdown object. - // - // element - Textarea or contenteditable element. - function Dropdown(element, completer, option) { - this.$el = Dropdown.createElement(option); - this.completer = completer; - this.id = completer.id + 'dropdown'; - this._data = []; // zipped data. - this.$inputEl = $(element); - this.option = option; - - // Override setPosition method. - if (option.listPosition) { this.setPosition = option.listPosition; } - if (option.height) { this.$el.height(option.height); } - var self = this; - $.each(['maxCount', 'placement', 'footer', 'header', 'noResultsMessage', 'className'], function (_i, name) { - if (option[name] != null) { self[name] = option[name]; } - }); - this._bindEvents(element); - dropdownViews[this.id] = this; - } - - $.extend(Dropdown, { - // Class methods - // ------------- - - createElement: function (option) { - var $parent = option.appendTo; - if (!($parent instanceof $)) { $parent = $($parent); } - var $el = $('
    ') - .addClass(option.dropdownClassName) - .attr('id', 'textcomplete-dropdown-' + option._oid) - .css({ - display: 'none', - left: 0, - position: 'absolute', - zIndex: option.zIndex - }) - .appendTo($parent); - return $el; - } - }); - - $.extend(Dropdown.prototype, { - // Public properties - // ----------------- - - $el: null, // jQuery object of ul.dropdown-menu element. - $inputEl: null, // jQuery object of target textarea. - completer: null, - footer: null, - header: null, - id: null, - maxCount: null, - placement: '', - shown: false, - data: [], // Shown zipped data. - className: '', - - // Public methods - // -------------- - - destroy: function () { - // Don't remove $el because it may be shared by several textcompletes. - this.deactivate(); - - this.$el.off('.' + this.id); - this.$inputEl.off('.' + this.id); - this.clear(); - this.$el.remove(); - this.$el = this.$inputEl = this.completer = null; - delete dropdownViews[this.id] - }, - - render: function (zippedData) { - var contentsHtml = this._buildContents(zippedData); - var unzippedData = $.map(zippedData, function (d) { return d.value; }); - if (zippedData.length) { - var strategy = zippedData[0].strategy; - if (strategy.id) { - this.$el.attr('data-strategy', strategy.id); - } else { - this.$el.removeAttr('data-strategy'); - } - this._renderHeader(unzippedData); - this._renderFooter(unzippedData); - if (contentsHtml) { - this._renderContents(contentsHtml); - this._fitToBottom(); - this._fitToRight(); - this._activateIndexedItem(); - } - this._setScroll(); - } else if (this.noResultsMessage) { - this._renderNoResultsMessage(unzippedData); - } else if (this.shown) { - this.deactivate(); - } - }, - - setPosition: function (pos) { - // Make the dropdown fixed if the input is also fixed - // This can't be done during init, as textcomplete may be used on multiple elements on the same page - // Because the same dropdown is reused behind the scenes, we need to recheck every time the dropdown is showed - var position = 'absolute'; - // Check if input or one of its parents has positioning we need to care about - this.$inputEl.add(this.$inputEl.parents()).each(function() { - if($(this).css('position') === 'absolute') // The element has absolute positioning, so it's all OK - return false; - if($(this).css('position') === 'fixed') { - pos.top -= $window.scrollTop(); - pos.left -= $window.scrollLeft(); - position = 'fixed'; - return false; - } - }); - this.$el.css(this._applyPlacement(pos)); - this.$el.css({ position: position }); // Update positioning - - return this; - }, - - clear: function () { - this.$el.html(''); - this.data = []; - this._index = 0; - this._$header = this._$footer = this._$noResultsMessage = null; - }, - - activate: function () { - if (!this.shown) { - this.clear(); - this.$el.show(); - if (this.className) { this.$el.addClass(this.className); } - this.completer.fire('textComplete:show'); - this.shown = true; - } - return this; - }, - - deactivate: function () { - if (this.shown) { - this.$el.hide(); - if (this.className) { this.$el.removeClass(this.className); } - this.completer.fire('textComplete:hide'); - this.shown = false; - } - return this; - }, - - isUp: function (e) { - return e.keyCode === 38 || (e.ctrlKey && e.keyCode === 80); // UP, Ctrl-P - }, - - isDown: function (e) { - return e.keyCode === 40 || (e.ctrlKey && e.keyCode === 78); // DOWN, Ctrl-N - }, - - isEnter: function (e) { - var modifiers = e.ctrlKey || e.altKey || e.metaKey || e.shiftKey; - return !modifiers && (e.keyCode === 13 || e.keyCode === 9 || (this.option.completeOnSpace === true && e.keyCode === 32)) // ENTER, TAB - }, - - isPageup: function (e) { - return e.keyCode === 33; // PAGEUP - }, - - isPagedown: function (e) { - return e.keyCode === 34; // PAGEDOWN - }, - - isEscape: function (e) { - return e.keyCode === 27; // ESCAPE - }, - - // Private properties - // ------------------ - - _data: null, // Currently shown zipped data. - _index: null, - _$header: null, - _$noResultsMessage: null, - _$footer: null, - - // Private methods - // --------------- - - _bindEvents: function () { - this.$el.on('mousedown.' + this.id, '.textcomplete-item', $.proxy(this._onClick, this)); - this.$el.on('touchstart.' + this.id, '.textcomplete-item', $.proxy(this._onClick, this)); - this.$el.on('mouseover.' + this.id, '.textcomplete-item', $.proxy(this._onMouseover, this)); - this.$inputEl.on('keydown.' + this.id, $.proxy(this._onKeydown, this)); - }, - - _onClick: function (e) { - var $el = $(e.target); - e.preventDefault(); - e.originalEvent.keepTextCompleteDropdown = this.id; - if (!$el.hasClass('textcomplete-item')) { - $el = $el.closest('.textcomplete-item'); - } - var datum = this.data[parseInt($el.data('index'), 10)]; - this.completer.select(datum.value, datum.strategy, e); - var self = this; - // Deactive at next tick to allow other event handlers to know whether - // the dropdown has been shown or not. - setTimeout(function () { - self.deactivate(); - if (e.type === 'touchstart') { - self.$inputEl.focus(); - } - }, 0); - }, - - // Activate hovered item. - _onMouseover: function (e) { - var $el = $(e.target); - e.preventDefault(); - if (!$el.hasClass('textcomplete-item')) { - $el = $el.closest('.textcomplete-item'); - } - this._index = parseInt($el.data('index'), 10); - this._activateIndexedItem(); - }, - - _onKeydown: function (e) { - if (!this.shown) { return; } - - var command; - - if ($.isFunction(this.option.onKeydown)) { - command = this.option.onKeydown(e, commands); - } - - if (command == null) { - command = this._defaultKeydown(e); - } - - switch (command) { - case commands.KEY_UP: - e.preventDefault(); - this._up(); - break; - case commands.KEY_DOWN: - e.preventDefault(); - this._down(); - break; - case commands.KEY_ENTER: - e.preventDefault(); - this._enter(e); - break; - case commands.KEY_PAGEUP: - e.preventDefault(); - this._pageup(); - break; - case commands.KEY_PAGEDOWN: - e.preventDefault(); - this._pagedown(); - break; - case commands.KEY_ESCAPE: - e.preventDefault(); - this.deactivate(); - break; - } - }, - - _defaultKeydown: function (e) { - if (this.isUp(e)) { - return commands.KEY_UP; - } else if (this.isDown(e)) { - return commands.KEY_DOWN; - } else if (this.isEnter(e)) { - return commands.KEY_ENTER; - } else if (this.isPageup(e)) { - return commands.KEY_PAGEUP; - } else if (this.isPagedown(e)) { - return commands.KEY_PAGEDOWN; - } else if (this.isEscape(e)) { - return commands.KEY_ESCAPE; - } - }, - - _up: function () { - if (this._index === 0) { - this._index = this.data.length - 1; - } else { - this._index -= 1; - } - this._activateIndexedItem(); - this._setScroll(); - }, - - _down: function () { - if (this._index === this.data.length - 1) { - this._index = 0; - } else { - this._index += 1; - } - this._activateIndexedItem(); - this._setScroll(); - }, - - _enter: function (e) { - var datum = this.data[parseInt(this._getActiveElement().data('index'), 10)]; - this.completer.select(datum.value, datum.strategy, e); - this.deactivate(); - }, - - _pageup: function () { - var target = 0; - var threshold = this._getActiveElement().position().top - this.$el.innerHeight(); - this.$el.children().each(function (i) { - if ($(this).position().top + $(this).outerHeight() > threshold) { - target = i; - return false; - } - }); - this._index = target; - this._activateIndexedItem(); - this._setScroll(); - }, - - _pagedown: function () { - var target = this.data.length - 1; - var threshold = this._getActiveElement().position().top + this.$el.innerHeight(); - this.$el.children().each(function (i) { - if ($(this).position().top > threshold) { - target = i; - return false - } - }); - this._index = target; - this._activateIndexedItem(); - this._setScroll(); - }, - - _activateIndexedItem: function () { - this.$el.find('.textcomplete-item.active').removeClass('active'); - this._getActiveElement().addClass('active'); - }, - - _getActiveElement: function () { - return this.$el.children('.textcomplete-item:nth(' + this._index + ')'); - }, - - _setScroll: function () { - var $activeEl = this._getActiveElement(); - var itemTop = $activeEl.position().top; - var itemHeight = $activeEl.outerHeight(); - var visibleHeight = this.$el.innerHeight(); - var visibleTop = this.$el.scrollTop(); - if (this._index === 0 || this._index == this.data.length - 1 || itemTop < 0) { - this.$el.scrollTop(itemTop + visibleTop); - } else if (itemTop + itemHeight > visibleHeight) { - this.$el.scrollTop(itemTop + itemHeight + visibleTop - visibleHeight); - } - }, - - _buildContents: function (zippedData) { - var datum, i, index; - var html = ''; - for (i = 0; i < zippedData.length; i++) { - if (this.data.length === this.maxCount) break; - datum = zippedData[i]; - if (include(this.data, datum)) { continue; } - index = this.data.length; - this.data.push(datum); - html += '
  • '; - html += datum.strategy.template(datum.value, datum.term); - html += '
    • '; - } - return html; - }, - - _renderHeader: function (unzippedData) { - if (this.header) { - if (!this._$header) { - this._$header = $('
  • ').prependTo(this.$el); - } - var html = $.isFunction(this.header) ? this.header(unzippedData) : this.header; - this._$header.html(html); - } - }, - - _renderFooter: function (unzippedData) { - if (this.footer) { - if (!this._$footer) { - this._$footer = $('
  • ').appendTo(this.$el); - } - var html = $.isFunction(this.footer) ? this.footer(unzippedData) : this.footer; - this._$footer.html(html); - } - }, - - _renderNoResultsMessage: function (unzippedData) { - if (this.noResultsMessage) { - if (!this._$noResultsMessage) { - this._$noResultsMessage = $('
  • ').appendTo(this.$el); - } - var html = $.isFunction(this.noResultsMessage) ? this.noResultsMessage(unzippedData) : this.noResultsMessage; - this._$noResultsMessage.html(html); - } - }, - - _renderContents: function (html) { - if (this._$footer) { - this._$footer.before(html); - } else { - this.$el.append(html); - } - }, - - _fitToBottom: function() { - var windowScrollBottom = $window.scrollTop() + $window.height(); - var height = this.$el.height(); - if ((this.$el.position().top + height) > windowScrollBottom) { - // only do this if we are not in an iframe - if (!this.completer.$iframe) { - this.$el.offset({top: windowScrollBottom - height}); - } - } - }, - - _fitToRight: function() { - // We don't know how wide our content is until the browser positions us, and at that point it clips us - // to the document width so we don't know if we would have overrun it. As a heuristic to avoid that clipping - // (which makes our elements wrap onto the next line and corrupt the next item), if we're close to the right - // edge, move left. We don't know how far to move left, so just keep nudging a bit. - var tolerance = this.option.rightEdgeOffset; // pixels. Make wider than vertical scrollbar because we might not be able to use that space. - var lastOffset = this.$el.offset().left, offset; - var width = this.$el.width(); - var maxLeft = $window.width() - tolerance; - while (lastOffset + width > maxLeft) { - this.$el.offset({left: lastOffset - tolerance}); - offset = this.$el.offset().left; - if (offset >= lastOffset) { break; } - lastOffset = offset; - } - }, - - _applyPlacement: function (position) { - // If the 'placement' option set to 'top', move the position above the element. - if (this.placement.indexOf('top') !== -1) { - // Overwrite the position object to set the 'bottom' property instead of the top. - position = { - top: 'auto', - bottom: this.$el.parent().height() - position.top + position.lineHeight, - left: position.left - }; - } else { - position.bottom = 'auto'; - delete position.lineHeight; - } - if (this.placement.indexOf('absleft') !== -1) { - position.left = 0; - } else if (this.placement.indexOf('absright') !== -1) { - position.right = 0; - position.left = 'auto'; - } - return position; - } - }); - - $.fn.textcomplete.Dropdown = Dropdown; - $.extend($.fn.textcomplete, commands); -}(jQuery); - -+function ($) { - 'use strict'; - - // Memoize a search function. - var memoize = function (func) { - var memo = {}; - return function (term, callback) { - if (memo[term]) { - callback(memo[term]); - } else { - func.call(this, term, function (data) { - memo[term] = (memo[term] || []).concat(data); - callback.apply(null, arguments); - }); - } - }; - }; - - function Strategy(options) { - $.extend(this, options); - if (this.cache) { this.search = memoize(this.search); } - } - - Strategy.parse = function (strategiesArray, params) { - return $.map(strategiesArray, function (strategy) { - var strategyObj = new Strategy(strategy); - strategyObj.el = params.el; - strategyObj.$el = params.$el; - return strategyObj; - }); - }; - - $.extend(Strategy.prototype, { - // Public properties - // ----------------- - - // Required - match: null, - replace: null, - search: null, - - // Optional - id: null, - cache: false, - context: function () { return true; }, - index: 2, - template: function (obj) { return obj; }, - idProperty: null - }); - - $.fn.textcomplete.Strategy = Strategy; - -}(jQuery); - -+function ($) { - 'use strict'; - - var now = Date.now || function () { return new Date().getTime(); }; - - // Returns a function, that, as long as it continues to be invoked, will not - // be triggered. The function will be called after it stops being called for - // `wait` msec. - // - // This utility function was originally implemented at Underscore.js. - var debounce = function (func, wait) { - var timeout, args, context, timestamp, result; - var later = function () { - var last = now() - timestamp; - if (last < wait) { - timeout = setTimeout(later, wait - last); - } else { - timeout = null; - result = func.apply(context, args); - context = args = null; - } - }; - - return function () { - context = this; - args = arguments; - timestamp = now(); - if (!timeout) { - timeout = setTimeout(later, wait); - } - return result; - }; - }; - - function Adapter () {} - - $.extend(Adapter.prototype, { - // Public properties - // ----------------- - - id: null, // Identity. - completer: null, // Completer object which creates it. - el: null, // Textarea element. - $el: null, // jQuery object of the textarea. - option: null, - - // Public methods - // -------------- - - initialize: function (element, completer, option) { - this.el = element; - this.$el = $(element); - this.id = completer.id + this.constructor.name; - this.completer = completer; - this.option = option; - - if (this.option.debounce) { - this._onKeyup = debounce(this._onKeyup, this.option.debounce); - } - - this._bindEvents(); - }, - - destroy: function () { - this.$el.off('.' + this.id); // Remove all event handlers. - this.$el = this.el = this.completer = null; - }, - - // Update the element with the given value and strategy. - // - // value - The selected object. It is one of the item of the array - // which was callbacked from the search function. - // strategy - The Strategy associated with the selected value. - select: function (/* value, strategy */) { - throw new Error('Not implemented'); - }, - - // Returns the caret's relative coordinates from body's left top corner. - getCaretPosition: function () { - var position = this._getCaretRelativePosition(); - var offset = this.$el.offset(); - - // Calculate the left top corner of `this.option.appendTo` element. - var $parent = this.option.appendTo; - if ($parent) { - if (!($parent instanceof $)) { $parent = $($parent); } - var parentOffset = $parent.offsetParent().offset(); - offset.top -= parentOffset.top; - offset.left -= parentOffset.left; - } - - position.top += offset.top; - position.left += offset.left; - return position; - }, - - // Focus on the element. - focus: function () { - this.$el.focus(); - }, - - // Private methods - // --------------- - - _bindEvents: function () { - this.$el.on('keyup.' + this.id, $.proxy(this._onKeyup, this)); - }, - - _onKeyup: function (e) { - if (this._skipSearch(e)) { return; } - this.completer.trigger(this.getTextFromHeadToCaret(), true); - }, - - // Suppress searching if it returns true. - _skipSearch: function (clickEvent) { - switch (clickEvent.keyCode) { - case 9: // TAB - case 13: // ENTER - case 16: // SHIFT - case 17: // CTRL - case 18: // ALT - case 33: // PAGEUP - case 34: // PAGEDOWN - case 40: // DOWN - case 38: // UP - case 27: // ESC - return true; - } - if (clickEvent.ctrlKey) switch (clickEvent.keyCode) { - case 78: // Ctrl-N - case 80: // Ctrl-P - return true; - } - } - }); - - $.fn.textcomplete.Adapter = Adapter; -}(jQuery); - -+function ($) { - 'use strict'; - - // Textarea adapter - // ================ - // - // Managing a textarea. It doesn't know a Dropdown. - function Textarea(element, completer, option) { - this.initialize(element, completer, option); - } - - $.extend(Textarea.prototype, $.fn.textcomplete.Adapter.prototype, { - // Public methods - // -------------- - - // Update the textarea with the given value and strategy. - select: function (value, strategy, e) { - var pre = this.getTextFromHeadToCaret(); - var post = this.el.value.substring(this.el.selectionEnd); - var newSubstr = strategy.replace(value, e); - var regExp; - if (typeof newSubstr !== 'undefined') { - if ($.isArray(newSubstr)) { - post = newSubstr[1] + post; - newSubstr = newSubstr[0]; - } - regExp = $.isFunction(strategy.match) ? strategy.match(pre) : strategy.match; - pre = pre.replace(regExp, newSubstr); - this.$el.val(pre + post); - this.el.selectionStart = this.el.selectionEnd = pre.length; - } - }, - - getTextFromHeadToCaret: function () { - return this.el.value.substring(0, this.el.selectionEnd); - }, - - // Private methods - // --------------- - - _getCaretRelativePosition: function () { - var p = $.fn.textcomplete.getCaretCoordinates(this.el, this.el.selectionStart); - return { - top: p.top + this._calculateLineHeight() - this.$el.scrollTop(), - left: p.left - this.$el.scrollLeft(), - lineHeight: this._calculateLineHeight() - }; - }, - - _calculateLineHeight: function () { - var lineHeight = parseInt(this.$el.css('line-height'), 10); - if (isNaN(lineHeight)) { - // http://stackoverflow.com/a/4515470/1297336 - var parentNode = this.el.parentNode; - var temp = document.createElement(this.el.nodeName); - var style = this.el.style; - temp.setAttribute( - 'style', - 'margin:0px;padding:0px;font-family:' + style.fontFamily + ';font-size:' + style.fontSize - ); - temp.innerHTML = 'test'; - parentNode.appendChild(temp); - lineHeight = temp.clientHeight; - parentNode.removeChild(temp); - } - return lineHeight; - } - }); - - $.fn.textcomplete.Textarea = Textarea; -}(jQuery); - -+function ($) { - 'use strict'; - - var sentinelChar = '吶'; - - function IETextarea(element, completer, option) { - this.initialize(element, completer, option); - $('' + sentinelChar + '').css({ - position: 'absolute', - top: -9999, - left: -9999 - }).insertBefore(element); - } - - $.extend(IETextarea.prototype, $.fn.textcomplete.Textarea.prototype, { - // Public methods - // -------------- - - select: function (value, strategy, e) { - var pre = this.getTextFromHeadToCaret(); - var post = this.el.value.substring(pre.length); - var newSubstr = strategy.replace(value, e); - var regExp; - if (typeof newSubstr !== 'undefined') { - if ($.isArray(newSubstr)) { - post = newSubstr[1] + post; - newSubstr = newSubstr[0]; - } - regExp = $.isFunction(strategy.match) ? strategy.match(pre) : strategy.match; - pre = pre.replace(regExp, newSubstr); - this.$el.val(pre + post); - this.el.focus(); - var range = this.el.createTextRange(); - range.collapse(true); - range.moveEnd('character', pre.length); - range.moveStart('character', pre.length); - range.select(); - } - }, - - getTextFromHeadToCaret: function () { - this.el.focus(); - var range = document.selection.createRange(); - range.moveStart('character', -this.el.value.length); - var arr = range.text.split(sentinelChar) - return arr.length === 1 ? arr[0] : arr[1]; - } - }); - - $.fn.textcomplete.IETextarea = IETextarea; -}(jQuery); - -// NOTE: TextComplete plugin has contenteditable support but it does not work -// fine especially on old IEs. -// Any pull requests are REALLY welcome. - -+function ($) { - 'use strict'; - - // ContentEditable adapter - // ======================= - // - // Adapter for contenteditable elements. - function ContentEditable (element, completer, option) { - this.initialize(element, completer, option); - } - - $.extend(ContentEditable.prototype, $.fn.textcomplete.Adapter.prototype, { - // Public methods - // -------------- - - // Update the content with the given value and strategy. - // When an dropdown item is selected, it is executed. - select: function (value, strategy, e) { - var pre = this.getTextFromHeadToCaret(); - // use ownerDocument instead of window to support iframes - var sel = this.el.ownerDocument.getSelection(); - - var range = sel.getRangeAt(0); - var selection = range.cloneRange(); - selection.selectNodeContents(range.startContainer); - var content = selection.toString(); - var post = content.substring(range.startOffset); - var newSubstr = strategy.replace(value, e); - var regExp; - if (typeof newSubstr !== 'undefined') { - if ($.isArray(newSubstr)) { - post = newSubstr[1] + post; - newSubstr = newSubstr[0]; - } - regExp = $.isFunction(strategy.match) ? strategy.match(pre) : strategy.match; - pre = pre.replace(regExp, newSubstr) - .replace(/ $/, " "); //   necessary at least for CKeditor to not eat spaces - range.selectNodeContents(range.startContainer); - range.deleteContents(); - - // create temporary elements - var preWrapper = this.el.ownerDocument.createElement("div"); - preWrapper.innerHTML = pre; - var postWrapper = this.el.ownerDocument.createElement("div"); - postWrapper.innerHTML = post; - - // create the fragment thats inserted - var fragment = this.el.ownerDocument.createDocumentFragment(); - var childNode; - var lastOfPre; - while (childNode = preWrapper.firstChild) { - lastOfPre = fragment.appendChild(childNode); - } - while (childNode = postWrapper.firstChild) { - fragment.appendChild(childNode); - } - - // insert the fragment & jump behind the last node in "pre" - range.insertNode(fragment); - range.setStartAfter(lastOfPre); - - range.collapse(true); - sel.removeAllRanges(); - sel.addRange(range); - } - }, - - // Private methods - // --------------- - - // Returns the caret's relative position from the contenteditable's - // left top corner. - // - // Examples - // - // this._getCaretRelativePosition() - // //=> { top: 18, left: 200, lineHeight: 16 } - // - // Dropdown's position will be decided using the result. - _getCaretRelativePosition: function () { - var range = this.el.ownerDocument.getSelection().getRangeAt(0).cloneRange(); - var node = this.el.ownerDocument.createElement('span'); - range.insertNode(node); - range.selectNodeContents(node); - range.deleteContents(); - var $node = $(node); - var position = $node.offset(); - position.left -= this.$el.offset().left; - position.top += $node.height() - this.$el.offset().top; - position.lineHeight = $node.height(); - - // special positioning logic for iframes - // this is typically used for contenteditables such as tinymce or ckeditor - if (this.completer.$iframe) { - var iframePosition = this.completer.$iframe.offset(); - position.top += iframePosition.top; - position.left += iframePosition.left; - //subtract scrollTop from element in iframe - position.top -= this.$el.scrollTop(); - } - - $node.remove(); - return position; - }, - - // Returns the string between the first character and the caret. - // Completer will be triggered with the result for start autocompleting. - // - // Example - // - // // Suppose the html is 'hello wor|ld' and | is the caret. - // this.getTextFromHeadToCaret() - // // => ' wor' // not 'hello wor' - getTextFromHeadToCaret: function () { - var range = this.el.ownerDocument.getSelection().getRangeAt(0); - var selection = range.cloneRange(); - selection.selectNodeContents(range.startContainer); - return selection.toString().substring(0, range.startOffset); - } - }); - - $.fn.textcomplete.ContentEditable = ContentEditable; -}(jQuery); - -// NOTE: TextComplete plugin has contenteditable support but it does not work -// fine especially on old IEs. -// Any pull requests are REALLY welcome. - -+function ($) { - 'use strict'; - - // CKEditor adapter - // ======================= - // - // Adapter for CKEditor, based on contenteditable elements. - function CKEditor (element, completer, option) { - this.initialize(element, completer, option); - } - - $.extend(CKEditor.prototype, $.fn.textcomplete.ContentEditable.prototype, { - _bindEvents: function () { - var $this = this; - this.option.ckeditor_instance.on('key', function(event) { - var domEvent = event.data; - $this._onKeyup(domEvent); - if ($this.completer.dropdown.shown && $this._skipSearch(domEvent)) { - return false; - } - }, null, null, 1); // 1 = Priority = Important! - // we actually also need the native event, as the CKEditor one is happening to late - this.$el.on('keyup.' + this.id, $.proxy(this._onKeyup, this)); - }, -}); - - $.fn.textcomplete.CKEditor = CKEditor; -}(jQuery); - -// The MIT License (MIT) -// -// Copyright (c) 2015 Jonathan Ong me@jongleberry.com -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and -// associated documentation files (the "Software"), to deal in the Software without restriction, -// including without limitation the rights to use, copy, modify, merge, publish, distribute, -// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT -// NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// https://github.com/component/textarea-caret-position - -(function ($) { - -// The properties that we copy into a mirrored div. -// Note that some browsers, such as Firefox, -// do not concatenate properties, i.e. padding-top, bottom etc. -> padding, -// so we have to do every single property specifically. -var properties = [ - 'direction', // RTL support - 'boxSizing', - 'width', // on Chrome and IE, exclude the scrollbar, so the mirror div wraps exactly as the textarea does - 'height', - 'overflowX', - 'overflowY', // copy the scrollbar for IE - - 'borderTopWidth', - 'borderRightWidth', - 'borderBottomWidth', - 'borderLeftWidth', - 'borderStyle', - - 'paddingTop', - 'paddingRight', - 'paddingBottom', - 'paddingLeft', - - // https://developer.mozilla.org/en-US/docs/Web/CSS/font - 'fontStyle', - 'fontVariant', - 'fontWeight', - 'fontStretch', - 'fontSize', - 'fontSizeAdjust', - 'lineHeight', - 'fontFamily', - - 'textAlign', - 'textTransform', - 'textIndent', - 'textDecoration', // might not make a difference, but better be safe - - 'letterSpacing', - 'wordSpacing', - - 'tabSize', - 'MozTabSize' - -]; - -var isBrowser = (typeof window !== 'undefined'); -var isFirefox = (isBrowser && window.mozInnerScreenX != null); - -function getCaretCoordinates(element, position, options) { - if(!isBrowser) { - throw new Error('textarea-caret-position#getCaretCoordinates should only be called in a browser'); - } - - var debug = options && options.debug || false; - if (debug) { - var el = document.querySelector('#input-textarea-caret-position-mirror-div'); - if ( el ) { el.parentNode.removeChild(el); } - } - - // mirrored div - var div = document.createElement('div'); - div.id = 'input-textarea-caret-position-mirror-div'; - document.body.appendChild(div); - - var style = div.style; - var computed = window.getComputedStyle? getComputedStyle(element) : element.currentStyle; // currentStyle for IE < 9 - - // default textarea styles - style.whiteSpace = 'pre-wrap'; - if (element.nodeName !== 'INPUT') - style.wordWrap = 'break-word'; // only for textarea-s - - // position off-screen - style.position = 'absolute'; // required to return coordinates properly - if (!debug) - style.visibility = 'hidden'; // not 'display: none' because we want rendering - - // transfer the element's properties to the div - properties.forEach(function (prop) { - style[prop] = computed[prop]; - }); - - if (isFirefox) { - // Firefox lies about the overflow property for textareas: https://bugzilla.mozilla.org/show_bug.cgi?id=984275 - if (element.scrollHeight > parseInt(computed.height)) - style.overflowY = 'scroll'; - } else { - style.overflow = 'hidden'; // for Chrome to not render a scrollbar; IE keeps overflowY = 'scroll' - } - - div.textContent = element.value.substring(0, position); - // the second special handling for input type="text" vs textarea: spaces need to be replaced with non-breaking spaces - http://stackoverflow.com/a/13402035/1269037 - if (element.nodeName === 'INPUT') - div.textContent = div.textContent.replace(/\s/g, '\u00a0'); - - var span = document.createElement('span'); - // Wrapping must be replicated *exactly*, including when a long word gets - // onto the next line, with whitespace at the end of the line before (#7). - // The *only* reliable way to do that is to copy the *entire* rest of the - // textarea's content into the created at the caret position. - // for inputs, just '.' would be enough, but why bother? - span.textContent = element.value.substring(position) || '.'; // || because a completely empty faux span doesn't render at all - div.appendChild(span); - - var coordinates = { - top: span.offsetTop + parseInt(computed['borderTopWidth']), - left: span.offsetLeft + parseInt(computed['borderLeftWidth']) - }; - - if (debug) { - span.style.backgroundColor = '#aaa'; - } else { - document.body.removeChild(div); - } - - return coordinates; -} - -$.fn.textcomplete.getCaretCoordinates = getCaretCoordinates; - -}(jQuery)); - -return jQuery; -})); diff --git a/library/jquery-textcomplete/jquery.textcomplete.min.js b/library/jquery-textcomplete/jquery.textcomplete.min.js deleted file mode 100644 index d8f67a804..000000000 --- a/library/jquery-textcomplete/jquery.textcomplete.min.js +++ /dev/null @@ -1,3 +0,0 @@ -/*! jquery-textcomplete - v1.8.0 - 2016-11-15 */ -!function(a){if("function"==typeof define&&define.amd)define(["jquery"],a);else if("object"==typeof module&&module.exports){var b=require("jquery");module.exports=a(b)}else a(jQuery)}(function(a){if("undefined"==typeof a)throw new Error("jQuery.textcomplete requires jQuery");return+function(a){"use strict";var b=function(a){console.warn&&console.warn(a)},c=1;a.fn.textcomplete=function(d,e){var f=Array.prototype.slice.call(arguments);return this.each(function(){var g=this,h=a(this),i=h.data("textComplete");if(i||(e||(e={}),e._oid=c++,i=new a.fn.textcomplete.Completer(this,e),h.data("textComplete",i)),"string"==typeof d){if(!i)return;f.shift(),i[d].apply(i,f),"destroy"===d&&h.removeData("textComplete")}else a.each(d,function(c){a.each(["header","footer","placement","maxCount"],function(a){c[a]&&(i.option[a]=c[a],b(a+"as a strategy param is deprecated. Use option."),delete c[a])})}),i.register(a.fn.textcomplete.Strategy.parse(d,{el:g,$el:h}))})}}(a),+function(a){"use strict";function b(c,d){if(this.$el=a(c),this.id="textcomplete"+e++,this.strategies=[],this.views=[],this.option=a.extend({},b.defaults,d),!(this.$el.is("input[type=text]")||this.$el.is("input[type=search]")||this.$el.is("textarea")||c.isContentEditable||"true"==c.contentEditable))throw new Error("textcomplete must be called on a Textarea or a ContentEditable.");if(c===c.ownerDocument.activeElement)this.initialize();else{var f=this;this.$el.one("focus."+this.id,function(){f.initialize()}),this.option.adapter&&"CKEditor"!=this.option.adapter||"undefined"==typeof CKEDITOR||!this.$el.is("textarea")||CKEDITOR.on("instanceReady",function(b){b.editor.once("focus",function(c){f.$el=a(b.editor.editable().$),f.option.adapter||(f.option.adapter=a.fn.textcomplete.CKEditor,f.option.ckeditor_instance=b.editor),f.initialize()})})}}var c=function(a){var b,c;return function(){var d=Array.prototype.slice.call(arguments);if(b)return void(c=d);b=!0;var e=this;d.unshift(function f(){if(c){var d=c;c=void 0,d.unshift(f),a.apply(e,d)}else b=!1}),a.apply(this,d)}},d=function(a){return"[object String]"===Object.prototype.toString.call(a)},e=0;b.defaults={appendTo:"body",className:"",dropdownClassName:"dropdown-menu textcomplete-dropdown",maxCount:10,zIndex:"100",rightEdgeOffset:30},a.extend(b.prototype,{id:null,option:null,strategies:null,adapter:null,dropdown:null,$el:null,$iframe:null,initialize:function(){var b=this.$el.get(0);if(this.$el.prop("ownerDocument")!==document&&window.frames.length)for(var c=0;c").addClass(b.dropdownClassName).attr("id","textcomplete-dropdown-"+b._oid).css({display:"none",left:0,position:"absolute",zIndex:b.zIndex}).appendTo(c);return d}}),a.extend(b.prototype,{$el:null,$inputEl:null,completer:null,footer:null,header:null,id:null,maxCount:null,placement:"",shown:!1,data:[],className:"",destroy:function(){this.deactivate(),this.$el.off("."+this.id),this.$inputEl.off("."+this.id),this.clear(),this.$el.remove(),this.$el=this.$inputEl=this.completer=null,delete e[this.id]},render:function(b){var c=this._buildContents(b),d=a.map(b,function(a){return a.value});if(b.length){var e=b[0].strategy;e.id?this.$el.attr("data-strategy",e.id):this.$el.removeAttr("data-strategy"),this._renderHeader(d),this._renderFooter(d),c&&(this._renderContents(c),this._fitToBottom(),this._fitToRight(),this._activateIndexedItem()),this._setScroll()}else this.noResultsMessage?this._renderNoResultsMessage(d):this.shown&&this.deactivate()},setPosition:function(b){var d="absolute";return this.$inputEl.add(this.$inputEl.parents()).each(function(){return"absolute"===a(this).css("position")?!1:"fixed"===a(this).css("position")?(b.top-=c.scrollTop(),b.left-=c.scrollLeft(),d="fixed",!1):void 0}),this.$el.css(this._applyPlacement(b)),this.$el.css({position:d}),this},clear:function(){this.$el.html(""),this.data=[],this._index=0,this._$header=this._$footer=this._$noResultsMessage=null},activate:function(){return this.shown||(this.clear(),this.$el.show(),this.className&&this.$el.addClass(this.className),this.completer.fire("textComplete:show"),this.shown=!0),this},deactivate:function(){return this.shown&&(this.$el.hide(),this.className&&this.$el.removeClass(this.className),this.completer.fire("textComplete:hide"),this.shown=!1),this},isUp:function(a){return 38===a.keyCode||a.ctrlKey&&80===a.keyCode},isDown:function(a){return 40===a.keyCode||a.ctrlKey&&78===a.keyCode},isEnter:function(a){var b=a.ctrlKey||a.altKey||a.metaKey||a.shiftKey;return!b&&(13===a.keyCode||9===a.keyCode||this.option.completeOnSpace===!0&&32===a.keyCode)},isPageup:function(a){return 33===a.keyCode},isPagedown:function(a){return 34===a.keyCode},isEscape:function(a){return 27===a.keyCode},_data:null,_index:null,_$header:null,_$noResultsMessage:null,_$footer:null,_bindEvents:function(){this.$el.on("mousedown."+this.id,".textcomplete-item",a.proxy(this._onClick,this)),this.$el.on("touchstart."+this.id,".textcomplete-item",a.proxy(this._onClick,this)),this.$el.on("mouseover."+this.id,".textcomplete-item",a.proxy(this._onMouseover,this)),this.$inputEl.on("keydown."+this.id,a.proxy(this._onKeydown,this))},_onClick:function(b){var c=a(b.target);b.preventDefault(),b.originalEvent.keepTextCompleteDropdown=this.id,c.hasClass("textcomplete-item")||(c=c.closest(".textcomplete-item"));var d=this.data[parseInt(c.data("index"),10)];this.completer.select(d.value,d.strategy,b);var e=this;setTimeout(function(){e.deactivate(),"touchstart"===b.type&&e.$inputEl.focus()},0)},_onMouseover:function(b){var c=a(b.target);b.preventDefault(),c.hasClass("textcomplete-item")||(c=c.closest(".textcomplete-item")),this._index=parseInt(c.data("index"),10),this._activateIndexedItem()},_onKeydown:function(b){if(this.shown){var c;switch(a.isFunction(this.option.onKeydown)&&(c=this.option.onKeydown(b,f)),null==c&&(c=this._defaultKeydown(b)),c){case f.KEY_UP:b.preventDefault(),this._up();break;case f.KEY_DOWN:b.preventDefault(),this._down();break;case f.KEY_ENTER:b.preventDefault(),this._enter(b);break;case f.KEY_PAGEUP:b.preventDefault(),this._pageup();break;case f.KEY_PAGEDOWN:b.preventDefault(),this._pagedown();break;case f.KEY_ESCAPE:b.preventDefault(),this.deactivate()}}},_defaultKeydown:function(a){return this.isUp(a)?f.KEY_UP:this.isDown(a)?f.KEY_DOWN:this.isEnter(a)?f.KEY_ENTER:this.isPageup(a)?f.KEY_PAGEUP:this.isPagedown(a)?f.KEY_PAGEDOWN:this.isEscape(a)?f.KEY_ESCAPE:void 0},_up:function(){0===this._index?this._index=this.data.length-1:this._index-=1,this._activateIndexedItem(),this._setScroll()},_down:function(){this._index===this.data.length-1?this._index=0:this._index+=1,this._activateIndexedItem(),this._setScroll()},_enter:function(a){var b=this.data[parseInt(this._getActiveElement().data("index"),10)];this.completer.select(b.value,b.strategy,a),this.deactivate()},_pageup:function(){var b=0,c=this._getActiveElement().position().top-this.$el.innerHeight();this.$el.children().each(function(d){return a(this).position().top+a(this).outerHeight()>c?(b=d,!1):void 0}),this._index=b,this._activateIndexedItem(),this._setScroll()},_pagedown:function(){var b=this.data.length-1,c=this._getActiveElement().position().top+this.$el.innerHeight();this.$el.children().each(function(d){return a(this).position().top>c?(b=d,!1):void 0}),this._index=b,this._activateIndexedItem(),this._setScroll()},_activateIndexedItem:function(){this.$el.find(".textcomplete-item.active").removeClass("active"),this._getActiveElement().addClass("active")},_getActiveElement:function(){return this.$el.children(".textcomplete-item:nth("+this._index+")")},_setScroll:function(){var a=this._getActiveElement(),b=a.position().top,c=a.outerHeight(),d=this.$el.innerHeight(),e=this.$el.scrollTop();0===this._index||this._index==this.data.length-1||0>b?this.$el.scrollTop(b+e):b+c>d&&this.$el.scrollTop(b+c+e-d)},_buildContents:function(a){var b,c,e,f="";for(c=0;c',f+=b.strategy.template(b.value,b.term),f+="");return f},_renderHeader:function(b){if(this.header){this._$header||(this._$header=a('
  • ').prependTo(this.$el));var c=a.isFunction(this.header)?this.header(b):this.header;this._$header.html(c)}},_renderFooter:function(b){if(this.footer){this._$footer||(this._$footer=a('
  • ').appendTo(this.$el));var c=a.isFunction(this.footer)?this.footer(b):this.footer;this._$footer.html(c)}},_renderNoResultsMessage:function(b){if(this.noResultsMessage){this._$noResultsMessage||(this._$noResultsMessage=a('
  • ').appendTo(this.$el));var c=a.isFunction(this.noResultsMessage)?this.noResultsMessage(b):this.noResultsMessage;this._$noResultsMessage.html(c)}},_renderContents:function(a){this._$footer?this._$footer.before(a):this.$el.append(a)},_fitToBottom:function(){var a=c.scrollTop()+c.height(),b=this.$el.height();this.$el.position().top+b>a&&(this.completer.$iframe||this.$el.offset({top:a-b}))},_fitToRight:function(){for(var a,b=this.option.rightEdgeOffset,d=this.$el.offset().left,e=this.$el.width(),f=c.width()-b;d+e>f&&(this.$el.offset({left:d-b}),a=this.$el.offset().left,!(a>=d));)d=a},_applyPlacement:function(a){return-1!==this.placement.indexOf("top")?a={top:"auto",bottom:this.$el.parent().height()-a.top+a.lineHeight,left:a.left}:(a.bottom="auto",delete a.lineHeight),-1!==this.placement.indexOf("absleft")?a.left=0:-1!==this.placement.indexOf("absright")&&(a.right=0,a.left="auto"),a}}),a.fn.textcomplete.Dropdown=b,a.extend(a.fn.textcomplete,f)}(a),+function(a){"use strict";function b(b){a.extend(this,b),this.cache&&(this.search=c(this.search))}var c=function(a){var b={};return function(c,d){b[c]?d(b[c]):a.call(this,c,function(a){b[c]=(b[c]||[]).concat(a),d.apply(null,arguments)})}};b.parse=function(c,d){return a.map(c,function(a){var c=new b(a);return c.el=d.el,c.$el=d.$el,c})},a.extend(b.prototype,{match:null,replace:null,search:null,id:null,cache:!1,context:function(){return!0},index:2,template:function(a){return a},idProperty:null}),a.fn.textcomplete.Strategy=b}(a),+function(a){"use strict";function b(){}var c=Date.now||function(){return(new Date).getTime()},d=function(a,b){var d,e,f,g,h,i=function(){var j=c()-g;b>j?d=setTimeout(i,b-j):(d=null,h=a.apply(f,e),f=e=null)};return function(){return f=this,e=arguments,g=c(),d||(d=setTimeout(i,b)),h}};a.extend(b.prototype,{id:null,completer:null,el:null,$el:null,option:null,initialize:function(b,c,e){this.el=b,this.$el=a(b),this.id=c.id+this.constructor.name,this.completer=c,this.option=e,this.option.debounce&&(this._onKeyup=d(this._onKeyup,this.option.debounce)),this._bindEvents()},destroy:function(){this.$el.off("."+this.id),this.$el=this.el=this.completer=null},select:function(){throw new Error("Not implemented")},getCaretPosition:function(){var b=this._getCaretRelativePosition(),c=this.$el.offset(),d=this.option.appendTo;if(d){d instanceof a||(d=a(d));var e=d.offsetParent().offset();c.top-=e.top,c.left-=e.left}return b.top+=c.top,b.left+=c.left,b},focus:function(){this.$el.focus()},_bindEvents:function(){this.$el.on("keyup."+this.id,a.proxy(this._onKeyup,this))},_onKeyup:function(a){this._skipSearch(a)||this.completer.trigger(this.getTextFromHeadToCaret(),!0)},_skipSearch:function(a){switch(a.keyCode){case 9:case 13:case 16:case 17:case 18:case 33:case 34:case 40:case 38:case 27:return!0}if(a.ctrlKey)switch(a.keyCode){case 78:case 80:return!0}}}),a.fn.textcomplete.Adapter=b}(a),+function(a){"use strict";function b(a,b,c){this.initialize(a,b,c)}a.extend(b.prototype,a.fn.textcomplete.Adapter.prototype,{select:function(b,c,d){var e,f=this.getTextFromHeadToCaret(),g=this.el.value.substring(this.el.selectionEnd),h=c.replace(b,d);"undefined"!=typeof h&&(a.isArray(h)&&(g=h[1]+g,h=h[0]),e=a.isFunction(c.match)?c.match(f):c.match,f=f.replace(e,h),this.$el.val(f+g),this.el.selectionStart=this.el.selectionEnd=f.length)},getTextFromHeadToCaret:function(){return this.el.value.substring(0,this.el.selectionEnd)},_getCaretRelativePosition:function(){var b=a.fn.textcomplete.getCaretCoordinates(this.el,this.el.selectionStart);return{top:b.top+this._calculateLineHeight()-this.$el.scrollTop(),left:b.left-this.$el.scrollLeft(),lineHeight:this._calculateLineHeight()}},_calculateLineHeight:function(){var a=parseInt(this.$el.css("line-height"),10);if(isNaN(a)){var b=this.el.parentNode,c=document.createElement(this.el.nodeName),d=this.el.style;c.setAttribute("style","margin:0px;padding:0px;font-family:"+d.fontFamily+";font-size:"+d.fontSize),c.innerHTML="test",b.appendChild(c),a=c.clientHeight,b.removeChild(c)}return a}}),a.fn.textcomplete.Textarea=b}(a),+function(a){"use strict";function b(b,d,e){this.initialize(b,d,e),a(""+c+"").css({position:"absolute",top:-9999,left:-9999}).insertBefore(b)}var c="吶";a.extend(b.prototype,a.fn.textcomplete.Textarea.prototype,{select:function(b,c,d){var e,f=this.getTextFromHeadToCaret(),g=this.el.value.substring(f.length),h=c.replace(b,d);if("undefined"!=typeof h){a.isArray(h)&&(g=h[1]+g,h=h[0]),e=a.isFunction(c.match)?c.match(f):c.match,f=f.replace(e,h),this.$el.val(f+g),this.el.focus();var i=this.el.createTextRange();i.collapse(!0),i.moveEnd("character",f.length),i.moveStart("character",f.length),i.select()}},getTextFromHeadToCaret:function(){this.el.focus();var a=document.selection.createRange();a.moveStart("character",-this.el.value.length);var b=a.text.split(c);return 1===b.length?b[0]:b[1]}}),a.fn.textcomplete.IETextarea=b}(a),+function(a){"use strict";function b(a,b,c){this.initialize(a,b,c)}a.extend(b.prototype,a.fn.textcomplete.Adapter.prototype,{select:function(b,c,d){var e=this.getTextFromHeadToCaret(),f=this.el.ownerDocument.getSelection(),g=f.getRangeAt(0),h=g.cloneRange();h.selectNodeContents(g.startContainer);var i,j=h.toString(),k=j.substring(g.startOffset),l=c.replace(b,d);if("undefined"!=typeof l){a.isArray(l)&&(k=l[1]+k,l=l[0]),i=a.isFunction(c.match)?c.match(e):c.match,e=e.replace(i,l).replace(/ $/," "),g.selectNodeContents(g.startContainer),g.deleteContents();var m=this.el.ownerDocument.createElement("div");m.innerHTML=e;var n=this.el.ownerDocument.createElement("div");n.innerHTML=k;for(var o,p,q=this.el.ownerDocument.createDocumentFragment();o=m.firstChild;)p=q.appendChild(o);for(;o=n.firstChild;)q.appendChild(o);g.insertNode(q),g.setStartAfter(p),g.collapse(!0),f.removeAllRanges(),f.addRange(g)}},_getCaretRelativePosition:function(){var b=this.el.ownerDocument.getSelection().getRangeAt(0).cloneRange(),c=this.el.ownerDocument.createElement("span");b.insertNode(c),b.selectNodeContents(c),b.deleteContents();var d=a(c),e=d.offset();if(e.left-=this.$el.offset().left,e.top+=d.height()-this.$el.offset().top,e.lineHeight=d.height(),this.completer.$iframe){var f=this.completer.$iframe.offset();e.top+=f.top,e.left+=f.left,e.top-=this.$el.scrollTop()}return d.remove(),e},getTextFromHeadToCaret:function(){var a=this.el.ownerDocument.getSelection().getRangeAt(0),b=a.cloneRange();return b.selectNodeContents(a.startContainer),b.toString().substring(0,a.startOffset)}}),a.fn.textcomplete.ContentEditable=b}(a),+function(a){"use strict";function b(a,b,c){this.initialize(a,b,c)}a.extend(b.prototype,a.fn.textcomplete.ContentEditable.prototype,{_bindEvents:function(){var b=this;this.option.ckeditor_instance.on("key",function(a){var c=a.data;return b._onKeyup(c),b.completer.dropdown.shown&&b._skipSearch(c)?!1:void 0},null,null,1),this.$el.on("keyup."+this.id,a.proxy(this._onKeyup,this))}}),a.fn.textcomplete.CKEditor=b}(a),function(a){function b(a,b,f){if(!d)throw new Error("textarea-caret-position#getCaretCoordinates should only be called in a browser");var g=f&&f.debug||!1;if(g){var h=document.querySelector("#input-textarea-caret-position-mirror-div");h&&h.parentNode.removeChild(h)}var i=document.createElement("div");i.id="input-textarea-caret-position-mirror-div",document.body.appendChild(i);var j=i.style,k=window.getComputedStyle?getComputedStyle(a):a.currentStyle;j.whiteSpace="pre-wrap","INPUT"!==a.nodeName&&(j.wordWrap="break-word"),j.position="absolute",g||(j.visibility="hidden"),c.forEach(function(a){j[a]=k[a]}),e?a.scrollHeight>parseInt(k.height)&&(j.overflowY="scroll"):j.overflow="hidden",i.textContent=a.value.substring(0,b),"INPUT"===a.nodeName&&(i.textContent=i.textContent.replace(/\s/g," "));var l=document.createElement("span");l.textContent=a.value.substring(b)||".",i.appendChild(l);var m={top:l.offsetTop+parseInt(k.borderTopWidth),left:l.offsetLeft+parseInt(k.borderLeftWidth)};return g?l.style.backgroundColor="#aaa":document.body.removeChild(i),m}var c=["direction","boxSizing","width","height","overflowX","overflowY","borderTopWidth","borderRightWidth","borderBottomWidth","borderLeftWidth","borderStyle","paddingTop","paddingRight","paddingBottom","paddingLeft","fontStyle","fontVariant","fontWeight","fontStretch","fontSize","fontSizeAdjust","lineHeight","fontFamily","textAlign","textTransform","textIndent","textDecoration","letterSpacing","wordSpacing","tabSize","MozTabSize"],d="undefined"!=typeof window,e=d&&null!=window.mozInnerScreenX;a.fn.textcomplete.getCaretCoordinates=b}(a),a}); -//# sourceMappingURL=dist/jquery.textcomplete.min.map \ No newline at end of file diff --git a/library/jquery-textcomplete/jquery.textcomplete.min.map b/library/jquery-textcomplete/jquery.textcomplete.min.map deleted file mode 100644 index 0e249c1c4..000000000 --- a/library/jquery-textcomplete/jquery.textcomplete.min.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"dist/jquery.textcomplete.min.js","sources":["dist/jquery.textcomplete.js"],"names":["factory","define","amd","module","exports","$","require","jQuery","Error","warn","message","console","id","fn","textcomplete","strategies","option","args","Array","prototype","slice","call","arguments","this","each","self","$this","completer","data","_oid","Completer","shift","apply","removeData","obj","name","register","Strategy","parse","el","$el","element","uniqueId","views","extend","defaults","is","isContentEditable","contentEditable","ownerDocument","activeElement","initialize","one","adapter","CKEDITOR","on","event","editor","once","event2","editable","ckeditor_instance","lock","func","locked","queuedArgsToReplay","unshift","replayOrFree","replayArgs","undefined","isString","Object","toString","appendTo","className","dropdownClassName","maxCount","zIndex","rightEdgeOffset","dropdown","$iframe","get","prop","document","window","frames","length","iframeIndex","frameElement","Dropdown","Adapter","viewName","selectionEnd","destroy","off","deactivate","trigger","text","skipUnchangedTerm","getTextFromHeadToCaret","searchQuery","_extractSearchQuery","term","_term","_search","fire","eventName","push","select","value","strategy","e","focus","_clearAtNext","i","context","matchRegexp","isFunction","match","index","free","search","stillSearching","shown","activate","clear","setPosition","getCaretPosition","render","_zip","map","createElement","_data","$inputEl","listPosition","height","_i","_bindEvents","dropdownViews","$window","include","zippedData","datum","elem","idProperty","originalEvent","keepTextCompleteDropdown","key","view","commands","SKIP_DEFAULT","KEY_UP","KEY_DOWN","KEY_ENTER","KEY_PAGEUP","KEY_PAGEDOWN","KEY_ESCAPE","$parent","addClass","attr","css","display","left","position","footer","header","placement","remove","contentsHtml","_buildContents","unzippedData","d","removeAttr","_renderHeader","_renderFooter","_renderContents","_fitToBottom","_fitToRight","_activateIndexedItem","_setScroll","noResultsMessage","_renderNoResultsMessage","pos","add","parents","top","scrollTop","scrollLeft","_applyPlacement","html","_index","_$header","_$footer","_$noResultsMessage","show","hide","removeClass","isUp","keyCode","ctrlKey","isDown","isEnter","modifiers","altKey","metaKey","shiftKey","completeOnSpace","isPageup","isPagedown","isEscape","proxy","_onClick","_onMouseover","_onKeydown","target","preventDefault","hasClass","closest","parseInt","setTimeout","type","command","onKeydown","_defaultKeydown","_up","_down","_enter","_pageup","_pagedown","_getActiveElement","threshold","innerHeight","children","outerHeight","find","$activeEl","itemTop","itemHeight","visibleHeight","visibleTop","template","prependTo","before","append","windowScrollBottom","offset","tolerance","lastOffset","width","maxLeft","indexOf","bottom","parent","lineHeight","right","options","cache","memoize","memo","callback","concat","strategiesArray","params","strategyObj","replace","now","Date","getTime","debounce","wait","timeout","timestamp","result","later","last","constructor","_onKeyup","_getCaretRelativePosition","parentOffset","offsetParent","_skipSearch","clickEvent","Textarea","regExp","pre","post","substring","newSubstr","isArray","val","selectionStart","p","getCaretCoordinates","_calculateLineHeight","isNaN","parentNode","temp","nodeName","style","setAttribute","fontFamily","fontSize","innerHTML","appendChild","clientHeight","removeChild","IETextarea","sentinelChar","insertBefore","range","createTextRange","collapse","moveEnd","moveStart","selection","createRange","arr","split","ContentEditable","sel","getSelection","getRangeAt","cloneRange","selectNodeContents","startContainer","content","startOffset","deleteContents","preWrapper","postWrapper","childNode","lastOfPre","fragment","createDocumentFragment","firstChild","insertNode","setStartAfter","removeAllRanges","addRange","node","$node","iframePosition","CKEditor","domEvent","isBrowser","debug","querySelector","div","body","computed","getComputedStyle","currentStyle","whiteSpace","wordWrap","visibility","properties","forEach","isFirefox","scrollHeight","overflowY","overflow","textContent","span","coordinates","offsetTop","offsetLeft","backgroundColor","mozInnerScreenX"],"mappings":";CAAC,SAAUA,GACT,GAAsB,kBAAXC,SAAyBA,OAAOC,IAEzCD,QAAQ,UAAWD,OACd,IAAsB,gBAAXG,SAAuBA,OAAOC,QAAS,CACvD,GAAIC,GAAIC,QAAQ,SAChBH,QAAOC,QAAUJ,EAAQK,OAGzBL,GAAQO,SAEV,SAAUA,GAUZ,GAAsB,mBAAXA,GACT,KAAM,IAAIC,OAAM,sCAw7ClB,QAr7CC,SAAUH,GACT,YAEA,IAAII,GAAO,SAAUC,GACfC,QAAQF,MAAQE,QAAQF,KAAKC,IAG/BE,EAAK,CAETP,GAAEQ,GAAGC,aAAe,SAAUC,EAAYC,GACxC,GAAIC,GAAOC,MAAMC,UAAUC,MAAMC,KAAKC,UACtC,OAAOC,MAAKC,KAAK,WACf,GAAIC,GAAOF,KACPG,EAAQrB,EAAEkB,MACVI,EAAYD,EAAME,KAAK,eAO3B,IANKD,IACHX,IAAWA,MACXA,EAAOa,KAAOjB,IACde,EAAY,GAAItB,GAAEQ,GAAGC,aAAagB,UAAUP,KAAMP,GAClDU,EAAME,KAAK,eAAgBD,IAEH,gBAAfZ,GAAyB,CAClC,IAAKY,EAAW,MAChBV,GAAKc,QACLJ,EAAUZ,GAAYiB,MAAML,EAAWV,GACpB,YAAfF,GACFW,EAAMO,WAAW,oBAKnB5B,GAAEmB,KAAKT,EAAY,SAAUmB,GAC3B7B,EAAEmB,MAAM,SAAU,SAAU,YAAa,YAAa,SAAUW,GAC1DD,EAAIC,KACNR,EAAUX,OAAOmB,GAAQD,EAAIC,GAC7B1B,EAAK0B,EAAO,wDACLD,GAAIC,QAIjBR,EAAUS,SAAS/B,EAAEQ,GAAGC,aAAauB,SAASC,MAAMvB,GAClDwB,GAAId,EACJe,IAAKd,SAMbnB,IAED,SAAUF,GACT,YAgEA,SAASyB,GAAUW,EAASzB,GAO1B,GANAO,KAAKiB,IAAanC,EAAEoC,GACpBlB,KAAKX,GAAa,eAAiB8B,IACnCnB,KAAKR,cACLQ,KAAKoB,SACLpB,KAAKP,OAAaX,EAAEuC,UAAWd,EAAUe,SAAU7B,KAE9CO,KAAKiB,IAAIM,GAAG,qBAAwBvB,KAAKiB,IAAIM,GAAG,uBAA0BvB,KAAKiB,IAAIM,GAAG,aAAgBL,EAAQM,mBAAgD,QAA3BN,EAAQO,iBAC9I,KAAM,IAAIxC,OAAM,kEAIlB,IAAIiC,IAAYA,EAAQQ,cAAcC,cAEpC3B,KAAK4B,iBACA,CAEL,GAAI1B,GAAOF,IACXA,MAAKiB,IAAIY,IAAI,SAAW7B,KAAKX,GAAI,WAAca,EAAK0B,eAG9C5B,KAAKP,OAAOqC,SAAkC,YAAvB9B,KAAKP,OAAOqC,SAA6C,mBAAZC,YAA4B/B,KAAKiB,IAAIM,GAAG,aAChHQ,SAASC,GAAG,gBAAiB,SAASC,GACpCA,EAAMC,OAAOC,KAAK,QAAS,SAASC,GAElClC,EAAKe,IAAMnC,EAAEmD,EAAMC,OAAOG,WAAWvD,GAChCoB,EAAKT,OAAOqC,UACf5B,EAAKT,OAAOqC,QAAUhD,EAAEQ,GAAGC,aAAuB,SAClDW,EAAKT,OAAO6C,kBAAoBL,EAAMC,QAExChC,EAAK0B,kBAtEf,GAAIW,GAAO,SAAUC,GACnB,GAAIC,GAAQC,CAEZ,OAAO,YAEL,GAAIhD,GAAOC,MAAMC,UAAUC,MAAMC,KAAKC,UACtC,IAAI0C,EAKF,YADAC,EAAqBhD,EAGvB+C,IAAS,CACT,IAAIvC,GAAOF,IACXN,GAAKiD,QAAQ,QAASC,KACpB,GAAIF,EAAoB,CAMtB,GAAIG,GAAaH,CACjBA,GAAqBI,OACrBD,EAAWF,QAAQC,GACnBJ,EAAK/B,MAAMP,EAAM2C,OAEjBJ,IAAS,IAGbD,EAAK/B,MAAMT,KAAMN,KAIjBqD,EAAW,SAAUpC,GACvB,MAA+C,oBAAxCqC,OAAOpD,UAAUqD,SAASnD,KAAKa,IAGpCQ,EAAW,CAuCfZ,GAAUe,UACR4B,SAAU,OACVC,UAAW,GACXC,kBAAmB,sCACnBC,SAAU,GACVC,OAAQ,MACRC,gBAAiB,IAGnBzE,EAAEuC,OAAOd,EAAUX,WAIjBP,GAAY,KACZI,OAAY,KACZD,WAAY,KACZsC,QAAY,KACZ0B,SAAY,KACZvC,IAAY,KACZwC,QAAY,KAKZ7B,WAAY,WACV,GAAIV,GAAUlB,KAAKiB,IAAIyC,IAAI,EAI3B,IAAI1D,KAAKiB,IAAI0C,KAAK,mBAAqBC,UAAYC,OAAOC,OAAOC,OAC/D,IAAK,GAAIC,GAAc,EAAGA,EAAcH,OAAOC,OAAOC,OAAQC,IAC5D,GAAIhE,KAAKiB,IAAI0C,KAAK,mBAAqBE,OAAOC,OAAOE,GAAaJ,SAAU,CAC1E5D,KAAKyD,QAAU3E,EAAE+E,OAAOC,OAAOE,GAAaC,aAC5C,OAONjE,KAAKwD,SAAW,GAAI1E,GAAEQ,GAAGC,aAAa2E,SAAShD,EAASlB,KAAMA,KAAKP,OACnE,IAAI0E,GAASC,CACTpE,MAAKP,OAAOqC,QACdqC,EAAUnE,KAAKP,OAAOqC,SAGpBsC,EADEpE,KAAKiB,IAAIM,GAAG,aAAevB,KAAKiB,IAAIM,GAAG,qBAAuBvB,KAAKiB,IAAIM,GAAG,sBACjC,gBAAzBL,GAAQmD,aAA4B,WAAa,aAExD,kBAEbF,EAAUrF,EAAEQ,GAAGC,aAAa6E,IAE9BpE,KAAK8B,QAAU,GAAIqC,GAAQjD,EAASlB,KAAMA,KAAKP,SAGjD6E,QAAS,WACPtE,KAAKiB,IAAIsD,IAAI,IAAMvE,KAAKX,IACpBW,KAAK8B,SACP9B,KAAK8B,QAAQwC,UAEXtE,KAAKwD,UACPxD,KAAKwD,SAASc,UAEhBtE,KAAKiB,IAAMjB,KAAK8B,QAAU9B,KAAKwD,SAAW,MAG5CgB,WAAY,WACNxE,KAAKwD,UACPxD,KAAKwD,SAASgB,cAKlBC,QAAS,SAAUC,EAAMC,GAClB3E,KAAKwD,UAAYxD,KAAK4B,aACnB,MAAR8C,IAAiBA,EAAO1E,KAAK8B,QAAQ8C,yBACrC,IAAIC,GAAc7E,KAAK8E,oBAAoBJ,EAC3C,IAAIG,EAAYd,OAAQ,CACtB,GAAIgB,GAAOF,EAAY,EAEvB,IAAIF,GAAqB3E,KAAKgF,QAAUD,GAAiB,KAATA,EAAe,MAC/D/E,MAAKgF,MAAQD,EACb/E,KAAKiF,QAAQxE,MAAMT,KAAM6E,OAEzB7E,MAAKgF,MAAQ,KACbhF,KAAKwD,SAASgB,cAIlBU,KAAM,SAAUC,GACd,GAAIzF,GAAOC,MAAMC,UAAUC,MAAMC,KAAKC,UAAW,EAEjD,OADAC,MAAKiB,IAAIwD,QAAQU,EAAWzF,GACrBM,MAGTa,SAAU,SAAUrB,GAClBG,MAAMC,UAAUwF,KAAK3E,MAAMT,KAAKR,WAAYA,IAS9C6F,OAAQ,SAAUC,EAAOC,EAAUC,GACjCxF,KAAKgF,MAAQ,KACbhF,KAAK8B,QAAQuD,OAAOC,EAAOC,EAAUC,GACrCxF,KAAKkF,KAAK,UAAUA,KAAK,sBAAuBI,EAAOC,GACvDvF,KAAK8B,QAAQ2D,SAMfC,cAAc,EACdV,MAAc,KASdF,oBAAqB,SAAUJ,GAC7B,IAAK,GAAIiB,GAAI,EAAGA,EAAI3F,KAAKR,WAAWuE,OAAQ4B,IAAK,CAC/C,GAAIJ,GAAWvF,KAAKR,WAAWmG,GAC3BC,EAAUL,EAASK,QAAQlB,EAC/B,IAAIkB,GAAuB,KAAZA,EAAgB,CAC7B,GAAIC,GAAc/G,EAAEgH,WAAWP,EAASQ,OAASR,EAASQ,MAAMrB,GAAQa,EAASQ,KAC7EhD,GAAS6C,KAAYlB,EAAOkB,EAChC,IAAIG,GAAQrB,EAAKqB,MAAMF,EACvB,IAAIE,EAAS,OAAQR,EAAUQ,EAAMR,EAASS,OAAQD,IAG1D,UAIFd,QAAS1C,EAAK,SAAU0D,EAAMV,EAAUR,EAAMgB,GAC5C,GAAI7F,GAAOF,IACXuF,GAASW,OAAOnB,EAAM,SAAU1E,EAAM8F,GAC/BjG,EAAKsD,SAAS4C,OACjBlG,EAAKsD,SAAS6C,WAEZnG,EAAKwF,eAEPxF,EAAKsD,SAAS8C,QACdpG,EAAKwF,cAAe,GAEtBxF,EAAKsD,SAAS+C,YAAYrG,EAAK4B,QAAQ0E,oBACvCtG,EAAKsD,SAASiD,OAAOvG,EAAKwG,KAAKrG,EAAMkF,EAAUR,IAC1CoB,IAEHF,IACA/F,EAAKwF,cAAe,IAErBK,KASLW,KAAM,SAAUrG,EAAMkF,EAAUR,GAC9B,MAAOjG,GAAE6H,IAAItG,EAAM,SAAUiF,GAC3B,OAASA,MAAOA,EAAOC,SAAUA,EAAUR,KAAMA,QAKvDjG,EAAEQ,GAAGC,aAAagB,UAAYA,GAC9BvB,IAED,SAAUF,GACT,YA2CA,SAASoF,GAAShD,EAASd,EAAWX,GACpCO,KAAKiB,IAAYiD,EAAS0C,cAAcnH,GACxCO,KAAKI,UAAYA,EACjBJ,KAAKX,GAAYe,EAAUf,GAAK,WAChCW,KAAK6G,SACL7G,KAAK8G,SAAYhI,EAAEoC,GACnBlB,KAAKP,OAAYA,EAGbA,EAAOsH,eAAgB/G,KAAKuG,YAAc9G,EAAOsH,cACjDtH,EAAOuH,QAAUhH,KAAKiB,IAAI+F,OAAOvH,EAAOuH,OAC5C,IAAI9G,GAAOF,IACXlB,GAAEmB,MAAM,WAAY,YAAa,SAAU,SAAU,mBAAoB,aAAc,SAAUgH,EAAIrG,GAC/E,MAAhBnB,EAAOmB,KAAiBV,EAAKU,GAAQnB,EAAOmB,MAElDZ,KAAKkH,YAAYhG,GACjBiG,EAAcnH,KAAKX,IAAMW,KAzD3B,GAAIoH,GAAUtI,EAAE+E,QAEZwD,EAAU,SAAUC,EAAYC,GAClC,GAAI5B,GAAG6B,EACHC,EAAaF,EAAMhC,SAASkC,UAChC,KAAK9B,EAAI,EAAGA,EAAI2B,EAAWvD,OAAQ4B,IAEjC,GADA6B,EAAOF,EAAW3B,GACd6B,EAAKjC,WAAagC,EAAMhC,SAC5B,GAAIkC,GACF,GAAID,EAAKlC,MAAMmC,KAAgBF,EAAMjC,MAAMmC,GAAa,OAAO,MAE/D,IAAID,EAAKlC,QAAUiC,EAAMjC,MAAO,OAAO,CAG3C,QAAO,GAGL6B,IACJrI,GAAE8E,UAAU5B,GAAG,QAAS,SAAUwD,GAChC,GAAInG,GAAKmG,EAAEkC,eAAiBlC,EAAEkC,cAAcC,wBAC5C7I,GAAEmB,KAAKkH,EAAe,SAAUS,EAAKC,GAC/BD,IAAQvI,GAAMwI,EAAKrD,gBAI3B,IAAIsD,IACFC,aAAc,EACdC,OAAQ,EACRC,SAAU,EACVC,UAAW,EACXC,WAAY,EACZC,aAAc,EACdC,WAAY,EA4BdvJ,GAAEuC,OAAO6C,GAIP0C,cAAe,SAAUnH,GACvB,GAAI6I,GAAU7I,EAAOyD,QACfoF,aAAmBxJ,KAAMwJ,EAAUxJ,EAAEwJ,GAC3C,IAAIrH,GAAMnC,EAAE,aACTyJ,SAAS9I,EAAO2D,mBAChBoF,KAAK,KAAM,yBAA2B/I,EAAOa,MAC7CmI,KACCC,QAAS,OACTC,KAAM,EACNC,SAAU,WACVtF,OAAQ7D,EAAO6D,SAEhBJ,SAASoF,EACZ,OAAOrH,MAIXnC,EAAEuC,OAAO6C,EAAStE,WAIhBqB,IAAW,KACX6F,SAAW,KACX1G,UAAW,KACXyI,OAAW,KACXC,OAAW,KACXzJ,GAAW,KACXgE,SAAW,KACX0F,UAAW,GACX3C,OAAW,EACX/F,QACA8C,UAAW,GAKXmB,QAAS,WAEPtE,KAAKwE,aAELxE,KAAKiB,IAAIsD,IAAI,IAAMvE,KAAKX,IACxBW,KAAK8G,SAASvC,IAAI,IAAMvE,KAAKX,IAC7BW,KAAKsG,QACLtG,KAAKiB,IAAI+H,SACThJ,KAAKiB,IAAMjB,KAAK8G,SAAW9G,KAAKI,UAAY,WACrC+G,GAAcnH,KAAKX,KAG5BoH,OAAQ,SAAUa,GAChB,GAAI2B,GAAejJ,KAAKkJ,eAAe5B,GACnC6B,EAAerK,EAAE6H,IAAIW,EAAY,SAAU8B,GAAK,MAAOA,GAAE9D,OAC7D,IAAIgC,EAAWvD,OAAQ,CACrB,GAAIwB,GAAW+B,EAAW,GAAG/B,QACzBA,GAASlG,GACXW,KAAKiB,IAAIuH,KAAK,gBAAiBjD,EAASlG,IAExCW,KAAKiB,IAAIoI,WAAW,iBAEtBrJ,KAAKsJ,cAAcH,GACnBnJ,KAAKuJ,cAAcJ,GACfF,IACFjJ,KAAKwJ,gBAAgBP,GACrBjJ,KAAKyJ,eACLzJ,KAAK0J,cACL1J,KAAK2J,wBAEP3J,KAAK4J,iBACI5J,MAAK6J,iBACd7J,KAAK8J,wBAAwBX,GACpBnJ,KAAKoG,OACdpG,KAAKwE,cAIT+B,YAAa,SAAUwD,GAIrB,GAAInB,GAAW,UAef,OAbA5I,MAAK8G,SAASkD,IAAIhK,KAAK8G,SAASmD,WAAWhK,KAAK,WAC9C,MAA+B,aAA5BnB,EAAEkB,MAAMyI,IAAI,aACN,EACsB,UAA5B3J,EAAEkB,MAAMyI,IAAI,aACbsB,EAAIG,KAAO9C,EAAQ+C,YACnBJ,EAAIpB,MAAQvB,EAAQgD,aACpBxB,EAAW,SACJ,GAJT,SAOF5I,KAAKiB,IAAIwH,IAAIzI,KAAKqK,gBAAgBN,IAClC/J,KAAKiB,IAAIwH,KAAMG,SAAUA,IAElB5I,MAGTsG,MAAO,WACLtG,KAAKiB,IAAIqJ,KAAK,IACdtK,KAAKK,QACLL,KAAKuK,OAAS,EACdvK,KAAKwK,SAAWxK,KAAKyK,SAAWzK,KAAK0K,mBAAqB,MAG5DrE,SAAU,WAQR,MAPKrG,MAAKoG,QACRpG,KAAKsG,QACLtG,KAAKiB,IAAI0J,OACL3K,KAAKmD,WAAanD,KAAKiB,IAAIsH,SAASvI,KAAKmD,WAC7CnD,KAAKI,UAAU8E,KAAK,qBACpBlF,KAAKoG,OAAQ,GAERpG,MAGTwE,WAAY,WAOV,MANIxE,MAAKoG,QACPpG,KAAKiB,IAAI2J,OACL5K,KAAKmD,WAAanD,KAAKiB,IAAI4J,YAAY7K,KAAKmD,WAChDnD,KAAKI,UAAU8E,KAAK,qBACpBlF,KAAKoG,OAAQ,GAERpG,MAGT8K,KAAM,SAAUtF,GACd,MAAqB,MAAdA,EAAEuF,SAAmBvF,EAAEwF,SAAyB,KAAdxF,EAAEuF,SAG7CE,OAAQ,SAAUzF,GAChB,MAAqB,MAAdA,EAAEuF,SAAmBvF,EAAEwF,SAAyB,KAAdxF,EAAEuF,SAG7CG,QAAS,SAAU1F,GACjB,GAAI2F,GAAY3F,EAAEwF,SAAWxF,EAAE4F,QAAU5F,EAAE6F,SAAW7F,EAAE8F,QACxD,QAAQH,IAA4B,KAAd3F,EAAEuF,SAAgC,IAAdvF,EAAEuF,SAAkB/K,KAAKP,OAAO8L,mBAAoB,GAAsB,KAAd/F,EAAEuF,UAG1GS,SAAU,SAAUhG,GAClB,MAAqB,MAAdA,EAAEuF,SAGXU,WAAY,SAAUjG,GACpB,MAAqB,MAAdA,EAAEuF,SAGXW,SAAU,SAAUlG,GAClB,MAAqB,MAAdA,EAAEuF,SAMXlE,MAAU,KACV0D,OAAU,KACVC,SAAU,KACVE,mBAAoB,KACpBD,SAAU,KAKVvD,YAAa,WACXlH,KAAKiB,IAAIe,GAAG,aAAehC,KAAKX,GAAI,qBAAsBP,EAAE6M,MAAM3L,KAAK4L,SAAU5L,OACjFA,KAAKiB,IAAIe,GAAG,cAAgBhC,KAAKX,GAAI,qBAAsBP,EAAE6M,MAAM3L,KAAK4L,SAAU5L,OAClFA,KAAKiB,IAAIe,GAAG,aAAehC,KAAKX,GAAI,qBAAsBP,EAAE6M,MAAM3L,KAAK6L,aAAc7L,OACrFA,KAAK8G,SAAS9E,GAAG,WAAahC,KAAKX,GAAIP,EAAE6M,MAAM3L,KAAK8L,WAAY9L,QAGlE4L,SAAU,SAAUpG,GAClB,GAAIvE,GAAMnC,EAAE0G,EAAEuG,OACdvG,GAAEwG,iBACFxG,EAAEkC,cAAcC,yBAA2B3H,KAAKX,GAC3C4B,EAAIgL,SAAS,uBAChBhL,EAAMA,EAAIiL,QAAQ,sBAEpB,IAAI3E,GAAQvH,KAAKK,KAAK8L,SAASlL,EAAIZ,KAAK,SAAU,IAClDL,MAAKI,UAAUiF,OAAOkC,EAAMjC,MAAOiC,EAAMhC,SAAUC,EACnD,IAAItF,GAAOF,IAGXoM,YAAW,WACTlM,EAAKsE,aACU,eAAXgB,EAAE6G,MACJnM,EAAK4G,SAASrB,SAEf,IAILoG,aAAc,SAAUrG,GACtB,GAAIvE,GAAMnC,EAAE0G,EAAEuG,OACdvG,GAAEwG,iBACG/K,EAAIgL,SAAS,uBAChBhL,EAAMA,EAAIiL,QAAQ,uBAEpBlM,KAAKuK,OAAS4B,SAASlL,EAAIZ,KAAK,SAAU,IAC1CL,KAAK2J,wBAGPmC,WAAY,SAAUtG,GACpB,GAAKxF,KAAKoG,MAAV,CAEA,GAAIkG,EAUJ,QARIxN,EAAEgH,WAAW9F,KAAKP,OAAO8M,aAC3BD,EAAUtM,KAAKP,OAAO8M,UAAU/G,EAAGsC,IAGtB,MAAXwE,IACFA,EAAUtM,KAAKwM,gBAAgBhH,IAGzB8G,GACN,IAAKxE,GAASE,OACZxC,EAAEwG,iBACFhM,KAAKyM,KACL,MACF,KAAK3E,GAASG,SACZzC,EAAEwG,iBACFhM,KAAK0M,OACL,MACF,KAAK5E,GAASI,UACZ1C,EAAEwG,iBACFhM,KAAK2M,OAAOnH,EACZ,MACF,KAAKsC,GAASK,WACZ3C,EAAEwG,iBACFhM,KAAK4M,SACL,MACF,KAAK9E,GAASM,aACZ5C,EAAEwG,iBACFhM,KAAK6M,WACL,MACF,KAAK/E,GAASO,WACZ7C,EAAEwG,iBACFhM,KAAKwE,gBAKXgI,gBAAiB,SAAUhH,GACzB,MAAIxF,MAAK8K,KAAKtF,GACLsC,EAASE,OACPhI,KAAKiL,OAAOzF,GACdsC,EAASG,SACPjI,KAAKkL,QAAQ1F,GACfsC,EAASI,UACPlI,KAAKwL,SAAShG,GAChBsC,EAASK,WACPnI,KAAKyL,WAAWjG,GAClBsC,EAASM,aACPpI,KAAK0L,SAASlG,GAChBsC,EAASO,WADX,QAKToE,IAAK,WACiB,IAAhBzM,KAAKuK,OACPvK,KAAKuK,OAASvK,KAAKK,KAAK0D,OAAS,EAEjC/D,KAAKuK,QAAU,EAEjBvK,KAAK2J,uBACL3J,KAAK4J,cAGP8C,MAAO,WACD1M,KAAKuK,SAAWvK,KAAKK,KAAK0D,OAAS,EACrC/D,KAAKuK,OAAS,EAEdvK,KAAKuK,QAAU,EAEjBvK,KAAK2J,uBACL3J,KAAK4J,cAGP+C,OAAQ,SAAUnH,GAChB,GAAI+B,GAAQvH,KAAKK,KAAK8L,SAASnM,KAAK8M,oBAAoBzM,KAAK,SAAU,IACvEL,MAAKI,UAAUiF,OAAOkC,EAAMjC,MAAOiC,EAAMhC,SAAUC,GACnDxF,KAAKwE,cAGPoI,QAAS,WACP,GAAIb,GAAS,EACTgB,EAAY/M,KAAK8M,oBAAoBlE,WAAWsB,IAAMlK,KAAKiB,IAAI+L,aACnEhN,MAAKiB,IAAIgM,WAAWhN,KAAK,SAAU0F,GACjC,MAAI7G,GAAEkB,MAAM4I,WAAWsB,IAAMpL,EAAEkB,MAAMkN,cAAgBH,GACnDhB,EAASpG,GACF,GAFT,SAKF3F,KAAKuK,OAASwB,EACd/L,KAAK2J,uBACL3J,KAAK4J,cAGPiD,UAAW,WACT,GAAId,GAAS/L,KAAKK,KAAK0D,OAAS,EAC5BgJ,EAAY/M,KAAK8M,oBAAoBlE,WAAWsB,IAAMlK,KAAKiB,IAAI+L,aACnEhN,MAAKiB,IAAIgM,WAAWhN,KAAK,SAAU0F,GACjC,MAAI7G,GAAEkB,MAAM4I,WAAWsB,IAAM6C,GAC3BhB,EAASpG,GACF,GAFT,SAKF3F,KAAKuK,OAASwB,EACd/L,KAAK2J,uBACL3J,KAAK4J,cAGPD,qBAAsB,WACpB3J,KAAKiB,IAAIkM,KAAK,6BAA6BtC,YAAY,UACvD7K,KAAK8M,oBAAoBvE,SAAS,WAGpCuE,kBAAmB,WACjB,MAAO9M,MAAKiB,IAAIgM,SAAS,0BAA4BjN,KAAKuK,OAAS,MAGrEX,WAAY,WACV,GAAIwD,GAAYpN,KAAK8M,oBACjBO,EAAUD,EAAUxE,WAAWsB,IAC/BoD,EAAaF,EAAUF,cACvBK,EAAgBvN,KAAKiB,IAAI+L,cACzBQ,EAAaxN,KAAKiB,IAAIkJ,WACN,KAAhBnK,KAAKuK,QAAgBvK,KAAKuK,QAAUvK,KAAKK,KAAK0D,OAAS,GAAe,EAAVsJ,EAC9DrN,KAAKiB,IAAIkJ,UAAUkD,EAAUG,GACpBH,EAAUC,EAAaC,GAChCvN,KAAKiB,IAAIkJ,UAAUkD,EAAUC,EAAaE,EAAaD,IAI3DrE,eAAgB,SAAU5B,GACxB,GAAIC,GAAO5B,EAAGK,EACVsE,EAAO,EACX,KAAK3E,EAAI,EAAGA,EAAI2B,EAAWvD,QACrB/D,KAAKK,KAAK0D,SAAW/D,KAAKqD,SADGsC,IAEjC4B,EAAQD,EAAW3B,GACf0B,EAAQrH,KAAKK,KAAMkH,KACvBvB,EAAQhG,KAAKK,KAAK0D,OAClB/D,KAAKK,KAAK+E,KAAKmC,GACf+C,GAAQ,6CAA+CtE,EAAQ,QAC/DsE,GAAU/C,EAAMhC,SAASkI,SAASlG,EAAMjC,MAAOiC,EAAMxC,MACrDuF,GAAQ,YAEV,OAAOA,IAGThB,cAAe,SAAUH,GACvB,GAAInJ,KAAK8I,OAAQ,CACV9I,KAAKwK,WACRxK,KAAKwK,SAAW1L,EAAE,yCAAyC4O,UAAU1N,KAAKiB,KAE5E,IAAIqJ,GAAOxL,EAAEgH,WAAW9F,KAAK8I,QAAU9I,KAAK8I,OAAOK,GAAgBnJ,KAAK8I,MACxE9I,MAAKwK,SAASF,KAAKA,KAIvBf,cAAe,SAAUJ,GACvB,GAAInJ,KAAK6I,OAAQ,CACV7I,KAAKyK,WACRzK,KAAKyK,SAAW3L,EAAE,yCAAyCoE,SAASlD,KAAKiB,KAE3E,IAAIqJ,GAAOxL,EAAEgH,WAAW9F,KAAK6I,QAAU7I,KAAK6I,OAAOM,GAAgBnJ,KAAK6I,MACxE7I,MAAKyK,SAASH,KAAKA,KAIvBR,wBAAyB,SAAUX,GACjC,GAAInJ,KAAK6J,iBAAkB,CACpB7J,KAAK0K,qBACR1K,KAAK0K,mBAAqB5L,EAAE,qDAAqDoE,SAASlD,KAAKiB,KAEjG,IAAIqJ,GAAOxL,EAAEgH,WAAW9F,KAAK6J,kBAAoB7J,KAAK6J,iBAAiBV,GAAgBnJ,KAAK6J,gBAC5F7J,MAAK0K,mBAAmBJ,KAAKA,KAIjCd,gBAAiB,SAAUc,GACrBtK,KAAKyK,SACPzK,KAAKyK,SAASkD,OAAOrD,GAErBtK,KAAKiB,IAAI2M,OAAOtD,IAIpBb,aAAc,WACZ,GAAIoE,GAAqBzG,EAAQ+C,YAAc/C,EAAQJ,SACnDA,EAAShH,KAAKiB,IAAI+F,QACjBhH,MAAKiB,IAAI2H,WAAWsB,IAAMlD,EAAU6G,IAElC7N,KAAKI,UAAUqD,SAClBzD,KAAKiB,IAAI6M,QAAQ5D,IAAK2D,EAAqB7G,MAKjD0C,YAAa,WASX,IAJA,GACyCoE,GADrCC,EAAY/N,KAAKP,OAAO8D,gBACxByK,EAAahO,KAAKiB,IAAI6M,SAASnF,KAC/BsF,EAAQjO,KAAKiB,IAAIgN,QACjBC,EAAU9G,EAAQ6G,QAAUF,EACzBC,EAAaC,EAAQC,IAC1BlO,KAAKiB,IAAI6M,QAAQnF,KAAMqF,EAAaD,IACpCD,EAAS9N,KAAKiB,IAAI6M,SAASnF,OACvBmF,GAAUE,KACdA,EAAaF,GAIjBzD,gBAAiB,SAAUzB,GAmBzB,MAjBsC,KAAlC5I,KAAK+I,UAAUoF,QAAQ,OAEzBvF,GACEsB,IAAK,OACLkE,OAAQpO,KAAKiB,IAAIoN,SAASrH,SAAW4B,EAASsB,IAAMtB,EAAS0F,WAC7D3F,KAAMC,EAASD,OAGjBC,EAASwF,OAAS,aACXxF,GAAS0F,YAEwB,KAAtCtO,KAAK+I,UAAUoF,QAAQ,WACzBvF,EAASD,KAAO,EACgC,KAAvC3I,KAAK+I,UAAUoF,QAAQ,cAChCvF,EAAS2F,MAAQ,EACjB3F,EAASD,KAAO,QAEXC,KAIX9J,EAAEQ,GAAGC,aAAa2E,SAAWA,EAC7BpF,EAAEuC,OAAOvC,EAAEQ,GAAGC,aAAcuI,IAC5B9I,IAED,SAAUF,GACT,YAiBA,SAASgC,GAAS0N,GAChB1P,EAAEuC,OAAOrB,KAAMwO,GACXxO,KAAKyO,QAASzO,KAAKkG,OAASwI,EAAQ1O,KAAKkG,SAhB/C,GAAIwI,GAAU,SAAUlM,GACtB,GAAImM,KACJ,OAAO,UAAU5J,EAAM6J,GACjBD,EAAK5J,GACP6J,EAASD,EAAK5J,IAEdvC,EAAK1C,KAAKE,KAAM+E,EAAM,SAAU1E,GAC9BsO,EAAK5J,IAAS4J,EAAK5J,QAAa8J,OAAOxO,GACvCuO,EAASnO,MAAM,KAAMV,cAW7Be,GAASC,MAAQ,SAAU+N,EAAiBC,GAC1C,MAAOjQ,GAAE6H,IAAImI,EAAiB,SAAUvJ,GACtC,GAAIyJ,GAAc,GAAIlO,GAASyE,EAG/B,OAFAyJ,GAAYhO,GAAK+N,EAAO/N,GACxBgO,EAAY/N,IAAM8N,EAAO9N,IAClB+N,KAIXlQ,EAAEuC,OAAOP,EAASlB,WAKhBmG,MAAY,KACZkJ,QAAY,KACZ/I,OAAY,KAGZ7G,GAAY,KACZoP,OAAY,EACZ7I,QAAY,WAAc,OAAO,GACjCI,MAAY,EACZyH,SAAY,SAAU9M,GAAO,MAAOA,IACpC8G,WAAY,OAGd3I,EAAEQ,GAAGC,aAAauB,SAAWA,GAE7B9B,IAED,SAAUF,GACT,YAiCA,SAASqF,MA/BT,GAAI+K,GAAMC,KAAKD,KAAO,WAAc,OAAO,GAAIC,OAAOC,WAOlDC,EAAW,SAAU7M,EAAM8M,GAC7B,GAAIC,GAAS7P,EAAMkG,EAAS4J,EAAWC,EACnCC,EAAQ,WACV,GAAIC,GAAOT,IAAQM,CACRF,GAAPK,EACFJ,EAAUnD,WAAWsD,EAAOJ,EAAOK,IAEnCJ,EAAU,KACVE,EAASjN,EAAK/B,MAAMmF,EAASlG,GAC7BkG,EAAUlG,EAAO,MAIrB,OAAO,YAOL,MANAkG,GAAU5F,KACVN,EAAOK,UACPyP,EAAYN,IACPK,IACHA,EAAUnD,WAAWsD,EAAOJ,IAEvBG,GAMX3Q,GAAEuC,OAAO8C,EAAQvE,WAIfP,GAAW,KACXe,UAAW,KACXY,GAAW,KACXC,IAAW,KACXxB,OAAW,KAKXmC,WAAY,SAAUV,EAASd,EAAWX,GACxCO,KAAKgB,GAAYE,EACjBlB,KAAKiB,IAAYnC,EAAEoC,GACnBlB,KAAKX,GAAYe,EAAUf,GAAKW,KAAK4P,YAAYhP,KACjDZ,KAAKI,UAAYA,EACjBJ,KAAKP,OAAYA,EAEbO,KAAKP,OAAO4P,WACdrP,KAAK6P,SAAWR,EAASrP,KAAK6P,SAAU7P,KAAKP,OAAO4P,WAGtDrP,KAAKkH,eAGP5C,QAAS,WACPtE,KAAKiB,IAAIsD,IAAI,IAAMvE,KAAKX,IACxBW,KAAKiB,IAAMjB,KAAKgB,GAAKhB,KAAKI,UAAY,MAQxCiF,OAAQ,WACN,KAAM,IAAIpG,OAAM,oBAIlBuH,iBAAkB,WAChB,GAAIoC,GAAW5I,KAAK8P,4BAChBhC,EAAS9N,KAAKiB,IAAI6M,SAGlBxF,EAAUtI,KAAKP,OAAOyD,QAC1B,IAAIoF,EAAS,CACJA,YAAmBxJ,KAAMwJ,EAAUxJ,EAAEwJ,GAC3C,IAAIyH,GAAezH,EAAQ0H,eAAelC,QAC1CA,GAAO5D,KAAO6F,EAAa7F,IAC3B4D,EAAOnF,MAAQoH,EAAapH,KAK/B,MAFAC,GAASsB,KAAO4D,EAAO5D,IACvBtB,EAASD,MAAQmF,EAAOnF,KACjBC,GAITnD,MAAO,WACLzF,KAAKiB,IAAIwE,SAMXyB,YAAa,WACXlH,KAAKiB,IAAIe,GAAG,SAAWhC,KAAKX,GAAIP,EAAE6M,MAAM3L,KAAK6P,SAAU7P,QAGzD6P,SAAU,SAAUrK,GACdxF,KAAKiQ,YAAYzK,IACrBxF,KAAKI,UAAUqE,QAAQzE,KAAK4E,0BAA0B,IAIxDqL,YAAa,SAAUC,GACrB,OAAQA,EAAWnF,SACjB,IAAK,GACL,IAAK,IACL,IAAK,IACL,IAAK,IACL,IAAK,IACL,IAAK,IACL,IAAK,IACL,IAAK,IACL,IAAK,IACL,IAAK,IACH,OAAO,EAEX,GAAImF,EAAWlF,QAAS,OAAQkF,EAAWnF,SACzC,IAAK,IACL,IAAK,IACH,OAAO,MAKfjM,EAAEQ,GAAGC,aAAa4E,QAAUA,GAC5BnF,IAED,SAAUF,GACT,YAMA,SAASqR,GAASjP,EAASd,EAAWX,GACpCO,KAAK4B,WAAWV,EAASd,EAAWX,GAGtCX,EAAEuC,OAAO8O,EAASvQ,UAAWd,EAAEQ,GAAGC,aAAa4E,QAAQvE,WAKrDyF,OAAQ,SAAUC,EAAOC,EAAUC,GACjC,GAGI4K,GAHAC,EAAMrQ,KAAK4E,yBACX0L,EAAOtQ,KAAKgB,GAAGsE,MAAMiL,UAAUvQ,KAAKgB,GAAGqD,cACvCmM,EAAYjL,EAAS0J,QAAQ3J,EAAOE,EAEf,oBAAdgL,KACL1R,EAAE2R,QAAQD,KACZF,EAAOE,EAAU,GAAKF,EACtBE,EAAYA,EAAU,IAExBJ,EAAStR,EAAEgH,WAAWP,EAASQ,OAASR,EAASQ,MAAMsK,GAAO9K,EAASQ,MACvEsK,EAAMA,EAAIpB,QAAQmB,EAAQI,GAC1BxQ,KAAKiB,IAAIyP,IAAIL,EAAMC,GACnBtQ,KAAKgB,GAAG2P,eAAiB3Q,KAAKgB,GAAGqD,aAAegM,EAAItM,SAIxDa,uBAAwB,WACtB,MAAO5E,MAAKgB,GAAGsE,MAAMiL,UAAU,EAAGvQ,KAAKgB,GAAGqD,eAM5CyL,0BAA2B,WACzB,GAAIc,GAAI9R,EAAEQ,GAAGC,aAAasR,oBAAoB7Q,KAAKgB,GAAIhB,KAAKgB,GAAG2P,eAC/D,QACEzG,IAAK0G,EAAE1G,IAAMlK,KAAK8Q,uBAAyB9Q,KAAKiB,IAAIkJ,YACpDxB,KAAMiI,EAAEjI,KAAO3I,KAAKiB,IAAImJ,aACxBkE,WAAYtO,KAAK8Q,yBAIrBA,qBAAsB,WACpB,GAAIxC,GAAanC,SAASnM,KAAKiB,IAAIwH,IAAI,eAAgB,GACvD,IAAIsI,MAAMzC,GAAa,CAErB,GAAI0C,GAAahR,KAAKgB,GAAGgQ,WACrBC,EAAOrN,SAASgD,cAAc5G,KAAKgB,GAAGkQ,UACtCC,EAAQnR,KAAKgB,GAAGmQ,KACpBF,GAAKG,aACH,QACA,sCAAwCD,EAAME,WAAa,cAAgBF,EAAMG,UAEnFL,EAAKM,UAAY,OACjBP,EAAWQ,YAAYP,GACvB3C,EAAa2C,EAAKQ,aAClBT,EAAWU,YAAYT,GAEzB,MAAO3C,MAIXxP,EAAEQ,GAAGC,aAAa4Q,SAAWA,GAC7BnR,IAED,SAAUF,GACT,YAIA,SAAS6S,GAAWzQ,EAASd,EAAWX,GACtCO,KAAK4B,WAAWV,EAASd,EAAWX,GACpCX,EAAE,SAAW8S,EAAe,WAAWnJ,KACrCG,SAAU,WACVsB,IAAK,MACLvB,KAAM,QACLkJ,aAAa3Q,GARlB,GAAI0Q,GAAe,GAWnB9S,GAAEuC,OAAOsQ,EAAW/R,UAAWd,EAAEQ,GAAGC,aAAa4Q,SAASvQ,WAIxDyF,OAAQ,SAAUC,EAAOC,EAAUC,GACjC,GAGI4K,GAHAC,EAAMrQ,KAAK4E,yBACX0L,EAAOtQ,KAAKgB,GAAGsE,MAAMiL,UAAUF,EAAItM,QACnCyM,EAAYjL,EAAS0J,QAAQ3J,EAAOE,EAExC,IAAyB,mBAAdgL,GAA2B,CAChC1R,EAAE2R,QAAQD,KACZF,EAAOE,EAAU,GAAKF,EACtBE,EAAYA,EAAU,IAExBJ,EAAStR,EAAEgH,WAAWP,EAASQ,OAASR,EAASQ,MAAMsK,GAAO9K,EAASQ,MACvEsK,EAAMA,EAAIpB,QAAQmB,EAAQI,GAC1BxQ,KAAKiB,IAAIyP,IAAIL,EAAMC,GACnBtQ,KAAKgB,GAAGyE,OACR,IAAIqM,GAAQ9R,KAAKgB,GAAG+Q,iBACpBD,GAAME,UAAS,GACfF,EAAMG,QAAQ,YAAa5B,EAAItM,QAC/B+N,EAAMI,UAAU,YAAa7B,EAAItM,QACjC+N,EAAMzM,WAIVT,uBAAwB,WACtB5E,KAAKgB,GAAGyE,OACR,IAAIqM,GAAQlO,SAASuO,UAAUC,aAC/BN,GAAMI,UAAU,aAAclS,KAAKgB,GAAGsE,MAAMvB,OAC5C,IAAIsO,GAAMP,EAAMpN,KAAK4N,MAAMV,EAC3B,OAAsB,KAAfS,EAAItO,OAAesO,EAAI,GAAKA,EAAI,MAI3CvT,EAAEQ,GAAGC,aAAaoS,WAAaA,GAC/B3S,IAMD,SAAUF,GACT,YAMA,SAASyT,GAAiBrR,EAASd,EAAWX,GAC5CO,KAAK4B,WAAWV,EAASd,EAAWX,GAGtCX,EAAEuC,OAAOkR,EAAgB3S,UAAWd,EAAEQ,GAAGC,aAAa4E,QAAQvE,WAM5DyF,OAAQ,SAAUC,EAAOC,EAAUC,GACjC,GAAI6K,GAAMrQ,KAAK4E,yBAEX4N,EAAMxS,KAAKgB,GAAGU,cAAc+Q,eAE5BX,EAAQU,EAAIE,WAAW,GACvBP,EAAYL,EAAMa,YACtBR,GAAUS,mBAAmBd,EAAMe,eACnC,IAGIzC,GAHA0C,EAAUX,EAAUlP,WACpBqN,EAAOwC,EAAQvC,UAAUuB,EAAMiB,aAC/BvC,EAAYjL,EAAS0J,QAAQ3J,EAAOE,EAExC,IAAyB,mBAAdgL,GAA2B,CAChC1R,EAAE2R,QAAQD,KACZF,EAAOE,EAAU,GAAKF,EACtBE,EAAYA,EAAU,IAExBJ,EAAStR,EAAEgH,WAAWP,EAASQ,OAASR,EAASQ,MAAMsK,GAAO9K,EAASQ,MACvEsK,EAAMA,EAAIpB,QAAQmB,EAAQI,GACrBvB,QAAQ,KAAM,SACnB6C,EAAMc,mBAAmBd,EAAMe,gBAC/Bf,EAAMkB,gBAGN,IAAIC,GAAajT,KAAKgB,GAAGU,cAAckF,cAAc,MACrDqM,GAAW1B,UAAYlB,CACvB,IAAI6C,GAAclT,KAAKgB,GAAGU,cAAckF,cAAc,MACtDsM,GAAY3B,UAAYjB,CAMxB,KAHA,GACI6C,GACAC,EAFAC,EAAWrT,KAAKgB,GAAGU,cAAc4R,yBAG9BH,EAAYF,EAAWM,YAC7BH,EAAYC,EAAS7B,YAAY2B,EAElC,MAAOA,EAAYD,EAAYK,YAC9BF,EAAS7B,YAAY2B,EAItBrB,GAAM0B,WAAWH,GACjBvB,EAAM2B,cAAcL,GAEpBtB,EAAME,UAAS,GACfQ,EAAIkB,kBACJlB,EAAImB,SAAS7B,KAgBjBhC,0BAA2B,WACzB,GAAIgC,GAAQ9R,KAAKgB,GAAGU,cAAc+Q,eAAeC,WAAW,GAAGC,aAC3DiB,EAAO5T,KAAKgB,GAAGU,cAAckF,cAAc,OAC/CkL,GAAM0B,WAAWI,GACjB9B,EAAMc,mBAAmBgB,GACzB9B,EAAMkB,gBACN,IAAIa,GAAQ/U,EAAE8U,GACVhL,EAAWiL,EAAM/F,QAOrB,IANAlF,EAASD,MAAQ3I,KAAKiB,IAAI6M,SAASnF,KACnCC,EAASsB,KAAO2J,EAAM7M,SAAWhH,KAAKiB,IAAI6M,SAAS5D,IACnDtB,EAAS0F,WAAauF,EAAM7M,SAIxBhH,KAAKI,UAAUqD,QAAS,CAC1B,GAAIqQ,GAAiB9T,KAAKI,UAAUqD,QAAQqK,QAC5ClF,GAASsB,KAAO4J,EAAe5J,IAC/BtB,EAASD,MAAQmL,EAAenL,KAEhCC,EAASsB,KAAOlK,KAAKiB,IAAIkJ,YAI3B,MADA0J,GAAM7K,SACCJ,GAWThE,uBAAwB,WACtB,GAAIkN,GAAQ9R,KAAKgB,GAAGU,cAAc+Q,eAAeC,WAAW,GACxDP,EAAYL,EAAMa,YAEtB,OADAR,GAAUS,mBAAmBd,EAAMe,gBAC5BV,EAAUlP,WAAWsN,UAAU,EAAGuB,EAAMiB,gBAInDjU,EAAEQ,GAAGC,aAAagT,gBAAkBA,GACpCvT,IAMD,SAAUF,GACT,YAMA,SAASiV,GAAU7S,EAASd,EAAWX,GACrCO,KAAK4B,WAAWV,EAASd,EAAWX,GAGtCX,EAAEuC,OAAO0S,EAASnU,UAAWd,EAAEQ,GAAGC,aAAagT,gBAAgB3S,WAC7DsH,YAAa,WACX,GAAI/G,GAAQH,IACZA,MAAKP,OAAO6C,kBAAkBN,GAAG,MAAO,SAASC,GAC/C,GAAI+R,GAAW/R,EAAM5B,IAErB,OADAF,GAAM0P,SAASmE,GACX7T,EAAMC,UAAUoD,SAAS4C,OAASjG,EAAM8P,YAAY+D,IAC/C,EADT,QAGC,KAAM,KAAM,GAEfhU,KAAKiB,IAAIe,GAAG,SAAWhC,KAAKX,GAAIP,EAAE6M,MAAM3L,KAAK6P,SAAU7P,UAI3DlB,EAAEQ,GAAGC,aAAawU,SAAWA,GAC7B/U,GAuBD,SAAUF,GAmDX,QAAS+R,GAAoB3P,EAAS0H,EAAU4F,GAC9C,IAAIyF,EACF,KAAM,IAAIhV,OAAM,iFAGlB,IAAIiV,GAAQ1F,GAAWA,EAAQ0F,QAAS,CACxC,IAAIA,EAAO,CACT,GAAIlT,GAAK4C,SAASuQ,cAAc,4CAC3BnT,IAAOA,EAAGgQ,WAAWU,YAAY1Q,GAIxC,GAAIoT,GAAMxQ,SAASgD,cAAc,MACjCwN,GAAI/U,GAAK,2CACTuE,SAASyQ,KAAK7C,YAAY4C,EAE1B,IAAIjD,GAAQiD,EAAIjD,MACZmD,EAAWzQ,OAAO0Q,iBAAkBA,iBAAiBrT,GAAWA,EAAQsT,YAG5ErD,GAAMsD,WAAa,WACM,UAArBvT,EAAQgQ,WACVC,EAAMuD,SAAW,cAGnBvD,EAAMvI,SAAW,WACZsL,IACH/C,EAAMwD,WAAa,UAGrBC,EAAWC,QAAQ,SAAUlR,GAC3BwN,EAAMxN,GAAQ2Q,EAAS3Q,KAGrBmR,EAEE5T,EAAQ6T,aAAe5I,SAASmI,EAAStN,UAC3CmK,EAAM6D,UAAY,UAEpB7D,EAAM8D,SAAW,SAGnBb,EAAIc,YAAchU,EAAQoE,MAAMiL,UAAU,EAAG3H,GAEpB,UAArB1H,EAAQgQ,WACVkD,EAAIc,YAAcd,EAAIc,YAAYjG,QAAQ,MAAO,KAEnD,IAAIkG,GAAOvR,SAASgD,cAAc,OAMlCuO,GAAKD,YAAchU,EAAQoE,MAAMiL,UAAU3H,IAAa,IACxDwL,EAAI5C,YAAY2D,EAEhB,IAAIC,IACFlL,IAAKiL,EAAKE,UAAYlJ,SAASmI,EAAyB,gBACxD3L,KAAMwM,EAAKG,WAAanJ,SAASmI,EAA0B,iBAS7D,OANIJ,GACFiB,EAAKhE,MAAMoE,gBAAkB,OAE7B3R,SAASyQ,KAAK3C,YAAY0C,GAGrBgB,EAhHT,GAAIR,IACF,YACA,YACA,QACA,SACA,YACA,YAEA,iBACA,mBACA,oBACA,kBACA,cAEA,aACA,eACA,gBACA,cAGA,YACA,cACA,aACA,cACA,WACA,iBACA,aACA,aAEA,YACA,gBACA,aACA,iBAEA,gBACA,cAEA,UACA,cAIEX,EAA+B,mBAAXpQ,QACpBiR,EAAab,GAAuC,MAA1BpQ,OAAO2R,eAwErC1W,GAAEQ,GAAGC,aAAasR,oBAAsBA,GAEtC7R,GAEKA"} \ No newline at end of file diff --git a/library/textcomplete/textcomplete.js b/library/textcomplete/textcomplete.js new file mode 100644 index 000000000..5134be691 --- /dev/null +++ b/library/textcomplete/textcomplete.js @@ -0,0 +1,2409 @@ +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) { +/******/ return installedModules[moduleId].exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { +/******/ configurable: false, +/******/ enumerable: true, +/******/ get: getter +/******/ }); +/******/ } +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 5); +/******/ }) +/************************************************************************/ +/******/ ([ +/* 0 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +var _strategy = __webpack_require__(2); + +var _strategy2 = _interopRequireDefault(_strategy); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +/** + * Encapsulate an result of each search results. + */ +var SearchResult = function () { + + /** + * @param {object} data - An element of array callbacked by search function. + */ + function SearchResult(data, term, strategy) { + _classCallCheck(this, SearchResult); + + this.data = data; + this.term = term; + this.strategy = strategy; + } + + _createClass(SearchResult, [{ + key: "replace", + value: function replace(beforeCursor, afterCursor) { + var replacement = this.strategy.replace(this.data); + if (replacement !== null) { + if (Array.isArray(replacement)) { + afterCursor = replacement[1] + afterCursor; + replacement = replacement[0]; + } + var match = this.strategy.matchText(beforeCursor); + if (match) { + replacement = replacement.replace(/\$&/g, match[0]).replace(/\$(\d)/g, function (_, p1) { + return match[parseInt(p1, 10)]; + }); + return [[beforeCursor.slice(0, match.index), replacement, beforeCursor.slice(match.index + match[0].length)].join(""), afterCursor]; + } + } + } + }, { + key: "render", + value: function render() { + return this.strategy.template(this.data, this.term); + } + }]); + + return SearchResult; +}(); + +exports.default = SearchResult; + +/***/ }), +/* 1 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var has = Object.prototype.hasOwnProperty + , prefix = '~'; + +/** + * Constructor to create a storage for our `EE` objects. + * An `Events` instance is a plain object whose properties are event names. + * + * @constructor + * @api private + */ +function Events() {} + +// +// We try to not inherit from `Object.prototype`. In some engines creating an +// instance in this way is faster than calling `Object.create(null)` directly. +// If `Object.create(null)` is not supported we prefix the event names with a +// character to make sure that the built-in object properties are not +// overridden or used as an attack vector. +// +if (Object.create) { + Events.prototype = Object.create(null); + + // + // This hack is needed because the `__proto__` property is still inherited in + // some old browsers like Android 4, iPhone 5.1, Opera 11 and Safari 5. + // + if (!new Events().__proto__) prefix = false; +} + +/** + * Representation of a single event listener. + * + * @param {Function} fn The listener function. + * @param {Mixed} context The context to invoke the listener with. + * @param {Boolean} [once=false] Specify if the listener is a one-time listener. + * @constructor + * @api private + */ +function EE(fn, context, once) { + this.fn = fn; + this.context = context; + this.once = once || false; +} + +/** + * Minimal `EventEmitter` interface that is molded against the Node.js + * `EventEmitter` interface. + * + * @constructor + * @api public + */ +function EventEmitter() { + this._events = new Events(); + this._eventsCount = 0; +} + +/** + * Return an array listing the events for which the emitter has registered + * listeners. + * + * @returns {Array} + * @api public + */ +EventEmitter.prototype.eventNames = function eventNames() { + var names = [] + , events + , name; + + if (this._eventsCount === 0) return names; + + for (name in (events = this._events)) { + if (has.call(events, name)) names.push(prefix ? name.slice(1) : name); + } + + if (Object.getOwnPropertySymbols) { + return names.concat(Object.getOwnPropertySymbols(events)); + } + + return names; +}; + +/** + * Return the listeners registered for a given event. + * + * @param {String|Symbol} event The event name. + * @param {Boolean} exists Only check if there are listeners. + * @returns {Array|Boolean} + * @api public + */ +EventEmitter.prototype.listeners = function listeners(event, exists) { + var evt = prefix ? prefix + event : event + , available = this._events[evt]; + + if (exists) return !!available; + if (!available) return []; + if (available.fn) return [available.fn]; + + for (var i = 0, l = available.length, ee = new Array(l); i < l; i++) { + ee[i] = available[i].fn; + } + + return ee; +}; + +/** + * Calls each of the listeners registered for a given event. + * + * @param {String|Symbol} event The event name. + * @returns {Boolean} `true` if the event had listeners, else `false`. + * @api public + */ +EventEmitter.prototype.emit = function emit(event, a1, a2, a3, a4, a5) { + var evt = prefix ? prefix + event : event; + + if (!this._events[evt]) return false; + + var listeners = this._events[evt] + , len = arguments.length + , args + , i; + + if (listeners.fn) { + if (listeners.once) this.removeListener(event, listeners.fn, undefined, true); + + switch (len) { + case 1: return listeners.fn.call(listeners.context), true; + case 2: return listeners.fn.call(listeners.context, a1), true; + case 3: return listeners.fn.call(listeners.context, a1, a2), true; + case 4: return listeners.fn.call(listeners.context, a1, a2, a3), true; + case 5: return listeners.fn.call(listeners.context, a1, a2, a3, a4), true; + case 6: return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true; + } + + for (i = 1, args = new Array(len -1); i < len; i++) { + args[i - 1] = arguments[i]; + } + + listeners.fn.apply(listeners.context, args); + } else { + var length = listeners.length + , j; + + for (i = 0; i < length; i++) { + if (listeners[i].once) this.removeListener(event, listeners[i].fn, undefined, true); + + switch (len) { + case 1: listeners[i].fn.call(listeners[i].context); break; + case 2: listeners[i].fn.call(listeners[i].context, a1); break; + case 3: listeners[i].fn.call(listeners[i].context, a1, a2); break; + case 4: listeners[i].fn.call(listeners[i].context, a1, a2, a3); break; + default: + if (!args) for (j = 1, args = new Array(len -1); j < len; j++) { + args[j - 1] = arguments[j]; + } + + listeners[i].fn.apply(listeners[i].context, args); + } + } + } + + return true; +}; + +/** + * Add a listener for a given event. + * + * @param {String|Symbol} event The event name. + * @param {Function} fn The listener function. + * @param {Mixed} [context=this] The context to invoke the listener with. + * @returns {EventEmitter} `this`. + * @api public + */ +EventEmitter.prototype.on = function on(event, fn, context) { + var listener = new EE(fn, context || this) + , evt = prefix ? prefix + event : event; + + if (!this._events[evt]) this._events[evt] = listener, this._eventsCount++; + else if (!this._events[evt].fn) this._events[evt].push(listener); + else this._events[evt] = [this._events[evt], listener]; + + return this; +}; + +/** + * Add a one-time listener for a given event. + * + * @param {String|Symbol} event The event name. + * @param {Function} fn The listener function. + * @param {Mixed} [context=this] The context to invoke the listener with. + * @returns {EventEmitter} `this`. + * @api public + */ +EventEmitter.prototype.once = function once(event, fn, context) { + var listener = new EE(fn, context || this, true) + , evt = prefix ? prefix + event : event; + + if (!this._events[evt]) this._events[evt] = listener, this._eventsCount++; + else if (!this._events[evt].fn) this._events[evt].push(listener); + else this._events[evt] = [this._events[evt], listener]; + + return this; +}; + +/** + * Remove the listeners of a given event. + * + * @param {String|Symbol} event The event name. + * @param {Function} fn Only remove the listeners that match this function. + * @param {Mixed} context Only remove the listeners that have this context. + * @param {Boolean} once Only remove one-time listeners. + * @returns {EventEmitter} `this`. + * @api public + */ +EventEmitter.prototype.removeListener = function removeListener(event, fn, context, once) { + var evt = prefix ? prefix + event : event; + + if (!this._events[evt]) return this; + if (!fn) { + if (--this._eventsCount === 0) this._events = new Events(); + else delete this._events[evt]; + return this; + } + + var listeners = this._events[evt]; + + if (listeners.fn) { + if ( + listeners.fn === fn + && (!once || listeners.once) + && (!context || listeners.context === context) + ) { + if (--this._eventsCount === 0) this._events = new Events(); + else delete this._events[evt]; + } + } else { + for (var i = 0, events = [], length = listeners.length; i < length; i++) { + if ( + listeners[i].fn !== fn + || (once && !listeners[i].once) + || (context && listeners[i].context !== context) + ) { + events.push(listeners[i]); + } + } + + // + // Reset the array, or remove it completely if we have no more listeners. + // + if (events.length) this._events[evt] = events.length === 1 ? events[0] : events; + else if (--this._eventsCount === 0) this._events = new Events(); + else delete this._events[evt]; + } + + return this; +}; + +/** + * Remove all listeners, or those of the specified event. + * + * @param {String|Symbol} [event] The event name. + * @returns {EventEmitter} `this`. + * @api public + */ +EventEmitter.prototype.removeAllListeners = function removeAllListeners(event) { + var evt; + + if (event) { + evt = prefix ? prefix + event : event; + if (this._events[evt]) { + if (--this._eventsCount === 0) this._events = new Events(); + else delete this._events[evt]; + } + } else { + this._events = new Events(); + this._eventsCount = 0; + } + + return this; +}; + +// +// Alias methods names because people roll like that. +// +EventEmitter.prototype.off = EventEmitter.prototype.removeListener; +EventEmitter.prototype.addListener = EventEmitter.prototype.on; + +// +// This function doesn't apply anymore. +// +EventEmitter.prototype.setMaxListeners = function setMaxListeners() { + return this; +}; + +// +// Expose the prefix. +// +EventEmitter.prefixed = prefix; + +// +// Allow `EventEmitter` to be imported as module namespace. +// +EventEmitter.EventEmitter = EventEmitter; + +// +// Expose the module. +// +if (true) { + module.exports = EventEmitter; +} + + +/***/ }), +/* 2 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +var DEFAULT_INDEX = 2; + +function DEFAULT_TEMPLATE(value) { + return value; +} + +/** + * Properties for a strategy. + * + * @typedef + */ + +/** + * Encapsulate a single strategy. + */ +var Strategy = function () { + function Strategy(props) { + _classCallCheck(this, Strategy); + + this.props = props; + this.cache = props.cache ? {} : null; + } + + /** + * @return {this} + */ + + + _createClass(Strategy, [{ + key: "destroy", + value: function destroy() { + this.cache = null; + return this; + } + }, { + key: "search", + value: function search(term, callback, match) { + if (this.cache) { + this.searchWithCache(term, callback, match); + } else { + this.props.search(term, callback, match); + } + } + + /** + * @param {object} data - An element of array callbacked by search function. + */ + + }, { + key: "replace", + value: function replace(data) { + return this.props.replace(data); + } + + /** @private */ + + }, { + key: "searchWithCache", + value: function searchWithCache(term, callback, match) { + var _this = this; + + if (this.cache && this.cache[term]) { + callback(this.cache[term]); + } else { + this.props.search(term, function (results) { + if (_this.cache) { + _this.cache[term] = results; + } + callback(results); + }, match); + } + } + + /** @private */ + + }, { + key: "matchText", + value: function matchText(text) { + if (typeof this.match === "function") { + return this.match(text); + } else { + return text.match(this.match); + } + } + + /** @private */ + + }, { + key: "match", + get: function get() { + return this.props.match; + } + + /** @private */ + + }, { + key: "index", + get: function get() { + return typeof this.props.index === "number" ? this.props.index : DEFAULT_INDEX; + } + }, { + key: "template", + get: function get() { + return this.props.template || DEFAULT_TEMPLATE; + } + }]); + + return Strategy; +}(); + +exports.default = Strategy; + +/***/ }), +/* 3 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.calculateElementOffset = calculateElementOffset; +exports.getLineHeightPx = getLineHeightPx; +exports.calculateLineHeightPx = calculateLineHeightPx; + + +/** + * Create a custom event + * + * @private + */ +var createCustomEvent = exports.createCustomEvent = function () { + if (typeof window.CustomEvent === "function") { + return function (type, options) { + return new document.defaultView.CustomEvent(type, { + cancelable: options && options.cancelable || false, + detail: options && options.detail || undefined + }); + }; + } else { + // Custom event polyfill from + // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#polyfill + return function (type, options) { + var event = document.createEvent("CustomEvent"); + event.initCustomEvent(type, + /* bubbles */false, options && options.cancelable || false, options && options.detail || undefined); + return event; + }; + } +} + +/** + * Get the current coordinates of the `el` relative to the document. + * + * @private + */ +();function calculateElementOffset(el) { + var rect = el.getBoundingClientRect(); + var _el$ownerDocument = el.ownerDocument, + defaultView = _el$ownerDocument.defaultView, + documentElement = _el$ownerDocument.documentElement; + + var offset = { + top: rect.top + defaultView.pageYOffset, + left: rect.left + defaultView.pageXOffset + }; + if (documentElement) { + offset.top -= documentElement.clientTop; + offset.left -= documentElement.clientLeft; + } + return offset; +} + +var CHAR_CODE_ZERO = "0".charCodeAt(0); +var CHAR_CODE_NINE = "9".charCodeAt(0); + +function isDigit(charCode) { + return charCode >= CHAR_CODE_ZERO && charCode <= CHAR_CODE_NINE; +} + +/** + * Returns the line-height of the given node in pixels. + * + * @private + */ +function getLineHeightPx(node) { + var computedStyle = window.getComputedStyle(node + + // If the char code starts with a digit, it is either a value in pixels, + // or unitless, as per: + // https://drafts.csswg.org/css2/visudet.html#propdef-line-height + // https://drafts.csswg.org/css2/cascade.html#computed-value + );if (isDigit(computedStyle.lineHeight.charCodeAt(0))) { + // In real browsers the value is *always* in pixels, even for unit-less + // line-heights. However, we still check as per the spec. + if (isDigit(computedStyle.lineHeight.charCodeAt(computedStyle.lineHeight.length - 1))) { + return parseFloat(computedStyle.lineHeight) * parseFloat(computedStyle.fontSize); + } else { + return parseFloat(computedStyle.lineHeight); + } + } + + // Otherwise, the value is "normal". + // If the line-height is "normal", calculate by font-size + return calculateLineHeightPx(node.nodeName, computedStyle); +} + +/** + * Returns calculated line-height of the given node in pixels. + * + * @private + */ +function calculateLineHeightPx(nodeName, computedStyle) { + var body = document.body; + if (!body) { + return 0; + } + + var tempNode = document.createElement(nodeName); + tempNode.innerHTML = " "; + tempNode.style.fontSize = computedStyle.fontSize; + tempNode.style.fontFamily = computedStyle.fontFamily; + tempNode.style.padding = "0"; + body.appendChild(tempNode + + // Make sure textarea has only 1 row + );if (tempNode instanceof HTMLTextAreaElement) { + ;tempNode.rows = 1; + } + + // Assume the height of the element is the line-height + var height = tempNode.offsetHeight; + body.removeChild(tempNode); + + return height; +} + +/***/ }), +/* 4 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +var _eventemitter = __webpack_require__(1); + +var _eventemitter2 = _interopRequireDefault(_eventemitter); + +var _utils = __webpack_require__(3); + +var _search_result = __webpack_require__(0); + +var _search_result2 = _interopRequireDefault(_search_result); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } +/*eslint no-unused-vars: off*/ + +/** + * Abstract class representing a editor target. + * + * Editor classes must implement `#applySearchResult`, `#getCursorOffset` and + * `#getBeforeCursor` methods. + * + * Editor classes must invoke `#emitMoveEvent`, `#emitEnterEvent`, + * `#emitChangeEvent` and `#emitEscEvent` at proper timing. + * + * @abstract + */ + + +/** @typedef */ +var Editor = function (_EventEmitter) { + _inherits(Editor, _EventEmitter); + + function Editor() { + _classCallCheck(this, Editor); + + return _possibleConstructorReturn(this, (Editor.__proto__ || Object.getPrototypeOf(Editor)).apply(this, arguments)); + } + + _createClass(Editor, [{ + key: "destroy", + + /** + * It is called when associated textcomplete object is destroyed. + * + * @return {this} + */ + value: function destroy() { + return this; + } + + /** + * It is called when a search result is selected by a user. + */ + + }, { + key: "applySearchResult", + value: function applySearchResult(_) { + throw new Error("Not implemented."); + } + + /** + * The input cursor's absolute coordinates from the window's left + * top corner. + */ + + }, { + key: "getCursorOffset", + value: function getCursorOffset() { + throw new Error("Not implemented."); + } + + /** + * Editor string value from head to cursor. + * Returns null if selection type is range not cursor. + */ + + }, { + key: "getBeforeCursor", + value: function getBeforeCursor() { + throw new Error("Not implemented."); + } + + /** + * Emit a move event, which moves active dropdown element. + * Child class must call this method at proper timing with proper parameter. + * + * @see {@link Textarea} for live example. + */ + + }, { + key: "emitMoveEvent", + value: function emitMoveEvent(code) { + var moveEvent = (0, _utils.createCustomEvent)("move", { + cancelable: true, + detail: { + code: code + } + }); + this.emit("move", moveEvent); + return moveEvent; + } + + /** + * Emit a enter event, which selects current search result. + * Child class must call this method at proper timing. + * + * @see {@link Textarea} for live example. + */ + + }, { + key: "emitEnterEvent", + value: function emitEnterEvent() { + var enterEvent = (0, _utils.createCustomEvent)("enter", { cancelable: true }); + this.emit("enter", enterEvent); + return enterEvent; + } + + /** + * Emit a change event, which triggers auto completion. + * Child class must call this method at proper timing. + * + * @see {@link Textarea} for live example. + */ + + }, { + key: "emitChangeEvent", + value: function emitChangeEvent() { + var changeEvent = (0, _utils.createCustomEvent)("change", { + detail: { + beforeCursor: this.getBeforeCursor() + } + }); + this.emit("change", changeEvent); + return changeEvent; + } + + /** + * Emit a esc event, which hides dropdown element. + * Child class must call this method at proper timing. + * + * @see {@link Textarea} for live example. + */ + + }, { + key: "emitEscEvent", + value: function emitEscEvent() { + var escEvent = (0, _utils.createCustomEvent)("esc", { cancelable: true }); + this.emit("esc", escEvent); + return escEvent; + } + + /** + * Helper method for parsing KeyboardEvent. + * + * @see {@link Textarea} for live example. + */ + + }, { + key: "getCode", + value: function getCode(e) { + return e.keyCode === 9 ? "ENTER" // tab + : e.keyCode === 13 ? "ENTER" // enter + : e.keyCode === 27 ? "ESC" // esc + : e.keyCode === 38 ? "UP" // up + : e.keyCode === 40 ? "DOWN" // down + : e.keyCode === 78 && e.ctrlKey ? "DOWN" // ctrl-n + : e.keyCode === 80 && e.ctrlKey ? "UP" // ctrl-p + : "OTHER"; + } + }]); + + return Editor; +}(_eventemitter2.default); + +exports.default = Editor; + +/***/ }), +/* 5 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(global) { + +var _textcomplete = __webpack_require__(7); + +var _textcomplete2 = _interopRequireDefault(_textcomplete); + +var _textarea = __webpack_require__(12); + +var _textarea2 = _interopRequireDefault(_textarea); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var editors = void 0; +if (global.Textcomplete && global.Textcomplete.editors) { + editors = global.Textcomplete.editors; +} else { + editors = {}; +} +editors.Textarea = _textarea2.default; + +global.Textcomplete = _textcomplete2.default; +global.Textcomplete.editors = editors; +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(6))) + +/***/ }), +/* 6 */ +/***/ (function(module, exports) { + +var g; + +// This works in non-strict mode +g = (function() { + return this; +})(); + +try { + // This works if eval is allowed (see CSP) + g = g || Function("return this")() || (1,eval)("this"); +} catch(e) { + // This works if the window reference is available + if(typeof window === "object") + g = window; +} + +// g can still be undefined, but nothing to do about it... +// We return undefined, instead of nothing here, so it's +// easier to handle this case. if(!global) { ...} + +module.exports = g; + + +/***/ }), +/* 7 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +var _completer = __webpack_require__(8); + +var _completer2 = _interopRequireDefault(_completer); + +var _editor = __webpack_require__(4); + +var _editor2 = _interopRequireDefault(_editor); + +var _dropdown = __webpack_require__(10); + +var _dropdown2 = _interopRequireDefault(_dropdown); + +var _strategy = __webpack_require__(2); + +var _strategy2 = _interopRequireDefault(_strategy); + +var _search_result = __webpack_require__(0); + +var _search_result2 = _interopRequireDefault(_search_result); + +var _eventemitter = __webpack_require__(1); + +var _eventemitter2 = _interopRequireDefault(_eventemitter); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } + +var CALLBACK_METHODS = ["handleChange", "handleEnter", "handleEsc", "handleHit", "handleMove", "handleSelect"]; + +/** @typedef */ + +/** + * The core of textcomplete. It acts as a mediator. + */ +var Textcomplete = function (_EventEmitter) { + _inherits(Textcomplete, _EventEmitter); + + /** + * @param {Editor} editor - Where the textcomplete works on. + */ + function Textcomplete(editor) { + var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + + _classCallCheck(this, Textcomplete); + + var _this = _possibleConstructorReturn(this, (Textcomplete.__proto__ || Object.getPrototypeOf(Textcomplete)).call(this)); + + _this.completer = new _completer2.default(); + _this.isQueryInFlight = false; + _this.nextPendingQuery = null; + _this.dropdown = new _dropdown2.default(options.dropdown || {}); + _this.editor = editor; + _this.options = options; + + CALLBACK_METHODS.forEach(function (method) { + ;_this[method] = _this[method].bind(_this); + }); + + _this.startListening(); + return _this; + } + + /** + * @return {this} + */ + + + _createClass(Textcomplete, [{ + key: "destroy", + value: function destroy() { + var destroyEditor = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true; + + this.completer.destroy(); + this.dropdown.destroy(); + if (destroyEditor) { + this.editor.destroy(); + } + this.stopListening(); + return this; + } + + /** + * @return {this} + */ + + }, { + key: "hide", + value: function hide() { + this.dropdown.deactivate(); + return this; + } + + /** + * @return {this} + * @example + * textcomplete.register([{ + * match: /(^|\s)(\w+)$/, + * search: function (term, callback) { + * $.ajax({ ... }) + * .done(callback) + * .fail([]); + * }, + * replace: function (value) { + * return '$1' + value + ' '; + * } + * }]); + */ + + }, { + key: "register", + value: function register(strategyPropsArray) { + var _this2 = this; + + strategyPropsArray.forEach(function (props) { + _this2.completer.registerStrategy(new _strategy2.default(props)); + }); + return this; + } + + /** + * Start autocompleting. + * + * @param {string} text - Head to input cursor. + * @return {this} + */ + + }, { + key: "trigger", + value: function trigger(text) { + if (this.isQueryInFlight) { + this.nextPendingQuery = text; + } else { + this.isQueryInFlight = true; + this.nextPendingQuery = null; + this.completer.run(text); + } + return this; + } + + /** @private */ + + }, { + key: "handleHit", + value: function handleHit(_ref) { + var searchResults = _ref.searchResults; + + if (searchResults.length) { + this.dropdown.render(searchResults, this.editor.getCursorOffset()); + } else { + this.dropdown.deactivate(); + } + this.isQueryInFlight = false; + if (this.nextPendingQuery !== null) { + this.trigger(this.nextPendingQuery); + } + } + + /** @private */ + + }, { + key: "handleMove", + value: function handleMove(e) { + e.detail.code === "UP" ? this.dropdown.up(e) : this.dropdown.down(e); + } + + /** @private */ + + }, { + key: "handleEnter", + value: function handleEnter(e) { + var activeItem = this.dropdown.getActiveItem(); + if (activeItem) { + this.dropdown.select(activeItem); + e.preventDefault(); + } else { + this.dropdown.deactivate(); + } + } + + /** @private */ + + }, { + key: "handleEsc", + value: function handleEsc(e) { + if (this.dropdown.shown) { + this.dropdown.deactivate(); + e.preventDefault(); + } + } + + /** @private */ + + }, { + key: "handleChange", + value: function handleChange(e) { + if (e.detail.beforeCursor != null) { + this.trigger(e.detail.beforeCursor); + } else { + this.dropdown.deactivate(); + } + } + + /** @private */ + + }, { + key: "handleSelect", + value: function handleSelect(selectEvent) { + this.emit("select", selectEvent); + if (!selectEvent.defaultPrevented) { + this.editor.applySearchResult(selectEvent.detail.searchResult); + } + } + + /** @private */ + + }, { + key: "startListening", + value: function startListening() { + var _this3 = this; + + this.editor.on("move", this.handleMove).on("enter", this.handleEnter).on("esc", this.handleEsc).on("change", this.handleChange); + this.dropdown.on("select", this.handleSelect);["show", "shown", "render", "rendered", "selected", "hidden", "hide"].forEach(function (eventName) { + _this3.dropdown.on(eventName, function () { + return _this3.emit(eventName); + }); + }); + this.completer.on("hit", this.handleHit); + } + + /** @private */ + + }, { + key: "stopListening", + value: function stopListening() { + this.completer.removeAllListeners(); + this.dropdown.removeAllListeners(); + this.editor.removeListener("move", this.handleMove).removeListener("enter", this.handleEnter).removeListener("esc", this.handleEsc).removeListener("change", this.handleChange); + } + }]); + + return Textcomplete; +}(_eventemitter2.default); + +exports.default = Textcomplete; + +/***/ }), +/* 8 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +var _eventemitter = __webpack_require__(1); + +var _eventemitter2 = _interopRequireDefault(_eventemitter); + +var _query = __webpack_require__(9); + +var _query2 = _interopRequireDefault(_query); + +var _search_result = __webpack_require__(0); + +var _search_result2 = _interopRequireDefault(_search_result); + +var _strategy = __webpack_require__(2); + +var _strategy2 = _interopRequireDefault(_strategy); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } + +var CALLBACK_METHODS = ["handleQueryResult"]; + +/** + * Complete engine. + */ + +var Completer = function (_EventEmitter) { + _inherits(Completer, _EventEmitter); + + function Completer() { + _classCallCheck(this, Completer); + + var _this = _possibleConstructorReturn(this, (Completer.__proto__ || Object.getPrototypeOf(Completer)).call(this)); + + _this.strategies = []; + + CALLBACK_METHODS.forEach(function (method) { + ;_this[method] = _this[method].bind(_this); + }); + return _this; + } + + /** + * @return {this} + */ + + + _createClass(Completer, [{ + key: "destroy", + value: function destroy() { + this.strategies.forEach(function (strategy) { + return strategy.destroy(); + }); + return this; + } + + /** + * Register a strategy to the completer. + * + * @return {this} + */ + + }, { + key: "registerStrategy", + value: function registerStrategy(strategy) { + this.strategies.push(strategy); + return this; + } + + /** + * @param {string} text - Head to input cursor. + */ + + }, { + key: "run", + value: function run(text) { + var query = this.extractQuery(text); + if (query) { + query.execute(this.handleQueryResult); + } else { + this.handleQueryResult([]); + } + } + + /** + * Find a query, which matches to the given text. + * + * @private + */ + + }, { + key: "extractQuery", + value: function extractQuery(text) { + for (var i = 0; i < this.strategies.length; i++) { + var query = _query2.default.build(this.strategies[i], text); + if (query) { + return query; + } + } + return null; + } + + /** + * Callbacked by {@link Query#execute}. + * + * @private + */ + + }, { + key: "handleQueryResult", + value: function handleQueryResult(searchResults) { + this.emit("hit", { searchResults: searchResults }); + } + }]); + + return Completer; +}(_eventemitter2.default); + +exports.default = Completer; + +/***/ }), +/* 9 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +var _search_result = __webpack_require__(0); + +var _search_result2 = _interopRequireDefault(_search_result); + +var _strategy = __webpack_require__(2); + +var _strategy2 = _interopRequireDefault(_strategy); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +/** + * Encapsulate matching condition between a Strategy and current editor's value. + */ +var Query = function () { + _createClass(Query, null, [{ + key: "build", + + + /** + * Build a Query object by the given string if this matches to the string. + * + * @param {string} text - Head to input cursor. + */ + value: function build(strategy, text) { + if (typeof strategy.props.context === "function") { + var context = strategy.props.context(text); + if (typeof context === "string") { + text = context; + } else if (!context) { + return null; + } + } + var match = strategy.matchText(text); + return match ? new Query(strategy, match[strategy.index], match) : null; + } + }]); + + function Query(strategy, term, match) { + _classCallCheck(this, Query); + + this.strategy = strategy; + this.term = term; + this.match = match; + } + + /** + * Invoke search strategy and callback the given function. + */ + + + _createClass(Query, [{ + key: "execute", + value: function execute(callback) { + var _this = this; + + this.strategy.search(this.term, function (results) { + callback(results.map(function (result) { + return new _search_result2.default(result, _this.term, _this.strategy); + })); + }, this.match); + } + }]); + + return Query; +}(); + +exports.default = Query; + +/***/ }), +/* 10 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +var _eventemitter = __webpack_require__(1); + +var _eventemitter2 = _interopRequireDefault(_eventemitter); + +var _dropdown_item = __webpack_require__(11); + +var _dropdown_item2 = _interopRequireDefault(_dropdown_item); + +var _search_result = __webpack_require__(0); + +var _search_result2 = _interopRequireDefault(_search_result); + +var _utils = __webpack_require__(3); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } + +var DEFAULT_CLASS_NAME = "dropdown-menu textcomplete-dropdown"; + +/** @typedef */ + +/** + * Encapsulate a dropdown view. + * + * @prop {boolean} shown - Whether the #el is shown or not. + * @prop {DropdownItem[]} items - The array of rendered dropdown items. + */ +var Dropdown = function (_EventEmitter) { + _inherits(Dropdown, _EventEmitter); + + _createClass(Dropdown, null, [{ + key: "createElement", + value: function createElement() { + var el = document.createElement("ul"); + var style = el.style; + style.display = "none"; + style.position = "absolute"; + style.zIndex = "10000"; + var body = document.body; + if (body) { + body.appendChild(el); + } + return el; + } + }]); + + function Dropdown(options) { + _classCallCheck(this, Dropdown); + + var _this = _possibleConstructorReturn(this, (Dropdown.__proto__ || Object.getPrototypeOf(Dropdown)).call(this)); + + _this.shown = false; + _this.items = []; + _this.activeItem = null; + _this.footer = options.footer; + _this.header = options.header; + _this.maxCount = options.maxCount || 10; + _this.el.className = options.className || DEFAULT_CLASS_NAME; + _this.rotate = options.hasOwnProperty("rotate") ? options.rotate : true; + _this.placement = options.placement; + _this.itemOptions = options.item || {}; + var style = options.style; + if (style) { + Object.keys(style).forEach(function (key) { + ;_this.el.style[key] = style[key]; + }); + } + return _this; + } + + /** + * @return {this} + */ + + + _createClass(Dropdown, [{ + key: "destroy", + value: function destroy() { + var parentNode = this.el.parentNode; + if (parentNode) { + parentNode.removeChild(this.el); + } + this.clear()._el = null; + return this; + } + }, { + key: "render", + + + /** + * Render the given data as dropdown items. + * + * @return {this} + */ + value: function render(searchResults, cursorOffset) { + var _this2 = this; + + var renderEvent = (0, _utils.createCustomEvent)("render", { cancelable: true }); + this.emit("render", renderEvent); + if (renderEvent.defaultPrevented) { + return this; + } + var rawResults = searchResults.map(function (searchResult) { + return searchResult.data; + }); + var dropdownItems = searchResults.slice(0, this.maxCount || searchResults.length).map(function (searchResult) { + return new _dropdown_item2.default(searchResult, _this2.itemOptions); + }); + this.clear().setStrategyId(searchResults[0]).renderEdge(rawResults, "header").append(dropdownItems).renderEdge(rawResults, "footer").show().setOffset(cursorOffset); + this.emit("rendered", (0, _utils.createCustomEvent)("rendered")); + return this; + } + + /** + * Hide the dropdown then sweep out items. + * + * @return {this} + */ + + }, { + key: "deactivate", + value: function deactivate() { + return this.hide().clear(); + } + + /** + * @return {this} + */ + + }, { + key: "select", + value: function select(dropdownItem) { + var detail = { searchResult: dropdownItem.searchResult }; + var selectEvent = (0, _utils.createCustomEvent)("select", { + cancelable: true, + detail: detail + }); + this.emit("select", selectEvent); + if (selectEvent.defaultPrevented) { + return this; + } + this.deactivate(); + this.emit("selected", (0, _utils.createCustomEvent)("selected", { detail: detail })); + return this; + } + + /** + * @return {this} + */ + + }, { + key: "up", + value: function up(e) { + return this.shown ? this.moveActiveItem("prev", e) : this; + } + + /** + * @return {this} + */ + + }, { + key: "down", + value: function down(e) { + return this.shown ? this.moveActiveItem("next", e) : this; + } + + /** + * Retrieve the active item. + */ + + }, { + key: "getActiveItem", + value: function getActiveItem() { + return this.activeItem; + } + + /** + * Add items to dropdown. + * + * @private + */ + + }, { + key: "append", + value: function append(items) { + var _this3 = this; + + var fragment = document.createDocumentFragment(); + items.forEach(function (item) { + _this3.items.push(item); + item.appended(_this3); + fragment.appendChild(item.el); + }); + this.el.appendChild(fragment); + return this; + } + + /** @private */ + + }, { + key: "setOffset", + value: function setOffset(cursorOffset) { + var doc = document.documentElement; + if (doc) { + var elementWidth = this.el.offsetWidth; + if (cursorOffset.left) { + var browserWidth = doc.clientWidth; + if (cursorOffset.left + elementWidth > browserWidth) { + cursorOffset.left = browserWidth - elementWidth; + } + this.el.style.left = cursorOffset.left + "px"; + } else if (cursorOffset.right) { + if (cursorOffset.right - elementWidth < 0) { + cursorOffset.right = 0; + } + this.el.style.right = cursorOffset.right + "px"; + } + if (this.isPlacementTop()) { + this.el.style.bottom = doc.clientHeight - cursorOffset.top + cursorOffset.lineHeight + "px"; + } else { + this.el.style.top = cursorOffset.top + "px"; + } + } + return this; + } + + /** + * Show the element. + * + * @private + */ + + }, { + key: "show", + value: function show() { + if (!this.shown) { + var showEvent = (0, _utils.createCustomEvent)("show", { cancelable: true }); + this.emit("show", showEvent); + if (showEvent.defaultPrevented) { + return this; + } + this.el.style.display = "block"; + this.shown = true; + this.emit("shown", (0, _utils.createCustomEvent)("shown")); + } + return this; + } + + /** + * Hide the element. + * + * @private + */ + + }, { + key: "hide", + value: function hide() { + if (this.shown) { + var hideEvent = (0, _utils.createCustomEvent)("hide", { cancelable: true }); + this.emit("hide", hideEvent); + if (hideEvent.defaultPrevented) { + return this; + } + this.el.style.display = "none"; + this.shown = false; + this.emit("hidden", (0, _utils.createCustomEvent)("hidden")); + } + return this; + } + + /** + * Clear search results. + * + * @private + */ + + }, { + key: "clear", + value: function clear() { + this.el.innerHTML = ""; + this.items.forEach(function (item) { + return item.destroy(); + }); + this.items = []; + return this; + } + + /** @private */ + + }, { + key: "moveActiveItem", + value: function moveActiveItem(direction, e) { + var nextActiveItem = direction === "next" ? this.activeItem ? this.activeItem.next : this.items[0] : this.activeItem ? this.activeItem.prev : this.items[this.items.length - 1]; + if (nextActiveItem) { + nextActiveItem.activate(); + e.preventDefault(); + } + return this; + } + + /** @private */ + + }, { + key: "setStrategyId", + value: function setStrategyId(searchResult) { + var strategyId = searchResult && searchResult.strategy.props.id; + if (strategyId) { + this.el.setAttribute("data-strategy", strategyId); + } else { + this.el.removeAttribute("data-strategy"); + } + return this; + } + + /** + * @private + * @param {object[]} rawResults - What callbacked by search function. + */ + + }, { + key: "renderEdge", + value: function renderEdge(rawResults, type) { + var source = (type === "header" ? this.header : this.footer) || ""; + var content = typeof source === "function" ? source(rawResults) : source; + var li = document.createElement("li"); + li.classList.add("textcomplete-" + type); + li.innerHTML = content; + this.el.appendChild(li); + return this; + } + + /** @private */ + + }, { + key: "isPlacementTop", + value: function isPlacementTop() { + return this.placement === "top"; + } + }, { + key: "el", + get: function get() { + if (!this._el) { + this._el = Dropdown.createElement(); + } + return this._el; + } + }]); + + return Dropdown; +}(_eventemitter2.default); + +exports.default = Dropdown; + +/***/ }), +/* 11 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.DEFAULT_CLASS_NAME = undefined; + +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +var _search_result = __webpack_require__(0); + +var _search_result2 = _interopRequireDefault(_search_result); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +var DEFAULT_CLASS_NAME = exports.DEFAULT_CLASS_NAME = "textcomplete-item"; +var CALLBACK_METHODS = ["onClick", "onMouseover"]; + +/** @typedef */ + + +// Declare interface instead of importing Dropdown itself to prevent circular dependency. + +/** + * Encapsulate an item of dropdown. + */ +var DropdownItem = function () { + function DropdownItem(searchResult, options) { + var _this = this; + + _classCallCheck(this, DropdownItem); + + this.searchResult = searchResult; + this.active = false; + this.className = options.className || DEFAULT_CLASS_NAME; + this.activeClassName = this.className + " active"; + + CALLBACK_METHODS.forEach(function (method) { + ;_this[method] = _this[method].bind(_this); + }); + } + + _createClass(DropdownItem, [{ + key: "destroy", + + + /** + * Try to free resources and perform other cleanup operations. + */ + value: function destroy() { + this.el.removeEventListener("mousedown", this.onClick, false); + this.el.removeEventListener("mouseover", this.onMouseover, false); + this.el.removeEventListener("touchstart", this.onClick, false); + if (this.active) { + this.dropdown.activeItem = null; + } + // This element has already been removed by {@link Dropdown#clear}. + this._el = null; + } + + /** + * Callbacked when it is appended to a dropdown. + * + * @see Dropdown#append + */ + + }, { + key: "appended", + value: function appended(dropdown) { + this.dropdown = dropdown; + this.siblings = dropdown.items; + this.index = this.siblings.length - 1; + } + + /** + * Deactivate active item then activate itself. + * + * @return {this} + */ + + }, { + key: "activate", + value: function activate() { + if (!this.active) { + var _activeItem = this.dropdown.getActiveItem(); + if (_activeItem) { + _activeItem.deactivate(); + } + this.dropdown.activeItem = this; + this.active = true; + this.el.className = this.activeClassName; + } + return this; + } + + /** + * Get the next sibling. + */ + + }, { + key: "deactivate", + + + /** @private */ + value: function deactivate() { + if (this.active) { + this.active = false; + this.el.className = this.className; + this.dropdown.activeItem = null; + } + return this; + } + + /** @private */ + + }, { + key: "onClick", + value: function onClick(e) { + e.preventDefault // Prevent blur event + ();this.dropdown.select(this); + } + + /** @private */ + + }, { + key: "onMouseover", + value: function onMouseover() { + this.activate(); + } + }, { + key: "el", + get: function get() { + if (this._el) { + return this._el; + } + var li = document.createElement("li"); + li.className = this.active ? this.activeClassName : this.className; + var a = document.createElement("a"); + a.innerHTML = this.searchResult.render(); + li.appendChild(a); + this._el = li; + li.addEventListener("mousedown", this.onClick); + li.addEventListener("mouseover", this.onMouseover); + li.addEventListener("touchstart", this.onClick); + return li; + } + }, { + key: "next", + get: function get() { + var nextIndex = void 0; + if (this.index === this.siblings.length - 1) { + if (!this.dropdown.rotate) { + return null; + } + nextIndex = 0; + } else { + nextIndex = this.index + 1; + } + return this.siblings[nextIndex]; + } + + /** + * Get the previous sibling. + */ + + }, { + key: "prev", + get: function get() { + var nextIndex = void 0; + if (this.index === 0) { + if (!this.dropdown.rotate) { + return null; + } + nextIndex = this.siblings.length - 1; + } else { + nextIndex = this.index - 1; + } + return this.siblings[nextIndex]; + } + }]); + + return DropdownItem; +}(); + +exports.default = DropdownItem; + +/***/ }), +/* 12 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; + +var _update = __webpack_require__(13); + +var _update2 = _interopRequireDefault(_update); + +var _editor = __webpack_require__(4); + +var _editor2 = _interopRequireDefault(_editor); + +var _utils = __webpack_require__(3); + +var _search_result = __webpack_require__(0); + +var _search_result2 = _interopRequireDefault(_search_result); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } + +var getCaretCoordinates = __webpack_require__(14); + +var CALLBACK_METHODS = ["onInput", "onKeydown"]; + +/** + * Encapsulate the target textarea element. + */ + +var Textarea = function (_Editor) { + _inherits(Textarea, _Editor); + + /** + * @param {HTMLTextAreaElement} el - Where the textcomplete works on. + */ + function Textarea(el) { + _classCallCheck(this, Textarea); + + var _this = _possibleConstructorReturn(this, (Textarea.__proto__ || Object.getPrototypeOf(Textarea)).call(this)); + + _this.el = el; + + CALLBACK_METHODS.forEach(function (method) { + ;_this[method] = _this[method].bind(_this); + }); + + _this.startListening(); + return _this; + } + + /** + * @return {this} + */ + + + _createClass(Textarea, [{ + key: "destroy", + value: function destroy() { + _get(Textarea.prototype.__proto__ || Object.getPrototypeOf(Textarea.prototype), "destroy", this).call(this); + this.stopListening + // Release the element reference early to help garbage collection. + ();this.el = null; + return this; + } + + /** + * Implementation for {@link Editor#applySearchResult} + */ + + }, { + key: "applySearchResult", + value: function applySearchResult(searchResult) { + var before = this.getBeforeCursor(); + if (before != null) { + var replace = searchResult.replace(before, this.getAfterCursor()); + this.el.focus // Clicking a dropdown item removes focus from the element. + ();if (Array.isArray(replace)) { + (0, _update2.default)(this.el, replace[0], replace[1]); + this.el.dispatchEvent(new Event("input")); + } + } + } + + /** + * Implementation for {@link Editor#getCursorOffset} + */ + + }, { + key: "getCursorOffset", + value: function getCursorOffset() { + var elOffset = (0, _utils.calculateElementOffset)(this.el); + var elScroll = this.getElScroll(); + var cursorPosition = this.getCursorPosition(); + var lineHeight = (0, _utils.getLineHeightPx)(this.el); + var top = elOffset.top - elScroll.top + cursorPosition.top + lineHeight; + var left = elOffset.left - elScroll.left + cursorPosition.left; + if (this.el.dir !== "rtl") { + return { top: top, left: left, lineHeight: lineHeight }; + } else { + var right = document.documentElement ? document.documentElement.clientWidth - left : 0; + return { top: top, right: right, lineHeight: lineHeight }; + } + } + + /** + * Implementation for {@link Editor#getBeforeCursor} + */ + + }, { + key: "getBeforeCursor", + value: function getBeforeCursor() { + return this.el.selectionStart !== this.el.selectionEnd ? null : this.el.value.substring(0, this.el.selectionEnd); + } + + /** @private */ + + }, { + key: "getAfterCursor", + value: function getAfterCursor() { + return this.el.value.substring(this.el.selectionEnd); + } + + /** @private */ + + }, { + key: "getElScroll", + value: function getElScroll() { + return { top: this.el.scrollTop, left: this.el.scrollLeft }; + } + + /** + * The input cursor's relative coordinates from the textarea's left + * top corner. + * + * @private + */ + + }, { + key: "getCursorPosition", + value: function getCursorPosition() { + return getCaretCoordinates(this.el, this.el.selectionEnd); + } + + /** @private */ + + }, { + key: "onInput", + value: function onInput() { + this.emitChangeEvent(); + } + + /** @private */ + + }, { + key: "onKeydown", + value: function onKeydown(e) { + var code = this.getCode(e); + var event = void 0; + if (code === "UP" || code === "DOWN") { + event = this.emitMoveEvent(code); + } else if (code === "ENTER") { + event = this.emitEnterEvent(); + } else if (code === "ESC") { + event = this.emitEscEvent(); + } + if (event && event.defaultPrevented) { + e.preventDefault(); + } + } + + /** @private */ + + }, { + key: "startListening", + value: function startListening() { + this.el.addEventListener("input", this.onInput); + this.el.addEventListener("keydown", this.onKeydown); + } + + /** @private */ + + }, { + key: "stopListening", + value: function stopListening() { + this.el.removeEventListener("input", this.onInput); + this.el.removeEventListener("keydown", this.onKeydown); + } + }]); + + return Textarea; +}(_editor2.default); + +exports.default = Textarea; + +/***/ }), +/* 13 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +exports.default = function (el, headToCursor, cursorToTail) { + var curr = el.value, + // strA + strB1 + strC + next = headToCursor + (cursorToTail || ''), + // strA + strB2 + strC + activeElement = document.activeElement; + + // Calculate length of strA and strC + var aLength = 0, + cLength = 0; + while (aLength < curr.length && aLength < next.length && curr[aLength] === next[aLength]) { + aLength++; + } + while (curr.length - cLength - 1 >= 0 && next.length - cLength - 1 >= 0 && curr[curr.length - cLength - 1] === next[next.length - cLength - 1]) { + cLength++; + } + aLength = Math.min(aLength, Math.min(curr.length, next.length) - cLength); + + // Select strB1 + el.setSelectionRange(aLength, curr.length - cLength); + + // Get strB2 + var strB2 = next.substring(aLength, next.length - cLength); + + // Replace strB1 with strB2 + el.focus(); + if (!document.execCommand('insertText', false, strB2)) { + // Document.execCommand returns false if the command is not supported. + // Firefox and IE returns false in this case. + el.value = next; + el.dispatchEvent(createInputEvent()); + } + + // Move cursor to the end of headToCursor + el.setSelectionRange(headToCursor.length, headToCursor.length); + + activeElement && activeElement.focus(); + return el; +}; + +function createInputEvent() { + if (typeof Event !== "undefined") { + return new Event("input", { bubbles: true, cancelable: true }); + } else { + var event = document.createEvent("Event"); + event.initEvent("input", true, true); + return event; + } +} + +/***/ }), +/* 14 */ +/***/ (function(module, exports) { + +/* jshint browser: true */ + +(function () { + +// The properties that we copy into a mirrored div. +// Note that some browsers, such as Firefox, +// do not concatenate properties, i.e. padding-top, bottom etc. -> padding, +// so we have to do every single property specifically. +var properties = [ + 'direction', // RTL support + 'boxSizing', + 'width', // on Chrome and IE, exclude the scrollbar, so the mirror div wraps exactly as the textarea does + 'height', + 'overflowX', + 'overflowY', // copy the scrollbar for IE + + 'borderTopWidth', + 'borderRightWidth', + 'borderBottomWidth', + 'borderLeftWidth', + 'borderStyle', + + 'paddingTop', + 'paddingRight', + 'paddingBottom', + 'paddingLeft', + + // https://developer.mozilla.org/en-US/docs/Web/CSS/font + 'fontStyle', + 'fontVariant', + 'fontWeight', + 'fontStretch', + 'fontSize', + 'fontSizeAdjust', + 'lineHeight', + 'fontFamily', + + 'textAlign', + 'textTransform', + 'textIndent', + 'textDecoration', // might not make a difference, but better be safe + + 'letterSpacing', + 'wordSpacing', + + 'tabSize', + 'MozTabSize' + +]; + +var isBrowser = (typeof window !== 'undefined'); +var isFirefox = (isBrowser && window.mozInnerScreenX != null); + +function getCaretCoordinates(element, position, options) { + if(!isBrowser) { + throw new Error('textarea-caret-position#getCaretCoordinates should only be called in a browser'); + } + + var debug = options && options.debug || false; + if (debug) { + var el = document.querySelector('#input-textarea-caret-position-mirror-div'); + if ( el ) { el.parentNode.removeChild(el); } + } + + // mirrored div + var div = document.createElement('div'); + div.id = 'input-textarea-caret-position-mirror-div'; + document.body.appendChild(div); + + var style = div.style; + var computed = window.getComputedStyle? getComputedStyle(element) : element.currentStyle; // currentStyle for IE < 9 + + // default textarea styles + style.whiteSpace = 'pre-wrap'; + if (element.nodeName !== 'INPUT') + style.wordWrap = 'break-word'; // only for textarea-s + + // position off-screen + style.position = 'absolute'; // required to return coordinates properly + if (!debug) + style.visibility = 'hidden'; // not 'display: none' because we want rendering + + // transfer the element's properties to the div + properties.forEach(function (prop) { + style[prop] = computed[prop]; + }); + + if (isFirefox) { + // Firefox lies about the overflow property for textareas: https://bugzilla.mozilla.org/show_bug.cgi?id=984275 + if (element.scrollHeight > parseInt(computed.height)) + style.overflowY = 'scroll'; + } else { + style.overflow = 'hidden'; // for Chrome to not render a scrollbar; IE keeps overflowY = 'scroll' + } + + div.textContent = element.value.substring(0, position); + // the second special handling for input type="text" vs textarea: spaces need to be replaced with non-breaking spaces - http://stackoverflow.com/a/13402035/1269037 + if (element.nodeName === 'INPUT') + div.textContent = div.textContent.replace(/\s/g, '\u00a0'); + + var span = document.createElement('span'); + // Wrapping must be replicated *exactly*, including when a long word gets + // onto the next line, with whitespace at the end of the line before (#7). + // The *only* reliable way to do that is to copy the *entire* rest of the + // textarea's content into the created at the caret position. + // for inputs, just '.' would be enough, but why bother? + span.textContent = element.value.substring(position) || '.'; // || because a completely empty faux span doesn't render at all + div.appendChild(span); + + var coordinates = { + top: span.offsetTop + parseInt(computed['borderTopWidth']), + left: span.offsetLeft + parseInt(computed['borderLeftWidth']) + }; + + if (debug) { + span.style.backgroundColor = '#aaa'; + } else { + document.body.removeChild(div); + } + + return coordinates; +} + +if (typeof module != 'undefined' && typeof module.exports != 'undefined') { + module.exports = getCaretCoordinates; +} else if(isBrowser){ + window.getCaretCoordinates = getCaretCoordinates; +} + +}()); + + +/***/ }) +/******/ ]); +//# sourceMappingURL=textcomplete.js.map \ No newline at end of file diff --git a/library/textcomplete/textcomplete.js.map b/library/textcomplete/textcomplete.js.map new file mode 100644 index 000000000..42ed11883 --- /dev/null +++ b/library/textcomplete/textcomplete.js.map @@ -0,0 +1 @@ +{"version":3,"sources":["webpack:///webpack/bootstrap 0bc74e584933ddf1c7ac","webpack:///./src/search_result.js","webpack:///./node_modules/eventemitter3/index.js","webpack:///./src/strategy.js","webpack:///./src/utils.js","webpack:///./src/editor.js","webpack:///./src/main.js","webpack:///(webpack)/buildin/global.js","webpack:///./src/textcomplete.js","webpack:///./src/completer.js","webpack:///./src/query.js","webpack:///./src/dropdown.js","webpack:///./src/dropdown_item.js","webpack:///./src/textarea.js","webpack:///./node_modules/undate/lib/update.js","webpack:///./node_modules/textarea-caret/index.js"],"names":["SearchResult","data","term","strategy","beforeCursor","afterCursor","replacement","replace","Array","isArray","match","matchText","_","p1","parseInt","slice","index","length","join","template","DEFAULT_INDEX","DEFAULT_TEMPLATE","value","Strategy","props","cache","callback","searchWithCache","search","results","text","calculateElementOffset","getLineHeightPx","calculateLineHeightPx","createCustomEvent","window","CustomEvent","type","options","document","defaultView","cancelable","detail","undefined","event","createEvent","initCustomEvent","el","rect","getBoundingClientRect","ownerDocument","documentElement","offset","top","pageYOffset","left","pageXOffset","clientTop","clientLeft","CHAR_CODE_ZERO","charCodeAt","CHAR_CODE_NINE","isDigit","charCode","node","computedStyle","getComputedStyle","lineHeight","parseFloat","fontSize","nodeName","body","tempNode","createElement","innerHTML","style","fontFamily","padding","appendChild","HTMLTextAreaElement","rows","height","offsetHeight","removeChild","Editor","Error","code","moveEvent","emit","enterEvent","changeEvent","getBeforeCursor","escEvent","e","keyCode","ctrlKey","editors","global","Textcomplete","Textarea","CALLBACK_METHODS","editor","completer","isQueryInFlight","nextPendingQuery","dropdown","forEach","method","bind","startListening","destroyEditor","destroy","stopListening","deactivate","strategyPropsArray","registerStrategy","run","searchResults","render","getCursorOffset","trigger","up","down","activeItem","getActiveItem","select","preventDefault","shown","selectEvent","defaultPrevented","applySearchResult","searchResult","on","handleMove","handleEnter","handleEsc","handleChange","handleSelect","eventName","handleHit","removeAllListeners","removeListener","Completer","strategies","push","query","extractQuery","execute","handleQueryResult","i","build","Query","context","map","result","DEFAULT_CLASS_NAME","Dropdown","display","position","zIndex","items","footer","header","maxCount","className","rotate","hasOwnProperty","placement","itemOptions","item","Object","keys","key","parentNode","clear","_el","cursorOffset","renderEvent","rawResults","dropdownItems","setStrategyId","renderEdge","append","show","setOffset","hide","dropdownItem","moveActiveItem","fragment","createDocumentFragment","appended","doc","elementWidth","offsetWidth","browserWidth","clientWidth","right","isPlacementTop","bottom","clientHeight","showEvent","hideEvent","direction","nextActiveItem","next","prev","activate","strategyId","id","setAttribute","removeAttribute","source","content","li","classList","add","DropdownItem","active","activeClassName","removeEventListener","onClick","onMouseover","siblings","a","addEventListener","nextIndex","getCaretCoordinates","require","before","getAfterCursor","focus","dispatchEvent","Event","elOffset","elScroll","getElScroll","cursorPosition","getCursorPosition","dir","selectionStart","selectionEnd","substring","scrollTop","scrollLeft","emitChangeEvent","getCode","emitMoveEvent","emitEnterEvent","emitEscEvent","onInput","onKeydown"],"mappings":";AAAA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAK;AACL;AACA;;AAEA;AACA;AACA;AACA,mCAA2B,0BAA0B,EAAE;AACvD,yCAAiC,eAAe;AAChD;AACA;AACA;;AAEA;AACA,8DAAsD,+DAA+D;;AAErH;AACA;;AAEA;AACA;;;;;;;;;;;;;;;;AC3DA;;;;;;;;AAEA;;;IAGqBA,Y;;AAKnB;;;AAGA,wBAAYC,IAAZ,EAA0BC,IAA1B,EAAwCC,QAAxC,EAA4D;AAAA;;AAC1D,SAAKF,IAAL,GAAYA,IAAZ;AACA,SAAKC,IAAL,GAAYA,IAAZ;AACA,SAAKC,QAAL,GAAgBA,QAAhB;AACD;;;;4BAEOC,Y,EAAsBC,W,EAAqB;AACjD,UAAIC,cAAc,KAAKH,QAAL,CAAcI,OAAd,CAAsB,KAAKN,IAA3B,CAAlB;AACA,UAAIK,gBAAgB,IAApB,EAA0B;AACxB,YAAIE,MAAMC,OAAN,CAAcH,WAAd,CAAJ,EAAgC;AAC9BD,wBAAcC,YAAY,CAAZ,IAAiBD,WAA/B;AACAC,wBAAcA,YAAY,CAAZ,CAAd;AACD;AACD,YAAMI,QAAQ,KAAKP,QAAL,CAAcQ,SAAd,CAAwBP,YAAxB,CAAd;AACA,YAAIM,KAAJ,EAAW;AACTJ,wBAAcA,YACXC,OADW,CACH,MADG,EACKG,MAAM,CAAN,CADL,EAEXH,OAFW,CAEH,SAFG,EAEQ,UAACK,CAAD,EAAIC,EAAJ;AAAA,mBAAWH,MAAMI,SAASD,EAAT,EAAa,EAAb,CAAN,CAAX;AAAA,WAFR,CAAd;AAGA,iBAAO,CACL,CACET,aAAaW,KAAb,CAAmB,CAAnB,EAAsBL,MAAMM,KAA5B,CADF,EAEEV,WAFF,EAGEF,aAAaW,KAAb,CAAmBL,MAAMM,KAAN,GAAcN,MAAM,CAAN,EAASO,MAA1C,CAHF,EAIEC,IAJF,CAIO,EAJP,CADK,EAMLb,WANK,CAAP;AAQD;AACF;AACF;;;6BAEgB;AACf,aAAO,KAAKF,QAAL,CAAcgB,QAAd,CAAuB,KAAKlB,IAA5B,EAAkC,KAAKC,IAAvC,CAAP;AACD;;;;;;kBAxCkBF,Y;;;;;;;ACPrB;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,WAAW,SAAS;AACpB,WAAW,MAAM;AACjB,WAAW,QAAQ;AACnB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,WAAW,cAAc;AACzB,WAAW,QAAQ;AACnB,aAAa;AACb;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA,0DAA0D,OAAO;AACjE;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,WAAW,cAAc;AACzB,aAAa,QAAQ;AACrB;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,yCAAyC,SAAS;AAClD;AACA;;AAEA;AACA,GAAG;AACH;AACA;;AAEA,eAAe,YAAY;AAC3B;;AAEA;AACA,2DAA2D;AAC3D,+DAA+D;AAC/D,mEAAmE;AACnE,uEAAuE;AACvE;AACA,0DAA0D,SAAS;AACnE;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,WAAW,cAAc;AACzB,WAAW,SAAS;AACpB,WAAW,MAAM;AACjB,aAAa,aAAa;AAC1B;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,WAAW,cAAc;AACzB,WAAW,SAAS;AACpB,WAAW,MAAM;AACjB,aAAa,aAAa;AAC1B;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,WAAW,cAAc;AACzB,WAAW,SAAS;AACpB,WAAW,MAAM;AACjB,WAAW,QAAQ;AACnB,aAAa,aAAa;AAC1B;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH,2DAA2D,YAAY;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,WAAW,cAAc;AACzB,aAAa,aAAa;AAC1B;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;;;;AC9SA,IAAMoB,gBAAgB,CAAtB;;AAEA,SAASC,gBAAT,CAA0BC,KAA1B,EAAiC;AAC/B,SAAOA,KAAP;AACD;;AAED;;;;;;AAgBA;;;IAGqBC,Q;AAInB,oBAAYC,KAAZ,EAAuC;AAAA;;AACrC,SAAKA,KAAL,GAAaA,KAAb;AACA,SAAKC,KAAL,GAAaD,MAAMC,KAAN,GAAc,EAAd,GAAmB,IAAhC;AACD;;AAED;;;;;;;8BAGU;AACR,WAAKA,KAAL,GAAa,IAAb;AACA,aAAO,IAAP;AACD;;;2BAEMvB,I,EAAcwB,Q,EAAoBhB,K,EAAwB;AAC/D,UAAI,KAAKe,KAAT,EAAgB;AACd,aAAKE,eAAL,CAAqBzB,IAArB,EAA2BwB,QAA3B,EAAqChB,KAArC;AACD,OAFD,MAEO;AACL,aAAKc,KAAL,CAAWI,MAAX,CAAkB1B,IAAlB,EAAwBwB,QAAxB,EAAkChB,KAAlC;AACD;AACF;;AAED;;;;;;4BAGQT,I,EAAW;AACjB,aAAO,KAAKuB,KAAL,CAAWjB,OAAX,CAAmBN,IAAnB,CAAP;AACD;;AAED;;;;oCACgBC,I,EAAcwB,Q,EAAoBhB,K,EAAwB;AAAA;;AACxE,UAAI,KAAKe,KAAL,IAAc,KAAKA,KAAL,CAAWvB,IAAX,CAAlB,EAAoC;AAClCwB,iBAAS,KAAKD,KAAL,CAAWvB,IAAX,CAAT;AACD,OAFD,MAEO;AACL,aAAKsB,KAAL,CAAWI,MAAX,CACE1B,IADF,EAEE,mBAAW;AACT,cAAI,MAAKuB,KAAT,EAAgB;AACd,kBAAKA,KAAL,CAAWvB,IAAX,IAAmB2B,OAAnB;AACD;AACDH,mBAASG,OAAT;AACD,SAPH,EAQEnB,KARF;AAUD;AACF;;AAED;;;;8BACUoB,I,EAAgC;AACxC,UAAI,OAAO,KAAKpB,KAAZ,KAAsB,UAA1B,EAAsC;AACpC,eAAO,KAAKA,KAAL,CAAWoB,IAAX,CAAP;AACD,OAFD,MAEO;AACL,eAAQA,KAAKpB,KAAL,CAAW,KAAKA,KAAhB,CAAR;AACD;AACF;;AAED;;;;wBACwD;AACtD,aAAO,KAAKc,KAAL,CAAWd,KAAlB;AACD;;AAED;;;;wBACoB;AAClB,aAAO,OAAO,KAAKc,KAAL,CAAWR,KAAlB,KAA4B,QAA5B,GACH,KAAKQ,KAAL,CAAWR,KADR,GAEHI,aAFJ;AAGD;;;wBAEkC;AACjC,aAAO,KAAKI,KAAL,CAAWL,QAAX,IAAuBE,gBAA9B;AACD;;;;;;kBAzEkBE,Q;;;;;;;;;;;;QCSLQ,sB,GAAAA,sB;QA4BAC,e,GAAAA,e;QAoCAC,qB,GAAAA,qB;;;AAxGhB;;;;;AAKO,IAAMC,gDAAqB,YAAM;AACtC,MAAI,OAAOC,OAAOC,WAAd,KAA8B,UAAlC,EAA8C;AAC5C,WAAO,UACLC,IADK,EAELC,OAFK,EAGQ;AACb,aAAO,IAAIC,SAASC,WAAT,CAAqBJ,WAAzB,CAAqCC,IAArC,EAA2C;AAChDI,oBAAaH,WAAWA,QAAQG,UAApB,IAAmC,KADC;AAEhDC,gBAASJ,WAAWA,QAAQI,MAApB,IAA+BC;AAFS,OAA3C,CAAP;AAID,KARD;AASD,GAVD,MAUO;AACL;AACA;AACA,WAAO,UACLN,IADK,EAELC,OAFK,EAGQ;AACb,UAAMM,QAAQL,SAASM,WAAT,CAAqB,aAArB,CAAd;AACAD,YAAME,eAAN,CACET,IADF;AAEE,mBAAc,KAFhB,EAGGC,WAAWA,QAAQG,UAApB,IAAmC,KAHrC,EAIGH,WAAWA,QAAQI,MAApB,IAA+BC,SAJjC;AAMA,aAAOC,KAAP;AACD,KAZD;AAaD;AACF;;AAED;;;;;AA9BiC,EAA1B,CAmCA,SAASb,sBAAT,CACLgB,EADK,EAE0B;AAC/B,MAAMC,OAAOD,GAAGE,qBAAH,EAAb;AAD+B,0BAEUF,GAAGG,aAFb;AAAA,MAEvBV,WAFuB,qBAEvBA,WAFuB;AAAA,MAEVW,eAFU,qBAEVA,eAFU;;AAG/B,MAAMC,SAAS;AACbC,SAAKL,KAAKK,GAAL,GAAWb,YAAYc,WADf;AAEbC,UAAMP,KAAKO,IAAL,GAAYf,YAAYgB;AAFjB,GAAf;AAIA,MAAIL,eAAJ,EAAqB;AACnBC,WAAOC,GAAP,IAAcF,gBAAgBM,SAA9B;AACAL,WAAOG,IAAP,IAAeJ,gBAAgBO,UAA/B;AACD;AACD,SAAON,MAAP;AACD;;AAED,IAAMO,iBAAiB,IAAIC,UAAJ,CAAe,CAAf,CAAvB;AACA,IAAMC,iBAAiB,IAAID,UAAJ,CAAe,CAAf,CAAvB;;AAEA,SAASE,OAAT,CAAiBC,QAAjB,EAA4C;AAC1C,SAAOA,YAAYJ,cAAZ,IAA8BI,YAAYF,cAAjD;AACD;;AAED;;;;;AAKO,SAAS7B,eAAT,CAAyBgC,IAAzB,EAAoD;AACzD,MAAMC,gBAAgB9B,OAAO+B,gBAAP,CAAwBF;;AAE9C;AACA;AACA;AACA;AALsB,GAAtB,CAMA,IAAIF,QAAQG,cAAcE,UAAd,CAAyBP,UAAzB,CAAoC,CAApC,CAAR,CAAJ,EAAqD;AACnD;AACA;AACA,QACEE,QACEG,cAAcE,UAAd,CAAyBP,UAAzB,CACEK,cAAcE,UAAd,CAAyBlD,MAAzB,GAAkC,CADpC,CADF,CADF,EAME;AACA,aACEmD,WAAWH,cAAcE,UAAzB,IACAC,WAAWH,cAAcI,QAAzB,CAFF;AAID,KAXD,MAWO;AACL,aAAOD,WAAWH,cAAcE,UAAzB,CAAP;AACD;AACF;;AAED;AACA;AACA,SAAOlC,sBAAsB+B,KAAKM,QAA3B,EAAqCL,aAArC,CAAP;AACD;;AAED;;;;;AAKO,SAAShC,qBAAT,CACLqC,QADK,EAELL,aAFK,EAGG;AACR,MAAMM,OAAOhC,SAASgC,IAAtB;AACA,MAAI,CAACA,IAAL,EAAW;AACT,WAAO,CAAP;AACD;;AAED,MAAMC,WAAWjC,SAASkC,aAAT,CAAuBH,QAAvB,CAAjB;AACAE,WAASE,SAAT,GAAqB,QAArB;AACAF,WAASG,KAAT,CAAeN,QAAf,GAA0BJ,cAAcI,QAAxC;AACAG,WAASG,KAAT,CAAeC,UAAf,GAA4BX,cAAcW,UAA1C;AACAJ,WAASG,KAAT,CAAeE,OAAf,GAAyB,GAAzB;AACAN,OAAKO,WAAL,CAAiBN;;AAEjB;AAFA,IAGA,IAAIA,oBAAoBO,mBAAxB,EAA6C;AAC3C,KAAEP,QAAD,CAAgCQ,IAAhC,GAAuC,CAAvC;AACF;;AAED;AACA,MAAMC,SAAST,SAASU,YAAxB;AACAX,OAAKY,WAAL,CAAiBX,QAAjB;;AAEA,SAAOS,MAAP;AACD,C;;;;;;;;;;;;;;;ACjID;;;;AAEA;;AACA;;;;;;;;;;;AALA;;AAiBA;;;;;;;;;;;;;AAVA;IAqBqBG,M;;;;;;;;;;;;AACnB;;;;;8BAKU;AACR,aAAO,IAAP;AACD;;AAED;;;;;;sCAGkBxE,C,EAAuB;AACvC,YAAM,IAAIyE,KAAJ,CAAU,kBAAV,CAAN;AACD;;AAED;;;;;;;sCAIgC;AAC9B,YAAM,IAAIA,KAAJ,CAAU,kBAAV,CAAN;AACD;;AAED;;;;;;;sCAI2B;AACzB,YAAM,IAAIA,KAAJ,CAAU,kBAAV,CAAN;AACD;;AAED;;;;;;;;;kCAMcC,I,EAAkC;AAC9C,UAAMC,YAAY,8BAAkB,MAAlB,EAA0B;AAC1C9C,oBAAY,IAD8B;AAE1CC,gBAAQ;AACN4C,gBAAMA;AADA;AAFkC,OAA1B,CAAlB;AAMA,WAAKE,IAAL,CAAU,MAAV,EAAkBD,SAAlB;AACA,aAAOA,SAAP;AACD;;AAED;;;;;;;;;qCAM8B;AAC5B,UAAME,aAAa,8BAAkB,OAAlB,EAA2B,EAAEhD,YAAY,IAAd,EAA3B,CAAnB;AACA,WAAK+C,IAAL,CAAU,OAAV,EAAmBC,UAAnB;AACA,aAAOA,UAAP;AACD;;AAED;;;;;;;;;sCAM+B;AAC7B,UAAMC,cAAc,8BAAkB,QAAlB,EAA4B;AAC9ChD,gBAAQ;AACNtC,wBAAc,KAAKuF,eAAL;AADR;AADsC,OAA5B,CAApB;AAKA,WAAKH,IAAL,CAAU,QAAV,EAAoBE,WAApB;AACA,aAAOA,WAAP;AACD;;AAED;;;;;;;;;mCAM4B;AAC1B,UAAME,WAAW,8BAAkB,KAAlB,EAAyB,EAAEnD,YAAY,IAAd,EAAzB,CAAjB;AACA,WAAK+C,IAAL,CAAU,KAAV,EAAiBI,QAAjB;AACA,aAAOA,QAAP;AACD;;AAED;;;;;;;;4BAKQC,C,EAA2B;AACjC,aAAOA,EAAEC,OAAF,KAAc,CAAd,GACH,OADG,CACK;AADL,QAEHD,EAAEC,OAAF,KAAc,EAAd,GACE,OADF,CACU;AADV,QAEED,EAAEC,OAAF,KAAc,EAAd,GACE,KADF,CACQ;AADR,QAEED,EAAEC,OAAF,KAAc,EAAd,GACE,IADF,CACO;AADP,QAEED,EAAEC,OAAF,KAAc,EAAd,GACE,MADF,CACS;AADT,QAEED,EAAEC,OAAF,KAAc,EAAd,IAAoBD,EAAEE,OAAtB,GACE,MADF,CACS;AADT,QAEEF,EAAEC,OAAF,KAAc,EAAd,IAAoBD,EAAEE,OAAtB,GACE,IADF,CACO;AADP,QAEE,OAdhB;AAeD;;;;;;kBA/GkBX,M;;;;;;;;;AC7BrB;;;;AACA;;;;;;AAEA,IAAIY,gBAAJ;AACA,IAAIC,OAAOC,YAAP,IAAuBD,OAAOC,YAAP,CAAoBF,OAA/C,EAAwD;AACtDA,YAAUC,OAAOC,YAAP,CAAoBF,OAA9B;AACD,CAFD,MAEO;AACLA,YAAU,EAAV;AACD;AACDA,QAAQG,QAAR;;AAEAF,OAAOC,YAAP;AACAD,OAAOC,YAAP,CAAoBF,OAApB,GAA8BA,OAA9B,C;;;;;;;ACZA;;AAEA;AACA;AACA;AACA,CAAC;;AAED;AACA;AACA;AACA,CAAC;AACD;AACA;AACA;AACA;;AAEA;AACA;AACA,4CAA4C;;AAE5C;;;;;;;;;;;;;;;;AClBA;;;;AACA;;;;AACA;;;;AACA;;;;AACA;;;;AAEA;;;;;;;;;;;;AAEA,IAAMI,mBAAmB,CACvB,cADuB,EAEvB,aAFuB,EAGvB,WAHuB,EAIvB,WAJuB,EAKvB,YALuB,EAMvB,cANuB,CAAzB;;AASA;;AAKA;;;IAGqBF,Y;;;AAQnB;;;AAGA,wBAAYG,MAAZ,EAA+D;AAAA,QAAnC/D,OAAmC,uEAAJ,EAAI;;AAAA;;AAAA;;AAG7D,UAAKgE,SAAL,GAAiB,yBAAjB;AACA,UAAKC,eAAL,GAAuB,KAAvB;AACA,UAAKC,gBAAL,GAAwB,IAAxB;AACA,UAAKC,QAAL,GAAgB,uBAAanE,QAAQmE,QAAR,IAAoB,EAAjC,CAAhB;AACA,UAAKJ,MAAL,GAAcA,MAAd;AACA,UAAK/D,OAAL,GAAeA,OAAf;;AAEA8D,qBAAiBM,OAAjB,CAAyB,kBAAU;AACjC,OAAC,MAAYC,MAAZ,IAAsB,MAAYA,MAAZ,EAAoBC,IAApB,OAAtB;AACF,KAFD;;AAIA,UAAKC,cAAL;AAd6D;AAe9D;;AAED;;;;;;;8BAGuC;AAAA,UAA/BC,aAA+B,uEAAN,IAAM;;AACrC,WAAKR,SAAL,CAAeS,OAAf;AACA,WAAKN,QAAL,CAAcM,OAAd;AACA,UAAID,aAAJ,EAAmB;AACjB,aAAKT,MAAL,CAAYU,OAAZ;AACD;AACD,WAAKC,aAAL;AACA,aAAO,IAAP;AACD;;AAED;;;;;;2BAGO;AACL,WAAKP,QAAL,CAAcQ,UAAd;AACA,aAAO,IAAP;AACD;;AAED;;;;;;;;;;;;;;;;;;6BAeSC,kB,EAA0C;AAAA;;AACjDA,yBAAmBR,OAAnB,CAA2B,iBAAS;AAClC,eAAKJ,SAAL,CAAea,gBAAf,CAAgC,uBAAa3F,KAAb,CAAhC;AACD,OAFD;AAGA,aAAO,IAAP;AACD;;AAED;;;;;;;;;4BAMQM,I,EAAc;AACpB,UAAI,KAAKyE,eAAT,EAA0B;AACxB,aAAKC,gBAAL,GAAwB1E,IAAxB;AACD,OAFD,MAEO;AACL,aAAKyE,eAAL,GAAuB,IAAvB;AACA,aAAKC,gBAAL,GAAwB,IAAxB;AACA,aAAKF,SAAL,CAAec,GAAf,CAAmBtF,IAAnB;AACD;AACD,aAAO,IAAP;AACD;;AAED;;;;oCACgE;AAAA,UAApDuF,aAAoD,QAApDA,aAAoD;;AAC9D,UAAIA,cAAcpG,MAAlB,EAA0B;AACxB,aAAKwF,QAAL,CAAca,MAAd,CAAqBD,aAArB,EAAoC,KAAKhB,MAAL,CAAYkB,eAAZ,EAApC;AACD,OAFD,MAEO;AACL,aAAKd,QAAL,CAAcQ,UAAd;AACD;AACD,WAAKV,eAAL,GAAuB,KAAvB;AACA,UAAI,KAAKC,gBAAL,KAA0B,IAA9B,EAAoC;AAClC,aAAKgB,OAAL,CAAa,KAAKhB,gBAAlB;AACD;AACF;;AAED;;;;+BACWX,C,EAAgB;AACzBA,QAAEnD,MAAF,CAAS4C,IAAT,KAAkB,IAAlB,GAAyB,KAAKmB,QAAL,CAAcgB,EAAd,CAAiB5B,CAAjB,CAAzB,GAA+C,KAAKY,QAAL,CAAciB,IAAd,CAAmB7B,CAAnB,CAA/C;AACD;;AAED;;;;gCACYA,C,EAAgB;AAC1B,UAAM8B,aAAa,KAAKlB,QAAL,CAAcmB,aAAd,EAAnB;AACA,UAAID,UAAJ,EAAgB;AACd,aAAKlB,QAAL,CAAcoB,MAAd,CAAqBF,UAArB;AACA9B,UAAEiC,cAAF;AACD,OAHD,MAGO;AACL,aAAKrB,QAAL,CAAcQ,UAAd;AACD;AACF;;AAED;;;;8BACUpB,C,EAAgB;AACxB,UAAI,KAAKY,QAAL,CAAcsB,KAAlB,EAAyB;AACvB,aAAKtB,QAAL,CAAcQ,UAAd;AACApB,UAAEiC,cAAF;AACD;AACF;;AAED;;;;iCACajC,C,EAAgB;AAC3B,UAAIA,EAAEnD,MAAF,CAAStC,YAAT,IAAyB,IAA7B,EAAmC;AACjC,aAAKoH,OAAL,CAAa3B,EAAEnD,MAAF,CAAStC,YAAtB;AACD,OAFD,MAEO;AACL,aAAKqG,QAAL,CAAcQ,UAAd;AACD;AACF;;AAED;;;;iCACae,W,EAA0B;AACrC,WAAKxC,IAAL,CAAU,QAAV,EAAoBwC,WAApB;AACA,UAAI,CAACA,YAAYC,gBAAjB,EAAmC;AACjC,aAAK5B,MAAL,CAAY6B,iBAAZ,CAA8BF,YAAYtF,MAAZ,CAAmByF,YAAjD;AACD;AACF;;AAED;;;;qCACiB;AAAA;;AACf,WAAK9B,MAAL,CACG+B,EADH,CACM,MADN,EACc,KAAKC,UADnB,EAEGD,EAFH,CAEM,OAFN,EAEe,KAAKE,WAFpB,EAGGF,EAHH,CAGM,KAHN,EAGa,KAAKG,SAHlB,EAIGH,EAJH,CAIM,QAJN,EAIgB,KAAKI,YAJrB;AAKA,WAAK/B,QAAL,CAAc2B,EAAd,CAAiB,QAAjB,EAA2B,KAAKK,YAAhC,EACC,CACC,MADD,EAEC,OAFD,EAGC,QAHD,EAIC,UAJD,EAKC,UALD,EAMC,QAND,EAOC,MAPD,EAQC/B,OARD,CAQS,qBAAa;AACrB,eAAKD,QAAL,CAAc2B,EAAd,CAAiBM,SAAjB,EAA4B;AAAA,iBAAM,OAAKlD,IAAL,CAAUkD,SAAV,CAAN;AAAA,SAA5B;AACD,OAVA;AAWD,WAAKpC,SAAL,CAAe8B,EAAf,CAAkB,KAAlB,EAAyB,KAAKO,SAA9B;AACD;;AAED;;;;oCACgB;AACd,WAAKrC,SAAL,CAAesC,kBAAf;AACA,WAAKnC,QAAL,CAAcmC,kBAAd;AACA,WAAKvC,MAAL,CACGwC,cADH,CACkB,MADlB,EAC0B,KAAKR,UAD/B,EAEGQ,cAFH,CAEkB,OAFlB,EAE2B,KAAKP,WAFhC,EAGGO,cAHH,CAGkB,KAHlB,EAGyB,KAAKN,SAH9B,EAIGM,cAJH,CAIkB,QAJlB,EAI4B,KAAKL,YAJjC;AAKD;;;;;;kBA7KkBtC,Y;;;;;;;;;;;;;;;ACzBrB;;;;AAEA;;;;AACA;;;;AACA;;;;;;;;;;;;AAEA,IAAME,mBAAmB,CAAC,mBAAD,CAAzB;;AAEA;;;;IAGqB0C,S;;;AAGnB,uBAAc;AAAA;;AAAA;;AAEZ,UAAKC,UAAL,GAAkB,EAAlB;;AAEA3C,qBAAiBM,OAAjB,CAAyB,kBAAU;AACjC,OAAC,MAAYC,MAAZ,IAAsB,MAAYA,MAAZ,EAAoBC,IAApB,OAAtB;AACF,KAFD;AAJY;AAOb;;AAED;;;;;;;8BAGU;AACR,WAAKmC,UAAL,CAAgBrC,OAAhB,CAAwB;AAAA,eAAYvG,SAAS4G,OAAT,EAAZ;AAAA,OAAxB;AACA,aAAO,IAAP;AACD;;AAED;;;;;;;;qCAKiB5G,Q,EAAoB;AACnC,WAAK4I,UAAL,CAAgBC,IAAhB,CAAqB7I,QAArB;AACA,aAAO,IAAP;AACD;;AAED;;;;;;wBAGI2B,I,EAAoB;AACtB,UAAMmH,QAAQ,KAAKC,YAAL,CAAkBpH,IAAlB,CAAd;AACA,UAAImH,KAAJ,EAAW;AACTA,cAAME,OAAN,CAAc,KAAKC,iBAAnB;AACD,OAFD,MAEO;AACL,aAAKA,iBAAL,CAAuB,EAAvB;AACD;AACF;;AAED;;;;;;;;iCAKatH,I,EAAc;AACzB,WAAK,IAAIuH,IAAI,CAAb,EAAgBA,IAAI,KAAKN,UAAL,CAAgB9H,MAApC,EAA4CoI,GAA5C,EAAiD;AAC/C,YAAMJ,QAAQ,gBAAMK,KAAN,CAAY,KAAKP,UAAL,CAAgBM,CAAhB,CAAZ,EAAgCvH,IAAhC,CAAd;AACA,YAAImH,KAAJ,EAAW;AACT,iBAAOA,KAAP;AACD;AACF;AACD,aAAO,IAAP;AACD;;AAED;;;;;;;;sCAKkB5B,a,EAA+B;AAC/C,WAAK7B,IAAL,CAAU,KAAV,EAAiB,EAAE6B,4BAAF,EAAjB;AACD;;;;;;kBAhEkByB,S;;;;;;;;;;;;;;;ACXrB;;;;AACA;;;;;;;;AAGA;;;IAGqBS,K;;;;;AAKnB;;;;;0BAKapJ,Q,EAAoB2B,I,EAAsB;AACrD,UAAI,OAAO3B,SAASqB,KAAT,CAAegI,OAAtB,KAAkC,UAAtC,EAAkD;AAChD,YAAMA,UAAUrJ,SAASqB,KAAT,CAAegI,OAAf,CAAuB1H,IAAvB,CAAhB;AACA,YAAI,OAAO0H,OAAP,KAAmB,QAAvB,EAAiC;AAC/B1H,iBAAO0H,OAAP;AACD,SAFD,MAEO,IAAI,CAACA,OAAL,EAAc;AACnB,iBAAO,IAAP;AACD;AACF;AACD,UAAM9I,QAAQP,SAASQ,SAAT,CAAmBmB,IAAnB,CAAd;AACA,aAAOpB,QAAQ,IAAI6I,KAAJ,CAAUpJ,QAAV,EAAoBO,MAAMP,SAASa,KAAf,CAApB,EAA2CN,KAA3C,CAAR,GAA4D,IAAnE;AACD;;;AAED,iBAAYP,QAAZ,EAAgCD,IAAhC,EAA8CQ,KAA9C,EAAgE;AAAA;;AAC9D,SAAKP,QAAL,GAAgBA,QAAhB;AACA,SAAKD,IAAL,GAAYA,IAAZ;AACA,SAAKQ,KAAL,GAAaA,KAAb;AACD;;AAED;;;;;;;4BAGQgB,Q,EAAoC;AAAA;;AAC1C,WAAKvB,QAAL,CAAcyB,MAAd,CACE,KAAK1B,IADP,EAEE,mBAAW;AACTwB,iBACEG,QAAQ4H,GAAR,CAAY,kBAAU;AACpB,iBAAO,4BAAiBC,MAAjB,EAAyB,MAAKxJ,IAA9B,EAAoC,MAAKC,QAAzC,CAAP;AACD,SAFD,CADF;AAKD,OARH,EASE,KAAKO,KATP;AAWD;;;;;;kBA5CkB6I,K;;;;;;;;;;;;;;;ACRrB;;;;AAEA;;;;AACA;;;;AACA;;;;;;;;;;AAGA,IAAMI,qBAAqB,qCAA3B;;AAEA;;AAYA;;;;;;IAMqBC,Q;;;;;oCAYsB;AACvC,UAAM7G,KAAKR,SAASkC,aAAT,CAAuB,IAAvB,CAAX;AACA,UAAME,QAAQ5B,GAAG4B,KAAjB;AACAA,YAAMkF,OAAN,GAAgB,MAAhB;AACAlF,YAAMmF,QAAN,GAAiB,UAAjB;AACAnF,YAAMoF,MAAN,GAAe,OAAf;AACA,UAAMxF,OAAOhC,SAASgC,IAAtB;AACA,UAAIA,IAAJ,EAAU;AACRA,aAAKO,WAAL,CAAiB/B,EAAjB;AACD;AACD,aAAOA,EAAP;AACD;;;AAED,oBAAYT,OAAZ,EAAsC;AAAA;;AAAA;;AAEpC,UAAKyF,KAAL,GAAa,KAAb;AACA,UAAKiC,KAAL,GAAa,EAAb;AACA,UAAKrC,UAAL,GAAkB,IAAlB;AACA,UAAKsC,MAAL,GAAc3H,QAAQ2H,MAAtB;AACA,UAAKC,MAAL,GAAc5H,QAAQ4H,MAAtB;AACA,UAAKC,QAAL,GAAgB7H,QAAQ6H,QAAR,IAAoB,EAApC;AACA,UAAKpH,EAAL,CAAQqH,SAAR,GAAoB9H,QAAQ8H,SAAR,IAAqBT,kBAAzC;AACA,UAAKU,MAAL,GAAc/H,QAAQgI,cAAR,CAAuB,QAAvB,IAAmChI,QAAQ+H,MAA3C,GAAoD,IAAlE;AACA,UAAKE,SAAL,GAAiBjI,QAAQiI,SAAzB;AACA,UAAKC,WAAL,GAAmBlI,QAAQmI,IAAR,IAAgB,EAAnC;AACA,QAAM9F,QAAQrC,QAAQqC,KAAtB;AACA,QAAIA,KAAJ,EAAW;AACT+F,aAAOC,IAAP,CAAYhG,KAAZ,EAAmB+B,OAAnB,CAA2B,eAAO;AAChC,SAAE,MAAK3D,EAAL,CAAQ4B,KAAT,CAAqBiG,GAArB,IAA4BjG,MAAMiG,GAAN,CAA5B;AACF,OAFD;AAGD;AAjBmC;AAkBrC;;AAED;;;;;;;8BAGU;AACR,UAAMC,aAAa,KAAK9H,EAAL,CAAQ8H,UAA3B;AACA,UAAIA,UAAJ,EAAgB;AACdA,mBAAW1F,WAAX,CAAuB,KAAKpC,EAA5B;AACD;AACD,WAAK+H,KAAL,GAAaC,GAAb,GAAmB,IAAnB;AACA,aAAO,IAAP;AACD;;;;;AASD;;;;;2BAKO1D,a,EAA+B2D,Y,EAA4B;AAAA;;AAChE,UAAMC,cAAc,8BAAkB,QAAlB,EAA4B,EAAExI,YAAY,IAAd,EAA5B,CAApB;AACA,WAAK+C,IAAL,CAAU,QAAV,EAAoByF,WAApB;AACA,UAAIA,YAAYhD,gBAAhB,EAAkC;AAChC,eAAO,IAAP;AACD;AACD,UAAMiD,aAAa7D,cAAcoC,GAAd,CAAkB;AAAA,eAAgBtB,aAAalI,IAA7B;AAAA,OAAlB,CAAnB;AACA,UAAMkL,gBAAgB9D,cACnBtG,KADmB,CACb,CADa,EACV,KAAKoJ,QAAL,IAAiB9C,cAAcpG,MADrB,EAEnBwI,GAFmB,CAEf;AAAA,eAAgB,4BAAiBtB,YAAjB,EAA+B,OAAKqC,WAApC,CAAhB;AAAA,OAFe,CAAtB;AAGA,WAAKM,KAAL,GACGM,aADH,CACiB/D,cAAc,CAAd,CADjB,EAEGgE,UAFH,CAEcH,UAFd,EAE0B,QAF1B,EAGGI,MAHH,CAGUH,aAHV,EAIGE,UAJH,CAIcH,UAJd,EAI0B,QAJ1B,EAKGK,IALH,GAMGC,SANH,CAMaR,YANb;AAOA,WAAKxF,IAAL,CAAU,UAAV,EAAsB,8BAAkB,UAAlB,CAAtB;AACA,aAAO,IAAP;AACD;;AAED;;;;;;;;iCAKa;AACX,aAAO,KAAKiG,IAAL,GAAYX,KAAZ,EAAP;AACD;;AAED;;;;;;2BAGOY,Y,EAA4B;AACjC,UAAMhJ,SAAS,EAAEyF,cAAcuD,aAAavD,YAA7B,EAAf;AACA,UAAMH,cAAc,8BAAkB,QAAlB,EAA4B;AAC9CvF,oBAAY,IADkC;AAE9CC,gBAAQA;AAFsC,OAA5B,CAApB;AAIA,WAAK8C,IAAL,CAAU,QAAV,EAAoBwC,WAApB;AACA,UAAIA,YAAYC,gBAAhB,EAAkC;AAChC,eAAO,IAAP;AACD;AACD,WAAKhB,UAAL;AACA,WAAKzB,IAAL,CAAU,UAAV,EAAsB,8BAAkB,UAAlB,EAA8B,EAAE9C,cAAF,EAA9B,CAAtB;AACA,aAAO,IAAP;AACD;;AAED;;;;;;uBAGGmD,C,EAAgB;AACjB,aAAO,KAAKkC,KAAL,GAAa,KAAK4D,cAAL,CAAoB,MAApB,EAA4B9F,CAA5B,CAAb,GAA8C,IAArD;AACD;;AAED;;;;;;yBAGKA,C,EAAgB;AACnB,aAAO,KAAKkC,KAAL,GAAa,KAAK4D,cAAL,CAAoB,MAApB,EAA4B9F,CAA5B,CAAb,GAA8C,IAArD;AACD;;AAED;;;;;;oCAGqC;AACnC,aAAO,KAAK8B,UAAZ;AACD;;AAED;;;;;;;;2BAKOqC,K,EAAuB;AAAA;;AAC5B,UAAM4B,WAAWrJ,SAASsJ,sBAAT,EAAjB;AACA7B,YAAMtD,OAAN,CAAc,gBAAQ;AACpB,eAAKsD,KAAL,CAAWhB,IAAX,CAAgByB,IAAhB;AACAA,aAAKqB,QAAL;AACAF,iBAAS9G,WAAT,CAAqB2F,KAAK1H,EAA1B;AACD,OAJD;AAKA,WAAKA,EAAL,CAAQ+B,WAAR,CAAoB8G,QAApB;AACA,aAAO,IAAP;AACD;;AAED;;;;8BACUZ,Y,EAA4B;AACpC,UAAMe,MAAMxJ,SAASY,eAArB;AACA,UAAI4I,GAAJ,EAAS;AACP,YAAMC,eAAe,KAAKjJ,EAAL,CAAQkJ,WAA7B;AACA,YAAIjB,aAAazH,IAAjB,EAAuB;AACrB,cAAM2I,eAAeH,IAAII,WAAzB;AACA,cAAInB,aAAazH,IAAb,GAAoByI,YAApB,GAAmCE,YAAvC,EAAqD;AACnDlB,yBAAazH,IAAb,GAAoB2I,eAAeF,YAAnC;AACD;AACD,eAAKjJ,EAAL,CAAQ4B,KAAR,CAAcpB,IAAd,GAAwByH,aAAazH,IAArC;AACD,SAND,MAMO,IAAIyH,aAAaoB,KAAjB,EAAwB;AAC7B,cAAIpB,aAAaoB,KAAb,GAAqBJ,YAArB,GAAoC,CAAxC,EAA2C;AACzChB,yBAAaoB,KAAb,GAAqB,CAArB;AACD;AACD,eAAKrJ,EAAL,CAAQ4B,KAAR,CAAcyH,KAAd,GAAyBpB,aAAaoB,KAAtC;AACD;AACD,YAAI,KAAKC,cAAL,EAAJ,EAA2B;AACzB,eAAKtJ,EAAL,CAAQ4B,KAAR,CAAc2H,MAAd,GAA0BP,IAAIQ,YAAJ,GACxBvB,aAAa3H,GADW,GAExB2H,aAAa7G,UAFf;AAGD,SAJD,MAIO;AACL,eAAKpB,EAAL,CAAQ4B,KAAR,CAActB,GAAd,GAAuB2H,aAAa3H,GAApC;AACD;AACF;AACD,aAAO,IAAP;AACD;;AAED;;;;;;;;2BAKO;AACL,UAAI,CAAC,KAAK0E,KAAV,EAAiB;AACf,YAAMyE,YAAY,8BAAkB,MAAlB,EAA0B,EAAE/J,YAAY,IAAd,EAA1B,CAAlB;AACA,aAAK+C,IAAL,CAAU,MAAV,EAAkBgH,SAAlB;AACA,YAAIA,UAAUvE,gBAAd,EAAgC;AAC9B,iBAAO,IAAP;AACD;AACD,aAAKlF,EAAL,CAAQ4B,KAAR,CAAckF,OAAd,GAAwB,OAAxB;AACA,aAAK9B,KAAL,GAAa,IAAb;AACA,aAAKvC,IAAL,CAAU,OAAV,EAAmB,8BAAkB,OAAlB,CAAnB;AACD;AACD,aAAO,IAAP;AACD;;AAED;;;;;;;;2BAKO;AACL,UAAI,KAAKuC,KAAT,EAAgB;AACd,YAAM0E,YAAY,8BAAkB,MAAlB,EAA0B,EAAEhK,YAAY,IAAd,EAA1B,CAAlB;AACA,aAAK+C,IAAL,CAAU,MAAV,EAAkBiH,SAAlB;AACA,YAAIA,UAAUxE,gBAAd,EAAgC;AAC9B,iBAAO,IAAP;AACD;AACD,aAAKlF,EAAL,CAAQ4B,KAAR,CAAckF,OAAd,GAAwB,MAAxB;AACA,aAAK9B,KAAL,GAAa,KAAb;AACA,aAAKvC,IAAL,CAAU,QAAV,EAAoB,8BAAkB,QAAlB,CAApB;AACD;AACD,aAAO,IAAP;AACD;;AAED;;;;;;;;4BAKQ;AACN,WAAKzC,EAAL,CAAQ2B,SAAR,GAAoB,EAApB;AACA,WAAKsF,KAAL,CAAWtD,OAAX,CAAmB;AAAA,eAAQ+D,KAAK1D,OAAL,EAAR;AAAA,OAAnB;AACA,WAAKiD,KAAL,GAAa,EAAb;AACA,aAAO,IAAP;AACD;;AAED;;;;mCACe0C,S,EAA4B7G,C,EAAgB;AACzD,UAAM8G,iBACJD,cAAc,MAAd,GACI,KAAK/E,UAAL,GAAkB,KAAKA,UAAL,CAAgBiF,IAAlC,GAAyC,KAAK5C,KAAL,CAAW,CAAX,CAD7C,GAEI,KAAKrC,UAAL,GACE,KAAKA,UAAL,CAAgBkF,IADlB,GAEE,KAAK7C,KAAL,CAAW,KAAKA,KAAL,CAAW/I,MAAX,GAAoB,CAA/B,CALR;AAMA,UAAI0L,cAAJ,EAAoB;AAClBA,uBAAeG,QAAf;AACAjH,UAAEiC,cAAF;AACD;AACD,aAAO,IAAP;AACD;;AAED;;;;kCACcK,Y,EAA6B;AACzC,UAAM4E,aAAa5E,gBAAgBA,aAAahI,QAAb,CAAsBqB,KAAtB,CAA4BwL,EAA/D;AACA,UAAID,UAAJ,EAAgB;AACd,aAAKhK,EAAL,CAAQkK,YAAR,CAAqB,eAArB,EAAsCF,UAAtC;AACD,OAFD,MAEO;AACL,aAAKhK,EAAL,CAAQmK,eAAR,CAAwB,eAAxB;AACD;AACD,aAAO,IAAP;AACD;;AAED;;;;;;;+BAIWhC,U,EAAsB7I,I,EAA2B;AAC1D,UAAM8K,SAAS,CAAC9K,SAAS,QAAT,GAAoB,KAAK6H,MAAzB,GAAkC,KAAKD,MAAxC,KAAmD,EAAlE;AACA,UAAMmD,UACJ,OAAOD,MAAP,KAAkB,UAAlB,GAA+BA,OAAOjC,UAAP,CAA/B,GAAoDiC,MADtD;AAEA,UAAME,KAAK9K,SAASkC,aAAT,CAAuB,IAAvB,CAAX;AACA4I,SAAGC,SAAH,CAAaC,GAAb,mBAAiClL,IAAjC;AACAgL,SAAG3I,SAAH,GAAe0I,OAAf;AACA,WAAKrK,EAAL,CAAQ+B,WAAR,CAAoBuI,EAApB;AACA,aAAO,IAAP;AACD;;AAED;;;;qCACiB;AACf,aAAO,KAAK9C,SAAL,KAAmB,KAA1B;AACD;;;wBA3N0B;AACzB,UAAI,CAAC,KAAKQ,GAAV,EAAe;AACb,aAAKA,GAAL,GAAWnB,SAASnF,aAAT,EAAX;AACD;AACD,aAAO,KAAKsG,GAAZ;AACD;;;;;;kBA9DkBnB,Q;;;;;;;;;;;;;;;;AC1BrB;;;;;;;;AAEO,IAAMD,kDAAqB,mBAA3B;AACP,IAAMvD,mBAAmB,CAAC,SAAD,EAAY,aAAZ,CAAzB;;AAEA;;;AAKA;;AASA;;;IAGqBoH,Y;AAUnB,wBAAYrF,YAAZ,EAAwC7F,OAAxC,EAAsE;AAAA;;AAAA;;AACpE,SAAK6F,YAAL,GAAoBA,YAApB;AACA,SAAKsF,MAAL,GAAc,KAAd;AACA,SAAKrD,SAAL,GAAiB9H,QAAQ8H,SAAR,IAAqBT,kBAAtC;AACA,SAAK+D,eAAL,GAA0B,KAAKtD,SAA/B;;AAEAhE,qBAAiBM,OAAjB,CAAyB,kBAAU;AACjC,OAAC,MAAYC,MAAZ,IAAsB,MAAYA,MAAZ,EAAoBC,IAApB,OAAtB;AACF,KAFD;AAGD;;;;;;AAkBD;;;8BAGU;AACR,WAAK7D,EAAL,CAAQ4K,mBAAR,CAA4B,WAA5B,EAAyC,KAAKC,OAA9C,EAAuD,KAAvD;AACA,WAAK7K,EAAL,CAAQ4K,mBAAR,CAA4B,WAA5B,EAAyC,KAAKE,WAA9C,EAA2D,KAA3D;AACA,WAAK9K,EAAL,CAAQ4K,mBAAR,CAA4B,YAA5B,EAA0C,KAAKC,OAA/C,EAAwD,KAAxD;AACA,UAAI,KAAKH,MAAT,EAAiB;AACf,aAAKhH,QAAL,CAAckB,UAAd,GAA2B,IAA3B;AACD;AACD;AACA,WAAKoD,GAAL,GAAW,IAAX;AACD;;AAED;;;;;;;;6BAKStE,Q,EAAoB;AAC3B,WAAKA,QAAL,GAAgBA,QAAhB;AACA,WAAKqH,QAAL,GAAgBrH,SAASuD,KAAzB;AACA,WAAKhJ,KAAL,GAAa,KAAK8M,QAAL,CAAc7M,MAAd,GAAuB,CAApC;AACD;;AAED;;;;;;;;+BAKW;AACT,UAAI,CAAC,KAAKwM,MAAV,EAAkB;AAChB,YAAM9F,cAAa,KAAKlB,QAAL,CAAcmB,aAAd,EAAnB;AACA,YAAID,WAAJ,EAAgB;AACdA,sBAAWV,UAAX;AACD;AACD,aAAKR,QAAL,CAAckB,UAAd,GAA2B,IAA3B;AACA,aAAK8F,MAAL,GAAc,IAAd;AACA,aAAK1K,EAAL,CAAQqH,SAAR,GAAoB,KAAKsD,eAAzB;AACD;AACD,aAAO,IAAP;AACD;;AAED;;;;;;;;AAgCA;iCACa;AACX,UAAI,KAAKD,MAAT,EAAiB;AACf,aAAKA,MAAL,GAAc,KAAd;AACA,aAAK1K,EAAL,CAAQqH,SAAR,GAAoB,KAAKA,SAAzB;AACA,aAAK3D,QAAL,CAAckB,UAAd,GAA2B,IAA3B;AACD;AACD,aAAO,IAAP;AACD;;AAED;;;;4BACQ9B,C,EAAU;AAChBA,QAAEiC,cAAF,CAAmB;AAAnB,SACA,KAAKrB,QAAL,CAAcoB,MAAd,CAAqB,IAArB;AACD;;AAED;;;;kCACc;AACZ,WAAKiF,QAAL;AACD;;;wBA9GuB;AACtB,UAAI,KAAK/B,GAAT,EAAc;AACZ,eAAO,KAAKA,GAAZ;AACD;AACD,UAAMsC,KAAK9K,SAASkC,aAAT,CAAuB,IAAvB,CAAX;AACA4I,SAAGjD,SAAH,GAAe,KAAKqD,MAAL,GAAc,KAAKC,eAAnB,GAAqC,KAAKtD,SAAzD;AACA,UAAM2D,IAAIxL,SAASkC,aAAT,CAAuB,GAAvB,CAAV;AACAsJ,QAAErJ,SAAF,GAAc,KAAKyD,YAAL,CAAkBb,MAAlB,EAAd;AACA+F,SAAGvI,WAAH,CAAeiJ,CAAf;AACA,WAAKhD,GAAL,GAAWsC,EAAX;AACAA,SAAGW,gBAAH,CAAoB,WAApB,EAAiC,KAAKJ,OAAtC;AACAP,SAAGW,gBAAH,CAAoB,WAApB,EAAiC,KAAKH,WAAtC;AACAR,SAAGW,gBAAH,CAAoB,YAApB,EAAkC,KAAKJ,OAAvC;AACA,aAAOP,EAAP;AACD;;;wBAgDyB;AACxB,UAAIY,kBAAJ;AACA,UAAI,KAAKjN,KAAL,KAAe,KAAK8M,QAAL,CAAc7M,MAAd,GAAuB,CAA1C,EAA6C;AAC3C,YAAI,CAAC,KAAKwF,QAAL,CAAc4D,MAAnB,EAA2B;AACzB,iBAAO,IAAP;AACD;AACD4D,oBAAY,CAAZ;AACD,OALD,MAKO;AACLA,oBAAY,KAAKjN,KAAL,GAAa,CAAzB;AACD;AACD,aAAO,KAAK8M,QAAL,CAAcG,SAAd,CAAP;AACD;;AAED;;;;;;wBAG0B;AACxB,UAAIA,kBAAJ;AACA,UAAI,KAAKjN,KAAL,KAAe,CAAnB,EAAsB;AACpB,YAAI,CAAC,KAAKyF,QAAL,CAAc4D,MAAnB,EAA2B;AACzB,iBAAO,IAAP;AACD;AACD4D,oBAAY,KAAKH,QAAL,CAAc7M,MAAd,GAAuB,CAAnC;AACD,OALD,MAKO;AACLgN,oBAAY,KAAKjN,KAAL,GAAa,CAAzB;AACD;AACD,aAAO,KAAK8M,QAAL,CAAcG,SAAd,CAAP;AACD;;;;;;kBA9GkBT,Y;;;;;;;;;;;;;;;;;ACtBrB;;;;AAEA;;;;AACA;;AACA;;;;;;;;;;;;AAEA,IAAMU,sBAAsB,mBAAAC,CAAQ,EAAR,CAA5B;;AAEA,IAAM/H,mBAAmB,CAAC,SAAD,EAAY,WAAZ,CAAzB;;AAEA;;;;IAGqBD,Q;;;AAGnB;;;AAGA,oBAAYpD,EAAZ,EAAqC;AAAA;;AAAA;;AAEnC,UAAKA,EAAL,GAAUA,EAAV;;AAEAqD,qBAAiBM,OAAjB,CAAyB,kBAAU;AACjC,OAAC,MAAYC,MAAZ,IAAsB,MAAYA,MAAZ,EAAoBC,IAApB,OAAtB;AACF,KAFD;;AAIA,UAAKC,cAAL;AARmC;AASpC;;AAED;;;;;;;8BAGU;AACR;AACA,WAAKG;AACL;AADA,SAEE,IAAD,CAAYjE,EAAZ,GAAiB,IAAjB;AACD,aAAO,IAAP;AACD;;AAED;;;;;;sCAGkBoF,Y,EAA4B;AAC5C,UAAMiG,SAAS,KAAKzI,eAAL,EAAf;AACA,UAAIyI,UAAU,IAAd,EAAoB;AAClB,YAAM7N,UAAU4H,aAAa5H,OAAb,CAAqB6N,MAArB,EAA6B,KAAKC,cAAL,EAA7B,CAAhB;AACA,aAAKtL,EAAL,CAAQuL,KAAR,CAAgB;AAAhB,WACA,IAAI9N,MAAMC,OAAN,CAAcF,OAAd,CAAJ,EAA4B;AAC1B,gCAAO,KAAKwC,EAAZ,EAAgBxC,QAAQ,CAAR,CAAhB,EAA4BA,QAAQ,CAAR,CAA5B;AACA,eAAKwC,EAAL,CAAQwL,aAAR,CAAsB,IAAIC,KAAJ,CAAU,OAAV,CAAtB;AACD;AACF;AACF;;AAED;;;;;;sCAGkB;AAChB,UAAMC,WAAW,mCAAuB,KAAK1L,EAA5B,CAAjB;AACA,UAAM2L,WAAW,KAAKC,WAAL,EAAjB;AACA,UAAMC,iBAAiB,KAAKC,iBAAL,EAAvB;AACA,UAAM1K,aAAa,4BAAgB,KAAKpB,EAArB,CAAnB;AACA,UAAMM,MAAMoL,SAASpL,GAAT,GAAeqL,SAASrL,GAAxB,GAA8BuL,eAAevL,GAA7C,GAAmDc,UAA/D;AACA,UAAMZ,OAAOkL,SAASlL,IAAT,GAAgBmL,SAASnL,IAAzB,GAAgCqL,eAAerL,IAA5D;AACA,UAAI,KAAKR,EAAL,CAAQ+L,GAAR,KAAgB,KAApB,EAA2B;AACzB,eAAO,EAAEzL,QAAF,EAAOE,UAAP,EAAaY,sBAAb,EAAP;AACD,OAFD,MAEO;AACL,YAAMiI,QAAQ7J,SAASY,eAAT,GACVZ,SAASY,eAAT,CAAyBgJ,WAAzB,GAAuC5I,IAD7B,GAEV,CAFJ;AAGA,eAAO,EAAEF,QAAF,EAAO+I,YAAP,EAAcjI,sBAAd,EAAP;AACD;AACF;;AAED;;;;;;sCAGkB;AAChB,aAAO,KAAKpB,EAAL,CAAQgM,cAAR,KAA2B,KAAKhM,EAAL,CAAQiM,YAAnC,GACH,IADG,GAEH,KAAKjM,EAAL,CAAQzB,KAAR,CAAc2N,SAAd,CAAwB,CAAxB,EAA2B,KAAKlM,EAAL,CAAQiM,YAAnC,CAFJ;AAGD;;AAED;;;;qCACiB;AACf,aAAO,KAAKjM,EAAL,CAAQzB,KAAR,CAAc2N,SAAd,CAAwB,KAAKlM,EAAL,CAAQiM,YAAhC,CAAP;AACD;;AAED;;;;kCAC6C;AAC3C,aAAO,EAAE3L,KAAK,KAAKN,EAAL,CAAQmM,SAAf,EAA0B3L,MAAM,KAAKR,EAAL,CAAQoM,UAAxC,EAAP;AACD;;AAED;;;;;;;;;wCAMmD;AACjD,aAAOjB,oBAAoB,KAAKnL,EAAzB,EAA6B,KAAKA,EAAL,CAAQiM,YAArC,CAAP;AACD;;AAED;;;;8BACU;AACR,WAAKI,eAAL;AACD;;AAED;;;;8BACUvJ,C,EAAkB;AAC1B,UAAMP,OAAO,KAAK+J,OAAL,CAAaxJ,CAAb,CAAb;AACA,UAAIjD,cAAJ;AACA,UAAI0C,SAAS,IAAT,IAAiBA,SAAS,MAA9B,EAAsC;AACpC1C,gBAAQ,KAAK0M,aAAL,CAAmBhK,IAAnB,CAAR;AACD,OAFD,MAEO,IAAIA,SAAS,OAAb,EAAsB;AAC3B1C,gBAAQ,KAAK2M,cAAL,EAAR;AACD,OAFM,MAEA,IAAIjK,SAAS,KAAb,EAAoB;AACzB1C,gBAAQ,KAAK4M,YAAL,EAAR;AACD;AACD,UAAI5M,SAASA,MAAMqF,gBAAnB,EAAqC;AACnCpC,UAAEiC,cAAF;AACD;AACF;;AAED;;;;qCACiB;AACf,WAAK/E,EAAL,CAAQiL,gBAAR,CAAyB,OAAzB,EAAkC,KAAKyB,OAAvC;AACA,WAAK1M,EAAL,CAAQiL,gBAAR,CAAyB,SAAzB,EAAoC,KAAK0B,SAAzC;AACD;;AAED;;;;oCACgB;AACd,WAAK3M,EAAL,CAAQ4K,mBAAR,CAA4B,OAA5B,EAAqC,KAAK8B,OAA1C;AACA,WAAK1M,EAAL,CAAQ4K,mBAAR,CAA4B,SAA5B,EAAuC,KAAK+B,SAA5C;AACD;;;;;;kBA3HkBvJ,Q;;;;;;;ACfrB;;AAEA;AACA;AACA,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA,+BAA+B,kCAAkC;AACjE,GAAG;AACH;AACA;AACA;AACA;AACA,C;;;;;;ACtDA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,eAAe,+BAA+B;AAC9C;;AAEA;AACA;AACA;AACA;;AAEA;AACA,2FAA2F;;AAE3F;AACA;AACA;AACA,kCAAkC;;AAElC;AACA,8BAA8B;AAC9B;AACA,gCAAgC;;AAEhC;AACA;AACA;AACA,GAAG;;AAEH;AACA;AACA;AACA;AACA,GAAG;AACH,8BAA8B,0CAA0C;AACxE;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,8DAA8D;AAC9D;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA,GAAG;AACH;AACA;;AAEA;AACA;;AAEA;AACA;AACA,CAAC;AACD;AACA;;AAEA,CAAC","file":"textcomplete.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 5);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 0bc74e584933ddf1c7ac","// @flow\n\nimport Strategy from \"./strategy\"\n\n/**\n * Encapsulate an result of each search results.\n */\nexport default class SearchResult {\n data: Object\n term: string\n strategy: Strategy\n\n /**\n * @param {object} data - An element of array callbacked by search function.\n */\n constructor(data: Object, term: string, strategy: Strategy) {\n this.data = data\n this.term = term\n this.strategy = strategy\n }\n\n replace(beforeCursor: string, afterCursor: string) {\n let replacement = this.strategy.replace(this.data)\n if (replacement !== null) {\n if (Array.isArray(replacement)) {\n afterCursor = replacement[1] + afterCursor\n replacement = replacement[0]\n }\n const match = this.strategy.matchText(beforeCursor)\n if (match) {\n replacement = replacement\n .replace(/\\$&/g, match[0])\n .replace(/\\$(\\d)/g, (_, p1) => match[parseInt(p1, 10)])\n return [\n [\n beforeCursor.slice(0, match.index),\n replacement,\n beforeCursor.slice(match.index + match[0].length),\n ].join(\"\"),\n afterCursor,\n ]\n }\n }\n }\n\n render(): string {\n return this.strategy.template(this.data, this.term)\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/search_result.js","'use strict';\n\nvar has = Object.prototype.hasOwnProperty\n , prefix = '~';\n\n/**\n * Constructor to create a storage for our `EE` objects.\n * An `Events` instance is a plain object whose properties are event names.\n *\n * @constructor\n * @api private\n */\nfunction Events() {}\n\n//\n// We try to not inherit from `Object.prototype`. In some engines creating an\n// instance in this way is faster than calling `Object.create(null)` directly.\n// If `Object.create(null)` is not supported we prefix the event names with a\n// character to make sure that the built-in object properties are not\n// overridden or used as an attack vector.\n//\nif (Object.create) {\n Events.prototype = Object.create(null);\n\n //\n // This hack is needed because the `__proto__` property is still inherited in\n // some old browsers like Android 4, iPhone 5.1, Opera 11 and Safari 5.\n //\n if (!new Events().__proto__) prefix = false;\n}\n\n/**\n * Representation of a single event listener.\n *\n * @param {Function} fn The listener function.\n * @param {Mixed} context The context to invoke the listener with.\n * @param {Boolean} [once=false] Specify if the listener is a one-time listener.\n * @constructor\n * @api private\n */\nfunction EE(fn, context, once) {\n this.fn = fn;\n this.context = context;\n this.once = once || false;\n}\n\n/**\n * Minimal `EventEmitter` interface that is molded against the Node.js\n * `EventEmitter` interface.\n *\n * @constructor\n * @api public\n */\nfunction EventEmitter() {\n this._events = new Events();\n this._eventsCount = 0;\n}\n\n/**\n * Return an array listing the events for which the emitter has registered\n * listeners.\n *\n * @returns {Array}\n * @api public\n */\nEventEmitter.prototype.eventNames = function eventNames() {\n var names = []\n , events\n , name;\n\n if (this._eventsCount === 0) return names;\n\n for (name in (events = this._events)) {\n if (has.call(events, name)) names.push(prefix ? name.slice(1) : name);\n }\n\n if (Object.getOwnPropertySymbols) {\n return names.concat(Object.getOwnPropertySymbols(events));\n }\n\n return names;\n};\n\n/**\n * Return the listeners registered for a given event.\n *\n * @param {String|Symbol} event The event name.\n * @param {Boolean} exists Only check if there are listeners.\n * @returns {Array|Boolean}\n * @api public\n */\nEventEmitter.prototype.listeners = function listeners(event, exists) {\n var evt = prefix ? prefix + event : event\n , available = this._events[evt];\n\n if (exists) return !!available;\n if (!available) return [];\n if (available.fn) return [available.fn];\n\n for (var i = 0, l = available.length, ee = new Array(l); i < l; i++) {\n ee[i] = available[i].fn;\n }\n\n return ee;\n};\n\n/**\n * Calls each of the listeners registered for a given event.\n *\n * @param {String|Symbol} event The event name.\n * @returns {Boolean} `true` if the event had listeners, else `false`.\n * @api public\n */\nEventEmitter.prototype.emit = function emit(event, a1, a2, a3, a4, a5) {\n var evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) return false;\n\n var listeners = this._events[evt]\n , len = arguments.length\n , args\n , i;\n\n if (listeners.fn) {\n if (listeners.once) this.removeListener(event, listeners.fn, undefined, true);\n\n switch (len) {\n case 1: return listeners.fn.call(listeners.context), true;\n case 2: return listeners.fn.call(listeners.context, a1), true;\n case 3: return listeners.fn.call(listeners.context, a1, a2), true;\n case 4: return listeners.fn.call(listeners.context, a1, a2, a3), true;\n case 5: return listeners.fn.call(listeners.context, a1, a2, a3, a4), true;\n case 6: return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true;\n }\n\n for (i = 1, args = new Array(len -1); i < len; i++) {\n args[i - 1] = arguments[i];\n }\n\n listeners.fn.apply(listeners.context, args);\n } else {\n var length = listeners.length\n , j;\n\n for (i = 0; i < length; i++) {\n if (listeners[i].once) this.removeListener(event, listeners[i].fn, undefined, true);\n\n switch (len) {\n case 1: listeners[i].fn.call(listeners[i].context); break;\n case 2: listeners[i].fn.call(listeners[i].context, a1); break;\n case 3: listeners[i].fn.call(listeners[i].context, a1, a2); break;\n case 4: listeners[i].fn.call(listeners[i].context, a1, a2, a3); break;\n default:\n if (!args) for (j = 1, args = new Array(len -1); j < len; j++) {\n args[j - 1] = arguments[j];\n }\n\n listeners[i].fn.apply(listeners[i].context, args);\n }\n }\n }\n\n return true;\n};\n\n/**\n * Add a listener for a given event.\n *\n * @param {String|Symbol} event The event name.\n * @param {Function} fn The listener function.\n * @param {Mixed} [context=this] The context to invoke the listener with.\n * @returns {EventEmitter} `this`.\n * @api public\n */\nEventEmitter.prototype.on = function on(event, fn, context) {\n var listener = new EE(fn, context || this)\n , evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) this._events[evt] = listener, this._eventsCount++;\n else if (!this._events[evt].fn) this._events[evt].push(listener);\n else this._events[evt] = [this._events[evt], listener];\n\n return this;\n};\n\n/**\n * Add a one-time listener for a given event.\n *\n * @param {String|Symbol} event The event name.\n * @param {Function} fn The listener function.\n * @param {Mixed} [context=this] The context to invoke the listener with.\n * @returns {EventEmitter} `this`.\n * @api public\n */\nEventEmitter.prototype.once = function once(event, fn, context) {\n var listener = new EE(fn, context || this, true)\n , evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) this._events[evt] = listener, this._eventsCount++;\n else if (!this._events[evt].fn) this._events[evt].push(listener);\n else this._events[evt] = [this._events[evt], listener];\n\n return this;\n};\n\n/**\n * Remove the listeners of a given event.\n *\n * @param {String|Symbol} event The event name.\n * @param {Function} fn Only remove the listeners that match this function.\n * @param {Mixed} context Only remove the listeners that have this context.\n * @param {Boolean} once Only remove one-time listeners.\n * @returns {EventEmitter} `this`.\n * @api public\n */\nEventEmitter.prototype.removeListener = function removeListener(event, fn, context, once) {\n var evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) return this;\n if (!fn) {\n if (--this._eventsCount === 0) this._events = new Events();\n else delete this._events[evt];\n return this;\n }\n\n var listeners = this._events[evt];\n\n if (listeners.fn) {\n if (\n listeners.fn === fn\n && (!once || listeners.once)\n && (!context || listeners.context === context)\n ) {\n if (--this._eventsCount === 0) this._events = new Events();\n else delete this._events[evt];\n }\n } else {\n for (var i = 0, events = [], length = listeners.length; i < length; i++) {\n if (\n listeners[i].fn !== fn\n || (once && !listeners[i].once)\n || (context && listeners[i].context !== context)\n ) {\n events.push(listeners[i]);\n }\n }\n\n //\n // Reset the array, or remove it completely if we have no more listeners.\n //\n if (events.length) this._events[evt] = events.length === 1 ? events[0] : events;\n else if (--this._eventsCount === 0) this._events = new Events();\n else delete this._events[evt];\n }\n\n return this;\n};\n\n/**\n * Remove all listeners, or those of the specified event.\n *\n * @param {String|Symbol} [event] The event name.\n * @returns {EventEmitter} `this`.\n * @api public\n */\nEventEmitter.prototype.removeAllListeners = function removeAllListeners(event) {\n var evt;\n\n if (event) {\n evt = prefix ? prefix + event : event;\n if (this._events[evt]) {\n if (--this._eventsCount === 0) this._events = new Events();\n else delete this._events[evt];\n }\n } else {\n this._events = new Events();\n this._eventsCount = 0;\n }\n\n return this;\n};\n\n//\n// Alias methods names because people roll like that.\n//\nEventEmitter.prototype.off = EventEmitter.prototype.removeListener;\nEventEmitter.prototype.addListener = EventEmitter.prototype.on;\n\n//\n// This function doesn't apply anymore.\n//\nEventEmitter.prototype.setMaxListeners = function setMaxListeners() {\n return this;\n};\n\n//\n// Expose the prefix.\n//\nEventEmitter.prefixed = prefix;\n\n//\n// Allow `EventEmitter` to be imported as module namespace.\n//\nEventEmitter.EventEmitter = EventEmitter;\n\n//\n// Expose the module.\n//\nif ('undefined' !== typeof module) {\n module.exports = EventEmitter;\n}\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./node_modules/eventemitter3/index.js\n// module id = 1\n// module chunks = 0","// @flow\n\ndeclare class MatchData extends Array {\n index: number;\n}\n\nexport type { MatchData }\n\nconst DEFAULT_INDEX = 2\n\nfunction DEFAULT_TEMPLATE(value) {\n return value\n}\n\n/**\n * Properties for a strategy.\n *\n * @typedef\n */\nexport type StrategyProperties = {\n match: RegExp | (string => MatchData | null),\n search: Function,\n replace: any => string[] | string | null,\n cache?: boolean,\n context?: Function,\n template?: any => string,\n index?: number,\n id?: string,\n}\n\n/**\n * Encapsulate a single strategy.\n */\nexport default class Strategy {\n props: StrategyProperties\n cache: ?Object\n\n constructor(props: StrategyProperties) {\n this.props = props\n this.cache = props.cache ? {} : null\n }\n\n /**\n * @return {this}\n */\n destroy() {\n this.cache = null\n return this\n }\n\n search(term: string, callback: Function, match: MatchData): void {\n if (this.cache) {\n this.searchWithCache(term, callback, match)\n } else {\n this.props.search(term, callback, match)\n }\n }\n\n /**\n * @param {object} data - An element of array callbacked by search function.\n */\n replace(data: any) {\n return this.props.replace(data)\n }\n\n /** @private */\n searchWithCache(term: string, callback: Function, match: MatchData): void {\n if (this.cache && this.cache[term]) {\n callback(this.cache[term])\n } else {\n this.props.search(\n term,\n results => {\n if (this.cache) {\n this.cache[term] = results\n }\n callback(results)\n },\n match,\n )\n }\n }\n\n /** @private */\n matchText(text: string): MatchData | null {\n if (typeof this.match === \"function\") {\n return this.match(text)\n } else {\n return (text.match(this.match): any)\n }\n }\n\n /** @private */\n get match(): $PropertyType {\n return this.props.match\n }\n\n /** @private */\n get index(): number {\n return typeof this.props.index === \"number\"\n ? this.props.index\n : DEFAULT_INDEX\n }\n\n get template(): (...any) => string {\n return this.props.template || DEFAULT_TEMPLATE\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/strategy.js","// @flow\n\n/**\n * Create a custom event\n *\n * @private\n */\nexport const createCustomEvent = (() => {\n if (typeof window.CustomEvent === \"function\") {\n return function(\n type: string,\n options: ?{ detail?: Object, cancelable?: boolean },\n ): CustomEvent {\n return new document.defaultView.CustomEvent(type, {\n cancelable: (options && options.cancelable) || false,\n detail: (options && options.detail) || undefined,\n })\n }\n } else {\n // Custom event polyfill from\n // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#polyfill\n return function(\n type: string,\n options: ?{ detail?: Object, cancelable?: boolean },\n ): CustomEvent {\n const event = document.createEvent(\"CustomEvent\")\n event.initCustomEvent(\n type,\n /* bubbles */ false,\n (options && options.cancelable) || false,\n (options && options.detail) || undefined,\n )\n return event\n }\n }\n})()\n\n/**\n * Get the current coordinates of the `el` relative to the document.\n *\n * @private\n */\nexport function calculateElementOffset(\n el: HTMLElement,\n): { top: number, left: number } {\n const rect = el.getBoundingClientRect()\n const { defaultView, documentElement } = el.ownerDocument\n const offset = {\n top: rect.top + defaultView.pageYOffset,\n left: rect.left + defaultView.pageXOffset,\n }\n if (documentElement) {\n offset.top -= documentElement.clientTop\n offset.left -= documentElement.clientLeft\n }\n return offset\n}\n\nconst CHAR_CODE_ZERO = \"0\".charCodeAt(0)\nconst CHAR_CODE_NINE = \"9\".charCodeAt(0)\n\nfunction isDigit(charCode: number): boolean {\n return charCode >= CHAR_CODE_ZERO && charCode <= CHAR_CODE_NINE\n}\n\n/**\n * Returns the line-height of the given node in pixels.\n *\n * @private\n */\nexport function getLineHeightPx(node: HTMLElement): number {\n const computedStyle = window.getComputedStyle(node)\n\n // If the char code starts with a digit, it is either a value in pixels,\n // or unitless, as per:\n // https://drafts.csswg.org/css2/visudet.html#propdef-line-height\n // https://drafts.csswg.org/css2/cascade.html#computed-value\n if (isDigit(computedStyle.lineHeight.charCodeAt(0))) {\n // In real browsers the value is *always* in pixels, even for unit-less\n // line-heights. However, we still check as per the spec.\n if (\n isDigit(\n computedStyle.lineHeight.charCodeAt(\n computedStyle.lineHeight.length - 1,\n ),\n )\n ) {\n return (\n parseFloat(computedStyle.lineHeight) *\n parseFloat(computedStyle.fontSize)\n )\n } else {\n return parseFloat(computedStyle.lineHeight)\n }\n }\n\n // Otherwise, the value is \"normal\".\n // If the line-height is \"normal\", calculate by font-size\n return calculateLineHeightPx(node.nodeName, computedStyle)\n}\n\n/**\n * Returns calculated line-height of the given node in pixels.\n *\n * @private\n */\nexport function calculateLineHeightPx(\n nodeName: string,\n computedStyle: CSSStyleDeclaration,\n): number {\n const body = document.body\n if (!body) {\n return 0\n }\n\n const tempNode = document.createElement(nodeName)\n tempNode.innerHTML = \" \"\n tempNode.style.fontSize = computedStyle.fontSize\n tempNode.style.fontFamily = computedStyle.fontFamily\n tempNode.style.padding = \"0\"\n body.appendChild(tempNode)\n\n // Make sure textarea has only 1 row\n if (tempNode instanceof HTMLTextAreaElement) {\n ;(tempNode: HTMLTextAreaElement).rows = 1\n }\n\n // Assume the height of the element is the line-height\n const height = tempNode.offsetHeight\n body.removeChild(tempNode)\n\n return height\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/utils.js","// @flow\n/*eslint no-unused-vars: off*/\n\nimport EventEmitter from \"eventemitter3\"\n\nimport { createCustomEvent } from \"./utils\"\nimport SearchResult from \"./search_result\"\n\n/** @typedef */\nexport type CursorOffset = {\n lineHeight: number,\n top: number,\n left?: number,\n right?: number,\n}\n\ntype KeyCode = \"ESC\" | \"ENTER\" | \"UP\" | \"DOWN\" | \"OTHER\"\n\n/**\n * Abstract class representing a editor target.\n *\n * Editor classes must implement `#applySearchResult`, `#getCursorOffset` and\n * `#getBeforeCursor` methods.\n *\n * Editor classes must invoke `#emitMoveEvent`, `#emitEnterEvent`,\n * `#emitChangeEvent` and `#emitEscEvent` at proper timing.\n *\n * @abstract\n */\nexport default class Editor extends EventEmitter {\n /**\n * It is called when associated textcomplete object is destroyed.\n *\n * @return {this}\n */\n destroy() {\n return this\n }\n\n /**\n * It is called when a search result is selected by a user.\n */\n applySearchResult(_: SearchResult): void {\n throw new Error(\"Not implemented.\")\n }\n\n /**\n * The input cursor's absolute coordinates from the window's left\n * top corner.\n */\n getCursorOffset(): CursorOffset {\n throw new Error(\"Not implemented.\")\n }\n\n /**\n * Editor string value from head to cursor.\n * Returns null if selection type is range not cursor.\n */\n getBeforeCursor(): ?string {\n throw new Error(\"Not implemented.\")\n }\n\n /**\n * Emit a move event, which moves active dropdown element.\n * Child class must call this method at proper timing with proper parameter.\n *\n * @see {@link Textarea} for live example.\n */\n emitMoveEvent(code: \"UP\" | \"DOWN\"): CustomEvent {\n const moveEvent = createCustomEvent(\"move\", {\n cancelable: true,\n detail: {\n code: code,\n },\n })\n this.emit(\"move\", moveEvent)\n return moveEvent\n }\n\n /**\n * Emit a enter event, which selects current search result.\n * Child class must call this method at proper timing.\n *\n * @see {@link Textarea} for live example.\n */\n emitEnterEvent(): CustomEvent {\n const enterEvent = createCustomEvent(\"enter\", { cancelable: true })\n this.emit(\"enter\", enterEvent)\n return enterEvent\n }\n\n /**\n * Emit a change event, which triggers auto completion.\n * Child class must call this method at proper timing.\n *\n * @see {@link Textarea} for live example.\n */\n emitChangeEvent(): CustomEvent {\n const changeEvent = createCustomEvent(\"change\", {\n detail: {\n beforeCursor: this.getBeforeCursor(),\n },\n })\n this.emit(\"change\", changeEvent)\n return changeEvent\n }\n\n /**\n * Emit a esc event, which hides dropdown element.\n * Child class must call this method at proper timing.\n *\n * @see {@link Textarea} for live example.\n */\n emitEscEvent(): CustomEvent {\n const escEvent = createCustomEvent(\"esc\", { cancelable: true })\n this.emit(\"esc\", escEvent)\n return escEvent\n }\n\n /**\n * Helper method for parsing KeyboardEvent.\n *\n * @see {@link Textarea} for live example.\n */\n getCode(e: KeyboardEvent): KeyCode {\n return e.keyCode === 9\n ? \"ENTER\" // tab\n : e.keyCode === 13\n ? \"ENTER\" // enter\n : e.keyCode === 27\n ? \"ESC\" // esc\n : e.keyCode === 38\n ? \"UP\" // up\n : e.keyCode === 40\n ? \"DOWN\" // down\n : e.keyCode === 78 && e.ctrlKey\n ? \"DOWN\" // ctrl-n\n : e.keyCode === 80 && e.ctrlKey\n ? \"UP\" // ctrl-p\n : \"OTHER\"\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/editor.js","import Textcomplete from \"./textcomplete\"\nimport Textarea from \"./textarea\"\n\nlet editors\nif (global.Textcomplete && global.Textcomplete.editors) {\n editors = global.Textcomplete.editors\n} else {\n editors = {}\n}\neditors.Textarea = Textarea\n\nglobal.Textcomplete = Textcomplete\nglobal.Textcomplete.editors = editors\n\n\n\n// WEBPACK FOOTER //\n// ./src/main.js","var g;\r\n\r\n// This works in non-strict mode\r\ng = (function() {\r\n\treturn this;\r\n})();\r\n\r\ntry {\r\n\t// This works if eval is allowed (see CSP)\r\n\tg = g || Function(\"return this\")() || (1,eval)(\"this\");\r\n} catch(e) {\r\n\t// This works if the window reference is available\r\n\tif(typeof window === \"object\")\r\n\t\tg = window;\r\n}\r\n\r\n// g can still be undefined, but nothing to do about it...\r\n// We return undefined, instead of nothing here, so it's\r\n// easier to handle this case. if(!global) { ...}\r\n\r\nmodule.exports = g;\r\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// (webpack)/buildin/global.js\n// module id = 6\n// module chunks = 0","// @flow\n\nimport Completer from \"./completer\"\nimport Editor from \"./editor\"\nimport Dropdown, { type DropdownOptions } from \"./dropdown\"\nimport Strategy, { type StrategyProperties } from \"./strategy\"\nimport SearchResult from \"./search_result\"\n\nimport EventEmitter from \"eventemitter3\"\n\nconst CALLBACK_METHODS = [\n \"handleChange\",\n \"handleEnter\",\n \"handleEsc\",\n \"handleHit\",\n \"handleMove\",\n \"handleSelect\",\n]\n\n/** @typedef */\ntype TextcompleteOptions = {\n dropdown?: DropdownOptions,\n}\n\n/**\n * The core of textcomplete. It acts as a mediator.\n */\nexport default class Textcomplete extends EventEmitter {\n dropdown: Dropdown\n editor: Editor\n options: TextcompleteOptions\n completer: Completer\n isQueryInFlight: boolean\n nextPendingQuery: string | null\n\n /**\n * @param {Editor} editor - Where the textcomplete works on.\n */\n constructor(editor: Editor, options: TextcompleteOptions = {}) {\n super()\n\n this.completer = new Completer()\n this.isQueryInFlight = false\n this.nextPendingQuery = null\n this.dropdown = new Dropdown(options.dropdown || {})\n this.editor = editor\n this.options = options\n\n CALLBACK_METHODS.forEach(method => {\n ;(this: any)[method] = (this: any)[method].bind(this)\n })\n\n this.startListening()\n }\n\n /**\n * @return {this}\n */\n destroy(destroyEditor: boolean = true) {\n this.completer.destroy()\n this.dropdown.destroy()\n if (destroyEditor) {\n this.editor.destroy()\n }\n this.stopListening()\n return this\n }\n\n /**\n * @return {this}\n */\n hide() {\n this.dropdown.deactivate()\n return this\n }\n\n /**\n * @return {this}\n * @example\n * textcomplete.register([{\n * match: /(^|\\s)(\\w+)$/,\n * search: function (term, callback) {\n * $.ajax({ ... })\n * .done(callback)\n * .fail([]);\n * },\n * replace: function (value) {\n * return '$1' + value + ' ';\n * }\n * }]);\n */\n register(strategyPropsArray: StrategyProperties[]) {\n strategyPropsArray.forEach(props => {\n this.completer.registerStrategy(new Strategy(props))\n })\n return this\n }\n\n /**\n * Start autocompleting.\n *\n * @param {string} text - Head to input cursor.\n * @return {this}\n */\n trigger(text: string) {\n if (this.isQueryInFlight) {\n this.nextPendingQuery = text\n } else {\n this.isQueryInFlight = true\n this.nextPendingQuery = null\n this.completer.run(text)\n }\n return this\n }\n\n /** @private */\n handleHit({ searchResults }: { searchResults: SearchResult[] }) {\n if (searchResults.length) {\n this.dropdown.render(searchResults, this.editor.getCursorOffset())\n } else {\n this.dropdown.deactivate()\n }\n this.isQueryInFlight = false\n if (this.nextPendingQuery !== null) {\n this.trigger(this.nextPendingQuery)\n }\n }\n\n /** @private */\n handleMove(e: CustomEvent) {\n e.detail.code === \"UP\" ? this.dropdown.up(e) : this.dropdown.down(e)\n }\n\n /** @private */\n handleEnter(e: CustomEvent) {\n const activeItem = this.dropdown.getActiveItem()\n if (activeItem) {\n this.dropdown.select(activeItem)\n e.preventDefault()\n } else {\n this.dropdown.deactivate()\n }\n }\n\n /** @private */\n handleEsc(e: CustomEvent) {\n if (this.dropdown.shown) {\n this.dropdown.deactivate()\n e.preventDefault()\n }\n }\n\n /** @private */\n handleChange(e: CustomEvent) {\n if (e.detail.beforeCursor != null) {\n this.trigger(e.detail.beforeCursor)\n } else {\n this.dropdown.deactivate()\n }\n }\n\n /** @private */\n handleSelect(selectEvent: CustomEvent) {\n this.emit(\"select\", selectEvent)\n if (!selectEvent.defaultPrevented) {\n this.editor.applySearchResult(selectEvent.detail.searchResult)\n }\n }\n\n /** @private */\n startListening() {\n this.editor\n .on(\"move\", this.handleMove)\n .on(\"enter\", this.handleEnter)\n .on(\"esc\", this.handleEsc)\n .on(\"change\", this.handleChange)\n this.dropdown.on(\"select\", this.handleSelect)\n ;[\n \"show\",\n \"shown\",\n \"render\",\n \"rendered\",\n \"selected\",\n \"hidden\",\n \"hide\",\n ].forEach(eventName => {\n this.dropdown.on(eventName, () => this.emit(eventName))\n })\n this.completer.on(\"hit\", this.handleHit)\n }\n\n /** @private */\n stopListening() {\n this.completer.removeAllListeners()\n this.dropdown.removeAllListeners()\n this.editor\n .removeListener(\"move\", this.handleMove)\n .removeListener(\"enter\", this.handleEnter)\n .removeListener(\"esc\", this.handleEsc)\n .removeListener(\"change\", this.handleChange)\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/textcomplete.js","// @flow\n\nimport EventEmitter from \"eventemitter3\"\n\nimport Query from \"./query\"\nimport SearchResult from \"./search_result\"\nimport Strategy from \"./strategy\"\n\nconst CALLBACK_METHODS = [\"handleQueryResult\"]\n\n/**\n * Complete engine.\n */\nexport default class Completer extends EventEmitter {\n strategies: Strategy[]\n\n constructor() {\n super()\n this.strategies = []\n\n CALLBACK_METHODS.forEach(method => {\n ;(this: any)[method] = (this: any)[method].bind(this)\n })\n }\n\n /**\n * @return {this}\n */\n destroy() {\n this.strategies.forEach(strategy => strategy.destroy())\n return this\n }\n\n /**\n * Register a strategy to the completer.\n *\n * @return {this}\n */\n registerStrategy(strategy: Strategy) {\n this.strategies.push(strategy)\n return this\n }\n\n /**\n * @param {string} text - Head to input cursor.\n */\n run(text: string): void {\n const query = this.extractQuery(text)\n if (query) {\n query.execute(this.handleQueryResult)\n } else {\n this.handleQueryResult([])\n }\n }\n\n /**\n * Find a query, which matches to the given text.\n *\n * @private\n */\n extractQuery(text: string) {\n for (let i = 0; i < this.strategies.length; i++) {\n const query = Query.build(this.strategies[i], text)\n if (query) {\n return query\n }\n }\n return null\n }\n\n /**\n * Callbacked by {@link Query#execute}.\n *\n * @private\n */\n handleQueryResult(searchResults: SearchResult[]) {\n this.emit(\"hit\", { searchResults })\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/completer.js","// @flow\n\nimport SearchResult from \"./search_result\"\nimport Strategy from \"./strategy\"\nimport type { MatchData } from \"./strategy\"\n\n/**\n * Encapsulate matching condition between a Strategy and current editor's value.\n */\nexport default class Query {\n strategy: Strategy\n term: string\n match: MatchData\n\n /**\n * Build a Query object by the given string if this matches to the string.\n *\n * @param {string} text - Head to input cursor.\n */\n static build(strategy: Strategy, text: string): ?Query {\n if (typeof strategy.props.context === \"function\") {\n const context = strategy.props.context(text)\n if (typeof context === \"string\") {\n text = context\n } else if (!context) {\n return null\n }\n }\n const match = strategy.matchText(text)\n return match ? new Query(strategy, match[strategy.index], match) : null\n }\n\n constructor(strategy: Strategy, term: string, match: MatchData) {\n this.strategy = strategy\n this.term = term\n this.match = match\n }\n\n /**\n * Invoke search strategy and callback the given function.\n */\n execute(callback: (SearchResult[]) => void) {\n this.strategy.search(\n this.term,\n results => {\n callback(\n results.map(result => {\n return new SearchResult(result, this.term, this.strategy)\n }),\n )\n },\n this.match,\n )\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/query.js","// @flow\nimport EventEmitter from \"eventemitter3\"\n\nimport DropdownItem, { type DropdownItemOptions } from \"./dropdown_item\"\nimport SearchResult from \"./search_result\"\nimport { createCustomEvent } from \"./utils\"\nimport type { CursorOffset } from \"./editor\"\n\nconst DEFAULT_CLASS_NAME = \"dropdown-menu textcomplete-dropdown\"\n\n/** @typedef */\nexport type DropdownOptions = {\n className?: string,\n footer?: any => string | string,\n header?: any => string | string,\n maxCount?: number,\n placement?: string,\n rotate?: boolean,\n style?: { [string]: string },\n item?: DropdownItemOptions,\n}\n\n/**\n * Encapsulate a dropdown view.\n *\n * @prop {boolean} shown - Whether the #el is shown or not.\n * @prop {DropdownItem[]} items - The array of rendered dropdown items.\n */\nexport default class Dropdown extends EventEmitter {\n shown: boolean\n items: DropdownItem[]\n activeItem: DropdownItem | null\n footer: $PropertyType\n header: $PropertyType\n maxCount: $PropertyType\n rotate: $PropertyType\n placement: $PropertyType\n itemOptions: DropdownItemOptions\n _el: ?HTMLUListElement\n\n static createElement(): HTMLUListElement {\n const el = document.createElement(\"ul\")\n const style = el.style\n style.display = \"none\"\n style.position = \"absolute\"\n style.zIndex = \"10000\"\n const body = document.body\n if (body) {\n body.appendChild(el)\n }\n return el\n }\n\n constructor(options: DropdownOptions) {\n super()\n this.shown = false\n this.items = []\n this.activeItem = null\n this.footer = options.footer\n this.header = options.header\n this.maxCount = options.maxCount || 10\n this.el.className = options.className || DEFAULT_CLASS_NAME\n this.rotate = options.hasOwnProperty(\"rotate\") ? options.rotate : true\n this.placement = options.placement\n this.itemOptions = options.item || {}\n const style = options.style\n if (style) {\n Object.keys(style).forEach(key => {\n ;(this.el.style: any)[key] = style[key]\n })\n }\n }\n\n /**\n * @return {this}\n */\n destroy() {\n const parentNode = this.el.parentNode\n if (parentNode) {\n parentNode.removeChild(this.el)\n }\n this.clear()._el = null\n return this\n }\n\n get el(): HTMLUListElement {\n if (!this._el) {\n this._el = Dropdown.createElement()\n }\n return this._el\n }\n\n /**\n * Render the given data as dropdown items.\n *\n * @return {this}\n */\n render(searchResults: SearchResult[], cursorOffset: CursorOffset) {\n const renderEvent = createCustomEvent(\"render\", { cancelable: true })\n this.emit(\"render\", renderEvent)\n if (renderEvent.defaultPrevented) {\n return this\n }\n const rawResults = searchResults.map(searchResult => searchResult.data)\n const dropdownItems = searchResults\n .slice(0, this.maxCount || searchResults.length)\n .map(searchResult => new DropdownItem(searchResult, this.itemOptions))\n this.clear()\n .setStrategyId(searchResults[0])\n .renderEdge(rawResults, \"header\")\n .append(dropdownItems)\n .renderEdge(rawResults, \"footer\")\n .show()\n .setOffset(cursorOffset)\n this.emit(\"rendered\", createCustomEvent(\"rendered\"))\n return this\n }\n\n /**\n * Hide the dropdown then sweep out items.\n *\n * @return {this}\n */\n deactivate() {\n return this.hide().clear()\n }\n\n /**\n * @return {this}\n */\n select(dropdownItem: DropdownItem) {\n const detail = { searchResult: dropdownItem.searchResult }\n const selectEvent = createCustomEvent(\"select\", {\n cancelable: true,\n detail: detail,\n })\n this.emit(\"select\", selectEvent)\n if (selectEvent.defaultPrevented) {\n return this\n }\n this.deactivate()\n this.emit(\"selected\", createCustomEvent(\"selected\", { detail }))\n return this\n }\n\n /**\n * @return {this}\n */\n up(e: CustomEvent) {\n return this.shown ? this.moveActiveItem(\"prev\", e) : this\n }\n\n /**\n * @return {this}\n */\n down(e: CustomEvent) {\n return this.shown ? this.moveActiveItem(\"next\", e) : this\n }\n\n /**\n * Retrieve the active item.\n */\n getActiveItem(): DropdownItem | null {\n return this.activeItem\n }\n\n /**\n * Add items to dropdown.\n *\n * @private\n */\n append(items: DropdownItem[]) {\n const fragment = document.createDocumentFragment()\n items.forEach(item => {\n this.items.push(item)\n item.appended(this)\n fragment.appendChild(item.el)\n })\n this.el.appendChild(fragment)\n return this\n }\n\n /** @private */\n setOffset(cursorOffset: CursorOffset) {\n const doc = document.documentElement\n if (doc) {\n const elementWidth = this.el.offsetWidth\n if (cursorOffset.left) {\n const browserWidth = doc.clientWidth\n if (cursorOffset.left + elementWidth > browserWidth) {\n cursorOffset.left = browserWidth - elementWidth\n }\n this.el.style.left = `${cursorOffset.left}px`\n } else if (cursorOffset.right) {\n if (cursorOffset.right - elementWidth < 0) {\n cursorOffset.right = 0\n }\n this.el.style.right = `${cursorOffset.right}px`\n }\n if (this.isPlacementTop()) {\n this.el.style.bottom = `${doc.clientHeight -\n cursorOffset.top +\n cursorOffset.lineHeight}px`\n } else {\n this.el.style.top = `${cursorOffset.top}px`\n }\n }\n return this\n }\n\n /**\n * Show the element.\n *\n * @private\n */\n show() {\n if (!this.shown) {\n const showEvent = createCustomEvent(\"show\", { cancelable: true })\n this.emit(\"show\", showEvent)\n if (showEvent.defaultPrevented) {\n return this\n }\n this.el.style.display = \"block\"\n this.shown = true\n this.emit(\"shown\", createCustomEvent(\"shown\"))\n }\n return this\n }\n\n /**\n * Hide the element.\n *\n * @private\n */\n hide() {\n if (this.shown) {\n const hideEvent = createCustomEvent(\"hide\", { cancelable: true })\n this.emit(\"hide\", hideEvent)\n if (hideEvent.defaultPrevented) {\n return this\n }\n this.el.style.display = \"none\"\n this.shown = false\n this.emit(\"hidden\", createCustomEvent(\"hidden\"))\n }\n return this\n }\n\n /**\n * Clear search results.\n *\n * @private\n */\n clear() {\n this.el.innerHTML = \"\"\n this.items.forEach(item => item.destroy())\n this.items = []\n return this\n }\n\n /** @private */\n moveActiveItem(direction: \"next\" | \"prev\", e: CustomEvent) {\n const nextActiveItem =\n direction === \"next\"\n ? this.activeItem ? this.activeItem.next : this.items[0]\n : this.activeItem\n ? this.activeItem.prev\n : this.items[this.items.length - 1]\n if (nextActiveItem) {\n nextActiveItem.activate()\n e.preventDefault()\n }\n return this\n }\n\n /** @private */\n setStrategyId(searchResult: ?SearchResult) {\n const strategyId = searchResult && searchResult.strategy.props.id\n if (strategyId) {\n this.el.setAttribute(\"data-strategy\", strategyId)\n } else {\n this.el.removeAttribute(\"data-strategy\")\n }\n return this\n }\n\n /**\n * @private\n * @param {object[]} rawResults - What callbacked by search function.\n */\n renderEdge(rawResults: Object[], type: \"header\" | \"footer\") {\n const source = (type === \"header\" ? this.header : this.footer) || \"\"\n const content: any =\n typeof source === \"function\" ? source(rawResults) : source\n const li = document.createElement(\"li\")\n li.classList.add(`textcomplete-${type}`)\n li.innerHTML = content\n this.el.appendChild(li)\n return this\n }\n\n /** @private */\n isPlacementTop() {\n return this.placement === \"top\"\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/dropdown.js","// @flow\n\nimport SearchResult from \"./search_result\"\n\nexport const DEFAULT_CLASS_NAME = \"textcomplete-item\"\nconst CALLBACK_METHODS = [\"onClick\", \"onMouseover\"]\n\n/** @typedef */\nexport type DropdownItemOptions = {\n className?: string,\n}\n\n// Declare interface instead of importing Dropdown itself to prevent circular dependency.\ninterface Dropdown {\n activeItem: DropdownItem | null;\n items: DropdownItem[];\n rotate: ?Boolean;\n getActiveItem(): DropdownItem | null;\n select(DropdownItem): DropdownItem;\n}\n\n/**\n * Encapsulate an item of dropdown.\n */\nexport default class DropdownItem {\n searchResult: SearchResult\n active: boolean\n className: string\n activeClassName: string\n siblings: DropdownItem[]\n dropdown: Dropdown\n index: number\n _el: ?HTMLLIElement\n\n constructor(searchResult: SearchResult, options: DropdownItemOptions) {\n this.searchResult = searchResult\n this.active = false\n this.className = options.className || DEFAULT_CLASS_NAME\n this.activeClassName = `${this.className} active`\n\n CALLBACK_METHODS.forEach(method => {\n ;(this: any)[method] = (this: any)[method].bind(this)\n })\n }\n\n get el(): HTMLLIElement {\n if (this._el) {\n return this._el\n }\n const li = document.createElement(\"li\")\n li.className = this.active ? this.activeClassName : this.className\n const a = document.createElement(\"a\")\n a.innerHTML = this.searchResult.render()\n li.appendChild(a)\n this._el = li\n li.addEventListener(\"mousedown\", this.onClick)\n li.addEventListener(\"mouseover\", this.onMouseover)\n li.addEventListener(\"touchstart\", this.onClick)\n return li\n }\n\n /**\n * Try to free resources and perform other cleanup operations.\n */\n destroy() {\n this.el.removeEventListener(\"mousedown\", this.onClick, false)\n this.el.removeEventListener(\"mouseover\", this.onMouseover, false)\n this.el.removeEventListener(\"touchstart\", this.onClick, false)\n if (this.active) {\n this.dropdown.activeItem = null\n }\n // This element has already been removed by {@link Dropdown#clear}.\n this._el = null\n }\n\n /**\n * Callbacked when it is appended to a dropdown.\n *\n * @see Dropdown#append\n */\n appended(dropdown: Dropdown) {\n this.dropdown = dropdown\n this.siblings = dropdown.items\n this.index = this.siblings.length - 1\n }\n\n /**\n * Deactivate active item then activate itself.\n *\n * @return {this}\n */\n activate() {\n if (!this.active) {\n const activeItem = this.dropdown.getActiveItem()\n if (activeItem) {\n activeItem.deactivate()\n }\n this.dropdown.activeItem = this\n this.active = true\n this.el.className = this.activeClassName\n }\n return this\n }\n\n /**\n * Get the next sibling.\n */\n get next(): ?DropdownItem {\n let nextIndex\n if (this.index === this.siblings.length - 1) {\n if (!this.dropdown.rotate) {\n return null\n }\n nextIndex = 0\n } else {\n nextIndex = this.index + 1\n }\n return this.siblings[nextIndex]\n }\n\n /**\n * Get the previous sibling.\n */\n get prev(): ?DropdownItem {\n let nextIndex\n if (this.index === 0) {\n if (!this.dropdown.rotate) {\n return null\n }\n nextIndex = this.siblings.length - 1\n } else {\n nextIndex = this.index - 1\n }\n return this.siblings[nextIndex]\n }\n\n /** @private */\n deactivate() {\n if (this.active) {\n this.active = false\n this.el.className = this.className\n this.dropdown.activeItem = null\n }\n return this\n }\n\n /** @private */\n onClick(e: Event) {\n e.preventDefault() // Prevent blur event\n this.dropdown.select(this)\n }\n\n /** @private */\n onMouseover() {\n this.activate()\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/dropdown_item.js","// @flow\n\nimport update from \"undate/lib/update\"\n\nimport Editor from \"./editor\"\nimport { calculateElementOffset, getLineHeightPx } from \"./utils\"\nimport SearchResult from \"./search_result\"\n\nconst getCaretCoordinates = require(\"textarea-caret\")\n\nconst CALLBACK_METHODS = [\"onInput\", \"onKeydown\"]\n\n/**\n * Encapsulate the target textarea element.\n */\nexport default class Textarea extends Editor {\n el: HTMLTextAreaElement\n\n /**\n * @param {HTMLTextAreaElement} el - Where the textcomplete works on.\n */\n constructor(el: HTMLTextAreaElement) {\n super()\n this.el = el\n\n CALLBACK_METHODS.forEach(method => {\n ;(this: any)[method] = (this: any)[method].bind(this)\n })\n\n this.startListening()\n }\n\n /**\n * @return {this}\n */\n destroy() {\n super.destroy()\n this.stopListening()\n // Release the element reference early to help garbage collection.\n ;(this: any).el = null\n return this\n }\n\n /**\n * Implementation for {@link Editor#applySearchResult}\n */\n applySearchResult(searchResult: SearchResult) {\n const before = this.getBeforeCursor()\n if (before != null) {\n const replace = searchResult.replace(before, this.getAfterCursor())\n this.el.focus() // Clicking a dropdown item removes focus from the element.\n if (Array.isArray(replace)) {\n update(this.el, replace[0], replace[1])\n this.el.dispatchEvent(new Event(\"input\"))\n }\n }\n }\n\n /**\n * Implementation for {@link Editor#getCursorOffset}\n */\n getCursorOffset() {\n const elOffset = calculateElementOffset(this.el)\n const elScroll = this.getElScroll()\n const cursorPosition = this.getCursorPosition()\n const lineHeight = getLineHeightPx(this.el)\n const top = elOffset.top - elScroll.top + cursorPosition.top + lineHeight\n const left = elOffset.left - elScroll.left + cursorPosition.left\n if (this.el.dir !== \"rtl\") {\n return { top, left, lineHeight }\n } else {\n const right = document.documentElement\n ? document.documentElement.clientWidth - left\n : 0\n return { top, right, lineHeight }\n }\n }\n\n /**\n * Implementation for {@link Editor#getBeforeCursor}\n */\n getBeforeCursor() {\n return this.el.selectionStart !== this.el.selectionEnd\n ? null\n : this.el.value.substring(0, this.el.selectionEnd)\n }\n\n /** @private */\n getAfterCursor() {\n return this.el.value.substring(this.el.selectionEnd)\n }\n\n /** @private */\n getElScroll(): { top: number, left: number } {\n return { top: this.el.scrollTop, left: this.el.scrollLeft }\n }\n\n /**\n * The input cursor's relative coordinates from the textarea's left\n * top corner.\n *\n * @private\n */\n getCursorPosition(): { top: number, left: number } {\n return getCaretCoordinates(this.el, this.el.selectionEnd)\n }\n\n /** @private */\n onInput() {\n this.emitChangeEvent()\n }\n\n /** @private */\n onKeydown(e: KeyboardEvent) {\n const code = this.getCode(e)\n let event\n if (code === \"UP\" || code === \"DOWN\") {\n event = this.emitMoveEvent(code)\n } else if (code === \"ENTER\") {\n event = this.emitEnterEvent()\n } else if (code === \"ESC\") {\n event = this.emitEscEvent()\n }\n if (event && event.defaultPrevented) {\n e.preventDefault()\n }\n }\n\n /** @private */\n startListening() {\n this.el.addEventListener(\"input\", this.onInput)\n this.el.addEventListener(\"keydown\", this.onKeydown)\n }\n\n /** @private */\n stopListening() {\n this.el.removeEventListener(\"input\", this.onInput)\n this.el.removeEventListener(\"keydown\", this.onKeydown)\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/textarea.js","\"use strict\";\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nexports.default = function (el, headToCursor, cursorToTail) {\n var curr = el.value,\n // strA + strB1 + strC\n next = headToCursor + (cursorToTail || ''),\n // strA + strB2 + strC\n activeElement = document.activeElement;\n\n // Calculate length of strA and strC\n var aLength = 0,\n cLength = 0;\n while (aLength < curr.length && aLength < next.length && curr[aLength] === next[aLength]) {\n aLength++;\n }\n while (curr.length - cLength - 1 >= 0 && next.length - cLength - 1 >= 0 && curr[curr.length - cLength - 1] === next[next.length - cLength - 1]) {\n cLength++;\n }\n aLength = Math.min(aLength, Math.min(curr.length, next.length) - cLength);\n\n // Select strB1\n el.setSelectionRange(aLength, curr.length - cLength);\n\n // Get strB2\n var strB2 = next.substring(aLength, next.length - cLength);\n\n // Replace strB1 with strB2\n el.focus();\n if (!document.execCommand('insertText', false, strB2)) {\n // Document.execCommand returns false if the command is not supported.\n // Firefox and IE returns false in this case.\n el.value = next;\n el.dispatchEvent(createInputEvent());\n }\n\n // Move cursor to the end of headToCursor\n el.setSelectionRange(headToCursor.length, headToCursor.length);\n\n activeElement && activeElement.focus();\n return el;\n};\n\nfunction createInputEvent() {\n if (typeof Event !== \"undefined\") {\n return new Event(\"input\", { bubbles: true, cancelable: true });\n } else {\n var event = document.createEvent(\"Event\");\n event.initEvent(\"input\", true, true);\n return event;\n }\n}\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./node_modules/undate/lib/update.js\n// module id = 13\n// module chunks = 0","/* jshint browser: true */\n\n(function () {\n\n// The properties that we copy into a mirrored div.\n// Note that some browsers, such as Firefox,\n// do not concatenate properties, i.e. padding-top, bottom etc. -> padding,\n// so we have to do every single property specifically.\nvar properties = [\n 'direction', // RTL support\n 'boxSizing',\n 'width', // on Chrome and IE, exclude the scrollbar, so the mirror div wraps exactly as the textarea does\n 'height',\n 'overflowX',\n 'overflowY', // copy the scrollbar for IE\n\n 'borderTopWidth',\n 'borderRightWidth',\n 'borderBottomWidth',\n 'borderLeftWidth',\n 'borderStyle',\n\n 'paddingTop',\n 'paddingRight',\n 'paddingBottom',\n 'paddingLeft',\n\n // https://developer.mozilla.org/en-US/docs/Web/CSS/font\n 'fontStyle',\n 'fontVariant',\n 'fontWeight',\n 'fontStretch',\n 'fontSize',\n 'fontSizeAdjust',\n 'lineHeight',\n 'fontFamily',\n\n 'textAlign',\n 'textTransform',\n 'textIndent',\n 'textDecoration', // might not make a difference, but better be safe\n\n 'letterSpacing',\n 'wordSpacing',\n\n 'tabSize',\n 'MozTabSize'\n\n];\n\nvar isBrowser = (typeof window !== 'undefined');\nvar isFirefox = (isBrowser && window.mozInnerScreenX != null);\n\nfunction getCaretCoordinates(element, position, options) {\n if(!isBrowser) {\n throw new Error('textarea-caret-position#getCaretCoordinates should only be called in a browser');\n }\n\n var debug = options && options.debug || false;\n if (debug) {\n var el = document.querySelector('#input-textarea-caret-position-mirror-div');\n if ( el ) { el.parentNode.removeChild(el); }\n }\n\n // mirrored div\n var div = document.createElement('div');\n div.id = 'input-textarea-caret-position-mirror-div';\n document.body.appendChild(div);\n\n var style = div.style;\n var computed = window.getComputedStyle? getComputedStyle(element) : element.currentStyle; // currentStyle for IE < 9\n\n // default textarea styles\n style.whiteSpace = 'pre-wrap';\n if (element.nodeName !== 'INPUT')\n style.wordWrap = 'break-word'; // only for textarea-s\n\n // position off-screen\n style.position = 'absolute'; // required to return coordinates properly\n if (!debug)\n style.visibility = 'hidden'; // not 'display: none' because we want rendering\n\n // transfer the element's properties to the div\n properties.forEach(function (prop) {\n style[prop] = computed[prop];\n });\n\n if (isFirefox) {\n // Firefox lies about the overflow property for textareas: https://bugzilla.mozilla.org/show_bug.cgi?id=984275\n if (element.scrollHeight > parseInt(computed.height))\n style.overflowY = 'scroll';\n } else {\n style.overflow = 'hidden'; // for Chrome to not render a scrollbar; IE keeps overflowY = 'scroll'\n }\n\n div.textContent = element.value.substring(0, position);\n // the second special handling for input type=\"text\" vs textarea: spaces need to be replaced with non-breaking spaces - http://stackoverflow.com/a/13402035/1269037\n if (element.nodeName === 'INPUT')\n div.textContent = div.textContent.replace(/\\s/g, '\\u00a0');\n\n var span = document.createElement('span');\n // Wrapping must be replicated *exactly*, including when a long word gets\n // onto the next line, with whitespace at the end of the line before (#7).\n // The *only* reliable way to do that is to copy the *entire* rest of the\n // textarea's content into the created at the caret position.\n // for inputs, just '.' would be enough, but why bother?\n span.textContent = element.value.substring(position) || '.'; // || because a completely empty faux span doesn't render at all\n div.appendChild(span);\n\n var coordinates = {\n top: span.offsetTop + parseInt(computed['borderTopWidth']),\n left: span.offsetLeft + parseInt(computed['borderLeftWidth'])\n };\n\n if (debug) {\n span.style.backgroundColor = '#aaa';\n } else {\n document.body.removeChild(div);\n }\n\n return coordinates;\n}\n\nif (typeof module != 'undefined' && typeof module.exports != 'undefined') {\n module.exports = getCaretCoordinates;\n} else if(isBrowser){\n window.getCaretCoordinates = getCaretCoordinates;\n}\n\n}());\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./node_modules/textarea-caret/index.js\n// module id = 14\n// module chunks = 0"],"sourceRoot":""} \ No newline at end of file diff --git a/library/textcomplete/textcomplete.min.js b/library/textcomplete/textcomplete.min.js new file mode 100644 index 000000000..717a2c905 --- /dev/null +++ b/library/textcomplete/textcomplete.min.js @@ -0,0 +1,2 @@ +!function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,t),i.l=!0,i.exports}var n={};t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=5)}([function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0});var i=function(){function e(e,t){for(var n=0;n=s&&e<=a}function i(e){var t=window.getComputedStyle(e);return r(t.lineHeight.charCodeAt(0))?r(t.lineHeight.charCodeAt(t.lineHeight.length-1))?parseFloat(t.lineHeight)*parseFloat(t.fontSize):parseFloat(t.lineHeight):o(e.nodeName,t)}function o(e,t){var n=document.body;if(!n)return 0;var r=document.createElement(e);r.innerHTML=" ",r.style.fontSize=t.fontSize,r.style.fontFamily=t.fontFamily,r.style.padding="0",n.appendChild(r),r instanceof HTMLTextAreaElement&&(r.rows=1);var i=r.offsetHeight;return n.removeChild(r),i}Object.defineProperty(t,"__esModule",{value:!0}),t.calculateElementOffset=n,t.getLineHeightPx=i,t.calculateLineHeightPx=o;var s=(t.createCustomEvent=function(){return"function"==typeof window.CustomEvent?function(e,t){return new document.defaultView.CustomEvent(e,{cancelable:t&&t.cancelable||!1,detail:t&&t.detail||void 0})}:function(e,t){var n=document.createEvent("CustomEvent");return n.initCustomEvent(e,!1,t&&t.cancelable||!1,t&&t.detail||void 0),n}}(),"0".charCodeAt(0)),a="9".charCodeAt(0)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var a=function(){function e(e,t){for(var n=0;n1&&void 0!==arguments[1]?arguments[1]:{};i(this,t);var r=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return r.completer=new l.default,r.isQueryInFlight=!1,r.nextPendingQuery=null,r.dropdown=new f.default(n.dropdown||{}),r.editor=e,r.options=n,g.forEach(function(e){r[e]=r[e].bind(r)}),r.startListening(),r}return s(t,e),a(t,[{key:"destroy",value:function(){var e=!(arguments.length>0&&void 0!==arguments[0])||arguments[0];return this.completer.destroy(),this.dropdown.destroy(),e&&this.editor.destroy(),this.stopListening(),this}},{key:"hide",value:function(){return this.dropdown.deactivate(),this}},{key:"register",value:function(e){var t=this;return e.forEach(function(e){t.completer.registerStrategy(new v.default(e))}),this}},{key:"trigger",value:function(e){return this.isQueryInFlight?this.nextPendingQuery=e:(this.isQueryInFlight=!0,this.nextPendingQuery=null,this.completer.run(e)),this}},{key:"handleHit",value:function(e){var t=e.searchResults;t.length?this.dropdown.render(t,this.editor.getCursorOffset()):this.dropdown.deactivate(),this.isQueryInFlight=!1,null!==this.nextPendingQuery&&this.trigger(this.nextPendingQuery)}},{key:"handleMove",value:function(e){"UP"===e.detail.code?this.dropdown.up(e):this.dropdown.down(e)}},{key:"handleEnter",value:function(e){var t=this.dropdown.getActiveItem();t?(this.dropdown.select(t),e.preventDefault()):this.dropdown.deactivate()}},{key:"handleEsc",value:function(e){this.dropdown.shown&&(this.dropdown.deactivate(),e.preventDefault())}},{key:"handleChange",value:function(e){null!=e.detail.beforeCursor?this.trigger(e.detail.beforeCursor):this.dropdown.deactivate()}},{key:"handleSelect",value:function(e){this.emit("select",e),e.defaultPrevented||this.editor.applySearchResult(e.detail.searchResult)}},{key:"startListening",value:function(){var e=this;this.editor.on("move",this.handleMove).on("enter",this.handleEnter).on("esc",this.handleEsc).on("change",this.handleChange),this.dropdown.on("select",this.handleSelect),["show","shown","render","rendered","selected","hidden","hide"].forEach(function(t){e.dropdown.on(t,function(){return e.emit(t)})}),this.completer.on("hit",this.handleHit)}},{key:"stopListening",value:function(){this.completer.removeAllListeners(),this.dropdown.removeAllListeners(),this.editor.removeListener("move",this.handleMove).removeListener("enter",this.handleEnter).removeListener("esc",this.handleEsc).removeListener("change",this.handleChange)}}]),t}(m.default);t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var a=function(){function e(e,t){for(var n=0;nr&&(e.left=r-n),this.el.style.left=e.left+"px"}else e.right&&(e.right-n<0&&(e.right=0),this.el.style.right=e.right+"px");this.isPlacementTop()?this.el.style.bottom=t.clientHeight-e.top+e.lineHeight+"px":this.el.style.top=e.top+"px"}return this}},{key:"show",value:function(){if(!this.shown){var e=(0,d.createCustomEvent)("show",{cancelable:!0});if(this.emit("show",e),e.defaultPrevented)return this;this.el.style.display="block",this.shown=!0,this.emit("shown",(0,d.createCustomEvent)("shown"))}return this}},{key:"hide",value:function(){if(this.shown){var e=(0,d.createCustomEvent)("hide",{cancelable:!0});if(this.emit("hide",e),e.defaultPrevented)return this;this.el.style.display="none",this.shown=!1,this.emit("hidden",(0,d.createCustomEvent)("hidden"))}return this}},{key:"clear",value:function(){return this.el.innerHTML="",this.items.forEach(function(e){return e.destroy()}),this.items=[],this}},{key:"moveActiveItem",value:function(e,t){var n="next"===e?this.activeItem?this.activeItem.next:this.items[0]:this.activeItem?this.activeItem.prev:this.items[this.items.length-1];return n&&(n.activate(),t.preventDefault()),this}},{key:"setStrategyId",value:function(e){var t=e&&e.strategy.props.id;return t?this.el.setAttribute("data-strategy",t):this.el.removeAttribute("data-strategy"),this}},{key:"renderEdge",value:function(e,t){var n=("header"===t?this.header:this.footer)||"",r="function"==typeof n?n(e):n,i=document.createElement("li");return i.classList.add("textcomplete-"+t),i.innerHTML=r,this.el.appendChild(i),this}},{key:"isPlacementTop",value:function(){return"top"===this.placement}},{key:"el",get:function(){return this._el||(this._el=t.createElement()),this._el}}]),t}(l.default);t.default=p},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0}),t.DEFAULT_CLASS_NAME=void 0;var i=function(){function e(e,t){for(var n=0;n=0&&o.length-u-1>=0&&i[i.length-u-1]===o[o.length-u-1];)u++;a=Math.min(a,Math.min(i.length,o.length)-u),e.setSelectionRange(a,i.length-u);var l=o.substring(a,o.length-u);return e.focus(),document.execCommand("insertText",!1,l)||(e.value=o,e.dispatchEvent(n())),e.setSelectionRange(t.length,t.length),s&&s.focus(),e}},function(e){!function(){function t(e,t,o){if(!r)throw new Error("textarea-caret-position#getCaretCoordinates should only be called in a browser");var s=o&&o.debug||!1;if(s){var a=document.querySelector("#input-textarea-caret-position-mirror-div");a&&a.parentNode.removeChild(a)}var u=document.createElement("div");u.id="input-textarea-caret-position-mirror-div",document.body.appendChild(u);var l=u.style,c=window.getComputedStyle?getComputedStyle(e):e.currentStyle;l.whiteSpace="pre-wrap","INPUT"!==e.nodeName&&(l.wordWrap="break-word"),l.position="absolute",s||(l.visibility="hidden"),n.forEach(function(e){l[e]=c[e]}),i?e.scrollHeight>parseInt(c.height)&&(l.overflowY="scroll"):l.overflow="hidden",u.textContent=e.value.substring(0,t),"INPUT"===e.nodeName&&(u.textContent=u.textContent.replace(/\s/g," "));var h=document.createElement("span");h.textContent=e.value.substring(t)||".",u.appendChild(h);var f={top:h.offsetTop+parseInt(c.borderTopWidth),left:h.offsetLeft+parseInt(c.borderLeftWidth)};return s?h.style.backgroundColor="#aaa":document.body.removeChild(u),f}var n=["direction","boxSizing","width","height","overflowX","overflowY","borderTopWidth","borderRightWidth","borderBottomWidth","borderLeftWidth","borderStyle","paddingTop","paddingRight","paddingBottom","paddingLeft","fontStyle","fontVariant","fontWeight","fontStretch","fontSize","fontSizeAdjust","lineHeight","fontFamily","textAlign","textTransform","textIndent","textDecoration","letterSpacing","wordSpacing","tabSize","MozTabSize"],r="undefined"!=typeof window,i=r&&null!=window.mozInnerScreenX;void 0!==e&&void 0!==e.exports?e.exports=t:r&&(window.getCaretCoordinates=t)}()}]); +//# sourceMappingURL=textcomplete.min.js.map \ No newline at end of file diff --git a/library/textcomplete/textcomplete.min.js.map b/library/textcomplete/textcomplete.min.js.map new file mode 100644 index 000000000..435675297 --- /dev/null +++ b/library/textcomplete/textcomplete.min.js.map @@ -0,0 +1 @@ +{"version":3,"sources":["webpack:///textcomplete.min.js","webpack:///webpack/bootstrap 5fdd342a07201b673919","webpack:///./src/search_result.js","webpack:///./node_modules/eventemitter3/index.js","webpack:///./src/strategy.js","webpack:///./src/utils.js","webpack:///./src/editor.js","webpack:///./src/main.js","webpack:///(webpack)/buildin/global.js","webpack:///./src/textcomplete.js","webpack:///./src/completer.js","webpack:///./src/query.js","webpack:///./src/dropdown.js","webpack:///./src/dropdown_item.js","webpack:///./src/textarea.js","webpack:///./node_modules/undate/lib/update.js","webpack:///./node_modules/textarea-caret/index.js"],"names":["modules","__webpack_require__","moduleId","installedModules","exports","module","i","l","call","m","c","d","name","getter","o","Object","defineProperty","configurable","enumerable","get","n","__esModule","object","property","prototype","hasOwnProperty","p","s","_classCallCheck","instance","Constructor","TypeError","value","_createClass","defineProperties","target","props","length","descriptor","writable","key","protoProps","staticProps","_strategy","SearchResult","obj","data","term","strategy","this","beforeCursor","afterCursor","replacement","replace","Array","isArray","match","matchText","_","p1","parseInt","slice","index","join","template","default","Events","EE","fn","context","once","EventEmitter","_events","_eventsCount","has","prefix","create","__proto__","eventNames","events","names","push","getOwnPropertySymbols","concat","listeners","event","exists","evt","available","ee","emit","a1","a2","a3","a4","a5","args","len","arguments","removeListener","undefined","apply","j","on","listener","removeAllListeners","off","addListener","setMaxListeners","prefixed","DEFAULT_TEMPLATE","Strategy","cache","callback","searchWithCache","search","_this","results","text","calculateElementOffset","el","rect","getBoundingClientRect","_el$ownerDocument","ownerDocument","defaultView","documentElement","offset","top","pageYOffset","left","pageXOffset","clientTop","clientLeft","isDigit","charCode","CHAR_CODE_ZERO","CHAR_CODE_NINE","getLineHeightPx","node","computedStyle","window","getComputedStyle","lineHeight","charCodeAt","parseFloat","fontSize","calculateLineHeightPx","nodeName","body","document","tempNode","createElement","innerHTML","style","fontFamily","padding","appendChild","HTMLTextAreaElement","rows","height","offsetHeight","removeChild","createCustomEvent","CustomEvent","type","options","cancelable","detail","createEvent","initCustomEvent","_interopRequireDefault","_possibleConstructorReturn","self","ReferenceError","_inherits","subClass","superClass","constructor","setPrototypeOf","_eventemitter","_eventemitter2","_utils","_search_result","Editor","_EventEmitter","getPrototypeOf","Error","code","moveEvent","enterEvent","changeEvent","getBeforeCursor","escEvent","e","keyCode","ctrlKey","global","_textcomplete","_textcomplete2","_textarea","_textarea2","editors","Textcomplete","Textarea","g","Function","eval","_completer","_completer2","_editor","_dropdown","_dropdown2","_strategy2","CALLBACK_METHODS","editor","completer","isQueryInFlight","nextPendingQuery","dropdown","forEach","method","bind","startListening","destroyEditor","destroy","stopListening","deactivate","strategyPropsArray","_this2","registerStrategy","run","_ref","searchResults","render","getCursorOffset","trigger","up","down","activeItem","getActiveItem","select","preventDefault","shown","selectEvent","defaultPrevented","applySearchResult","searchResult","_this3","handleMove","handleEnter","handleEsc","handleChange","handleSelect","eventName","handleHit","_query","_query2","Completer","strategies","query","extractQuery","execute","handleQueryResult","build","_search_result2","Query","map","result","_dropdown_item","_dropdown_item2","DEFAULT_CLASS_NAME","Dropdown","items","footer","header","maxCount","className","rotate","placement","itemOptions","item","keys","display","position","zIndex","parentNode","clear","_el","cursorOffset","renderEvent","rawResults","dropdownItems","setStrategyId","renderEdge","append","show","setOffset","hide","dropdownItem","moveActiveItem","fragment","createDocumentFragment","appended","doc","elementWidth","offsetWidth","browserWidth","clientWidth","right","isPlacementTop","bottom","clientHeight","showEvent","hideEvent","direction","nextActiveItem","next","prev","activate","strategyId","id","setAttribute","removeAttribute","source","content","li","classList","add","DropdownItem","active","activeClassName","removeEventListener","onClick","onMouseover","siblings","a","addEventListener","nextIndex","_get","receiver","desc","getOwnPropertyDescriptor","parent","_update","_update2","_editor2","getCaretCoordinates","_Editor","before","getAfterCursor","focus","dispatchEvent","Event","elOffset","elScroll","getElScroll","cursorPosition","getCursorPosition","dir","selectionStart","selectionEnd","substring","scrollTop","scrollLeft","emitChangeEvent","getCode","emitMoveEvent","emitEnterEvent","emitEscEvent","onInput","onKeydown","createInputEvent","bubbles","initEvent","headToCursor","cursorToTail","curr","activeElement","aLength","cLength","Math","min","setSelectionRange","strB2","execCommand","element","isBrowser","debug","querySelector","div","computed","currentStyle","whiteSpace","wordWrap","visibility","properties","prop","isFirefox","scrollHeight","overflowY","overflow","textContent","span","coordinates","offsetTop","offsetLeft","backgroundColor","mozInnerScreenX"],"mappings":"CAAS,SAAUA,GCInB,QAAAC,GAAAC,GAGA,GAAAC,EAAAD,GACA,MAAAC,GAAAD,GAAAE,OAGA,IAAAC,GAAAF,EAAAD,IACAI,EAAAJ,EACAK,GAAA,EACAH,WAUA,OANAJ,GAAAE,GAAAM,KAAAH,EAAAD,QAAAC,IAAAD,QAAAH,GAGAI,EAAAE,GAAA,EAGAF,EAAAD,QAvBA,GAAAD,KA4BAF,GAAAQ,EAAAT,EAGAC,EAAAS,EAAAP,EAGAF,EAAAU,EAAA,SAAAP,EAAAQ,EAAAC,GACAZ,EAAAa,EAAAV,EAAAQ,IACAG,OAAAC,eAAAZ,EAAAQ,GACAK,cAAA,EACAC,YAAA,EACAC,IAAAN,KAMAZ,EAAAmB,EAAA,SAAAf,GACA,GAAAQ,GAAAR,KAAAgB,WACA,WAA2B,MAAAhB,GAAA,SAC3B,WAAiC,MAAAA,GAEjC,OADAJ,GAAAU,EAAAE,EAAA,IAAAA,GACAA,GAIAZ,EAAAa,EAAA,SAAAQ,EAAAC,GAAsD,MAAAR,QAAAS,UAAAC,eAAAjB,KAAAc,EAAAC,IAGtDtB,EAAAyB,EAAA,GAGAzB,IAAA0B,EAAA,KDMM,SAAUtB,EAAQD,EAASH,GAEjC,YAeA,SAAS2B,GAAgBC,EAAUC,GAAe,KAAMD,YAAoBC,IAAgB,KAAM,IAAIC,WAAU,qCAZhHhB,OAAOC,eAAeZ,EAAS,cAC7B4B,OAAO,GAGT,IAAIC,GAAe,WAAc,QAASC,GAAiBC,EAAQC,GAAS,IAAK,GAAI9B,GAAI,EAAGA,EAAI8B,EAAMC,OAAQ/B,IAAK,CAAE,GAAIgC,GAAaF,EAAM9B,EAAIgC,GAAWpB,WAAaoB,EAAWpB,aAAc,EAAOoB,EAAWrB,cAAe,EAAU,SAAWqB,KAAYA,EAAWC,UAAW,GAAMxB,OAAOC,eAAemB,EAAQG,EAAWE,IAAKF,IAAiB,MAAO,UAAUR,EAAaW,EAAYC,GAAiJ,MAA9HD,IAAYP,EAAiBJ,EAAYN,UAAWiB,GAAiBC,GAAaR,EAAiBJ,EAAaY,GAAqBZ,ME1EhiBa,EAAA1C,EAAA,GAKqB2C,GF2ErB,SAAgCC,GAAcA,GAAOA,EAAIxB,YAFjBsB,GASrB,WE1EjB,QAAAC,GAAYE,EAAcC,EAAcC,GAAoBpB,EAAAqB,KAAAL,GAC1DK,KAAKH,KAAOA,EACZG,KAAKF,KAAOA,EACZE,KAAKD,SAAWA,EF6GlB,MAzBAf,GAAaW,IACXJ,IAAK,UACLR,MAAO,SEnFDkB,EAAsBC,GAC5B,GAAIC,GAAcH,KAAKD,SAASK,QAAQJ,KAAKH,KAC7C,IAAoB,OAAhBM,EAAsB,CACpBE,MAAMC,QAAQH,KAChBD,EAAcC,EAAY,GAAKD,EAC/BC,EAAcA,EAAY,GAE5B,IAAMI,GAAQP,KAAKD,SAASS,UAAUP,EACtC,IAAIM,EAIF,MAHAJ,GAAcA,EACXC,QAAQ,OAAQG,EAAM,IACtBH,QAAQ,UAAW,SAACK,EAAGC,GAAJ,MAAWH,GAAMI,SAASD,EAAI,SAGhDT,EAAaW,MAAM,EAAGL,EAAMM,OAC5BV,EACAF,EAAaW,MAAML,EAAMM,MAAQN,EAAM,GAAGnB,SAC1C0B,KAAK,IACPZ,OFkFNX,IAAK,SACLR,MAAO,WE5EP,MAAOiB,MAAKD,SAASgB,SAASf,KAAKH,KAAMG,KAAKF,UFiFzCH,KAGTxC,GAAQ6D,QE3HarB,GF+Hf,SAAUvC,GAEhB,YG5HA,SAAA6D,MA4BA,QAAAC,GAAAC,EAAAC,EAAAC,GACArB,KAAAmB,KACAnB,KAAAoB,UACApB,KAAAqB,SAAA,EAUA,QAAAC,KACAtB,KAAAuB,QAAA,GAAAN,GACAjB,KAAAwB,aAAA,EArDA,GAAAC,GAAA3D,OAAAS,UAAAC,eACAkD,EAAA,GAkBA5D,QAAA6D,SACAV,EAAA1C,UAAAT,OAAA6D,OAAA,OAMA,GAAAV,IAAAW,YAAAF,GAAA,IAqCAJ,EAAA/C,UAAAsD,WAAA,WACA,GACAC,GACAnE,EAFAoE,IAIA,QAAA/B,KAAAwB,aAAA,MAAAO,EAEA,KAAApE,IAAAmE,GAAA9B,KAAAuB,QACAE,EAAAlE,KAAAuE,EAAAnE,IAAAoE,EAAAC,KAAAN,EAAA/D,EAAAiD,MAAA,GAAAjD,EAGA,OAAAG,QAAAmE,sBACAF,EAAAG,OAAApE,OAAAmE,sBAAAH,IAGAC,GAWAT,EAAA/C,UAAA4D,UAAA,SAAAC,EAAAC,GACA,GAAAC,GAAAZ,IAAAU,IACAG,EAAAvC,KAAAuB,QAAAe,EAEA,IAAAD,EAAA,QAAAE,CACA,KAAAA,EAAA,QACA,IAAAA,EAAApB,GAAA,OAAAoB,EAAApB,GAEA,QAAA9D,GAAA,EAAAC,EAAAiF,EAAAnD,OAAAoD,EAAA,GAAAnC,OAAA/C,GAA0DD,EAAAC,EAAOD,IACjEmF,EAAAnF,GAAAkF,EAAAlF,GAAA8D,EAGA,OAAAqB,IAUAlB,EAAA/C,UAAAkE,KAAA,SAAAL,EAAAM,EAAAC,EAAAC,EAAAC,EAAAC,GACA,GAAAR,GAAAZ,IAAAU,GAEA,KAAApC,KAAAuB,QAAAe,GAAA,QAEA,IAEAS,GACA1F,EAHA8E,EAAAnC,KAAAuB,QAAAe,GACAU,EAAAC,UAAA7D,MAIA,IAAA+C,EAAAhB,GAAA,CAGA,OAFAgB,EAAAd,MAAArB,KAAAkD,eAAAd,EAAAD,EAAAhB,OAAAgC,IAAA,GAEAH,GACA,aAAAb,GAAAhB,GAAA5D,KAAA4E,EAAAf,UAAA,CACA,cAAAe,GAAAhB,GAAA5D,KAAA4E,EAAAf,QAAAsB,IAAA,CACA,cAAAP,GAAAhB,GAAA5D,KAAA4E,EAAAf,QAAAsB,EAAAC,IAAA,CACA,cAAAR,GAAAhB,GAAA5D,KAAA4E,EAAAf,QAAAsB,EAAAC,EAAAC,IAAA,CACA,cAAAT,GAAAhB,GAAA5D,KAAA4E,EAAAf,QAAAsB,EAAAC,EAAAC,EAAAC,IAAA,CACA,cAAAV,GAAAhB,GAAA5D,KAAA4E,EAAAf,QAAAsB,EAAAC,EAAAC,EAAAC,EAAAC,IAAA,EAGA,IAAAzF,EAAA,EAAA0F,EAAA,GAAA1C,OAAA2C,EAAA,GAAyC3F,EAAA2F,EAAS3F,IAClD0F,EAAA1F,EAAA,GAAA4F,UAAA5F,EAGA8E,GAAAhB,GAAAiC,MAAAjB,EAAAf,QAAA2B,OACG,CACH,GACAM,GADAjE,EAAA+C,EAAA/C,MAGA,KAAA/B,EAAA,EAAeA,EAAA+B,EAAY/B,IAG3B,OAFA8E,EAAA9E,GAAAgE,MAAArB,KAAAkD,eAAAd,EAAAD,EAAA9E,GAAA8D,OAAAgC,IAAA,GAEAH,GACA,OAAAb,EAAA9E,GAAA8D,GAAA5D,KAAA4E,EAAA9E,GAAA+D,QAA2D,MAC3D,QAAAe,EAAA9E,GAAA8D,GAAA5D,KAAA4E,EAAA9E,GAAA+D,QAAAsB,EAA+D,MAC/D,QAAAP,EAAA9E,GAAA8D,GAAA5D,KAAA4E,EAAA9E,GAAA+D,QAAAsB,EAAAC,EAAmE,MACnE,QAAAR,EAAA9E,GAAA8D,GAAA5D,KAAA4E,EAAA9E,GAAA+D,QAAAsB,EAAAC,EAAAC,EAAuE,MACvE,SACA,IAAAG,EAAA,IAAAM,EAAA,EAAAN,EAAA,GAAA1C,OAAA2C,EAAA,GAA0DK,EAAAL,EAASK,IACnEN,EAAAM,EAAA,GAAAJ,UAAAI,EAGAlB,GAAA9E,GAAA8D,GAAAiC,MAAAjB,EAAA9E,GAAA+D,QAAA2B,IAKA,UAYAzB,EAAA/C,UAAA+E,GAAA,SAAAlB,EAAAjB,EAAAC,GACA,GAAAmC,GAAA,GAAArC,GAAAC,EAAAC,GAAApB,MACAsC,EAAAZ,IAAAU,GAMA,OAJApC,MAAAuB,QAAAe,GACAtC,KAAAuB,QAAAe,GAAAnB,GACAnB,KAAAuB,QAAAe,IAAAtC,KAAAuB,QAAAe,GAAAiB,GADAvD,KAAAuB,QAAAe,GAAAN,KAAAuB,IADAvD,KAAAuB,QAAAe,GAAAiB,EAAAvD,KAAAwB,gBAIAxB,MAYAsB,EAAA/C,UAAA8C,KAAA,SAAAe,EAAAjB,EAAAC,GACA,GAAAmC,GAAA,GAAArC,GAAAC,EAAAC,GAAApB,MAAA,GACAsC,EAAAZ,IAAAU,GAMA,OAJApC,MAAAuB,QAAAe,GACAtC,KAAAuB,QAAAe,GAAAnB,GACAnB,KAAAuB,QAAAe,IAAAtC,KAAAuB,QAAAe,GAAAiB,GADAvD,KAAAuB,QAAAe,GAAAN,KAAAuB,IADAvD,KAAAuB,QAAAe,GAAAiB,EAAAvD,KAAAwB,gBAIAxB,MAaAsB,EAAA/C,UAAA2E,eAAA,SAAAd,EAAAjB,EAAAC,EAAAC,GACA,GAAAiB,GAAAZ,IAAAU,GAEA,KAAApC,KAAAuB,QAAAe,GAAA,MAAAtC,KACA,KAAAmB,EAGA,MAFA,MAAAnB,KAAAwB,aAAAxB,KAAAuB,QAAA,GAAAN,SACAjB,MAAAuB,QAAAe,GACAtC,IAGA,IAAAmC,GAAAnC,KAAAuB,QAAAe,EAEA,IAAAH,EAAAhB,GAEAgB,EAAAhB,QACAE,IAAAc,EAAAd,MACAD,GAAAe,EAAAf,cAEA,KAAApB,KAAAwB,aAAAxB,KAAAuB,QAAA,GAAAN,SACAjB,MAAAuB,QAAAe,QAEG,CACH,OAAAjF,GAAA,EAAAyE,KAAA1C,EAAA+C,EAAA/C,OAA2D/B,EAAA+B,EAAY/B,KAEvE8E,EAAA9E,GAAA8D,QACAE,IAAAc,EAAA9E,GAAAgE,MACAD,GAAAe,EAAA9E,GAAA+D,cAEAU,EAAAE,KAAAG,EAAA9E,GAOAyE,GAAA1C,OAAAY,KAAAuB,QAAAe,GAAA,IAAAR,EAAA1C,OAAA0C,EAAA,GAAAA,EACA,KAAA9B,KAAAwB,aAAAxB,KAAAuB,QAAA,GAAAN,SACAjB,MAAAuB,QAAAe,GAGA,MAAAtC,OAUAsB,EAAA/C,UAAAiF,mBAAA,SAAApB,GACA,GAAAE,EAaA,OAXAF,IACAE,EAAAZ,IAAAU,IACApC,KAAAuB,QAAAe,KACA,KAAAtC,KAAAwB,aAAAxB,KAAAuB,QAAA,GAAAN,SACAjB,MAAAuB,QAAAe,MAGAtC,KAAAuB,QAAA,GAAAN,GACAjB,KAAAwB,aAAA,GAGAxB,MAMAsB,EAAA/C,UAAAkF,IAAAnC,EAAA/C,UAAA2E,eACA5B,EAAA/C,UAAAmF,YAAApC,EAAA/C,UAAA+E,GAKAhC,EAAA/C,UAAAoF,gBAAA,WACA,MAAA3D,OAMAsB,EAAAsC,SAAAlC,EAKAJ,iBAMAlE,EAAAD,QAAAmE,GH+IM,SAAUlE,EAAQD,GAExB,YASA,SAASwB,GAAgBC,EAAUC,GAAe,KAAMD,YAAoBC,IAAgB,KAAM,IAAIC,WAAU,qCIrchH,QAAS+E,GAAiB9E,GACxB,MAAOA,GJ8bTjB,OAAOC,eAAeZ,EAAS,cAC7B4B,OAAO,GAGT,IAAIC,GAAe,WAAc,QAASC,GAAiBC,EAAQC,GAAS,IAAK,GAAI9B,GAAI,EAAGA,EAAI8B,EAAMC,OAAQ/B,IAAK,CAAE,GAAIgC,GAAaF,EAAM9B,EAAIgC,GAAWpB,WAAaoB,EAAWpB,aAAc,EAAOoB,EAAWrB,cAAe,EAAU,SAAWqB,KAAYA,EAAWC,UAAW,GAAMxB,OAAOC,eAAemB,EAAQG,EAAWE,IAAKF,IAAiB,MAAO,UAAUR,EAAaW,EAAYC,GAAiJ,MAA9HD,IAAYP,EAAiBJ,EAAYN,UAAWiB,GAAiBC,GAAaR,EAAiBJ,EAAaY,GAAqBZ,MI5a3gBiF,EJ+bN,WI3bb,QAAAA,GAAY3E,GAA2BR,EAAAqB,KAAA8D,GACrC9D,KAAKb,MAAQA,EACba,KAAK+D,MAAQ5E,EAAM4E,SAAa,KJqhBlC,MA/EA/E,GAAa8E,IACXvE,IAAK,UACLR,MAAO,WIhcP,MADAiB,MAAK+D,MAAQ,KACN/D,QJqcPT,IAAK,SACLR,MAAO,SIncFe,EAAckE,EAAoBzD,GACnCP,KAAK+D,MACP/D,KAAKiE,gBAAgBnE,EAAMkE,EAAUzD,GAErCP,KAAKb,MAAM+E,OAAOpE,EAAMkE,EAAUzD,MJ4cpChB,IAAK,UACLR,MAAO,SItcDc,GACN,MAAOG,MAAKb,MAAMiB,QAAQP,MJ4c1BN,IAAK,kBACLR,MAAO,SIzcOe,EAAckE,EAAoBzD,GAAwB,GAAA4D,GAAAnE,IACpEA,MAAK+D,OAAS/D,KAAK+D,MAAMjE,GAC3BkE,EAAShE,KAAK+D,MAAMjE,IAEpBE,KAAKb,MAAM+E,OACTpE,EACA,SAAAsE,GACMD,EAAKJ,QACPI,EAAKJ,MAAMjE,GAAQsE,GAErBJ,EAASI,IAEX7D,MJ+cJhB,IAAK,YACLR,MAAO,SI1cCsF,GACR,MAA0B,kBAAfrE,MAAKO,MACPP,KAAKO,MAAM8D,GAEVA,EAAK9D,MAAMP,KAAKO,UJid1BhB,IAAK,QACLrB,IAAK,WI5cL,MAAO8B,MAAKb,MAAMoB,SJmdlBhB,IAAK,QACLrB,IAAK,WI/cL,MAAmC,gBAArB8B,MAAKb,MAAM0B,MACrBb,KAAKb,MAAM0B,MA5FG,KJ8iBlBtB,IAAK,WACLrB,IAAK,WI9cL,MAAO8B,MAAKb,MAAM4B,UAAY8C,MJmdzBC,IAGT3G,GAAQ6D,QI9hBa8C,GJkiBf,SAAU1G,EAAQD,GAExB,YK3hBO,SAASmH,GACdC,GAEA,GAAMC,GAAOD,EAAGE,wBADeC,EAEUH,EAAGI,cAApCC,EAFuBF,EAEvBE,YAAaC,EAFUH,EAEVG,gBACfC,GACJC,IAAKP,EAAKO,IAAMH,EAAYI,YAC5BC,KAAMT,EAAKS,KAAOL,EAAYM,YAMhC,OAJIL,KACFC,EAAOC,KAAOF,EAAgBM,UAC9BL,EAAOG,MAAQJ,EAAgBO,YAE1BN,EAMT,QAASO,GAAQC,GACf,MAAOA,IAAYC,GAAkBD,GAAYE,EAQ5C,QAASC,GAAgBC,GAC9B,GAAMC,GAAgBC,OAAOC,iBAAiBH,EAM9C,OAAIL,GAAQM,EAAcG,WAAWC,WAAW,IAI5CV,EACEM,EAAcG,WAAWC,WACvBJ,EAAcG,WAAW1G,OAAS,IAKpC4G,WAAWL,EAAcG,YACzBE,WAAWL,EAAcM,UAGpBD,WAAWL,EAAcG,YAM7BI,EAAsBR,EAAKS,SAAUR,GAQvC,QAASO,GACdC,EACAR,GAEA,GAAMS,GAAOC,SAASD,IACtB,KAAKA,EACH,MAAO,EAGT,IAAME,GAAWD,SAASE,cAAcJ,EACxCG,GAASE,UAAY,SACrBF,EAASG,MAAMR,SAAWN,EAAcM,SACxCK,EAASG,MAAMC,WAAaf,EAAce,WAC1CJ,EAASG,MAAME,QAAU,IACzBP,EAAKQ,YAAYN,GAGbA,YAAoBO,uBACpBP,EAA+BQ,KAAO,EAI1C,IAAMC,GAAST,EAASU,YAGxB,OAFAZ,GAAKa,YAAYX,GAEVS,ELqcTjJ,OAAOC,eAAeZ,EAAS,cAC7B4B,OAAO,IAET5B,EKjiBgBmH,yBLkiBhBnH,EKtgBgBsI,kBLugBhBtI,EKnegB+I,uBAnGT,IAmDDX,IAnDO2B,oBAAqB,WAChC,MAAkC,kBAAvBtB,QAAOuB,YACT,SACLC,EACAC,GAEA,MAAO,IAAIhB,UAASzB,YAAYuC,YAAYC,GAC1CE,WAAaD,GAAWA,EAAQC,aAAe,EAC/CC,OAASF,GAAWA,EAAQE,YAAWpE,MAMpC,SACLiE,EACAC,GAEA,GAAMjF,GAAQiE,SAASmB,YAAY,cAOnC,OANApF,GAAMqF,gBACJL,GACc,EACbC,GAAWA,EAAQC,aAAe,EAClCD,GAAWA,EAAQE,YAAWpE,IAE1Bf,MA0BU,IAAI2D,WAAW,IAChCP,EAAiB,IAAIO,WAAW,ILsoBhC,SAAU3I,EAAQD,EAASH,GAEjC,YAmBA,SAAS0K,GAAuB9H,GAAO,MAAOA,IAAOA,EAAIxB,WAAawB,GAAQoB,QAASpB,GAEvF,QAASjB,GAAgBC,EAAUC,GAAe,KAAMD,YAAoBC,IAAgB,KAAM,IAAIC,WAAU,qCAEhH,QAAS6I,GAA2BC,EAAMrK,GAAQ,IAAKqK,EAAQ,KAAM,IAAIC,gBAAe,4DAAgE,QAAOtK,GAAyB,gBAATA,IAAqC,kBAATA,GAA8BqK,EAAPrK,EAElO,QAASuK,GAAUC,EAAUC,GAAc,GAA0B,kBAAfA,IAA4C,OAAfA,EAAuB,KAAM,IAAIlJ,WAAU,iEAAoEkJ,GAAeD,GAASxJ,UAAYT,OAAO6D,OAAOqG,GAAcA,EAAWzJ,WAAa0J,aAAelJ,MAAOgJ,EAAU9J,YAAY,EAAOqB,UAAU,EAAMtB,cAAc,KAAegK,IAAYlK,OAAOoK,eAAiBpK,OAAOoK,eAAeH,EAAUC,GAAcD,EAASnG,UAAYoG,GAtBjelK,OAAOC,eAAeZ,EAAS,cAC7B4B,OAAO,GAGT,IAAIC,GAAe,WAAc,QAASC,GAAiBC,EAAQC,GAAS,IAAK,GAAI9B,GAAI,EAAGA,EAAI8B,EAAMC,OAAQ/B,IAAK,CAAE,GAAIgC,GAAaF,EAAM9B,EAAIgC,GAAWpB,WAAaoB,EAAWpB,aAAc,EAAOoB,EAAWrB,cAAe,EAAU,SAAWqB,KAAYA,EAAWC,UAAW,GAAMxB,OAAOC,eAAemB,EAAQG,EAAWE,IAAKF,IAAiB,MAAO,UAAUR,EAAaW,EAAYC,GAAiJ,MAA9HD,IAAYP,EAAiBJ,EAAYN,UAAWiB,GAAiBC,GAAaR,EAAiBJ,EAAaY,GAAqBZ,MMvsBhiBsJ,EAAAnL,EAAA,GN2sBIoL,EAAiBV,EAAuBS,GMzsB5CE,EAAArL,EAAA,GACAsL,EAAAtL,EAAA,GAuBqBuL,GNurBCb,EAAuBY,GAyBhC,SAAUE,GAGrB,QAASD,KAGP,MAFA5J,GAAgBqB,KAAMuI,GAEfZ,EAA2B3H,MAAOuI,EAAO3G,WAAa9D,OAAO2K,eAAeF,IAASnF,MAAMpD,KAAMiD,YAwI1G,MA7IA6E,GAAUS,EAAQC,GAQlBxJ,EAAauJ,IACXhJ,IAAK,UAOLR,MAAO,WM1tBP,MAAOiB,SNmuBPT,IAAK,oBACLR,MAAO,WM7tBP,KAAM,IAAI2J,OAAM,uBNuuBhBnJ,IAAK,kBACLR,MAAO,WMhuBP,KAAM,IAAI2J,OAAM,uBN0uBhBnJ,IAAK,kBACLR,MAAO,WMnuBP,KAAM,IAAI2J,OAAM,uBN+uBhBnJ,IAAK,gBACLR,MAAO,SMvuBK4J,GACZ,GAAMC,IAAY,EAAAP,EAAAnB,mBAAkB,QAClCI,YAAY,EACZC,QACEoB,KAAMA,IAIV,OADA3I,MAAKyC,KAAK,OAAQmG,GACXA,KNkvBPrJ,IAAK,iBACLR,MAAO,WMzuBP,GAAM8J,IAAa,EAAAR,EAAAnB,mBAAkB,SAAWI,YAAY,GAE5D,OADAtH,MAAKyC,KAAK,QAASoG,GACZA,KNqvBPtJ,IAAK,kBACLR,MAAO,WM5uBP,GAAM+J,IAAc,EAAAT,EAAAnB,mBAAkB,UACpCK,QACEtH,aAAcD,KAAK+I,oBAIvB,OADA/I,MAAKyC,KAAK,SAAUqG,GACbA,KNwvBPvJ,IAAK,eACLR,MAAO,WM/uBP,GAAMiK,IAAW,EAAAX,EAAAnB,mBAAkB,OAASI,YAAY,GAExD,OADAtH,MAAKyC,KAAK,MAAOuG,GACVA,KN0vBPzJ,IAAK,UACLR,MAAO,SMnvBDkK,GACN,MAAqB,KAAdA,EAAEC,QACL,QACc,KAAdD,EAAEC,QACA,QACc,KAAdD,EAAEC,QACA,MACc,KAAdD,EAAEC,QACA,KACc,KAAdD,EAAEC,QACA,OACc,KAAdD,EAAEC,SAAkBD,EAAEE,QACpB,OACc,KAAdF,EAAEC,SAAkBD,EAAEE,QACpB,KACA,YNgvBXZ,GACPH,EAAepH,SAEjB7D,GAAQ6D,QMj2BauH,GNq2Bf,SAAUnL,EAAQD,EAASH,GAEjC,cAC4B,SAASoM,GAUrC,QAAS1B,GAAuB9H,GAAO,MAAOA,IAAOA,EAAIxB,WAAawB,GAAQoB,QAASpB,GO/4BvF,GAAAyJ,GAAArM,EAAA,GPy4BIsM,EAAiB5B,EAAuB2B,GOx4B5CE,EAAAvM,EAAA,IP44BIwM,EAAa9B,EAAuB6B,GO14BpCE,QAEFA,GADEL,EAAOM,cAAgBN,EAAOM,aAAaD,QACnCL,EAAOM,aAAaD,WAIhCA,EAAQE,SAARH,EAAAxI,QAEAoI,EAAOM,aAAPJ,EAAAtI,QACAoI,EAAOM,aAAaD,QAAUA,IP+4BDlM,KAAKJ,EAASH,EAAoB,KAIzD,SAAUI,GQ/5BhB,GAAAwM,EAGAA,GAAA,WACA,MAAA5J,QAGA,KAEA4J,KAAAC,SAAA,qBAAAC,MAAA,QACC,MAAAb,GAED,gBAAArD,UACAgE,EAAAhE,QAOAxI,EAAAD,QAAAyM,GRs6BM,SAAUxM,EAAQD,EAASH,GAEjC,YAiCA,SAAS0K,GAAuB9H,GAAO,MAAOA,IAAOA,EAAIxB,WAAawB,GAAQoB,QAASpB,GAEvF,QAASjB,GAAgBC,EAAUC,GAAe,KAAMD,YAAoBC,IAAgB,KAAM,IAAIC,WAAU,qCAEhH,QAAS6I,GAA2BC,EAAMrK,GAAQ,IAAKqK,EAAQ,KAAM,IAAIC,gBAAe,4DAAgE,QAAOtK,GAAyB,gBAATA,IAAqC,kBAATA,GAA8BqK,EAAPrK,EAElO,QAASuK,GAAUC,EAAUC,GAAc,GAA0B,kBAAfA,IAA4C,OAAfA,EAAuB,KAAM,IAAIlJ,WAAU,iEAAoEkJ,GAAeD,GAASxJ,UAAYT,OAAO6D,OAAOqG,GAAcA,EAAWzJ,WAAa0J,aAAelJ,MAAOgJ,EAAU9J,YAAY,EAAOqB,UAAU,EAAMtB,cAAc,KAAegK,IAAYlK,OAAOoK,eAAiBpK,OAAOoK,eAAeH,EAAUC,GAAcD,EAASnG,UAAYoG,GApCjelK,OAAOC,eAAeZ,EAAS,cAC7B4B,OAAO,GAGT,IAAIC,GAAe,WAAc,QAASC,GAAiBC,EAAQC,GAAS,IAAK,GAAI9B,GAAI,EAAGA,EAAI8B,EAAMC,OAAQ/B,IAAK,CAAE,GAAIgC,GAAaF,EAAM9B,EAAIgC,GAAWpB,WAAaoB,EAAWpB,aAAc,EAAOoB,EAAWrB,cAAe,EAAU,SAAWqB,KAAYA,EAAWC,UAAW,GAAMxB,OAAOC,eAAemB,EAAQG,EAAWE,IAAKF,IAAiB,MAAO,UAAUR,EAAaW,EAAYC,GAAiJ,MAA9HD,IAAYP,EAAiBJ,EAAYN,UAAWiB,GAAiBC,GAAaR,EAAiBJ,EAAaY,GAAqBZ,MSj8BhiBkL,EAAA/M,EAAA,GTq8BIgN,EAActC,EAAuBqC,GSp8BzCE,EAAAjN,EAAA,GACAkN,GTu8BexC,EAAuBuC,GSv8BtCjN,EAAA,KT28BImN,EAAazC,EAAuBwC,GS18BxCxK,EAAA1C,EAAA,GT88BIoN,EAAa1C,EAAuBhI,GS78BxC4I,EAAAtL,EAAA,GAEAmL,GT+8BsBT,EAAuBY,GS/8B7CtL,EAAA,ITm9BIoL,EAAiBV,EAAuBS,GSj9BtCkC,GACJ,eACA,cACA,YACA,YACA,aACA,gBAWmBX,ETi9BF,SAAUlB,GSt8B3B,QAAAkB,GAAYY,GAAmD,GAAnCjD,GAAmCpE,UAAA7D,OAAA,OAAA+D,KAAAF,UAAA,GAAAA,UAAA,KAAAtE,GAAAqB,KAAA0J,EAAA,IAAAvF,GAAAwD,EAAA3H,MAAA0J,EAAA9H,WAAA9D,OAAA2K,eAAAiB,IAAAnM,KAAAyC,MAAA,OAG7DmE,GAAKoG,UAAY,GAAAP,GAAAhJ,QACjBmD,EAAKqG,iBAAkB,EACvBrG,EAAKsG,iBAAmB,KACxBtG,EAAKuG,SAAW,GAAAP,GAAAnJ,QAAaqG,EAAQqD,cACrCvG,EAAKmG,OAASA,EACdnG,EAAKkD,QAAUA,EAEfgD,EAAiBM,QAAQ,SAAAC,GACtBzG,EAAYyG,GAAUzG,EAAYyG,GAAQC,KAApB1G,KAGzBA,EAAK2G,iBAdwD3G,ETopC/D,MA7MA2D,GAAU4B,EAAclB,GAgCxBxJ,EAAa0K,IACXnK,IAAK,UACLR,MAAO,WSr9B8B,GAA/BgM,KAA+B9H,UAAA7D,OAAA,OAAA+D,KAAAF,UAAA,KAAAA,UAAA,EAOrC,OANAjD,MAAKuK,UAAUS,UACfhL,KAAK0K,SAASM,UACVD,GACF/K,KAAKsK,OAAOU,UAEdhL,KAAKiL,gBACEjL,QT+9BPT,IAAK,OACLR,MAAO,WSx9BP,MADAiB,MAAK0K,SAASQ,aACPlL,QT8+BPT,IAAK,WACLR,MAAO,SS79BAoM,GAA0C,GAAAC,GAAApL,IAIjD,OAHAmL,GAAmBR,QAAQ,SAAAxL,GACzBiM,EAAKb,UAAUc,iBAAiB,GAAAjB,GAAApJ,QAAa7B,MAExCa,QT0+BPT,IAAK,UACLR,MAAO,SSl+BDsF,GAQN,MAPIrE,MAAKwK,gBACPxK,KAAKyK,iBAAmBpG,GAExBrE,KAAKwK,iBAAkB,EACvBxK,KAAKyK,iBAAmB,KACxBzK,KAAKuK,UAAUe,IAAIjH,IAEdrE,QTw+BPT,IAAK,YACLR,MAAO,SAAmBwM,GSr+BoC,GAApDC,GAAoDD,EAApDC,aACNA,GAAcpM,OAChBY,KAAK0K,SAASe,OAAOD,EAAexL,KAAKsK,OAAOoB,mBAEhD1L,KAAK0K,SAASQ,aAEhBlL,KAAKwK,iBAAkB,EACO,OAA1BxK,KAAKyK,kBACPzK,KAAK2L,QAAQ3L,KAAKyK,qBT8+BpBlL,IAAK,aACLR,MAAO,SS1+BEkK,GACS,OAAlBA,EAAE1B,OAAOoB,KAAgB3I,KAAK0K,SAASkB,GAAG3C,GAAKjJ,KAAK0K,SAASmB,KAAK5C,MTg/BlE1J,IAAK,cACLR,MAAO,SS7+BGkK,GACV,GAAM6C,GAAa9L,KAAK0K,SAASqB,eAC7BD,IACF9L,KAAK0K,SAASsB,OAAOF,GACrB7C,EAAEgD,kBAEFjM,KAAK0K,SAASQ,gBTo/BhB3L,IAAK,YACLR,MAAO,SSh/BCkK,GACJjJ,KAAK0K,SAASwB,QAChBlM,KAAK0K,SAASQ,aACdjC,EAAEgD,qBTu/BJ1M,IAAK,eACLR,MAAO,SSn/BIkK,GACkB,MAAzBA,EAAE1B,OAAOtH,aACXD,KAAK2L,QAAQ1C,EAAE1B,OAAOtH,cAEtBD,KAAK0K,SAASQ,gBT0/BhB3L,IAAK,eACLR,MAAO,SSt/BIoN,GACXnM,KAAKyC,KAAK,SAAU0J,GACfA,EAAYC,kBACfpM,KAAKsK,OAAO+B,kBAAkBF,EAAY5E,OAAO+E,iBT6/BnD/M,IAAK,iBACLR,MAAO,WSz/BQ,GAAAwN,GAAAvM,IACfA,MAAKsK,OACFhH,GAAG,OAAQtD,KAAKwM,YAChBlJ,GAAG,QAAStD,KAAKyM,aACjBnJ,GAAG,MAAOtD,KAAK0M,WACfpJ,GAAG,SAAUtD,KAAK2M,cACrB3M,KAAK0K,SAASpH,GAAG,SAAUtD,KAAK4M,eAE9B,OACA,QACA,SACA,WACA,WACA,SACA,QACAjC,QAAQ,SAAAkC,GACRN,EAAK7B,SAASpH,GAAGuJ,EAAW,iBAAMN,GAAK9J,KAAKoK,OAE9C7M,KAAKuK,UAAUjH,GAAG,MAAOtD,KAAK8M,cTs/B9BvN,IAAK,gBACLR,MAAO,WSl/BPiB,KAAKuK,UAAU/G,qBACfxD,KAAK0K,SAASlH,qBACdxD,KAAKsK,OACFpH,eAAe,OAAQlD,KAAKwM,YAC5BtJ,eAAe,QAASlD,KAAKyM,aAC7BvJ,eAAe,MAAOlD,KAAK0M,WAC3BxJ,eAAe,SAAUlD,KAAK2M,kBTm/B5BjD,GACPtB,EAAepH,QAEjB7D,GAAQ6D,QSlqCa0I,GTsqCf,SAAUtM,EAAQD,EAASH,GAEjC,YAyBA,SAAS0K,GAAuB9H,GAAO,MAAOA,IAAOA,EAAIxB,WAAawB,GAAQoB,QAASpB,GAEvF,QAASjB,GAAgBC,EAAUC,GAAe,KAAMD,YAAoBC,IAAgB,KAAM,IAAIC,WAAU,qCAEhH,QAAS6I,GAA2BC,EAAMrK,GAAQ,IAAKqK,EAAQ,KAAM,IAAIC,gBAAe,4DAAgE,QAAOtK,GAAyB,gBAATA,IAAqC,kBAATA,GAA8BqK,EAAPrK,EAElO,QAASuK,GAAUC,EAAUC,GAAc,GAA0B,kBAAfA,IAA4C,OAAfA,EAAuB,KAAM,IAAIlJ,WAAU,iEAAoEkJ,GAAeD,GAASxJ,UAAYT,OAAO6D,OAAOqG,GAAcA,EAAWzJ,WAAa0J,aAAelJ,MAAOgJ,EAAU9J,YAAY,EAAOqB,UAAU,EAAMtB,cAAc,KAAegK,IAAYlK,OAAOoK,eAAiBpK,OAAOoK,eAAeH,EAAUC,GAAcD,EAASnG,UAAYoG,GA5BjelK,OAAOC,eAAeZ,EAAS,cAC7B4B,OAAO,GAGT,IAAIC,GAAe,WAAc,QAASC,GAAiBC,EAAQC,GAAS,IAAK,GAAI9B,GAAI,EAAGA,EAAI8B,EAAMC,OAAQ/B,IAAK,CAAE,GAAIgC,GAAaF,EAAM9B,EAAIgC,GAAWpB,WAAaoB,EAAWpB,aAAc,EAAOoB,EAAWrB,cAAe,EAAU,SAAWqB,KAAYA,EAAWC,UAAW,GAAMxB,OAAOC,eAAemB,EAAQG,EAAWE,IAAKF,IAAiB,MAAO,UAAUR,EAAaW,EAAYC,GAAiJ,MAA9HD,IAAYP,EAAiBJ,EAAYN,UAAWiB,GAAiBC,GAAaR,EAAiBJ,EAAaY,GAAqBZ,MUxsChiBsJ,EAAAnL,EAAA,GV4sCIoL,EAAiBV,EAAuBS,GU1sC5C4E,EAAA/P,EAAA,GV8sCIgQ,EAAUtF,EAAuBqF,GU7sCrCzE,EAAAtL,EAAA,GACA0C,GVgtCsBgI,EAAuBY,GUhtC7CtL,EAAA,IAEMqN,GVktCW3C,EAAuBhI,IUltCd,sBAKLuN,EV6tCL,SAAUzE,GU1tCxB,QAAAyE,KAActO,EAAAqB,KAAAiN,EAAA,IAAA9I,GAAAwD,EAAA3H,MAAAiN,EAAArL,WAAA9D,OAAA2K,eAAAwE,IAAA1P,KAAAyC,MAAA,OAEZmE,GAAK+I,cAEL7C,EAAiBM,QAAQ,SAAAC,GACtBzG,EAAYyG,GAAUzG,EAAYyG,GAAQC,KAApB1G,KALbA,EVmzCd,MAxFA2D,GAAUmF,EAAWzE,GAoBrBxJ,EAAaiO,IACX1N,IAAK,UACLR,MAAO,WUnuCP,MADAiB,MAAKkN,WAAWvC,QAAQ,SAAA5K,GAAA,MAAYA,GAASiL,YACtChL,QVivCPT,IAAK,mBACLR,MAAO,SU1uCQgB,GAEf,MADAC,MAAKkN,WAAWlL,KAAKjC,GACdC,QVkvCPT,IAAK,MACLR,MAAO,SU7uCLsF,GACF,GAAM8I,GAAQnN,KAAKoN,aAAa/I,EAC5B8I,GACFA,EAAME,QAAQrN,KAAKsN,mBAEnBtN,KAAKsN,yBVwvCP/N,IAAK,eACLR,MAAO,SUhvCIsF,GACX,IAAK,GAAIhH,GAAI,EAAGA,EAAI2C,KAAKkN,WAAW9N,OAAQ/B,IAAK,CAC/C,GAAM8P,GAAQH,EAAAhM,QAAMuM,MAAMvN,KAAKkN,WAAW7P,GAAIgH,EAC9C,IAAI8I,EACF,MAAOA,GAGX,MAAO,SV0vCP5N,IAAK,oBACLR,MAAO,SUnvCSyM,GAChBxL,KAAKyC,KAAK,OAAS+I,sBVuvCdyB,GACP7E,EAAepH,QAEjB7D,GAAQ6D,QUzzCaiM,GV6zCf,SAAU7P,EAAQD,EAASH,GAEjC,YAiBA,SAAS0K,GAAuB9H,GAAO,MAAOA,IAAOA,EAAIxB,WAAawB,GAAQoB,QAASpB,GAEvF,QAASjB,GAAgBC,EAAUC,GAAe,KAAMD,YAAoBC,IAAgB,KAAM,IAAIC,WAAU,qCAhBhHhB,OAAOC,eAAeZ,EAAS,cAC7B4B,OAAO,GAGT,IAAIC,GAAe,WAAc,QAASC,GAAiBC,EAAQC,GAAS,IAAK,GAAI9B,GAAI,EAAGA,EAAI8B,EAAMC,OAAQ/B,IAAK,CAAE,GAAIgC,GAAaF,EAAM9B,EAAIgC,GAAWpB,WAAaoB,EAAWpB,aAAc,EAAOoB,EAAWrB,cAAe,EAAU,SAAWqB,KAAYA,EAAWC,UAAW,GAAMxB,OAAOC,eAAemB,EAAQG,EAAWE,IAAKF,IAAiB,MAAO,UAAUR,EAAaW,EAAYC,GAAiJ,MAA9HD,IAAYP,EAAiBJ,EAAYN,UAAWiB,GAAiBC,GAAaR,EAAiBJ,EAAaY,GAAqBZ,MWj1ChiByJ,EAAAtL,EAAA,GXq1CIwQ,EAAkB9F,EAAuBY,GWp1C7C5I,EAAA1C,EAAA,GAMqByQ,GXk1CJ/F,EAAuBhI,GAS5B,WWp0CV,QAAA+N,GAAY1N,EAAoBD,EAAcS,GAAkB5B,EAAAqB,KAAAyN,GAC9DzN,KAAKD,SAAWA,EAChBC,KAAKF,KAAOA,EACZE,KAAKO,MAAQA,EXm3Cf,MAjDAvB,GAAayO,EAAO,OAClBlO,IAAK,QAQLR,MAAO,SW31CIgB,EAAoBsE,GAC/B,GAAsC,kBAA3BtE,GAASZ,MAAMiC,QAAwB,CAChD,GAAMA,GAAUrB,EAASZ,MAAMiC,QAAQiD,EACvC,IAAuB,gBAAZjD,GACTiD,EAAOjD,MACF,KAAKA,EACV,MAAO,MAGX,GAAMb,GAAQR,EAASS,UAAU6D,EACjC,OAAO9D,GAAQ,GAAIkN,GAAM1N,EAAUQ,EAAMR,EAASc,OAAQN,GAAS,SX42CrEvB,EAAayO,IACXlO,IAAK,UACLR,MAAO,SWl2CDiF,GAAoC,GAAAG,GAAAnE,IAC1CA,MAAKD,SAASmE,OACZlE,KAAKF,KACL,SAAAsE,GACEJ,EACEI,EAAQsJ,IAAI,SAAAC,GACV,MAAO,IAAAH,GAAAxM,QAAiB2M,EAAQxJ,EAAKrE,KAAMqE,EAAKpE,cAItDC,KAAKO,WXm2CFkN,KAGTtQ,GAAQ6D,QWh5CayM,GXo5Cf,SAAUrQ,EAAQD,EAASH,GAEjC,YAuBA,SAAS0K,GAAuB9H,GAAO,MAAOA,IAAOA,EAAIxB,WAAawB,GAAQoB,QAASpB,GAEvF,QAASjB,GAAgBC,EAAUC,GAAe,KAAMD,YAAoBC,IAAgB,KAAM,IAAIC,WAAU,qCAEhH,QAAS6I,GAA2BC,EAAMrK,GAAQ,IAAKqK,EAAQ,KAAM,IAAIC,gBAAe,4DAAgE,QAAOtK,GAAyB,gBAATA,IAAqC,kBAATA,GAA8BqK,EAAPrK,EAElO,QAASuK,GAAUC,EAAUC,GAAc,GAA0B,kBAAfA,IAA4C,OAAfA,EAAuB,KAAM,IAAIlJ,WAAU,iEAAoEkJ,GAAeD,GAASxJ,UAAYT,OAAO6D,OAAOqG,GAAcA,EAAWzJ,WAAa0J,aAAelJ,MAAOgJ,EAAU9J,YAAY,EAAOqB,UAAU,EAAMtB,cAAc,KAAegK,IAAYlK,OAAOoK,eAAiBpK,OAAOoK,eAAeH,EAAUC,GAAcD,EAASnG,UAAYoG,GA1BjelK,OAAOC,eAAeZ,EAAS,cAC7B4B,OAAO,GAGT,IAAIC,GAAe,WAAc,QAASC,GAAiBC,EAAQC,GAAS,IAAK,GAAI9B,GAAI,EAAGA,EAAI8B,EAAMC,OAAQ/B,IAAK,CAAE,GAAIgC,GAAaF,EAAM9B,EAAIgC,GAAWpB,WAAaoB,EAAWpB,aAAc,EAAOoB,EAAWrB,cAAe,EAAU,SAAWqB,KAAYA,EAAWC,UAAW,GAAMxB,OAAOC,eAAemB,EAAQG,EAAWE,IAAKF,IAAiB,MAAO,UAAUR,EAAaW,EAAYC,GAAiJ,MAA9HD,IAAYP,EAAiBJ,EAAYN,UAAWiB,GAAiBC,GAAaR,EAAiBJ,EAAaY,GAAqBZ,MYr6ChiBsJ,EAAAnL,EAAA,GZy6CIoL,EAAiBV,EAAuBS,GYv6C5CyF,EAAA5Q,EAAA,IZ26CI6Q,EAAkBnG,EAAuBkG,GY16C7CtF,EAAAtL,EAAA,GACAqL,GZ66CsBX,EAAuBY,GY76C7CtL,EAAA,IAGM8Q,EAAqB,sCAoBNC,EZ46CN,SAAUvF,GYn5CvB,QAAAuF,GAAY1G,GAA0B1I,EAAAqB,KAAA+N,EAAA,IAAA5J,GAAAwD,EAAA3H,MAAA+N,EAAAnM,WAAA9D,OAAA2K,eAAAsF,IAAAxQ,KAAAyC,MAEpCmE,GAAK+H,OAAQ,EACb/H,EAAK6J,SACL7J,EAAK2H,WAAa,KAClB3H,EAAK8J,OAAS5G,EAAQ4G,OACtB9J,EAAK+J,OAAS7G,EAAQ6G,OACtB/J,EAAKgK,SAAW9G,EAAQ8G,UAAY,GACpChK,EAAKI,GAAG6J,UAAY/G,EAAQ+G,WAAaN,EACzC3J,EAAKkK,QAAShH,EAAQ7I,eAAe,WAAY6I,EAAQgH,OACzDlK,EAAKmK,UAAYjH,EAAQiH,UACzBnK,EAAKoK,YAAclH,EAAQmH,QAC3B,IAAM/H,GAAQY,EAAQZ,KAZc,OAahCA,IACF3I,OAAO2Q,KAAKhI,GAAOkE,QAAQ,SAAApL,GACvB4E,EAAKI,GAAGkC,MAAYlH,GAAOkH,EAAMlH,KAfH4E,EZotDtC,MAhUA2D,GAAUiG,EAAUvF,GAEpBxJ,EAAa+O,EAAU,OACrBxO,IAAK,gBACLR,MAAO,WYp6CP,GAAMwF,GAAK8B,SAASE,cAAc,MAC5BE,EAAQlC,EAAGkC,KACjBA,GAAMiI,QAAU,OAChBjI,EAAMkI,SAAW,WACjBlI,EAAMmI,OAAS,OACf,IAAMxI,GAAOC,SAASD,IAItB,OAHIA,IACFA,EAAKQ,YAAYrC,GAEZA,MZs8CTvF,EAAa+O,IACXxO,IAAK,UACLR,MAAO,WY76CP,GAAM8P,GAAa7O,KAAKuE,GAAGsK,UAK3B,OAJIA,IACFA,EAAW5H,YAAYjH,KAAKuE,IAE9BvE,KAAK8O,QAAQC,IAAM,KACZ/O,QZi7CPT,IAAK,SAQLR,MAAO,SY16CFyM,EAA+BwD,GAA4B,GAAA5D,GAAApL,KAC1DiP,GAAc,EAAA5G,EAAAnB,mBAAkB,UAAYI,YAAY,GAE9D,IADAtH,KAAKyC,KAAK,SAAUwM,GAChBA,EAAY7C,iBACd,MAAOpM,KAET,IAAMkP,GAAa1D,EAAckC,IAAI,SAAApB,GAAA,MAAgBA,GAAazM,OAC5DsP,EAAgB3D,EACnB5K,MAAM,EAAGZ,KAAKmO,UAAY3C,EAAcpM,QACxCsO,IAAI,SAAApB,GAAA,MAAgB,IAAAuB,GAAA7M,QAAiBsL,EAAclB,EAAKmD,cAS3D,OARAvO,MAAK8O,QACFM,cAAc5D,EAAc,IAC5B6D,WAAWH,EAAY,UACvBI,OAAOH,GACPE,WAAWH,EAAY,UACvBK,OACAC,UAAUR,GACbhP,KAAKyC,KAAK,YAAY,EAAA4F,EAAAnB,mBAAkB,aACjClH,QZk7CPT,IAAK,aACLR,MAAO,WY16CP,MAAOiB,MAAKyP,OAAOX,WZm7CnBvP,IAAK,SACLR,MAAO,SY96CF2Q,GACL,GAAMnI,IAAW+E,aAAcoD,EAAapD,cACtCH,GAAc,EAAA9D,EAAAnB,mBAAkB,UACpCI,YAAY,EACZC,OAAQA,GAGV,OADAvH,MAAKyC,KAAK,SAAU0J,GAChBA,EAAYC,iBACPpM,MAETA,KAAKkL,aACLlL,KAAKyC,KAAK,YAAY,EAAA4F,EAAAnB,mBAAkB,YAAcK,YAC/CvH,SZs7CPT,IAAK,KACLR,MAAO,SYj7CNkK,GACD,MAAOjJ,MAAKkM,MAAQlM,KAAK2P,eAAe,OAAQ1G,GAAKjJ,QZy7CrDT,IAAK,OACLR,MAAO,SYp7CJkK,GACH,MAAOjJ,MAAKkM,MAAQlM,KAAK2P,eAAe,OAAQ1G,GAAKjJ,QZ47CrDT,IAAK,gBACLR,MAAO,WYt7CP,MAAOiB,MAAK8L,cZi8CZvM,IAAK,SACLR,MAAO,SY17CFiP,GAAuB,GAAAzB,GAAAvM,KACtB4P,EAAWvJ,SAASwJ,wBAO1B,OANA7B,GAAMrD,QAAQ,SAAA6D,GACZjC,EAAKyB,MAAMhM,KAAKwM,GAChBA,EAAKsB,SAALvD,GACAqD,EAAShJ,YAAY4H,EAAKjK,MAE5BvE,KAAKuE,GAAGqC,YAAYgJ,GACb5P,QZk8CPT,IAAK,YACLR,MAAO,SY/7CCiQ,GACR,GAAMe,GAAM1J,SAASxB,eACrB,IAAIkL,EAAK,CACP,GAAMC,GAAehQ,KAAKuE,GAAG0L,WAC7B,IAAIjB,EAAa/J,KAAM,CACrB,GAAMiL,GAAeH,EAAII,WACrBnB,GAAa/J,KAAO+K,EAAeE,IACrClB,EAAa/J,KAAOiL,EAAeF,GAErChQ,KAAKuE,GAAGkC,MAAMxB,KAAU+J,EAAa/J,KAArC,SACS+J,GAAaoB,QAClBpB,EAAaoB,MAAQJ,EAAe,IACtChB,EAAaoB,MAAQ,GAEvBpQ,KAAKuE,GAAGkC,MAAM2J,MAAWpB,EAAaoB,MAAtC,KAEEpQ,MAAKqQ,iBACPrQ,KAAKuE,GAAGkC,MAAM6J,OAAYP,EAAIQ,aAC5BvB,EAAajK,IACbiK,EAAalJ,WAFf,KAIA9F,KAAKuE,GAAGkC,MAAM1B,IAASiK,EAAajK,IAApC,KAGJ,MAAO/E,SZu8CPT,IAAK,OACLR,MAAO,WY/7CP,IAAKiB,KAAKkM,MAAO,CACf,GAAMsE,IAAY,EAAAnI,EAAAnB,mBAAkB,QAAUI,YAAY,GAE1D,IADAtH,KAAKyC,KAAK,OAAQ+N,GACdA,EAAUpE,iBACZ,MAAOpM,KAETA,MAAKuE,GAAGkC,MAAMiI,QAAU,QACxB1O,KAAKkM,OAAQ,EACblM,KAAKyC,KAAK,SAAS,EAAA4F,EAAAnB,mBAAkB,UAEvC,MAAOlH,SZ08CPT,IAAK,OACLR,MAAO,WYl8CP,GAAIiB,KAAKkM,MAAO,CACd,GAAMuE,IAAY,EAAApI,EAAAnB,mBAAkB,QAAUI,YAAY,GAE1D,IADAtH,KAAKyC,KAAK,OAAQgO,GACdA,EAAUrE,iBACZ,MAAOpM,KAETA,MAAKuE,GAAGkC,MAAMiI,QAAU,OACxB1O,KAAKkM,OAAQ,EACblM,KAAKyC,KAAK,UAAU,EAAA4F,EAAAnB,mBAAkB,WAExC,MAAOlH,SZ68CPT,IAAK,QACLR,MAAO,WYl8CP,MAHAiB,MAAKuE,GAAGiC,UAAY,GACpBxG,KAAKgO,MAAMrD,QAAQ,SAAA6D,GAAA,MAAQA,GAAKxD,YAChChL,KAAKgO,SACEhO,QZ88CPT,IAAK,iBACLR,MAAO,SY38CM2R,EAA4BzH,GACzC,GAAM0H,GACU,SAAdD,EACI1Q,KAAK8L,WAAa9L,KAAK8L,WAAW8E,KAAO5Q,KAAKgO,MAAM,GACpDhO,KAAK8L,WACH9L,KAAK8L,WAAW+E,KAChB7Q,KAAKgO,MAAMhO,KAAKgO,MAAM5O,OAAS,EAKvC,OAJIuR,KACFA,EAAeG,WACf7H,EAAEgD,kBAEGjM,QZ48CPT,IAAK,gBACLR,MAAO,SYz8CKuN,GACZ,GAAMyE,GAAazE,GAAgBA,EAAavM,SAASZ,MAAM6R,EAM/D,OALID,GACF/Q,KAAKuE,GAAG0M,aAAa,gBAAiBF,GAEtC/Q,KAAKuE,GAAG2M,gBAAgB,iBAEnBlR,QZk9CPT,IAAK,aACLR,MAAO,SY58CEmQ,EAAsB9H,GAC/B,GAAM+J,IAAmB,WAAT/J,EAAoBpH,KAAKkO,OAASlO,KAAKiO,SAAW,GAC5DmD,EACc,kBAAXD,GAAwBA,EAAOjC,GAAciC,EAChDE,EAAKhL,SAASE,cAAc,KAIlC,OAHA8K,GAAGC,UAAUC,IAAb,gBAAiCnK,GACjCiK,EAAG7K,UAAY4K,EACfpR,KAAKuE,GAAGqC,YAAYyK,GACbrR,QZi9CPT,IAAK,iBACLR,MAAO,WY78CP,MAA0B,QAAnBiB,KAAKsO,aZi9CZ/O,IAAK,KACLrB,IAAK,WYxqDL,MAHK8B,MAAK+O,MACR/O,KAAK+O,IAAMhB,EAASxH,iBAEfvG,KAAK+O,QZgrDPhB,GACP3F,EAAepH,QAEjB7D,GAAQ6D,QYhvDa+M,GZovDf,SAAU3Q,EAAQD,EAASH,GAEjC,YAgBA,SAAS2B,GAAgBC,EAAUC,GAAe,KAAMD,YAAoBC,IAAgB,KAAM,IAAIC,WAAU,qCAbhHhB,OAAOC,eAAeZ,EAAS,cAC7B4B,OAAO,IAET5B,EAAQ2Q,uBAAqB3K,EAE7B,IAAInE,GAAe,WAAc,QAASC,GAAiBC,EAAQC,GAAS,IAAK,GAAI9B,GAAI,EAAGA,EAAI8B,EAAMC,OAAQ/B,IAAK,CAAE,GAAIgC,GAAaF,EAAM9B,EAAIgC,GAAWpB,WAAaoB,EAAWpB,aAAc,EAAOoB,EAAWrB,cAAe,EAAU,SAAWqB,KAAYA,EAAWC,UAAW,GAAMxB,OAAOC,eAAemB,EAAQG,EAAWE,IAAKF,IAAiB,MAAO,UAAUR,EAAaW,EAAYC,GAAiJ,MAA9HD,IAAYP,EAAiBJ,EAAYN,UAAWiB,GAAiBC,GAAaR,EAAiBJ,EAAaY,GAAqBZ,MaxxDhiByJ,EAAAtL,EAAA,GAEa8Q,Gb4xDb,SAAgClO,GAAcA,GAAOA,EAAIxB,YAFZkK,Ga1xDhCwF,qBAAqB,qBAC5BzD,GAAoB,UAAW,eAmBhBmH,EbuxDF,Wa7wDjB,QAAAA,GAAYlF,EAA4BjF,GAA8B,GAAAlD,GAAAnE,IAAArB,GAAAqB,KAAAwR,GACpExR,KAAKsM,aAAeA,EACpBtM,KAAKyR,QAAS,EACdzR,KAAKoO,UAAY/G,EAAQ+G,WAAaN,EACtC9N,KAAK0R,gBAAqB1R,KAAKoO,UAA/B,UAEA/D,EAAiBM,QAAQ,SAAAC,GACtBzG,EAAYyG,GAAUzG,EAAYyG,GAAQC,KAApB1G,Kbi6D3B,MA3IAnF,GAAawS,IACXjS,IAAK,UAMLR,MAAO,WarwDPiB,KAAKuE,GAAGoN,oBAAoB,YAAa3R,KAAK4R,SAAS,GACvD5R,KAAKuE,GAAGoN,oBAAoB,YAAa3R,KAAK6R,aAAa,GAC3D7R,KAAKuE,GAAGoN,oBAAoB,aAAc3R,KAAK4R,SAAS,GACpD5R,KAAKyR,SACPzR,KAAK0K,SAASoB,WAAa,MAG7B9L,KAAK+O,IAAM,QbgxDXxP,IAAK,WACLR,MAAO,SazwDA2L,GACP1K,KAAK0K,SAAWA,EAChB1K,KAAK8R,SAAWpH,EAASsD,MACzBhO,KAAKa,MAAQb,KAAK8R,SAAS1S,OAAS,KbmxDpCG,IAAK,WACLR,MAAO,Wa3wDP,IAAKiB,KAAKyR,OAAQ,CAChB,GAAM3F,GAAa9L,KAAK0K,SAASqB,eAC7BD,IACFA,EAAWZ,aAEblL,KAAK0K,SAASoB,WAAa9L,KAC3BA,KAAKyR,QAAS,EACdzR,KAAKuE,GAAG6J,UAAYpO,KAAK0R,gBAE3B,MAAO1R,SboxDPT,IAAK,aAILR,MAAO,Wa9uDP,MALIiB,MAAKyR,SACPzR,KAAKyR,QAAS,EACdzR,KAAKuE,GAAG6J,UAAYpO,KAAKoO,UACzBpO,KAAK0K,SAASoB,WAAa,MAEtB9L,Qb0vDPT,IAAK,UACLR,MAAO,SavvDDkK,GACNA,EAAEgD,iBACFjM,KAAK0K,SAASsB,OAAOhM,Sb6vDrBT,IAAK,cACLR,MAAO,WazvDPiB,KAAK8Q,cb6vDLvR,IAAK,KACLrB,IAAK,Wa12DL,GAAI8B,KAAK+O,IACP,MAAO/O,MAAK+O,GAEd,IAAMsC,GAAKhL,SAASE,cAAc,KAClC8K,GAAGjD,UAAYpO,KAAKyR,OAASzR,KAAK0R,gBAAkB1R,KAAKoO,SACzD,IAAM2D,GAAI1L,SAASE,cAAc,IAOjC,OANAwL,GAAEvL,UAAYxG,KAAKsM,aAAab,SAChC4F,EAAGzK,YAAYmL,GACf/R,KAAK+O,IAAMsC,EACXA,EAAGW,iBAAiB,YAAahS,KAAK4R,SACtCP,EAAGW,iBAAiB,YAAahS,KAAK6R,aACtCR,EAAGW,iBAAiB,aAAchS,KAAK4R,SAChCP,Kb82DP9R,IAAK,OACLrB,IAAK,Wa7zDL,GAAI+T,SACJ,IAAIjS,KAAKa,QAAUb,KAAK8R,SAAS1S,OAAS,EAAG,CAC3C,IAAKY,KAAK0K,SAAS2D,OACjB,MAAO,KAET4D,GAAY,MAEZA,GAAYjS,KAAKa,MAAQ,CAE3B,OAAOb,MAAK8R,SAASG,Mbs0DrB1S,IAAK,OACLrB,IAAK,Wah0DL,GAAI+T,SACJ,IAAmB,IAAfjS,KAAKa,MAAa,CACpB,IAAKb,KAAK0K,SAAS2D,OACjB,MAAO,KAET4D,GAAYjS,KAAK8R,SAAS1S,OAAS,MAEnC6S,GAAYjS,KAAKa,MAAQ,CAE3B,OAAOb,MAAK8R,SAASG,Obq0DhBT,IAGTrU,GAAQ6D,Qar7DawQ,Gby7Df,SAAUpU,EAAQD,EAASH,GAEjC,YAyBA,SAAS0K,GAAuB9H,GAAO,MAAOA,IAAOA,EAAIxB,WAAawB,GAAQoB,QAASpB,GAEvF,QAASjB,GAAgBC,EAAUC,GAAe,KAAMD,YAAoBC,IAAgB,KAAM,IAAIC,WAAU,qCAEhH,QAAS6I,GAA2BC,EAAMrK,GAAQ,IAAKqK,EAAQ,KAAM,IAAIC,gBAAe,4DAAgE,QAAOtK,GAAyB,gBAATA,IAAqC,kBAATA,GAA8BqK,EAAPrK,EAElO,QAASuK,GAAUC,EAAUC,GAAc,GAA0B,kBAAfA,IAA4C,OAAfA,EAAuB,KAAM,IAAIlJ,WAAU,iEAAoEkJ,GAAeD,GAASxJ,UAAYT,OAAO6D,OAAOqG,GAAcA,EAAWzJ,WAAa0J,aAAelJ,MAAOgJ,EAAU9J,YAAY,EAAOqB,UAAU,EAAMtB,cAAc,KAAegK,IAAYlK,OAAOoK,eAAiBpK,OAAOoK,eAAeH,EAAUC,GAAcD,EAASnG,UAAYoG,GA5BjelK,OAAOC,eAAeZ,EAAS,cAC7B4B,OAAO,GAGT,IAAIC,GAAe,WAAc,QAASC,GAAiBC,EAAQC,GAAS,IAAK,GAAI9B,GAAI,EAAGA,EAAI8B,EAAMC,OAAQ/B,IAAK,CAAE,GAAIgC,GAAaF,EAAM9B,EAAIgC,GAAWpB,WAAaoB,EAAWpB,aAAc,EAAOoB,EAAWrB,cAAe,EAAU,SAAWqB,KAAYA,EAAWC,UAAW,GAAMxB,OAAOC,eAAemB,EAAQG,EAAWE,IAAKF,IAAiB,MAAO,UAAUR,EAAaW,EAAYC,GAAiJ,MAA9HD,IAAYP,EAAiBJ,EAAYN,UAAWiB,GAAiBC,GAAaR,EAAiBJ,EAAaY,GAAqBZ,MAE5hBqT,EAAO,QAAShU,GAAIG,EAAQC,EAAU6T,GAA2B,OAAX9T,IAAiBA,EAASwL,SAAStL,UAAW,IAAI6T,GAAOtU,OAAOuU,yBAAyBhU,EAAQC,EAAW,QAAa6E,KAATiP,EAAoB,CAAE,GAAIE,GAASxU,OAAO2K,eAAepK,EAAS,OAAe,QAAXiU,MAAmB,GAAkCpU,EAAIoU,EAAQhU,EAAU6T,GAAoB,GAAI,SAAWC,GAAQ,MAAOA,GAAKrT,KAAgB,IAAInB,GAASwU,EAAKlU,GAAK,QAAeiF,KAAXvF,EAA4C,MAAOA,GAAOL,KAAK4U,Ic19D5dI,EAAAvV,EAAA,Id89DIwV,EAAW9K,EAAuB6K,Gc59DtCtI,EAAAjN,EAAA,Gdg+DIyV,EAAW/K,EAAuBuC,Gc/9DtC5B,EAAArL,EAAA,GACAsL,EAAAtL,EAAA,GAEM0V,Gdk+DgBhL,EAAuBY,Gcl+DjBtL,EAAQ,KAE9BqN,GAAoB,UAAW,aAKhBV,Ed6+DN,SAAUgJ,Gcv+DvB,QAAAhJ,GAAYpF,GAAyB5F,EAAAqB,KAAA2J,EAAA,IAAAxF,GAAAwD,EAAA3H,MAAA2J,EAAA/H,WAAA9D,OAAA2K,eAAAkB,IAAApM,KAAAyC,MAAA,OAEnCmE,GAAKI,GAAKA,EAEV8F,EAAiBM,QAAQ,SAAAC,GACtBzG,EAAYyG,GAAUzG,EAAYyG,GAAQC,KAApB1G,KAGzBA,EAAK2G,iBAR8B3G,EduoErC,MA/JA2D,GAAU6B,EAAUgJ,GAyBpB3T,EAAa2K,IACXpK,IAAK,UACLR,MAAO,Wch/DP,MAJAmT,GAAAvI,EAAApL,UAAAqD,WAAA9D,OAAA2K,eAAAkB,EAAApL,WAAA,UAAAyB,MAAAzC,KAAAyC,MACAA,KAAKiL,gBAEHjL,KAAWuE,GAAK,KACXvE,Qd6/DPT,IAAK,oBACLR,MAAO,Scx/DSuN,GAChB,GAAMsG,GAAS5S,KAAK+I,iBACpB,IAAc,MAAV6J,EAAgB,CAClB,GAAMxS,GAAUkM,EAAalM,QAAQwS,EAAQ5S,KAAK6S,iBAClD7S,MAAKuE,GAAGuO,QACJzS,MAAMC,QAAQF,MAChB,EAAAoS,EAAAxR,SAAOhB,KAAKuE,GAAInE,EAAQ,GAAIA,EAAQ,IACpCJ,KAAKuE,GAAGwO,cAAc,GAAIC,OAAM,edkgEpCzT,IAAK,kBACLR,MAAO,Wc1/DP,GAAMkU,IAAW,EAAA5K,EAAA/D,wBAAuBtE,KAAKuE,IACvC2O,EAAWlT,KAAKmT,cAChBC,EAAiBpT,KAAKqT,oBACtBvN,GAAa,EAAAuC,EAAA5C,iBAAgBzF,KAAKuE,IAClCQ,EAAMkO,EAASlO,IAAMmO,EAASnO,IAAMqO,EAAerO,IAAMe,EACzDb,EAAOgO,EAAShO,KAAOiO,EAASjO,KAAOmO,EAAenO,IAC5D,OAAoB,QAAhBjF,KAAKuE,GAAG+O,KACDvO,MAAKE,OAAMa,eAKXf,MAAKqL,MAHA/J,SAASxB,gBACnBwB,SAASxB,gBAAgBsL,YAAclL,EACvC,EACiBa,iBdkgEvBvG,IAAK,kBACLR,MAAO,Wc3/DP,MAAOiB,MAAKuE,GAAGgP,iBAAmBvT,KAAKuE,GAAGiP,aACtC,KACAxT,KAAKuE,GAAGxF,MAAM0U,UAAU,EAAGzT,KAAKuE,GAAGiP,iBdggEvCjU,IAAK,iBACLR,MAAO,Wc5/DP,MAAOiB,MAAKuE,GAAGxF,MAAM0U,UAAUzT,KAAKuE,GAAGiP,iBdmgEvCjU,IAAK,cACLR,MAAO,Wc//DP,OAASgG,IAAK/E,KAAKuE,GAAGmP,UAAWzO,KAAMjF,KAAKuE,GAAGoP,ed2gE/CpU,IAAK,oBACLR,MAAO,WclgEP,MAAO2T,GAAoB1S,KAAKuE,GAAIvE,KAAKuE,GAAGiP,iBdygE5CjU,IAAK,UACLR,MAAO,WcrgEPiB,KAAK4T,qBd4gELrU,IAAK,YACLR,MAAO,SczgECkK,GACR,GAAMN,GAAO3I,KAAK6T,QAAQ5K,GACtB7G,QACS,QAATuG,GAA0B,SAATA,EACnBvG,EAAQpC,KAAK8T,cAAcnL,GACT,UAATA,EACTvG,EAAQpC,KAAK+T,iBACK,QAATpL,IACTvG,EAAQpC,KAAKgU,gBAEX5R,GAASA,EAAMgK,kBACjBnD,EAAEgD,oBdghEJ1M,IAAK,iBACLR,MAAO,Wc3gEPiB,KAAKuE,GAAGyN,iBAAiB,QAAShS,KAAKiU,SACvCjU,KAAKuE,GAAGyN,iBAAiB,UAAWhS,KAAKkU,cdkhEzC3U,IAAK,gBACLR,MAAO,Wc9gEPiB,KAAKuE,GAAGoN,oBAAoB,QAAS3R,KAAKiU,SAC1CjU,KAAKuE,GAAGoN,oBAAoB,UAAW3R,KAAKkU,edmhEvCvK,GACP8I,EAASzR,QAEX7D,GAAQ6D,QchpEa2I,GdopEf,SAAUvM,EAAQD,GAExB,YevnEA,SAAAgX,KACA,sBAAAnB,OACA,UAAAA,OAAA,SAA+BoB,SAAA,EAAA9M,YAAA,GAE/B,IAAAlF,GAAAiE,SAAAmB,YAAA,QAEA,OADApF,GAAAiS,UAAA,eACAjS,EAlDAtE,OAAAC,eAAAZ,EAAA,cACA4B,OAAA,IAGA5B,EAAA6D,QAAA,SAAAuD,EAAA+P,EAAAC,GAUA,IATA,GAAAC,GAAAjQ,EAAAxF,MAEA6R,EAAA0D,GAAAC,GAAA,IAEAE,EAAApO,SAAAoO,cAGAC,EAAA,EACAC,EAAA,EACAD,EAAAF,EAAApV,QAAAsV,EAAA9D,EAAAxR,QAAAoV,EAAAE,KAAA9D,EAAA8D,IACAA,GAEA,MAAAF,EAAApV,OAAAuV,EAAA,MAAA/D,EAAAxR,OAAAuV,EAAA,MAAAH,IAAApV,OAAAuV,EAAA,KAAA/D,IAAAxR,OAAAuV,EAAA,IACAA,GAEAD,GAAAE,KAAAC,IAAAH,EAAAE,KAAAC,IAAAL,EAAApV,OAAAwR,EAAAxR,QAAAuV,GAGApQ,EAAAuQ,kBAAAJ,EAAAF,EAAApV,OAAAuV,EAGA,IAAAI,GAAAnE,EAAA6C,UAAAiB,EAAA9D,EAAAxR,OAAAuV,EAeA,OAZApQ,GAAAuO,QACAzM,SAAA2O,YAAA,gBAAAD,KAGAxQ,EAAAxF,MAAA6R,EACArM,EAAAwO,cAAAoB,MAIA5P,EAAAuQ,kBAAAR,EAAAlV,OAAAkV,EAAAlV,QAEAqV,KAAA3B,QACAvO,IfqrEM,SAAUnH,IgB9tEhB,WAmDA,QAAAsV,GAAAuC,EAAAtG,EAAAtH,GACA,IAAA6N,EACA,SAAAxM,OAAA,iFAGA,IAAAyM,GAAA9N,KAAA8N,QAAA,CACA,IAAAA,EAAA,CACA,GAAA5Q,GAAA8B,SAAA+O,cAAA,4CACA7Q,IAAeA,EAAAsK,WAAA5H,YAAA1C,GAIf,GAAA8Q,GAAAhP,SAAAE,cAAA,MACA8O,GAAArE,GAAA,2CACA3K,SAAAD,KAAAQ,YAAAyO,EAEA,IAAA5O,GAAA4O,EAAA5O,MACA6O,EAAA1P,OAAAC,kCAAAoP,KAAAM,YAGA9O,GAAA+O,WAAA,WACA,UAAAP,EAAA9O,WACAM,EAAAgP,SAAA,cAGAhP,EAAAkI,SAAA,WACAwG,IACA1O,EAAAiP,WAAA,UAGAC,EAAAhL,QAAA,SAAAiL,GACAnP,EAAAmP,GAAAN,EAAAM,KAGAC,EAEAZ,EAAAa,aAAAnV,SAAA2U,EAAAvO,UACAN,EAAAsP,UAAA,UAEAtP,EAAAuP,SAAA,SAGAX,EAAAY,YAAAhB,EAAAlW,MAAA0U,UAAA,EAAA9E,GAEA,UAAAsG,EAAA9O,WACAkP,EAAAY,YAAAZ,EAAAY,YAAA7V,QAAA,WAEA,IAAA8V,GAAA7P,SAAAE,cAAA,OAMA2P,GAAAD,YAAAhB,EAAAlW,MAAA0U,UAAA9E,IAAA,IACA0G,EAAAzO,YAAAsP,EAEA,IAAAC,IACApR,IAAAmR,EAAAE,UAAAzV,SAAA2U,EAAA,gBACArQ,KAAAiR,EAAAG,WAAA1V,SAAA2U,EAAA,iBASA,OANAH,GACAe,EAAAzP,MAAA6P,gBAAA,OAEAjQ,SAAAD,KAAAa,YAAAoO,GAGAc,EAhHA,GAAAR,IACA,YACA,YACA,QACA,SACA,YACA,YAEA,iBACA,mBACA,oBACA,kBACA,cAEA,aACA,eACA,gBACA,cAGA,YACA,cACA,aACA,cACA,WACA,iBACA,aACA,aAEA,YACA,gBACA,aACA,iBAEA,gBACA,cAEA,UACA,cAIAT,EAAA,mBAAAtP,QACAiQ,EAAAX,GAAA,MAAAtP,OAAA2Q,oBAwEA,KAAAnZ,OAAA,KAAAA,EAAAD,QACAC,EAAAD,QAAAuV,EACCwC,IACDtP,OAAA8M","file":"textcomplete.min.js","sourcesContent":["/******/ (function(modules) { // webpackBootstrap\n/******/ \t// The module cache\n/******/ \tvar installedModules = {};\n/******/\n/******/ \t// The require function\n/******/ \tfunction __webpack_require__(moduleId) {\n/******/\n/******/ \t\t// Check if module is in cache\n/******/ \t\tif(installedModules[moduleId]) {\n/******/ \t\t\treturn installedModules[moduleId].exports;\n/******/ \t\t}\n/******/ \t\t// Create a new module (and put it into the cache)\n/******/ \t\tvar module = installedModules[moduleId] = {\n/******/ \t\t\ti: moduleId,\n/******/ \t\t\tl: false,\n/******/ \t\t\texports: {}\n/******/ \t\t};\n/******/\n/******/ \t\t// Execute the module function\n/******/ \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n/******/\n/******/ \t\t// Flag the module as loaded\n/******/ \t\tmodule.l = true;\n/******/\n/******/ \t\t// Return the exports of the module\n/******/ \t\treturn module.exports;\n/******/ \t}\n/******/\n/******/\n/******/ \t// expose the modules object (__webpack_modules__)\n/******/ \t__webpack_require__.m = modules;\n/******/\n/******/ \t// expose the module cache\n/******/ \t__webpack_require__.c = installedModules;\n/******/\n/******/ \t// define getter function for harmony exports\n/******/ \t__webpack_require__.d = function(exports, name, getter) {\n/******/ \t\tif(!__webpack_require__.o(exports, name)) {\n/******/ \t\t\tObject.defineProperty(exports, name, {\n/******/ \t\t\t\tconfigurable: false,\n/******/ \t\t\t\tenumerable: true,\n/******/ \t\t\t\tget: getter\n/******/ \t\t\t});\n/******/ \t\t}\n/******/ \t};\n/******/\n/******/ \t// getDefaultExport function for compatibility with non-harmony modules\n/******/ \t__webpack_require__.n = function(module) {\n/******/ \t\tvar getter = module && module.__esModule ?\n/******/ \t\t\tfunction getDefault() { return module['default']; } :\n/******/ \t\t\tfunction getModuleExports() { return module; };\n/******/ \t\t__webpack_require__.d(getter, 'a', getter);\n/******/ \t\treturn getter;\n/******/ \t};\n/******/\n/******/ \t// Object.prototype.hasOwnProperty.call\n/******/ \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n/******/\n/******/ \t// __webpack_public_path__\n/******/ \t__webpack_require__.p = \"\";\n/******/\n/******/ \t// Load entry module and return exports\n/******/ \treturn __webpack_require__(__webpack_require__.s = 5);\n/******/ })\n/************************************************************************/\n/******/ ([\n/* 0 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();\n\nvar _strategy = __webpack_require__(2);\n\nvar _strategy2 = _interopRequireDefault(_strategy);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\n/**\n * Encapsulate an result of each search results.\n */\nvar SearchResult = function () {\n\n /**\n * @param {object} data - An element of array callbacked by search function.\n */\n function SearchResult(data, term, strategy) {\n _classCallCheck(this, SearchResult);\n\n this.data = data;\n this.term = term;\n this.strategy = strategy;\n }\n\n _createClass(SearchResult, [{\n key: \"replace\",\n value: function replace(beforeCursor, afterCursor) {\n var replacement = this.strategy.replace(this.data);\n if (replacement !== null) {\n if (Array.isArray(replacement)) {\n afterCursor = replacement[1] + afterCursor;\n replacement = replacement[0];\n }\n var match = this.strategy.matchText(beforeCursor);\n if (match) {\n replacement = replacement.replace(/\\$&/g, match[0]).replace(/\\$(\\d)/g, function (_, p1) {\n return match[parseInt(p1, 10)];\n });\n return [[beforeCursor.slice(0, match.index), replacement, beforeCursor.slice(match.index + match[0].length)].join(\"\"), afterCursor];\n }\n }\n }\n }, {\n key: \"render\",\n value: function render() {\n return this.strategy.template(this.data, this.term);\n }\n }]);\n\n return SearchResult;\n}();\n\nexports.default = SearchResult;\n\n/***/ }),\n/* 1 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\nvar has = Object.prototype.hasOwnProperty\n , prefix = '~';\n\n/**\n * Constructor to create a storage for our `EE` objects.\n * An `Events` instance is a plain object whose properties are event names.\n *\n * @constructor\n * @api private\n */\nfunction Events() {}\n\n//\n// We try to not inherit from `Object.prototype`. In some engines creating an\n// instance in this way is faster than calling `Object.create(null)` directly.\n// If `Object.create(null)` is not supported we prefix the event names with a\n// character to make sure that the built-in object properties are not\n// overridden or used as an attack vector.\n//\nif (Object.create) {\n Events.prototype = Object.create(null);\n\n //\n // This hack is needed because the `__proto__` property is still inherited in\n // some old browsers like Android 4, iPhone 5.1, Opera 11 and Safari 5.\n //\n if (!new Events().__proto__) prefix = false;\n}\n\n/**\n * Representation of a single event listener.\n *\n * @param {Function} fn The listener function.\n * @param {Mixed} context The context to invoke the listener with.\n * @param {Boolean} [once=false] Specify if the listener is a one-time listener.\n * @constructor\n * @api private\n */\nfunction EE(fn, context, once) {\n this.fn = fn;\n this.context = context;\n this.once = once || false;\n}\n\n/**\n * Minimal `EventEmitter` interface that is molded against the Node.js\n * `EventEmitter` interface.\n *\n * @constructor\n * @api public\n */\nfunction EventEmitter() {\n this._events = new Events();\n this._eventsCount = 0;\n}\n\n/**\n * Return an array listing the events for which the emitter has registered\n * listeners.\n *\n * @returns {Array}\n * @api public\n */\nEventEmitter.prototype.eventNames = function eventNames() {\n var names = []\n , events\n , name;\n\n if (this._eventsCount === 0) return names;\n\n for (name in (events = this._events)) {\n if (has.call(events, name)) names.push(prefix ? name.slice(1) : name);\n }\n\n if (Object.getOwnPropertySymbols) {\n return names.concat(Object.getOwnPropertySymbols(events));\n }\n\n return names;\n};\n\n/**\n * Return the listeners registered for a given event.\n *\n * @param {String|Symbol} event The event name.\n * @param {Boolean} exists Only check if there are listeners.\n * @returns {Array|Boolean}\n * @api public\n */\nEventEmitter.prototype.listeners = function listeners(event, exists) {\n var evt = prefix ? prefix + event : event\n , available = this._events[evt];\n\n if (exists) return !!available;\n if (!available) return [];\n if (available.fn) return [available.fn];\n\n for (var i = 0, l = available.length, ee = new Array(l); i < l; i++) {\n ee[i] = available[i].fn;\n }\n\n return ee;\n};\n\n/**\n * Calls each of the listeners registered for a given event.\n *\n * @param {String|Symbol} event The event name.\n * @returns {Boolean} `true` if the event had listeners, else `false`.\n * @api public\n */\nEventEmitter.prototype.emit = function emit(event, a1, a2, a3, a4, a5) {\n var evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) return false;\n\n var listeners = this._events[evt]\n , len = arguments.length\n , args\n , i;\n\n if (listeners.fn) {\n if (listeners.once) this.removeListener(event, listeners.fn, undefined, true);\n\n switch (len) {\n case 1: return listeners.fn.call(listeners.context), true;\n case 2: return listeners.fn.call(listeners.context, a1), true;\n case 3: return listeners.fn.call(listeners.context, a1, a2), true;\n case 4: return listeners.fn.call(listeners.context, a1, a2, a3), true;\n case 5: return listeners.fn.call(listeners.context, a1, a2, a3, a4), true;\n case 6: return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true;\n }\n\n for (i = 1, args = new Array(len -1); i < len; i++) {\n args[i - 1] = arguments[i];\n }\n\n listeners.fn.apply(listeners.context, args);\n } else {\n var length = listeners.length\n , j;\n\n for (i = 0; i < length; i++) {\n if (listeners[i].once) this.removeListener(event, listeners[i].fn, undefined, true);\n\n switch (len) {\n case 1: listeners[i].fn.call(listeners[i].context); break;\n case 2: listeners[i].fn.call(listeners[i].context, a1); break;\n case 3: listeners[i].fn.call(listeners[i].context, a1, a2); break;\n case 4: listeners[i].fn.call(listeners[i].context, a1, a2, a3); break;\n default:\n if (!args) for (j = 1, args = new Array(len -1); j < len; j++) {\n args[j - 1] = arguments[j];\n }\n\n listeners[i].fn.apply(listeners[i].context, args);\n }\n }\n }\n\n return true;\n};\n\n/**\n * Add a listener for a given event.\n *\n * @param {String|Symbol} event The event name.\n * @param {Function} fn The listener function.\n * @param {Mixed} [context=this] The context to invoke the listener with.\n * @returns {EventEmitter} `this`.\n * @api public\n */\nEventEmitter.prototype.on = function on(event, fn, context) {\n var listener = new EE(fn, context || this)\n , evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) this._events[evt] = listener, this._eventsCount++;\n else if (!this._events[evt].fn) this._events[evt].push(listener);\n else this._events[evt] = [this._events[evt], listener];\n\n return this;\n};\n\n/**\n * Add a one-time listener for a given event.\n *\n * @param {String|Symbol} event The event name.\n * @param {Function} fn The listener function.\n * @param {Mixed} [context=this] The context to invoke the listener with.\n * @returns {EventEmitter} `this`.\n * @api public\n */\nEventEmitter.prototype.once = function once(event, fn, context) {\n var listener = new EE(fn, context || this, true)\n , evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) this._events[evt] = listener, this._eventsCount++;\n else if (!this._events[evt].fn) this._events[evt].push(listener);\n else this._events[evt] = [this._events[evt], listener];\n\n return this;\n};\n\n/**\n * Remove the listeners of a given event.\n *\n * @param {String|Symbol} event The event name.\n * @param {Function} fn Only remove the listeners that match this function.\n * @param {Mixed} context Only remove the listeners that have this context.\n * @param {Boolean} once Only remove one-time listeners.\n * @returns {EventEmitter} `this`.\n * @api public\n */\nEventEmitter.prototype.removeListener = function removeListener(event, fn, context, once) {\n var evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) return this;\n if (!fn) {\n if (--this._eventsCount === 0) this._events = new Events();\n else delete this._events[evt];\n return this;\n }\n\n var listeners = this._events[evt];\n\n if (listeners.fn) {\n if (\n listeners.fn === fn\n && (!once || listeners.once)\n && (!context || listeners.context === context)\n ) {\n if (--this._eventsCount === 0) this._events = new Events();\n else delete this._events[evt];\n }\n } else {\n for (var i = 0, events = [], length = listeners.length; i < length; i++) {\n if (\n listeners[i].fn !== fn\n || (once && !listeners[i].once)\n || (context && listeners[i].context !== context)\n ) {\n events.push(listeners[i]);\n }\n }\n\n //\n // Reset the array, or remove it completely if we have no more listeners.\n //\n if (events.length) this._events[evt] = events.length === 1 ? events[0] : events;\n else if (--this._eventsCount === 0) this._events = new Events();\n else delete this._events[evt];\n }\n\n return this;\n};\n\n/**\n * Remove all listeners, or those of the specified event.\n *\n * @param {String|Symbol} [event] The event name.\n * @returns {EventEmitter} `this`.\n * @api public\n */\nEventEmitter.prototype.removeAllListeners = function removeAllListeners(event) {\n var evt;\n\n if (event) {\n evt = prefix ? prefix + event : event;\n if (this._events[evt]) {\n if (--this._eventsCount === 0) this._events = new Events();\n else delete this._events[evt];\n }\n } else {\n this._events = new Events();\n this._eventsCount = 0;\n }\n\n return this;\n};\n\n//\n// Alias methods names because people roll like that.\n//\nEventEmitter.prototype.off = EventEmitter.prototype.removeListener;\nEventEmitter.prototype.addListener = EventEmitter.prototype.on;\n\n//\n// This function doesn't apply anymore.\n//\nEventEmitter.prototype.setMaxListeners = function setMaxListeners() {\n return this;\n};\n\n//\n// Expose the prefix.\n//\nEventEmitter.prefixed = prefix;\n\n//\n// Allow `EventEmitter` to be imported as module namespace.\n//\nEventEmitter.EventEmitter = EventEmitter;\n\n//\n// Expose the module.\n//\nif (true) {\n module.exports = EventEmitter;\n}\n\n\n/***/ }),\n/* 2 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nvar DEFAULT_INDEX = 2;\n\nfunction DEFAULT_TEMPLATE(value) {\n return value;\n}\n\n/**\n * Properties for a strategy.\n *\n * @typedef\n */\n\n/**\n * Encapsulate a single strategy.\n */\nvar Strategy = function () {\n function Strategy(props) {\n _classCallCheck(this, Strategy);\n\n this.props = props;\n this.cache = props.cache ? {} : null;\n }\n\n /**\n * @return {this}\n */\n\n\n _createClass(Strategy, [{\n key: \"destroy\",\n value: function destroy() {\n this.cache = null;\n return this;\n }\n }, {\n key: \"search\",\n value: function search(term, callback, match) {\n if (this.cache) {\n this.searchWithCache(term, callback, match);\n } else {\n this.props.search(term, callback, match);\n }\n }\n\n /**\n * @param {object} data - An element of array callbacked by search function.\n */\n\n }, {\n key: \"replace\",\n value: function replace(data) {\n return this.props.replace(data);\n }\n\n /** @private */\n\n }, {\n key: \"searchWithCache\",\n value: function searchWithCache(term, callback, match) {\n var _this = this;\n\n if (this.cache && this.cache[term]) {\n callback(this.cache[term]);\n } else {\n this.props.search(term, function (results) {\n if (_this.cache) {\n _this.cache[term] = results;\n }\n callback(results);\n }, match);\n }\n }\n\n /** @private */\n\n }, {\n key: \"matchText\",\n value: function matchText(text) {\n if (typeof this.match === \"function\") {\n return this.match(text);\n } else {\n return text.match(this.match);\n }\n }\n\n /** @private */\n\n }, {\n key: \"match\",\n get: function get() {\n return this.props.match;\n }\n\n /** @private */\n\n }, {\n key: \"index\",\n get: function get() {\n return typeof this.props.index === \"number\" ? this.props.index : DEFAULT_INDEX;\n }\n }, {\n key: \"template\",\n get: function get() {\n return this.props.template || DEFAULT_TEMPLATE;\n }\n }]);\n\n return Strategy;\n}();\n\nexports.default = Strategy;\n\n/***/ }),\n/* 3 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\nexports.calculateElementOffset = calculateElementOffset;\nexports.getLineHeightPx = getLineHeightPx;\nexports.calculateLineHeightPx = calculateLineHeightPx;\n\n\n/**\n * Create a custom event\n *\n * @private\n */\nvar createCustomEvent = exports.createCustomEvent = function () {\n if (typeof window.CustomEvent === \"function\") {\n return function (type, options) {\n return new document.defaultView.CustomEvent(type, {\n cancelable: options && options.cancelable || false,\n detail: options && options.detail || undefined\n });\n };\n } else {\n // Custom event polyfill from\n // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#polyfill\n return function (type, options) {\n var event = document.createEvent(\"CustomEvent\");\n event.initCustomEvent(type,\n /* bubbles */false, options && options.cancelable || false, options && options.detail || undefined);\n return event;\n };\n }\n}\n\n/**\n * Get the current coordinates of the `el` relative to the document.\n *\n * @private\n */\n();function calculateElementOffset(el) {\n var rect = el.getBoundingClientRect();\n var _el$ownerDocument = el.ownerDocument,\n defaultView = _el$ownerDocument.defaultView,\n documentElement = _el$ownerDocument.documentElement;\n\n var offset = {\n top: rect.top + defaultView.pageYOffset,\n left: rect.left + defaultView.pageXOffset\n };\n if (documentElement) {\n offset.top -= documentElement.clientTop;\n offset.left -= documentElement.clientLeft;\n }\n return offset;\n}\n\nvar CHAR_CODE_ZERO = \"0\".charCodeAt(0);\nvar CHAR_CODE_NINE = \"9\".charCodeAt(0);\n\nfunction isDigit(charCode) {\n return charCode >= CHAR_CODE_ZERO && charCode <= CHAR_CODE_NINE;\n}\n\n/**\n * Returns the line-height of the given node in pixels.\n *\n * @private\n */\nfunction getLineHeightPx(node) {\n var computedStyle = window.getComputedStyle(node\n\n // If the char code starts with a digit, it is either a value in pixels,\n // or unitless, as per:\n // https://drafts.csswg.org/css2/visudet.html#propdef-line-height\n // https://drafts.csswg.org/css2/cascade.html#computed-value\n );if (isDigit(computedStyle.lineHeight.charCodeAt(0))) {\n // In real browsers the value is *always* in pixels, even for unit-less\n // line-heights. However, we still check as per the spec.\n if (isDigit(computedStyle.lineHeight.charCodeAt(computedStyle.lineHeight.length - 1))) {\n return parseFloat(computedStyle.lineHeight) * parseFloat(computedStyle.fontSize);\n } else {\n return parseFloat(computedStyle.lineHeight);\n }\n }\n\n // Otherwise, the value is \"normal\".\n // If the line-height is \"normal\", calculate by font-size\n return calculateLineHeightPx(node.nodeName, computedStyle);\n}\n\n/**\n * Returns calculated line-height of the given node in pixels.\n *\n * @private\n */\nfunction calculateLineHeightPx(nodeName, computedStyle) {\n var body = document.body;\n if (!body) {\n return 0;\n }\n\n var tempNode = document.createElement(nodeName);\n tempNode.innerHTML = \" \";\n tempNode.style.fontSize = computedStyle.fontSize;\n tempNode.style.fontFamily = computedStyle.fontFamily;\n tempNode.style.padding = \"0\";\n body.appendChild(tempNode\n\n // Make sure textarea has only 1 row\n );if (tempNode instanceof HTMLTextAreaElement) {\n ;tempNode.rows = 1;\n }\n\n // Assume the height of the element is the line-height\n var height = tempNode.offsetHeight;\n body.removeChild(tempNode);\n\n return height;\n}\n\n/***/ }),\n/* 4 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();\n\nvar _eventemitter = __webpack_require__(1);\n\nvar _eventemitter2 = _interopRequireDefault(_eventemitter);\n\nvar _utils = __webpack_require__(3);\n\nvar _search_result = __webpack_require__(0);\n\nvar _search_result2 = _interopRequireDefault(_search_result);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return call && (typeof call === \"object\" || typeof call === \"function\") ? call : self; }\n\nfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function, not \" + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }\n/*eslint no-unused-vars: off*/\n\n/**\n * Abstract class representing a editor target.\n *\n * Editor classes must implement `#applySearchResult`, `#getCursorOffset` and\n * `#getBeforeCursor` methods.\n *\n * Editor classes must invoke `#emitMoveEvent`, `#emitEnterEvent`,\n * `#emitChangeEvent` and `#emitEscEvent` at proper timing.\n *\n * @abstract\n */\n\n\n/** @typedef */\nvar Editor = function (_EventEmitter) {\n _inherits(Editor, _EventEmitter);\n\n function Editor() {\n _classCallCheck(this, Editor);\n\n return _possibleConstructorReturn(this, (Editor.__proto__ || Object.getPrototypeOf(Editor)).apply(this, arguments));\n }\n\n _createClass(Editor, [{\n key: \"destroy\",\n\n /**\n * It is called when associated textcomplete object is destroyed.\n *\n * @return {this}\n */\n value: function destroy() {\n return this;\n }\n\n /**\n * It is called when a search result is selected by a user.\n */\n\n }, {\n key: \"applySearchResult\",\n value: function applySearchResult(_) {\n throw new Error(\"Not implemented.\");\n }\n\n /**\n * The input cursor's absolute coordinates from the window's left\n * top corner.\n */\n\n }, {\n key: \"getCursorOffset\",\n value: function getCursorOffset() {\n throw new Error(\"Not implemented.\");\n }\n\n /**\n * Editor string value from head to cursor.\n * Returns null if selection type is range not cursor.\n */\n\n }, {\n key: \"getBeforeCursor\",\n value: function getBeforeCursor() {\n throw new Error(\"Not implemented.\");\n }\n\n /**\n * Emit a move event, which moves active dropdown element.\n * Child class must call this method at proper timing with proper parameter.\n *\n * @see {@link Textarea} for live example.\n */\n\n }, {\n key: \"emitMoveEvent\",\n value: function emitMoveEvent(code) {\n var moveEvent = (0, _utils.createCustomEvent)(\"move\", {\n cancelable: true,\n detail: {\n code: code\n }\n });\n this.emit(\"move\", moveEvent);\n return moveEvent;\n }\n\n /**\n * Emit a enter event, which selects current search result.\n * Child class must call this method at proper timing.\n *\n * @see {@link Textarea} for live example.\n */\n\n }, {\n key: \"emitEnterEvent\",\n value: function emitEnterEvent() {\n var enterEvent = (0, _utils.createCustomEvent)(\"enter\", { cancelable: true });\n this.emit(\"enter\", enterEvent);\n return enterEvent;\n }\n\n /**\n * Emit a change event, which triggers auto completion.\n * Child class must call this method at proper timing.\n *\n * @see {@link Textarea} for live example.\n */\n\n }, {\n key: \"emitChangeEvent\",\n value: function emitChangeEvent() {\n var changeEvent = (0, _utils.createCustomEvent)(\"change\", {\n detail: {\n beforeCursor: this.getBeforeCursor()\n }\n });\n this.emit(\"change\", changeEvent);\n return changeEvent;\n }\n\n /**\n * Emit a esc event, which hides dropdown element.\n * Child class must call this method at proper timing.\n *\n * @see {@link Textarea} for live example.\n */\n\n }, {\n key: \"emitEscEvent\",\n value: function emitEscEvent() {\n var escEvent = (0, _utils.createCustomEvent)(\"esc\", { cancelable: true });\n this.emit(\"esc\", escEvent);\n return escEvent;\n }\n\n /**\n * Helper method for parsing KeyboardEvent.\n *\n * @see {@link Textarea} for live example.\n */\n\n }, {\n key: \"getCode\",\n value: function getCode(e) {\n return e.keyCode === 9 ? \"ENTER\" // tab\n : e.keyCode === 13 ? \"ENTER\" // enter\n : e.keyCode === 27 ? \"ESC\" // esc\n : e.keyCode === 38 ? \"UP\" // up\n : e.keyCode === 40 ? \"DOWN\" // down\n : e.keyCode === 78 && e.ctrlKey ? \"DOWN\" // ctrl-n\n : e.keyCode === 80 && e.ctrlKey ? \"UP\" // ctrl-p\n : \"OTHER\";\n }\n }]);\n\n return Editor;\n}(_eventemitter2.default);\n\nexports.default = Editor;\n\n/***/ }),\n/* 5 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n/* WEBPACK VAR INJECTION */(function(global) {\n\nvar _textcomplete = __webpack_require__(7);\n\nvar _textcomplete2 = _interopRequireDefault(_textcomplete);\n\nvar _textarea = __webpack_require__(12);\n\nvar _textarea2 = _interopRequireDefault(_textarea);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nvar editors = void 0;\nif (global.Textcomplete && global.Textcomplete.editors) {\n editors = global.Textcomplete.editors;\n} else {\n editors = {};\n}\neditors.Textarea = _textarea2.default;\n\nglobal.Textcomplete = _textcomplete2.default;\nglobal.Textcomplete.editors = editors;\n/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(6)))\n\n/***/ }),\n/* 6 */\n/***/ (function(module, exports) {\n\nvar g;\r\n\r\n// This works in non-strict mode\r\ng = (function() {\r\n\treturn this;\r\n})();\r\n\r\ntry {\r\n\t// This works if eval is allowed (see CSP)\r\n\tg = g || Function(\"return this\")() || (1,eval)(\"this\");\r\n} catch(e) {\r\n\t// This works if the window reference is available\r\n\tif(typeof window === \"object\")\r\n\t\tg = window;\r\n}\r\n\r\n// g can still be undefined, but nothing to do about it...\r\n// We return undefined, instead of nothing here, so it's\r\n// easier to handle this case. if(!global) { ...}\r\n\r\nmodule.exports = g;\r\n\n\n/***/ }),\n/* 7 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();\n\nvar _completer = __webpack_require__(8);\n\nvar _completer2 = _interopRequireDefault(_completer);\n\nvar _editor = __webpack_require__(4);\n\nvar _editor2 = _interopRequireDefault(_editor);\n\nvar _dropdown = __webpack_require__(10);\n\nvar _dropdown2 = _interopRequireDefault(_dropdown);\n\nvar _strategy = __webpack_require__(2);\n\nvar _strategy2 = _interopRequireDefault(_strategy);\n\nvar _search_result = __webpack_require__(0);\n\nvar _search_result2 = _interopRequireDefault(_search_result);\n\nvar _eventemitter = __webpack_require__(1);\n\nvar _eventemitter2 = _interopRequireDefault(_eventemitter);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return call && (typeof call === \"object\" || typeof call === \"function\") ? call : self; }\n\nfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function, not \" + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }\n\nvar CALLBACK_METHODS = [\"handleChange\", \"handleEnter\", \"handleEsc\", \"handleHit\", \"handleMove\", \"handleSelect\"];\n\n/** @typedef */\n\n/**\n * The core of textcomplete. It acts as a mediator.\n */\nvar Textcomplete = function (_EventEmitter) {\n _inherits(Textcomplete, _EventEmitter);\n\n /**\n * @param {Editor} editor - Where the textcomplete works on.\n */\n function Textcomplete(editor) {\n var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};\n\n _classCallCheck(this, Textcomplete);\n\n var _this = _possibleConstructorReturn(this, (Textcomplete.__proto__ || Object.getPrototypeOf(Textcomplete)).call(this));\n\n _this.completer = new _completer2.default();\n _this.isQueryInFlight = false;\n _this.nextPendingQuery = null;\n _this.dropdown = new _dropdown2.default(options.dropdown || {});\n _this.editor = editor;\n _this.options = options;\n\n CALLBACK_METHODS.forEach(function (method) {\n ;_this[method] = _this[method].bind(_this);\n });\n\n _this.startListening();\n return _this;\n }\n\n /**\n * @return {this}\n */\n\n\n _createClass(Textcomplete, [{\n key: \"destroy\",\n value: function destroy() {\n var destroyEditor = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;\n\n this.completer.destroy();\n this.dropdown.destroy();\n if (destroyEditor) {\n this.editor.destroy();\n }\n this.stopListening();\n return this;\n }\n\n /**\n * @return {this}\n */\n\n }, {\n key: \"hide\",\n value: function hide() {\n this.dropdown.deactivate();\n return this;\n }\n\n /**\n * @return {this}\n * @example\n * textcomplete.register([{\n * match: /(^|\\s)(\\w+)$/,\n * search: function (term, callback) {\n * $.ajax({ ... })\n * .done(callback)\n * .fail([]);\n * },\n * replace: function (value) {\n * return '$1' + value + ' ';\n * }\n * }]);\n */\n\n }, {\n key: \"register\",\n value: function register(strategyPropsArray) {\n var _this2 = this;\n\n strategyPropsArray.forEach(function (props) {\n _this2.completer.registerStrategy(new _strategy2.default(props));\n });\n return this;\n }\n\n /**\n * Start autocompleting.\n *\n * @param {string} text - Head to input cursor.\n * @return {this}\n */\n\n }, {\n key: \"trigger\",\n value: function trigger(text) {\n if (this.isQueryInFlight) {\n this.nextPendingQuery = text;\n } else {\n this.isQueryInFlight = true;\n this.nextPendingQuery = null;\n this.completer.run(text);\n }\n return this;\n }\n\n /** @private */\n\n }, {\n key: \"handleHit\",\n value: function handleHit(_ref) {\n var searchResults = _ref.searchResults;\n\n if (searchResults.length) {\n this.dropdown.render(searchResults, this.editor.getCursorOffset());\n } else {\n this.dropdown.deactivate();\n }\n this.isQueryInFlight = false;\n if (this.nextPendingQuery !== null) {\n this.trigger(this.nextPendingQuery);\n }\n }\n\n /** @private */\n\n }, {\n key: \"handleMove\",\n value: function handleMove(e) {\n e.detail.code === \"UP\" ? this.dropdown.up(e) : this.dropdown.down(e);\n }\n\n /** @private */\n\n }, {\n key: \"handleEnter\",\n value: function handleEnter(e) {\n var activeItem = this.dropdown.getActiveItem();\n if (activeItem) {\n this.dropdown.select(activeItem);\n e.preventDefault();\n } else {\n this.dropdown.deactivate();\n }\n }\n\n /** @private */\n\n }, {\n key: \"handleEsc\",\n value: function handleEsc(e) {\n if (this.dropdown.shown) {\n this.dropdown.deactivate();\n e.preventDefault();\n }\n }\n\n /** @private */\n\n }, {\n key: \"handleChange\",\n value: function handleChange(e) {\n if (e.detail.beforeCursor != null) {\n this.trigger(e.detail.beforeCursor);\n } else {\n this.dropdown.deactivate();\n }\n }\n\n /** @private */\n\n }, {\n key: \"handleSelect\",\n value: function handleSelect(selectEvent) {\n this.emit(\"select\", selectEvent);\n if (!selectEvent.defaultPrevented) {\n this.editor.applySearchResult(selectEvent.detail.searchResult);\n }\n }\n\n /** @private */\n\n }, {\n key: \"startListening\",\n value: function startListening() {\n var _this3 = this;\n\n this.editor.on(\"move\", this.handleMove).on(\"enter\", this.handleEnter).on(\"esc\", this.handleEsc).on(\"change\", this.handleChange);\n this.dropdown.on(\"select\", this.handleSelect);[\"show\", \"shown\", \"render\", \"rendered\", \"selected\", \"hidden\", \"hide\"].forEach(function (eventName) {\n _this3.dropdown.on(eventName, function () {\n return _this3.emit(eventName);\n });\n });\n this.completer.on(\"hit\", this.handleHit);\n }\n\n /** @private */\n\n }, {\n key: \"stopListening\",\n value: function stopListening() {\n this.completer.removeAllListeners();\n this.dropdown.removeAllListeners();\n this.editor.removeListener(\"move\", this.handleMove).removeListener(\"enter\", this.handleEnter).removeListener(\"esc\", this.handleEsc).removeListener(\"change\", this.handleChange);\n }\n }]);\n\n return Textcomplete;\n}(_eventemitter2.default);\n\nexports.default = Textcomplete;\n\n/***/ }),\n/* 8 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();\n\nvar _eventemitter = __webpack_require__(1);\n\nvar _eventemitter2 = _interopRequireDefault(_eventemitter);\n\nvar _query = __webpack_require__(9);\n\nvar _query2 = _interopRequireDefault(_query);\n\nvar _search_result = __webpack_require__(0);\n\nvar _search_result2 = _interopRequireDefault(_search_result);\n\nvar _strategy = __webpack_require__(2);\n\nvar _strategy2 = _interopRequireDefault(_strategy);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return call && (typeof call === \"object\" || typeof call === \"function\") ? call : self; }\n\nfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function, not \" + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }\n\nvar CALLBACK_METHODS = [\"handleQueryResult\"];\n\n/**\n * Complete engine.\n */\n\nvar Completer = function (_EventEmitter) {\n _inherits(Completer, _EventEmitter);\n\n function Completer() {\n _classCallCheck(this, Completer);\n\n var _this = _possibleConstructorReturn(this, (Completer.__proto__ || Object.getPrototypeOf(Completer)).call(this));\n\n _this.strategies = [];\n\n CALLBACK_METHODS.forEach(function (method) {\n ;_this[method] = _this[method].bind(_this);\n });\n return _this;\n }\n\n /**\n * @return {this}\n */\n\n\n _createClass(Completer, [{\n key: \"destroy\",\n value: function destroy() {\n this.strategies.forEach(function (strategy) {\n return strategy.destroy();\n });\n return this;\n }\n\n /**\n * Register a strategy to the completer.\n *\n * @return {this}\n */\n\n }, {\n key: \"registerStrategy\",\n value: function registerStrategy(strategy) {\n this.strategies.push(strategy);\n return this;\n }\n\n /**\n * @param {string} text - Head to input cursor.\n */\n\n }, {\n key: \"run\",\n value: function run(text) {\n var query = this.extractQuery(text);\n if (query) {\n query.execute(this.handleQueryResult);\n } else {\n this.handleQueryResult([]);\n }\n }\n\n /**\n * Find a query, which matches to the given text.\n *\n * @private\n */\n\n }, {\n key: \"extractQuery\",\n value: function extractQuery(text) {\n for (var i = 0; i < this.strategies.length; i++) {\n var query = _query2.default.build(this.strategies[i], text);\n if (query) {\n return query;\n }\n }\n return null;\n }\n\n /**\n * Callbacked by {@link Query#execute}.\n *\n * @private\n */\n\n }, {\n key: \"handleQueryResult\",\n value: function handleQueryResult(searchResults) {\n this.emit(\"hit\", { searchResults: searchResults });\n }\n }]);\n\n return Completer;\n}(_eventemitter2.default);\n\nexports.default = Completer;\n\n/***/ }),\n/* 9 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();\n\nvar _search_result = __webpack_require__(0);\n\nvar _search_result2 = _interopRequireDefault(_search_result);\n\nvar _strategy = __webpack_require__(2);\n\nvar _strategy2 = _interopRequireDefault(_strategy);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\n/**\n * Encapsulate matching condition between a Strategy and current editor's value.\n */\nvar Query = function () {\n _createClass(Query, null, [{\n key: \"build\",\n\n\n /**\n * Build a Query object by the given string if this matches to the string.\n *\n * @param {string} text - Head to input cursor.\n */\n value: function build(strategy, text) {\n if (typeof strategy.props.context === \"function\") {\n var context = strategy.props.context(text);\n if (typeof context === \"string\") {\n text = context;\n } else if (!context) {\n return null;\n }\n }\n var match = strategy.matchText(text);\n return match ? new Query(strategy, match[strategy.index], match) : null;\n }\n }]);\n\n function Query(strategy, term, match) {\n _classCallCheck(this, Query);\n\n this.strategy = strategy;\n this.term = term;\n this.match = match;\n }\n\n /**\n * Invoke search strategy and callback the given function.\n */\n\n\n _createClass(Query, [{\n key: \"execute\",\n value: function execute(callback) {\n var _this = this;\n\n this.strategy.search(this.term, function (results) {\n callback(results.map(function (result) {\n return new _search_result2.default(result, _this.term, _this.strategy);\n }));\n }, this.match);\n }\n }]);\n\n return Query;\n}();\n\nexports.default = Query;\n\n/***/ }),\n/* 10 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();\n\nvar _eventemitter = __webpack_require__(1);\n\nvar _eventemitter2 = _interopRequireDefault(_eventemitter);\n\nvar _dropdown_item = __webpack_require__(11);\n\nvar _dropdown_item2 = _interopRequireDefault(_dropdown_item);\n\nvar _search_result = __webpack_require__(0);\n\nvar _search_result2 = _interopRequireDefault(_search_result);\n\nvar _utils = __webpack_require__(3);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return call && (typeof call === \"object\" || typeof call === \"function\") ? call : self; }\n\nfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function, not \" + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }\n\nvar DEFAULT_CLASS_NAME = \"dropdown-menu textcomplete-dropdown\";\n\n/** @typedef */\n\n/**\n * Encapsulate a dropdown view.\n *\n * @prop {boolean} shown - Whether the #el is shown or not.\n * @prop {DropdownItem[]} items - The array of rendered dropdown items.\n */\nvar Dropdown = function (_EventEmitter) {\n _inherits(Dropdown, _EventEmitter);\n\n _createClass(Dropdown, null, [{\n key: \"createElement\",\n value: function createElement() {\n var el = document.createElement(\"ul\");\n var style = el.style;\n style.display = \"none\";\n style.position = \"absolute\";\n style.zIndex = \"10000\";\n var body = document.body;\n if (body) {\n body.appendChild(el);\n }\n return el;\n }\n }]);\n\n function Dropdown(options) {\n _classCallCheck(this, Dropdown);\n\n var _this = _possibleConstructorReturn(this, (Dropdown.__proto__ || Object.getPrototypeOf(Dropdown)).call(this));\n\n _this.shown = false;\n _this.items = [];\n _this.activeItem = null;\n _this.footer = options.footer;\n _this.header = options.header;\n _this.maxCount = options.maxCount || 10;\n _this.el.className = options.className || DEFAULT_CLASS_NAME;\n _this.rotate = options.hasOwnProperty(\"rotate\") ? options.rotate : true;\n _this.placement = options.placement;\n _this.itemOptions = options.item || {};\n var style = options.style;\n if (style) {\n Object.keys(style).forEach(function (key) {\n ;_this.el.style[key] = style[key];\n });\n }\n return _this;\n }\n\n /**\n * @return {this}\n */\n\n\n _createClass(Dropdown, [{\n key: \"destroy\",\n value: function destroy() {\n var parentNode = this.el.parentNode;\n if (parentNode) {\n parentNode.removeChild(this.el);\n }\n this.clear()._el = null;\n return this;\n }\n }, {\n key: \"render\",\n\n\n /**\n * Render the given data as dropdown items.\n *\n * @return {this}\n */\n value: function render(searchResults, cursorOffset) {\n var _this2 = this;\n\n var renderEvent = (0, _utils.createCustomEvent)(\"render\", { cancelable: true });\n this.emit(\"render\", renderEvent);\n if (renderEvent.defaultPrevented) {\n return this;\n }\n var rawResults = searchResults.map(function (searchResult) {\n return searchResult.data;\n });\n var dropdownItems = searchResults.slice(0, this.maxCount || searchResults.length).map(function (searchResult) {\n return new _dropdown_item2.default(searchResult, _this2.itemOptions);\n });\n this.clear().setStrategyId(searchResults[0]).renderEdge(rawResults, \"header\").append(dropdownItems).renderEdge(rawResults, \"footer\").show().setOffset(cursorOffset);\n this.emit(\"rendered\", (0, _utils.createCustomEvent)(\"rendered\"));\n return this;\n }\n\n /**\n * Hide the dropdown then sweep out items.\n *\n * @return {this}\n */\n\n }, {\n key: \"deactivate\",\n value: function deactivate() {\n return this.hide().clear();\n }\n\n /**\n * @return {this}\n */\n\n }, {\n key: \"select\",\n value: function select(dropdownItem) {\n var detail = { searchResult: dropdownItem.searchResult };\n var selectEvent = (0, _utils.createCustomEvent)(\"select\", {\n cancelable: true,\n detail: detail\n });\n this.emit(\"select\", selectEvent);\n if (selectEvent.defaultPrevented) {\n return this;\n }\n this.deactivate();\n this.emit(\"selected\", (0, _utils.createCustomEvent)(\"selected\", { detail: detail }));\n return this;\n }\n\n /**\n * @return {this}\n */\n\n }, {\n key: \"up\",\n value: function up(e) {\n return this.shown ? this.moveActiveItem(\"prev\", e) : this;\n }\n\n /**\n * @return {this}\n */\n\n }, {\n key: \"down\",\n value: function down(e) {\n return this.shown ? this.moveActiveItem(\"next\", e) : this;\n }\n\n /**\n * Retrieve the active item.\n */\n\n }, {\n key: \"getActiveItem\",\n value: function getActiveItem() {\n return this.activeItem;\n }\n\n /**\n * Add items to dropdown.\n *\n * @private\n */\n\n }, {\n key: \"append\",\n value: function append(items) {\n var _this3 = this;\n\n var fragment = document.createDocumentFragment();\n items.forEach(function (item) {\n _this3.items.push(item);\n item.appended(_this3);\n fragment.appendChild(item.el);\n });\n this.el.appendChild(fragment);\n return this;\n }\n\n /** @private */\n\n }, {\n key: \"setOffset\",\n value: function setOffset(cursorOffset) {\n var doc = document.documentElement;\n if (doc) {\n var elementWidth = this.el.offsetWidth;\n if (cursorOffset.left) {\n var browserWidth = doc.clientWidth;\n if (cursorOffset.left + elementWidth > browserWidth) {\n cursorOffset.left = browserWidth - elementWidth;\n }\n this.el.style.left = cursorOffset.left + \"px\";\n } else if (cursorOffset.right) {\n if (cursorOffset.right - elementWidth < 0) {\n cursorOffset.right = 0;\n }\n this.el.style.right = cursorOffset.right + \"px\";\n }\n if (this.isPlacementTop()) {\n this.el.style.bottom = doc.clientHeight - cursorOffset.top + cursorOffset.lineHeight + \"px\";\n } else {\n this.el.style.top = cursorOffset.top + \"px\";\n }\n }\n return this;\n }\n\n /**\n * Show the element.\n *\n * @private\n */\n\n }, {\n key: \"show\",\n value: function show() {\n if (!this.shown) {\n var showEvent = (0, _utils.createCustomEvent)(\"show\", { cancelable: true });\n this.emit(\"show\", showEvent);\n if (showEvent.defaultPrevented) {\n return this;\n }\n this.el.style.display = \"block\";\n this.shown = true;\n this.emit(\"shown\", (0, _utils.createCustomEvent)(\"shown\"));\n }\n return this;\n }\n\n /**\n * Hide the element.\n *\n * @private\n */\n\n }, {\n key: \"hide\",\n value: function hide() {\n if (this.shown) {\n var hideEvent = (0, _utils.createCustomEvent)(\"hide\", { cancelable: true });\n this.emit(\"hide\", hideEvent);\n if (hideEvent.defaultPrevented) {\n return this;\n }\n this.el.style.display = \"none\";\n this.shown = false;\n this.emit(\"hidden\", (0, _utils.createCustomEvent)(\"hidden\"));\n }\n return this;\n }\n\n /**\n * Clear search results.\n *\n * @private\n */\n\n }, {\n key: \"clear\",\n value: function clear() {\n this.el.innerHTML = \"\";\n this.items.forEach(function (item) {\n return item.destroy();\n });\n this.items = [];\n return this;\n }\n\n /** @private */\n\n }, {\n key: \"moveActiveItem\",\n value: function moveActiveItem(direction, e) {\n var nextActiveItem = direction === \"next\" ? this.activeItem ? this.activeItem.next : this.items[0] : this.activeItem ? this.activeItem.prev : this.items[this.items.length - 1];\n if (nextActiveItem) {\n nextActiveItem.activate();\n e.preventDefault();\n }\n return this;\n }\n\n /** @private */\n\n }, {\n key: \"setStrategyId\",\n value: function setStrategyId(searchResult) {\n var strategyId = searchResult && searchResult.strategy.props.id;\n if (strategyId) {\n this.el.setAttribute(\"data-strategy\", strategyId);\n } else {\n this.el.removeAttribute(\"data-strategy\");\n }\n return this;\n }\n\n /**\n * @private\n * @param {object[]} rawResults - What callbacked by search function.\n */\n\n }, {\n key: \"renderEdge\",\n value: function renderEdge(rawResults, type) {\n var source = (type === \"header\" ? this.header : this.footer) || \"\";\n var content = typeof source === \"function\" ? source(rawResults) : source;\n var li = document.createElement(\"li\");\n li.classList.add(\"textcomplete-\" + type);\n li.innerHTML = content;\n this.el.appendChild(li);\n return this;\n }\n\n /** @private */\n\n }, {\n key: \"isPlacementTop\",\n value: function isPlacementTop() {\n return this.placement === \"top\";\n }\n }, {\n key: \"el\",\n get: function get() {\n if (!this._el) {\n this._el = Dropdown.createElement();\n }\n return this._el;\n }\n }]);\n\n return Dropdown;\n}(_eventemitter2.default);\n\nexports.default = Dropdown;\n\n/***/ }),\n/* 11 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\nexports.DEFAULT_CLASS_NAME = undefined;\n\nvar _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();\n\nvar _search_result = __webpack_require__(0);\n\nvar _search_result2 = _interopRequireDefault(_search_result);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nvar DEFAULT_CLASS_NAME = exports.DEFAULT_CLASS_NAME = \"textcomplete-item\";\nvar CALLBACK_METHODS = [\"onClick\", \"onMouseover\"];\n\n/** @typedef */\n\n\n// Declare interface instead of importing Dropdown itself to prevent circular dependency.\n\n/**\n * Encapsulate an item of dropdown.\n */\nvar DropdownItem = function () {\n function DropdownItem(searchResult, options) {\n var _this = this;\n\n _classCallCheck(this, DropdownItem);\n\n this.searchResult = searchResult;\n this.active = false;\n this.className = options.className || DEFAULT_CLASS_NAME;\n this.activeClassName = this.className + \" active\";\n\n CALLBACK_METHODS.forEach(function (method) {\n ;_this[method] = _this[method].bind(_this);\n });\n }\n\n _createClass(DropdownItem, [{\n key: \"destroy\",\n\n\n /**\n * Try to free resources and perform other cleanup operations.\n */\n value: function destroy() {\n this.el.removeEventListener(\"mousedown\", this.onClick, false);\n this.el.removeEventListener(\"mouseover\", this.onMouseover, false);\n this.el.removeEventListener(\"touchstart\", this.onClick, false);\n if (this.active) {\n this.dropdown.activeItem = null;\n }\n // This element has already been removed by {@link Dropdown#clear}.\n this._el = null;\n }\n\n /**\n * Callbacked when it is appended to a dropdown.\n *\n * @see Dropdown#append\n */\n\n }, {\n key: \"appended\",\n value: function appended(dropdown) {\n this.dropdown = dropdown;\n this.siblings = dropdown.items;\n this.index = this.siblings.length - 1;\n }\n\n /**\n * Deactivate active item then activate itself.\n *\n * @return {this}\n */\n\n }, {\n key: \"activate\",\n value: function activate() {\n if (!this.active) {\n var _activeItem = this.dropdown.getActiveItem();\n if (_activeItem) {\n _activeItem.deactivate();\n }\n this.dropdown.activeItem = this;\n this.active = true;\n this.el.className = this.activeClassName;\n }\n return this;\n }\n\n /**\n * Get the next sibling.\n */\n\n }, {\n key: \"deactivate\",\n\n\n /** @private */\n value: function deactivate() {\n if (this.active) {\n this.active = false;\n this.el.className = this.className;\n this.dropdown.activeItem = null;\n }\n return this;\n }\n\n /** @private */\n\n }, {\n key: \"onClick\",\n value: function onClick(e) {\n e.preventDefault // Prevent blur event\n ();this.dropdown.select(this);\n }\n\n /** @private */\n\n }, {\n key: \"onMouseover\",\n value: function onMouseover() {\n this.activate();\n }\n }, {\n key: \"el\",\n get: function get() {\n if (this._el) {\n return this._el;\n }\n var li = document.createElement(\"li\");\n li.className = this.active ? this.activeClassName : this.className;\n var a = document.createElement(\"a\");\n a.innerHTML = this.searchResult.render();\n li.appendChild(a);\n this._el = li;\n li.addEventListener(\"mousedown\", this.onClick);\n li.addEventListener(\"mouseover\", this.onMouseover);\n li.addEventListener(\"touchstart\", this.onClick);\n return li;\n }\n }, {\n key: \"next\",\n get: function get() {\n var nextIndex = void 0;\n if (this.index === this.siblings.length - 1) {\n if (!this.dropdown.rotate) {\n return null;\n }\n nextIndex = 0;\n } else {\n nextIndex = this.index + 1;\n }\n return this.siblings[nextIndex];\n }\n\n /**\n * Get the previous sibling.\n */\n\n }, {\n key: \"prev\",\n get: function get() {\n var nextIndex = void 0;\n if (this.index === 0) {\n if (!this.dropdown.rotate) {\n return null;\n }\n nextIndex = this.siblings.length - 1;\n } else {\n nextIndex = this.index - 1;\n }\n return this.siblings[nextIndex];\n }\n }]);\n\n return DropdownItem;\n}();\n\nexports.default = DropdownItem;\n\n/***/ }),\n/* 12 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();\n\nvar _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if (\"value\" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };\n\nvar _update = __webpack_require__(13);\n\nvar _update2 = _interopRequireDefault(_update);\n\nvar _editor = __webpack_require__(4);\n\nvar _editor2 = _interopRequireDefault(_editor);\n\nvar _utils = __webpack_require__(3);\n\nvar _search_result = __webpack_require__(0);\n\nvar _search_result2 = _interopRequireDefault(_search_result);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return call && (typeof call === \"object\" || typeof call === \"function\") ? call : self; }\n\nfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function, not \" + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }\n\nvar getCaretCoordinates = __webpack_require__(14);\n\nvar CALLBACK_METHODS = [\"onInput\", \"onKeydown\"];\n\n/**\n * Encapsulate the target textarea element.\n */\n\nvar Textarea = function (_Editor) {\n _inherits(Textarea, _Editor);\n\n /**\n * @param {HTMLTextAreaElement} el - Where the textcomplete works on.\n */\n function Textarea(el) {\n _classCallCheck(this, Textarea);\n\n var _this = _possibleConstructorReturn(this, (Textarea.__proto__ || Object.getPrototypeOf(Textarea)).call(this));\n\n _this.el = el;\n\n CALLBACK_METHODS.forEach(function (method) {\n ;_this[method] = _this[method].bind(_this);\n });\n\n _this.startListening();\n return _this;\n }\n\n /**\n * @return {this}\n */\n\n\n _createClass(Textarea, [{\n key: \"destroy\",\n value: function destroy() {\n _get(Textarea.prototype.__proto__ || Object.getPrototypeOf(Textarea.prototype), \"destroy\", this).call(this);\n this.stopListening\n // Release the element reference early to help garbage collection.\n ();this.el = null;\n return this;\n }\n\n /**\n * Implementation for {@link Editor#applySearchResult}\n */\n\n }, {\n key: \"applySearchResult\",\n value: function applySearchResult(searchResult) {\n var before = this.getBeforeCursor();\n if (before != null) {\n var replace = searchResult.replace(before, this.getAfterCursor());\n this.el.focus // Clicking a dropdown item removes focus from the element.\n ();if (Array.isArray(replace)) {\n (0, _update2.default)(this.el, replace[0], replace[1]);\n this.el.dispatchEvent(new Event(\"input\"));\n }\n }\n }\n\n /**\n * Implementation for {@link Editor#getCursorOffset}\n */\n\n }, {\n key: \"getCursorOffset\",\n value: function getCursorOffset() {\n var elOffset = (0, _utils.calculateElementOffset)(this.el);\n var elScroll = this.getElScroll();\n var cursorPosition = this.getCursorPosition();\n var lineHeight = (0, _utils.getLineHeightPx)(this.el);\n var top = elOffset.top - elScroll.top + cursorPosition.top + lineHeight;\n var left = elOffset.left - elScroll.left + cursorPosition.left;\n if (this.el.dir !== \"rtl\") {\n return { top: top, left: left, lineHeight: lineHeight };\n } else {\n var right = document.documentElement ? document.documentElement.clientWidth - left : 0;\n return { top: top, right: right, lineHeight: lineHeight };\n }\n }\n\n /**\n * Implementation for {@link Editor#getBeforeCursor}\n */\n\n }, {\n key: \"getBeforeCursor\",\n value: function getBeforeCursor() {\n return this.el.selectionStart !== this.el.selectionEnd ? null : this.el.value.substring(0, this.el.selectionEnd);\n }\n\n /** @private */\n\n }, {\n key: \"getAfterCursor\",\n value: function getAfterCursor() {\n return this.el.value.substring(this.el.selectionEnd);\n }\n\n /** @private */\n\n }, {\n key: \"getElScroll\",\n value: function getElScroll() {\n return { top: this.el.scrollTop, left: this.el.scrollLeft };\n }\n\n /**\n * The input cursor's relative coordinates from the textarea's left\n * top corner.\n *\n * @private\n */\n\n }, {\n key: \"getCursorPosition\",\n value: function getCursorPosition() {\n return getCaretCoordinates(this.el, this.el.selectionEnd);\n }\n\n /** @private */\n\n }, {\n key: \"onInput\",\n value: function onInput() {\n this.emitChangeEvent();\n }\n\n /** @private */\n\n }, {\n key: \"onKeydown\",\n value: function onKeydown(e) {\n var code = this.getCode(e);\n var event = void 0;\n if (code === \"UP\" || code === \"DOWN\") {\n event = this.emitMoveEvent(code);\n } else if (code === \"ENTER\") {\n event = this.emitEnterEvent();\n } else if (code === \"ESC\") {\n event = this.emitEscEvent();\n }\n if (event && event.defaultPrevented) {\n e.preventDefault();\n }\n }\n\n /** @private */\n\n }, {\n key: \"startListening\",\n value: function startListening() {\n this.el.addEventListener(\"input\", this.onInput);\n this.el.addEventListener(\"keydown\", this.onKeydown);\n }\n\n /** @private */\n\n }, {\n key: \"stopListening\",\n value: function stopListening() {\n this.el.removeEventListener(\"input\", this.onInput);\n this.el.removeEventListener(\"keydown\", this.onKeydown);\n }\n }]);\n\n return Textarea;\n}(_editor2.default);\n\nexports.default = Textarea;\n\n/***/ }),\n/* 13 */\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nexports.default = function (el, headToCursor, cursorToTail) {\n var curr = el.value,\n // strA + strB1 + strC\n next = headToCursor + (cursorToTail || ''),\n // strA + strB2 + strC\n activeElement = document.activeElement;\n\n // Calculate length of strA and strC\n var aLength = 0,\n cLength = 0;\n while (aLength < curr.length && aLength < next.length && curr[aLength] === next[aLength]) {\n aLength++;\n }\n while (curr.length - cLength - 1 >= 0 && next.length - cLength - 1 >= 0 && curr[curr.length - cLength - 1] === next[next.length - cLength - 1]) {\n cLength++;\n }\n aLength = Math.min(aLength, Math.min(curr.length, next.length) - cLength);\n\n // Select strB1\n el.setSelectionRange(aLength, curr.length - cLength);\n\n // Get strB2\n var strB2 = next.substring(aLength, next.length - cLength);\n\n // Replace strB1 with strB2\n el.focus();\n if (!document.execCommand('insertText', false, strB2)) {\n // Document.execCommand returns false if the command is not supported.\n // Firefox and IE returns false in this case.\n el.value = next;\n el.dispatchEvent(createInputEvent());\n }\n\n // Move cursor to the end of headToCursor\n el.setSelectionRange(headToCursor.length, headToCursor.length);\n\n activeElement && activeElement.focus();\n return el;\n};\n\nfunction createInputEvent() {\n if (typeof Event !== \"undefined\") {\n return new Event(\"input\", { bubbles: true, cancelable: true });\n } else {\n var event = document.createEvent(\"Event\");\n event.initEvent(\"input\", true, true);\n return event;\n }\n}\n\n/***/ }),\n/* 14 */\n/***/ (function(module, exports) {\n\n/* jshint browser: true */\n\n(function () {\n\n// The properties that we copy into a mirrored div.\n// Note that some browsers, such as Firefox,\n// do not concatenate properties, i.e. padding-top, bottom etc. -> padding,\n// so we have to do every single property specifically.\nvar properties = [\n 'direction', // RTL support\n 'boxSizing',\n 'width', // on Chrome and IE, exclude the scrollbar, so the mirror div wraps exactly as the textarea does\n 'height',\n 'overflowX',\n 'overflowY', // copy the scrollbar for IE\n\n 'borderTopWidth',\n 'borderRightWidth',\n 'borderBottomWidth',\n 'borderLeftWidth',\n 'borderStyle',\n\n 'paddingTop',\n 'paddingRight',\n 'paddingBottom',\n 'paddingLeft',\n\n // https://developer.mozilla.org/en-US/docs/Web/CSS/font\n 'fontStyle',\n 'fontVariant',\n 'fontWeight',\n 'fontStretch',\n 'fontSize',\n 'fontSizeAdjust',\n 'lineHeight',\n 'fontFamily',\n\n 'textAlign',\n 'textTransform',\n 'textIndent',\n 'textDecoration', // might not make a difference, but better be safe\n\n 'letterSpacing',\n 'wordSpacing',\n\n 'tabSize',\n 'MozTabSize'\n\n];\n\nvar isBrowser = (typeof window !== 'undefined');\nvar isFirefox = (isBrowser && window.mozInnerScreenX != null);\n\nfunction getCaretCoordinates(element, position, options) {\n if(!isBrowser) {\n throw new Error('textarea-caret-position#getCaretCoordinates should only be called in a browser');\n }\n\n var debug = options && options.debug || false;\n if (debug) {\n var el = document.querySelector('#input-textarea-caret-position-mirror-div');\n if ( el ) { el.parentNode.removeChild(el); }\n }\n\n // mirrored div\n var div = document.createElement('div');\n div.id = 'input-textarea-caret-position-mirror-div';\n document.body.appendChild(div);\n\n var style = div.style;\n var computed = window.getComputedStyle? getComputedStyle(element) : element.currentStyle; // currentStyle for IE < 9\n\n // default textarea styles\n style.whiteSpace = 'pre-wrap';\n if (element.nodeName !== 'INPUT')\n style.wordWrap = 'break-word'; // only for textarea-s\n\n // position off-screen\n style.position = 'absolute'; // required to return coordinates properly\n if (!debug)\n style.visibility = 'hidden'; // not 'display: none' because we want rendering\n\n // transfer the element's properties to the div\n properties.forEach(function (prop) {\n style[prop] = computed[prop];\n });\n\n if (isFirefox) {\n // Firefox lies about the overflow property for textareas: https://bugzilla.mozilla.org/show_bug.cgi?id=984275\n if (element.scrollHeight > parseInt(computed.height))\n style.overflowY = 'scroll';\n } else {\n style.overflow = 'hidden'; // for Chrome to not render a scrollbar; IE keeps overflowY = 'scroll'\n }\n\n div.textContent = element.value.substring(0, position);\n // the second special handling for input type=\"text\" vs textarea: spaces need to be replaced with non-breaking spaces - http://stackoverflow.com/a/13402035/1269037\n if (element.nodeName === 'INPUT')\n div.textContent = div.textContent.replace(/\\s/g, '\\u00a0');\n\n var span = document.createElement('span');\n // Wrapping must be replicated *exactly*, including when a long word gets\n // onto the next line, with whitespace at the end of the line before (#7).\n // The *only* reliable way to do that is to copy the *entire* rest of the\n // textarea's content into the created at the caret position.\n // for inputs, just '.' would be enough, but why bother?\n span.textContent = element.value.substring(position) || '.'; // || because a completely empty faux span doesn't render at all\n div.appendChild(span);\n\n var coordinates = {\n top: span.offsetTop + parseInt(computed['borderTopWidth']),\n left: span.offsetLeft + parseInt(computed['borderLeftWidth'])\n };\n\n if (debug) {\n span.style.backgroundColor = '#aaa';\n } else {\n document.body.removeChild(div);\n }\n\n return coordinates;\n}\n\nif (typeof module != 'undefined' && typeof module.exports != 'undefined') {\n module.exports = getCaretCoordinates;\n} else if(isBrowser){\n window.getCaretCoordinates = getCaretCoordinates;\n}\n\n}());\n\n\n/***/ })\n/******/ ]);\n\n\n// WEBPACK FOOTER //\n// textcomplete.min.js"," \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 5);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 5fdd342a07201b673919","// @flow\n\nimport Strategy from \"./strategy\"\n\n/**\n * Encapsulate an result of each search results.\n */\nexport default class SearchResult {\n data: Object\n term: string\n strategy: Strategy\n\n /**\n * @param {object} data - An element of array callbacked by search function.\n */\n constructor(data: Object, term: string, strategy: Strategy) {\n this.data = data\n this.term = term\n this.strategy = strategy\n }\n\n replace(beforeCursor: string, afterCursor: string) {\n let replacement = this.strategy.replace(this.data)\n if (replacement !== null) {\n if (Array.isArray(replacement)) {\n afterCursor = replacement[1] + afterCursor\n replacement = replacement[0]\n }\n const match = this.strategy.matchText(beforeCursor)\n if (match) {\n replacement = replacement\n .replace(/\\$&/g, match[0])\n .replace(/\\$(\\d)/g, (_, p1) => match[parseInt(p1, 10)])\n return [\n [\n beforeCursor.slice(0, match.index),\n replacement,\n beforeCursor.slice(match.index + match[0].length),\n ].join(\"\"),\n afterCursor,\n ]\n }\n }\n }\n\n render(): string {\n return this.strategy.template(this.data, this.term)\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/search_result.js","'use strict';\n\nvar has = Object.prototype.hasOwnProperty\n , prefix = '~';\n\n/**\n * Constructor to create a storage for our `EE` objects.\n * An `Events` instance is a plain object whose properties are event names.\n *\n * @constructor\n * @api private\n */\nfunction Events() {}\n\n//\n// We try to not inherit from `Object.prototype`. In some engines creating an\n// instance in this way is faster than calling `Object.create(null)` directly.\n// If `Object.create(null)` is not supported we prefix the event names with a\n// character to make sure that the built-in object properties are not\n// overridden or used as an attack vector.\n//\nif (Object.create) {\n Events.prototype = Object.create(null);\n\n //\n // This hack is needed because the `__proto__` property is still inherited in\n // some old browsers like Android 4, iPhone 5.1, Opera 11 and Safari 5.\n //\n if (!new Events().__proto__) prefix = false;\n}\n\n/**\n * Representation of a single event listener.\n *\n * @param {Function} fn The listener function.\n * @param {Mixed} context The context to invoke the listener with.\n * @param {Boolean} [once=false] Specify if the listener is a one-time listener.\n * @constructor\n * @api private\n */\nfunction EE(fn, context, once) {\n this.fn = fn;\n this.context = context;\n this.once = once || false;\n}\n\n/**\n * Minimal `EventEmitter` interface that is molded against the Node.js\n * `EventEmitter` interface.\n *\n * @constructor\n * @api public\n */\nfunction EventEmitter() {\n this._events = new Events();\n this._eventsCount = 0;\n}\n\n/**\n * Return an array listing the events for which the emitter has registered\n * listeners.\n *\n * @returns {Array}\n * @api public\n */\nEventEmitter.prototype.eventNames = function eventNames() {\n var names = []\n , events\n , name;\n\n if (this._eventsCount === 0) return names;\n\n for (name in (events = this._events)) {\n if (has.call(events, name)) names.push(prefix ? name.slice(1) : name);\n }\n\n if (Object.getOwnPropertySymbols) {\n return names.concat(Object.getOwnPropertySymbols(events));\n }\n\n return names;\n};\n\n/**\n * Return the listeners registered for a given event.\n *\n * @param {String|Symbol} event The event name.\n * @param {Boolean} exists Only check if there are listeners.\n * @returns {Array|Boolean}\n * @api public\n */\nEventEmitter.prototype.listeners = function listeners(event, exists) {\n var evt = prefix ? prefix + event : event\n , available = this._events[evt];\n\n if (exists) return !!available;\n if (!available) return [];\n if (available.fn) return [available.fn];\n\n for (var i = 0, l = available.length, ee = new Array(l); i < l; i++) {\n ee[i] = available[i].fn;\n }\n\n return ee;\n};\n\n/**\n * Calls each of the listeners registered for a given event.\n *\n * @param {String|Symbol} event The event name.\n * @returns {Boolean} `true` if the event had listeners, else `false`.\n * @api public\n */\nEventEmitter.prototype.emit = function emit(event, a1, a2, a3, a4, a5) {\n var evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) return false;\n\n var listeners = this._events[evt]\n , len = arguments.length\n , args\n , i;\n\n if (listeners.fn) {\n if (listeners.once) this.removeListener(event, listeners.fn, undefined, true);\n\n switch (len) {\n case 1: return listeners.fn.call(listeners.context), true;\n case 2: return listeners.fn.call(listeners.context, a1), true;\n case 3: return listeners.fn.call(listeners.context, a1, a2), true;\n case 4: return listeners.fn.call(listeners.context, a1, a2, a3), true;\n case 5: return listeners.fn.call(listeners.context, a1, a2, a3, a4), true;\n case 6: return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true;\n }\n\n for (i = 1, args = new Array(len -1); i < len; i++) {\n args[i - 1] = arguments[i];\n }\n\n listeners.fn.apply(listeners.context, args);\n } else {\n var length = listeners.length\n , j;\n\n for (i = 0; i < length; i++) {\n if (listeners[i].once) this.removeListener(event, listeners[i].fn, undefined, true);\n\n switch (len) {\n case 1: listeners[i].fn.call(listeners[i].context); break;\n case 2: listeners[i].fn.call(listeners[i].context, a1); break;\n case 3: listeners[i].fn.call(listeners[i].context, a1, a2); break;\n case 4: listeners[i].fn.call(listeners[i].context, a1, a2, a3); break;\n default:\n if (!args) for (j = 1, args = new Array(len -1); j < len; j++) {\n args[j - 1] = arguments[j];\n }\n\n listeners[i].fn.apply(listeners[i].context, args);\n }\n }\n }\n\n return true;\n};\n\n/**\n * Add a listener for a given event.\n *\n * @param {String|Symbol} event The event name.\n * @param {Function} fn The listener function.\n * @param {Mixed} [context=this] The context to invoke the listener with.\n * @returns {EventEmitter} `this`.\n * @api public\n */\nEventEmitter.prototype.on = function on(event, fn, context) {\n var listener = new EE(fn, context || this)\n , evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) this._events[evt] = listener, this._eventsCount++;\n else if (!this._events[evt].fn) this._events[evt].push(listener);\n else this._events[evt] = [this._events[evt], listener];\n\n return this;\n};\n\n/**\n * Add a one-time listener for a given event.\n *\n * @param {String|Symbol} event The event name.\n * @param {Function} fn The listener function.\n * @param {Mixed} [context=this] The context to invoke the listener with.\n * @returns {EventEmitter} `this`.\n * @api public\n */\nEventEmitter.prototype.once = function once(event, fn, context) {\n var listener = new EE(fn, context || this, true)\n , evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) this._events[evt] = listener, this._eventsCount++;\n else if (!this._events[evt].fn) this._events[evt].push(listener);\n else this._events[evt] = [this._events[evt], listener];\n\n return this;\n};\n\n/**\n * Remove the listeners of a given event.\n *\n * @param {String|Symbol} event The event name.\n * @param {Function} fn Only remove the listeners that match this function.\n * @param {Mixed} context Only remove the listeners that have this context.\n * @param {Boolean} once Only remove one-time listeners.\n * @returns {EventEmitter} `this`.\n * @api public\n */\nEventEmitter.prototype.removeListener = function removeListener(event, fn, context, once) {\n var evt = prefix ? prefix + event : event;\n\n if (!this._events[evt]) return this;\n if (!fn) {\n if (--this._eventsCount === 0) this._events = new Events();\n else delete this._events[evt];\n return this;\n }\n\n var listeners = this._events[evt];\n\n if (listeners.fn) {\n if (\n listeners.fn === fn\n && (!once || listeners.once)\n && (!context || listeners.context === context)\n ) {\n if (--this._eventsCount === 0) this._events = new Events();\n else delete this._events[evt];\n }\n } else {\n for (var i = 0, events = [], length = listeners.length; i < length; i++) {\n if (\n listeners[i].fn !== fn\n || (once && !listeners[i].once)\n || (context && listeners[i].context !== context)\n ) {\n events.push(listeners[i]);\n }\n }\n\n //\n // Reset the array, or remove it completely if we have no more listeners.\n //\n if (events.length) this._events[evt] = events.length === 1 ? events[0] : events;\n else if (--this._eventsCount === 0) this._events = new Events();\n else delete this._events[evt];\n }\n\n return this;\n};\n\n/**\n * Remove all listeners, or those of the specified event.\n *\n * @param {String|Symbol} [event] The event name.\n * @returns {EventEmitter} `this`.\n * @api public\n */\nEventEmitter.prototype.removeAllListeners = function removeAllListeners(event) {\n var evt;\n\n if (event) {\n evt = prefix ? prefix + event : event;\n if (this._events[evt]) {\n if (--this._eventsCount === 0) this._events = new Events();\n else delete this._events[evt];\n }\n } else {\n this._events = new Events();\n this._eventsCount = 0;\n }\n\n return this;\n};\n\n//\n// Alias methods names because people roll like that.\n//\nEventEmitter.prototype.off = EventEmitter.prototype.removeListener;\nEventEmitter.prototype.addListener = EventEmitter.prototype.on;\n\n//\n// This function doesn't apply anymore.\n//\nEventEmitter.prototype.setMaxListeners = function setMaxListeners() {\n return this;\n};\n\n//\n// Expose the prefix.\n//\nEventEmitter.prefixed = prefix;\n\n//\n// Allow `EventEmitter` to be imported as module namespace.\n//\nEventEmitter.EventEmitter = EventEmitter;\n\n//\n// Expose the module.\n//\nif ('undefined' !== typeof module) {\n module.exports = EventEmitter;\n}\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./node_modules/eventemitter3/index.js\n// module id = 1\n// module chunks = 0","// @flow\n\ndeclare class MatchData extends Array {\n index: number;\n}\n\nexport type { MatchData }\n\nconst DEFAULT_INDEX = 2\n\nfunction DEFAULT_TEMPLATE(value) {\n return value\n}\n\n/**\n * Properties for a strategy.\n *\n * @typedef\n */\nexport type StrategyProperties = {\n match: RegExp | (string => MatchData | null),\n search: Function,\n replace: any => string[] | string | null,\n cache?: boolean,\n context?: Function,\n template?: any => string,\n index?: number,\n id?: string,\n}\n\n/**\n * Encapsulate a single strategy.\n */\nexport default class Strategy {\n props: StrategyProperties\n cache: ?Object\n\n constructor(props: StrategyProperties) {\n this.props = props\n this.cache = props.cache ? {} : null\n }\n\n /**\n * @return {this}\n */\n destroy() {\n this.cache = null\n return this\n }\n\n search(term: string, callback: Function, match: MatchData): void {\n if (this.cache) {\n this.searchWithCache(term, callback, match)\n } else {\n this.props.search(term, callback, match)\n }\n }\n\n /**\n * @param {object} data - An element of array callbacked by search function.\n */\n replace(data: any) {\n return this.props.replace(data)\n }\n\n /** @private */\n searchWithCache(term: string, callback: Function, match: MatchData): void {\n if (this.cache && this.cache[term]) {\n callback(this.cache[term])\n } else {\n this.props.search(\n term,\n results => {\n if (this.cache) {\n this.cache[term] = results\n }\n callback(results)\n },\n match,\n )\n }\n }\n\n /** @private */\n matchText(text: string): MatchData | null {\n if (typeof this.match === \"function\") {\n return this.match(text)\n } else {\n return (text.match(this.match): any)\n }\n }\n\n /** @private */\n get match(): $PropertyType {\n return this.props.match\n }\n\n /** @private */\n get index(): number {\n return typeof this.props.index === \"number\"\n ? this.props.index\n : DEFAULT_INDEX\n }\n\n get template(): (...any) => string {\n return this.props.template || DEFAULT_TEMPLATE\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/strategy.js","// @flow\n\n/**\n * Create a custom event\n *\n * @private\n */\nexport const createCustomEvent = (() => {\n if (typeof window.CustomEvent === \"function\") {\n return function(\n type: string,\n options: ?{ detail?: Object, cancelable?: boolean },\n ): CustomEvent {\n return new document.defaultView.CustomEvent(type, {\n cancelable: (options && options.cancelable) || false,\n detail: (options && options.detail) || undefined,\n })\n }\n } else {\n // Custom event polyfill from\n // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#polyfill\n return function(\n type: string,\n options: ?{ detail?: Object, cancelable?: boolean },\n ): CustomEvent {\n const event = document.createEvent(\"CustomEvent\")\n event.initCustomEvent(\n type,\n /* bubbles */ false,\n (options && options.cancelable) || false,\n (options && options.detail) || undefined,\n )\n return event\n }\n }\n})()\n\n/**\n * Get the current coordinates of the `el` relative to the document.\n *\n * @private\n */\nexport function calculateElementOffset(\n el: HTMLElement,\n): { top: number, left: number } {\n const rect = el.getBoundingClientRect()\n const { defaultView, documentElement } = el.ownerDocument\n const offset = {\n top: rect.top + defaultView.pageYOffset,\n left: rect.left + defaultView.pageXOffset,\n }\n if (documentElement) {\n offset.top -= documentElement.clientTop\n offset.left -= documentElement.clientLeft\n }\n return offset\n}\n\nconst CHAR_CODE_ZERO = \"0\".charCodeAt(0)\nconst CHAR_CODE_NINE = \"9\".charCodeAt(0)\n\nfunction isDigit(charCode: number): boolean {\n return charCode >= CHAR_CODE_ZERO && charCode <= CHAR_CODE_NINE\n}\n\n/**\n * Returns the line-height of the given node in pixels.\n *\n * @private\n */\nexport function getLineHeightPx(node: HTMLElement): number {\n const computedStyle = window.getComputedStyle(node)\n\n // If the char code starts with a digit, it is either a value in pixels,\n // or unitless, as per:\n // https://drafts.csswg.org/css2/visudet.html#propdef-line-height\n // https://drafts.csswg.org/css2/cascade.html#computed-value\n if (isDigit(computedStyle.lineHeight.charCodeAt(0))) {\n // In real browsers the value is *always* in pixels, even for unit-less\n // line-heights. However, we still check as per the spec.\n if (\n isDigit(\n computedStyle.lineHeight.charCodeAt(\n computedStyle.lineHeight.length - 1,\n ),\n )\n ) {\n return (\n parseFloat(computedStyle.lineHeight) *\n parseFloat(computedStyle.fontSize)\n )\n } else {\n return parseFloat(computedStyle.lineHeight)\n }\n }\n\n // Otherwise, the value is \"normal\".\n // If the line-height is \"normal\", calculate by font-size\n return calculateLineHeightPx(node.nodeName, computedStyle)\n}\n\n/**\n * Returns calculated line-height of the given node in pixels.\n *\n * @private\n */\nexport function calculateLineHeightPx(\n nodeName: string,\n computedStyle: CSSStyleDeclaration,\n): number {\n const body = document.body\n if (!body) {\n return 0\n }\n\n const tempNode = document.createElement(nodeName)\n tempNode.innerHTML = \" \"\n tempNode.style.fontSize = computedStyle.fontSize\n tempNode.style.fontFamily = computedStyle.fontFamily\n tempNode.style.padding = \"0\"\n body.appendChild(tempNode)\n\n // Make sure textarea has only 1 row\n if (tempNode instanceof HTMLTextAreaElement) {\n ;(tempNode: HTMLTextAreaElement).rows = 1\n }\n\n // Assume the height of the element is the line-height\n const height = tempNode.offsetHeight\n body.removeChild(tempNode)\n\n return height\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/utils.js","// @flow\n/*eslint no-unused-vars: off*/\n\nimport EventEmitter from \"eventemitter3\"\n\nimport { createCustomEvent } from \"./utils\"\nimport SearchResult from \"./search_result\"\n\n/** @typedef */\nexport type CursorOffset = {\n lineHeight: number,\n top: number,\n left?: number,\n right?: number,\n}\n\ntype KeyCode = \"ESC\" | \"ENTER\" | \"UP\" | \"DOWN\" | \"OTHER\"\n\n/**\n * Abstract class representing a editor target.\n *\n * Editor classes must implement `#applySearchResult`, `#getCursorOffset` and\n * `#getBeforeCursor` methods.\n *\n * Editor classes must invoke `#emitMoveEvent`, `#emitEnterEvent`,\n * `#emitChangeEvent` and `#emitEscEvent` at proper timing.\n *\n * @abstract\n */\nexport default class Editor extends EventEmitter {\n /**\n * It is called when associated textcomplete object is destroyed.\n *\n * @return {this}\n */\n destroy() {\n return this\n }\n\n /**\n * It is called when a search result is selected by a user.\n */\n applySearchResult(_: SearchResult): void {\n throw new Error(\"Not implemented.\")\n }\n\n /**\n * The input cursor's absolute coordinates from the window's left\n * top corner.\n */\n getCursorOffset(): CursorOffset {\n throw new Error(\"Not implemented.\")\n }\n\n /**\n * Editor string value from head to cursor.\n * Returns null if selection type is range not cursor.\n */\n getBeforeCursor(): ?string {\n throw new Error(\"Not implemented.\")\n }\n\n /**\n * Emit a move event, which moves active dropdown element.\n * Child class must call this method at proper timing with proper parameter.\n *\n * @see {@link Textarea} for live example.\n */\n emitMoveEvent(code: \"UP\" | \"DOWN\"): CustomEvent {\n const moveEvent = createCustomEvent(\"move\", {\n cancelable: true,\n detail: {\n code: code,\n },\n })\n this.emit(\"move\", moveEvent)\n return moveEvent\n }\n\n /**\n * Emit a enter event, which selects current search result.\n * Child class must call this method at proper timing.\n *\n * @see {@link Textarea} for live example.\n */\n emitEnterEvent(): CustomEvent {\n const enterEvent = createCustomEvent(\"enter\", { cancelable: true })\n this.emit(\"enter\", enterEvent)\n return enterEvent\n }\n\n /**\n * Emit a change event, which triggers auto completion.\n * Child class must call this method at proper timing.\n *\n * @see {@link Textarea} for live example.\n */\n emitChangeEvent(): CustomEvent {\n const changeEvent = createCustomEvent(\"change\", {\n detail: {\n beforeCursor: this.getBeforeCursor(),\n },\n })\n this.emit(\"change\", changeEvent)\n return changeEvent\n }\n\n /**\n * Emit a esc event, which hides dropdown element.\n * Child class must call this method at proper timing.\n *\n * @see {@link Textarea} for live example.\n */\n emitEscEvent(): CustomEvent {\n const escEvent = createCustomEvent(\"esc\", { cancelable: true })\n this.emit(\"esc\", escEvent)\n return escEvent\n }\n\n /**\n * Helper method for parsing KeyboardEvent.\n *\n * @see {@link Textarea} for live example.\n */\n getCode(e: KeyboardEvent): KeyCode {\n return e.keyCode === 9\n ? \"ENTER\" // tab\n : e.keyCode === 13\n ? \"ENTER\" // enter\n : e.keyCode === 27\n ? \"ESC\" // esc\n : e.keyCode === 38\n ? \"UP\" // up\n : e.keyCode === 40\n ? \"DOWN\" // down\n : e.keyCode === 78 && e.ctrlKey\n ? \"DOWN\" // ctrl-n\n : e.keyCode === 80 && e.ctrlKey\n ? \"UP\" // ctrl-p\n : \"OTHER\"\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/editor.js","import Textcomplete from \"./textcomplete\"\nimport Textarea from \"./textarea\"\n\nlet editors\nif (global.Textcomplete && global.Textcomplete.editors) {\n editors = global.Textcomplete.editors\n} else {\n editors = {}\n}\neditors.Textarea = Textarea\n\nglobal.Textcomplete = Textcomplete\nglobal.Textcomplete.editors = editors\n\n\n\n// WEBPACK FOOTER //\n// ./src/main.js","var g;\r\n\r\n// This works in non-strict mode\r\ng = (function() {\r\n\treturn this;\r\n})();\r\n\r\ntry {\r\n\t// This works if eval is allowed (see CSP)\r\n\tg = g || Function(\"return this\")() || (1,eval)(\"this\");\r\n} catch(e) {\r\n\t// This works if the window reference is available\r\n\tif(typeof window === \"object\")\r\n\t\tg = window;\r\n}\r\n\r\n// g can still be undefined, but nothing to do about it...\r\n// We return undefined, instead of nothing here, so it's\r\n// easier to handle this case. if(!global) { ...}\r\n\r\nmodule.exports = g;\r\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// (webpack)/buildin/global.js\n// module id = 6\n// module chunks = 0","// @flow\n\nimport Completer from \"./completer\"\nimport Editor from \"./editor\"\nimport Dropdown, { type DropdownOptions } from \"./dropdown\"\nimport Strategy, { type StrategyProperties } from \"./strategy\"\nimport SearchResult from \"./search_result\"\n\nimport EventEmitter from \"eventemitter3\"\n\nconst CALLBACK_METHODS = [\n \"handleChange\",\n \"handleEnter\",\n \"handleEsc\",\n \"handleHit\",\n \"handleMove\",\n \"handleSelect\",\n]\n\n/** @typedef */\ntype TextcompleteOptions = {\n dropdown?: DropdownOptions,\n}\n\n/**\n * The core of textcomplete. It acts as a mediator.\n */\nexport default class Textcomplete extends EventEmitter {\n dropdown: Dropdown\n editor: Editor\n options: TextcompleteOptions\n completer: Completer\n isQueryInFlight: boolean\n nextPendingQuery: string | null\n\n /**\n * @param {Editor} editor - Where the textcomplete works on.\n */\n constructor(editor: Editor, options: TextcompleteOptions = {}) {\n super()\n\n this.completer = new Completer()\n this.isQueryInFlight = false\n this.nextPendingQuery = null\n this.dropdown = new Dropdown(options.dropdown || {})\n this.editor = editor\n this.options = options\n\n CALLBACK_METHODS.forEach(method => {\n ;(this: any)[method] = (this: any)[method].bind(this)\n })\n\n this.startListening()\n }\n\n /**\n * @return {this}\n */\n destroy(destroyEditor: boolean = true) {\n this.completer.destroy()\n this.dropdown.destroy()\n if (destroyEditor) {\n this.editor.destroy()\n }\n this.stopListening()\n return this\n }\n\n /**\n * @return {this}\n */\n hide() {\n this.dropdown.deactivate()\n return this\n }\n\n /**\n * @return {this}\n * @example\n * textcomplete.register([{\n * match: /(^|\\s)(\\w+)$/,\n * search: function (term, callback) {\n * $.ajax({ ... })\n * .done(callback)\n * .fail([]);\n * },\n * replace: function (value) {\n * return '$1' + value + ' ';\n * }\n * }]);\n */\n register(strategyPropsArray: StrategyProperties[]) {\n strategyPropsArray.forEach(props => {\n this.completer.registerStrategy(new Strategy(props))\n })\n return this\n }\n\n /**\n * Start autocompleting.\n *\n * @param {string} text - Head to input cursor.\n * @return {this}\n */\n trigger(text: string) {\n if (this.isQueryInFlight) {\n this.nextPendingQuery = text\n } else {\n this.isQueryInFlight = true\n this.nextPendingQuery = null\n this.completer.run(text)\n }\n return this\n }\n\n /** @private */\n handleHit({ searchResults }: { searchResults: SearchResult[] }) {\n if (searchResults.length) {\n this.dropdown.render(searchResults, this.editor.getCursorOffset())\n } else {\n this.dropdown.deactivate()\n }\n this.isQueryInFlight = false\n if (this.nextPendingQuery !== null) {\n this.trigger(this.nextPendingQuery)\n }\n }\n\n /** @private */\n handleMove(e: CustomEvent) {\n e.detail.code === \"UP\" ? this.dropdown.up(e) : this.dropdown.down(e)\n }\n\n /** @private */\n handleEnter(e: CustomEvent) {\n const activeItem = this.dropdown.getActiveItem()\n if (activeItem) {\n this.dropdown.select(activeItem)\n e.preventDefault()\n } else {\n this.dropdown.deactivate()\n }\n }\n\n /** @private */\n handleEsc(e: CustomEvent) {\n if (this.dropdown.shown) {\n this.dropdown.deactivate()\n e.preventDefault()\n }\n }\n\n /** @private */\n handleChange(e: CustomEvent) {\n if (e.detail.beforeCursor != null) {\n this.trigger(e.detail.beforeCursor)\n } else {\n this.dropdown.deactivate()\n }\n }\n\n /** @private */\n handleSelect(selectEvent: CustomEvent) {\n this.emit(\"select\", selectEvent)\n if (!selectEvent.defaultPrevented) {\n this.editor.applySearchResult(selectEvent.detail.searchResult)\n }\n }\n\n /** @private */\n startListening() {\n this.editor\n .on(\"move\", this.handleMove)\n .on(\"enter\", this.handleEnter)\n .on(\"esc\", this.handleEsc)\n .on(\"change\", this.handleChange)\n this.dropdown.on(\"select\", this.handleSelect)\n ;[\n \"show\",\n \"shown\",\n \"render\",\n \"rendered\",\n \"selected\",\n \"hidden\",\n \"hide\",\n ].forEach(eventName => {\n this.dropdown.on(eventName, () => this.emit(eventName))\n })\n this.completer.on(\"hit\", this.handleHit)\n }\n\n /** @private */\n stopListening() {\n this.completer.removeAllListeners()\n this.dropdown.removeAllListeners()\n this.editor\n .removeListener(\"move\", this.handleMove)\n .removeListener(\"enter\", this.handleEnter)\n .removeListener(\"esc\", this.handleEsc)\n .removeListener(\"change\", this.handleChange)\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/textcomplete.js","// @flow\n\nimport EventEmitter from \"eventemitter3\"\n\nimport Query from \"./query\"\nimport SearchResult from \"./search_result\"\nimport Strategy from \"./strategy\"\n\nconst CALLBACK_METHODS = [\"handleQueryResult\"]\n\n/**\n * Complete engine.\n */\nexport default class Completer extends EventEmitter {\n strategies: Strategy[]\n\n constructor() {\n super()\n this.strategies = []\n\n CALLBACK_METHODS.forEach(method => {\n ;(this: any)[method] = (this: any)[method].bind(this)\n })\n }\n\n /**\n * @return {this}\n */\n destroy() {\n this.strategies.forEach(strategy => strategy.destroy())\n return this\n }\n\n /**\n * Register a strategy to the completer.\n *\n * @return {this}\n */\n registerStrategy(strategy: Strategy) {\n this.strategies.push(strategy)\n return this\n }\n\n /**\n * @param {string} text - Head to input cursor.\n */\n run(text: string): void {\n const query = this.extractQuery(text)\n if (query) {\n query.execute(this.handleQueryResult)\n } else {\n this.handleQueryResult([])\n }\n }\n\n /**\n * Find a query, which matches to the given text.\n *\n * @private\n */\n extractQuery(text: string) {\n for (let i = 0; i < this.strategies.length; i++) {\n const query = Query.build(this.strategies[i], text)\n if (query) {\n return query\n }\n }\n return null\n }\n\n /**\n * Callbacked by {@link Query#execute}.\n *\n * @private\n */\n handleQueryResult(searchResults: SearchResult[]) {\n this.emit(\"hit\", { searchResults })\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/completer.js","// @flow\n\nimport SearchResult from \"./search_result\"\nimport Strategy from \"./strategy\"\nimport type { MatchData } from \"./strategy\"\n\n/**\n * Encapsulate matching condition between a Strategy and current editor's value.\n */\nexport default class Query {\n strategy: Strategy\n term: string\n match: MatchData\n\n /**\n * Build a Query object by the given string if this matches to the string.\n *\n * @param {string} text - Head to input cursor.\n */\n static build(strategy: Strategy, text: string): ?Query {\n if (typeof strategy.props.context === \"function\") {\n const context = strategy.props.context(text)\n if (typeof context === \"string\") {\n text = context\n } else if (!context) {\n return null\n }\n }\n const match = strategy.matchText(text)\n return match ? new Query(strategy, match[strategy.index], match) : null\n }\n\n constructor(strategy: Strategy, term: string, match: MatchData) {\n this.strategy = strategy\n this.term = term\n this.match = match\n }\n\n /**\n * Invoke search strategy and callback the given function.\n */\n execute(callback: (SearchResult[]) => void) {\n this.strategy.search(\n this.term,\n results => {\n callback(\n results.map(result => {\n return new SearchResult(result, this.term, this.strategy)\n }),\n )\n },\n this.match,\n )\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/query.js","// @flow\nimport EventEmitter from \"eventemitter3\"\n\nimport DropdownItem, { type DropdownItemOptions } from \"./dropdown_item\"\nimport SearchResult from \"./search_result\"\nimport { createCustomEvent } from \"./utils\"\nimport type { CursorOffset } from \"./editor\"\n\nconst DEFAULT_CLASS_NAME = \"dropdown-menu textcomplete-dropdown\"\n\n/** @typedef */\nexport type DropdownOptions = {\n className?: string,\n footer?: any => string | string,\n header?: any => string | string,\n maxCount?: number,\n placement?: string,\n rotate?: boolean,\n style?: { [string]: string },\n item?: DropdownItemOptions,\n}\n\n/**\n * Encapsulate a dropdown view.\n *\n * @prop {boolean} shown - Whether the #el is shown or not.\n * @prop {DropdownItem[]} items - The array of rendered dropdown items.\n */\nexport default class Dropdown extends EventEmitter {\n shown: boolean\n items: DropdownItem[]\n activeItem: DropdownItem | null\n footer: $PropertyType\n header: $PropertyType\n maxCount: $PropertyType\n rotate: $PropertyType\n placement: $PropertyType\n itemOptions: DropdownItemOptions\n _el: ?HTMLUListElement\n\n static createElement(): HTMLUListElement {\n const el = document.createElement(\"ul\")\n const style = el.style\n style.display = \"none\"\n style.position = \"absolute\"\n style.zIndex = \"10000\"\n const body = document.body\n if (body) {\n body.appendChild(el)\n }\n return el\n }\n\n constructor(options: DropdownOptions) {\n super()\n this.shown = false\n this.items = []\n this.activeItem = null\n this.footer = options.footer\n this.header = options.header\n this.maxCount = options.maxCount || 10\n this.el.className = options.className || DEFAULT_CLASS_NAME\n this.rotate = options.hasOwnProperty(\"rotate\") ? options.rotate : true\n this.placement = options.placement\n this.itemOptions = options.item || {}\n const style = options.style\n if (style) {\n Object.keys(style).forEach(key => {\n ;(this.el.style: any)[key] = style[key]\n })\n }\n }\n\n /**\n * @return {this}\n */\n destroy() {\n const parentNode = this.el.parentNode\n if (parentNode) {\n parentNode.removeChild(this.el)\n }\n this.clear()._el = null\n return this\n }\n\n get el(): HTMLUListElement {\n if (!this._el) {\n this._el = Dropdown.createElement()\n }\n return this._el\n }\n\n /**\n * Render the given data as dropdown items.\n *\n * @return {this}\n */\n render(searchResults: SearchResult[], cursorOffset: CursorOffset) {\n const renderEvent = createCustomEvent(\"render\", { cancelable: true })\n this.emit(\"render\", renderEvent)\n if (renderEvent.defaultPrevented) {\n return this\n }\n const rawResults = searchResults.map(searchResult => searchResult.data)\n const dropdownItems = searchResults\n .slice(0, this.maxCount || searchResults.length)\n .map(searchResult => new DropdownItem(searchResult, this.itemOptions))\n this.clear()\n .setStrategyId(searchResults[0])\n .renderEdge(rawResults, \"header\")\n .append(dropdownItems)\n .renderEdge(rawResults, \"footer\")\n .show()\n .setOffset(cursorOffset)\n this.emit(\"rendered\", createCustomEvent(\"rendered\"))\n return this\n }\n\n /**\n * Hide the dropdown then sweep out items.\n *\n * @return {this}\n */\n deactivate() {\n return this.hide().clear()\n }\n\n /**\n * @return {this}\n */\n select(dropdownItem: DropdownItem) {\n const detail = { searchResult: dropdownItem.searchResult }\n const selectEvent = createCustomEvent(\"select\", {\n cancelable: true,\n detail: detail,\n })\n this.emit(\"select\", selectEvent)\n if (selectEvent.defaultPrevented) {\n return this\n }\n this.deactivate()\n this.emit(\"selected\", createCustomEvent(\"selected\", { detail }))\n return this\n }\n\n /**\n * @return {this}\n */\n up(e: CustomEvent) {\n return this.shown ? this.moveActiveItem(\"prev\", e) : this\n }\n\n /**\n * @return {this}\n */\n down(e: CustomEvent) {\n return this.shown ? this.moveActiveItem(\"next\", e) : this\n }\n\n /**\n * Retrieve the active item.\n */\n getActiveItem(): DropdownItem | null {\n return this.activeItem\n }\n\n /**\n * Add items to dropdown.\n *\n * @private\n */\n append(items: DropdownItem[]) {\n const fragment = document.createDocumentFragment()\n items.forEach(item => {\n this.items.push(item)\n item.appended(this)\n fragment.appendChild(item.el)\n })\n this.el.appendChild(fragment)\n return this\n }\n\n /** @private */\n setOffset(cursorOffset: CursorOffset) {\n const doc = document.documentElement\n if (doc) {\n const elementWidth = this.el.offsetWidth\n if (cursorOffset.left) {\n const browserWidth = doc.clientWidth\n if (cursorOffset.left + elementWidth > browserWidth) {\n cursorOffset.left = browserWidth - elementWidth\n }\n this.el.style.left = `${cursorOffset.left}px`\n } else if (cursorOffset.right) {\n if (cursorOffset.right - elementWidth < 0) {\n cursorOffset.right = 0\n }\n this.el.style.right = `${cursorOffset.right}px`\n }\n if (this.isPlacementTop()) {\n this.el.style.bottom = `${doc.clientHeight -\n cursorOffset.top +\n cursorOffset.lineHeight}px`\n } else {\n this.el.style.top = `${cursorOffset.top}px`\n }\n }\n return this\n }\n\n /**\n * Show the element.\n *\n * @private\n */\n show() {\n if (!this.shown) {\n const showEvent = createCustomEvent(\"show\", { cancelable: true })\n this.emit(\"show\", showEvent)\n if (showEvent.defaultPrevented) {\n return this\n }\n this.el.style.display = \"block\"\n this.shown = true\n this.emit(\"shown\", createCustomEvent(\"shown\"))\n }\n return this\n }\n\n /**\n * Hide the element.\n *\n * @private\n */\n hide() {\n if (this.shown) {\n const hideEvent = createCustomEvent(\"hide\", { cancelable: true })\n this.emit(\"hide\", hideEvent)\n if (hideEvent.defaultPrevented) {\n return this\n }\n this.el.style.display = \"none\"\n this.shown = false\n this.emit(\"hidden\", createCustomEvent(\"hidden\"))\n }\n return this\n }\n\n /**\n * Clear search results.\n *\n * @private\n */\n clear() {\n this.el.innerHTML = \"\"\n this.items.forEach(item => item.destroy())\n this.items = []\n return this\n }\n\n /** @private */\n moveActiveItem(direction: \"next\" | \"prev\", e: CustomEvent) {\n const nextActiveItem =\n direction === \"next\"\n ? this.activeItem ? this.activeItem.next : this.items[0]\n : this.activeItem\n ? this.activeItem.prev\n : this.items[this.items.length - 1]\n if (nextActiveItem) {\n nextActiveItem.activate()\n e.preventDefault()\n }\n return this\n }\n\n /** @private */\n setStrategyId(searchResult: ?SearchResult) {\n const strategyId = searchResult && searchResult.strategy.props.id\n if (strategyId) {\n this.el.setAttribute(\"data-strategy\", strategyId)\n } else {\n this.el.removeAttribute(\"data-strategy\")\n }\n return this\n }\n\n /**\n * @private\n * @param {object[]} rawResults - What callbacked by search function.\n */\n renderEdge(rawResults: Object[], type: \"header\" | \"footer\") {\n const source = (type === \"header\" ? this.header : this.footer) || \"\"\n const content: any =\n typeof source === \"function\" ? source(rawResults) : source\n const li = document.createElement(\"li\")\n li.classList.add(`textcomplete-${type}`)\n li.innerHTML = content\n this.el.appendChild(li)\n return this\n }\n\n /** @private */\n isPlacementTop() {\n return this.placement === \"top\"\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/dropdown.js","// @flow\n\nimport SearchResult from \"./search_result\"\n\nexport const DEFAULT_CLASS_NAME = \"textcomplete-item\"\nconst CALLBACK_METHODS = [\"onClick\", \"onMouseover\"]\n\n/** @typedef */\nexport type DropdownItemOptions = {\n className?: string,\n}\n\n// Declare interface instead of importing Dropdown itself to prevent circular dependency.\ninterface Dropdown {\n activeItem: DropdownItem | null;\n items: DropdownItem[];\n rotate: ?Boolean;\n getActiveItem(): DropdownItem | null;\n select(DropdownItem): DropdownItem;\n}\n\n/**\n * Encapsulate an item of dropdown.\n */\nexport default class DropdownItem {\n searchResult: SearchResult\n active: boolean\n className: string\n activeClassName: string\n siblings: DropdownItem[]\n dropdown: Dropdown\n index: number\n _el: ?HTMLLIElement\n\n constructor(searchResult: SearchResult, options: DropdownItemOptions) {\n this.searchResult = searchResult\n this.active = false\n this.className = options.className || DEFAULT_CLASS_NAME\n this.activeClassName = `${this.className} active`\n\n CALLBACK_METHODS.forEach(method => {\n ;(this: any)[method] = (this: any)[method].bind(this)\n })\n }\n\n get el(): HTMLLIElement {\n if (this._el) {\n return this._el\n }\n const li = document.createElement(\"li\")\n li.className = this.active ? this.activeClassName : this.className\n const a = document.createElement(\"a\")\n a.innerHTML = this.searchResult.render()\n li.appendChild(a)\n this._el = li\n li.addEventListener(\"mousedown\", this.onClick)\n li.addEventListener(\"mouseover\", this.onMouseover)\n li.addEventListener(\"touchstart\", this.onClick)\n return li\n }\n\n /**\n * Try to free resources and perform other cleanup operations.\n */\n destroy() {\n this.el.removeEventListener(\"mousedown\", this.onClick, false)\n this.el.removeEventListener(\"mouseover\", this.onMouseover, false)\n this.el.removeEventListener(\"touchstart\", this.onClick, false)\n if (this.active) {\n this.dropdown.activeItem = null\n }\n // This element has already been removed by {@link Dropdown#clear}.\n this._el = null\n }\n\n /**\n * Callbacked when it is appended to a dropdown.\n *\n * @see Dropdown#append\n */\n appended(dropdown: Dropdown) {\n this.dropdown = dropdown\n this.siblings = dropdown.items\n this.index = this.siblings.length - 1\n }\n\n /**\n * Deactivate active item then activate itself.\n *\n * @return {this}\n */\n activate() {\n if (!this.active) {\n const activeItem = this.dropdown.getActiveItem()\n if (activeItem) {\n activeItem.deactivate()\n }\n this.dropdown.activeItem = this\n this.active = true\n this.el.className = this.activeClassName\n }\n return this\n }\n\n /**\n * Get the next sibling.\n */\n get next(): ?DropdownItem {\n let nextIndex\n if (this.index === this.siblings.length - 1) {\n if (!this.dropdown.rotate) {\n return null\n }\n nextIndex = 0\n } else {\n nextIndex = this.index + 1\n }\n return this.siblings[nextIndex]\n }\n\n /**\n * Get the previous sibling.\n */\n get prev(): ?DropdownItem {\n let nextIndex\n if (this.index === 0) {\n if (!this.dropdown.rotate) {\n return null\n }\n nextIndex = this.siblings.length - 1\n } else {\n nextIndex = this.index - 1\n }\n return this.siblings[nextIndex]\n }\n\n /** @private */\n deactivate() {\n if (this.active) {\n this.active = false\n this.el.className = this.className\n this.dropdown.activeItem = null\n }\n return this\n }\n\n /** @private */\n onClick(e: Event) {\n e.preventDefault() // Prevent blur event\n this.dropdown.select(this)\n }\n\n /** @private */\n onMouseover() {\n this.activate()\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/dropdown_item.js","// @flow\n\nimport update from \"undate/lib/update\"\n\nimport Editor from \"./editor\"\nimport { calculateElementOffset, getLineHeightPx } from \"./utils\"\nimport SearchResult from \"./search_result\"\n\nconst getCaretCoordinates = require(\"textarea-caret\")\n\nconst CALLBACK_METHODS = [\"onInput\", \"onKeydown\"]\n\n/**\n * Encapsulate the target textarea element.\n */\nexport default class Textarea extends Editor {\n el: HTMLTextAreaElement\n\n /**\n * @param {HTMLTextAreaElement} el - Where the textcomplete works on.\n */\n constructor(el: HTMLTextAreaElement) {\n super()\n this.el = el\n\n CALLBACK_METHODS.forEach(method => {\n ;(this: any)[method] = (this: any)[method].bind(this)\n })\n\n this.startListening()\n }\n\n /**\n * @return {this}\n */\n destroy() {\n super.destroy()\n this.stopListening()\n // Release the element reference early to help garbage collection.\n ;(this: any).el = null\n return this\n }\n\n /**\n * Implementation for {@link Editor#applySearchResult}\n */\n applySearchResult(searchResult: SearchResult) {\n const before = this.getBeforeCursor()\n if (before != null) {\n const replace = searchResult.replace(before, this.getAfterCursor())\n this.el.focus() // Clicking a dropdown item removes focus from the element.\n if (Array.isArray(replace)) {\n update(this.el, replace[0], replace[1])\n this.el.dispatchEvent(new Event(\"input\"))\n }\n }\n }\n\n /**\n * Implementation for {@link Editor#getCursorOffset}\n */\n getCursorOffset() {\n const elOffset = calculateElementOffset(this.el)\n const elScroll = this.getElScroll()\n const cursorPosition = this.getCursorPosition()\n const lineHeight = getLineHeightPx(this.el)\n const top = elOffset.top - elScroll.top + cursorPosition.top + lineHeight\n const left = elOffset.left - elScroll.left + cursorPosition.left\n if (this.el.dir !== \"rtl\") {\n return { top, left, lineHeight }\n } else {\n const right = document.documentElement\n ? document.documentElement.clientWidth - left\n : 0\n return { top, right, lineHeight }\n }\n }\n\n /**\n * Implementation for {@link Editor#getBeforeCursor}\n */\n getBeforeCursor() {\n return this.el.selectionStart !== this.el.selectionEnd\n ? null\n : this.el.value.substring(0, this.el.selectionEnd)\n }\n\n /** @private */\n getAfterCursor() {\n return this.el.value.substring(this.el.selectionEnd)\n }\n\n /** @private */\n getElScroll(): { top: number, left: number } {\n return { top: this.el.scrollTop, left: this.el.scrollLeft }\n }\n\n /**\n * The input cursor's relative coordinates from the textarea's left\n * top corner.\n *\n * @private\n */\n getCursorPosition(): { top: number, left: number } {\n return getCaretCoordinates(this.el, this.el.selectionEnd)\n }\n\n /** @private */\n onInput() {\n this.emitChangeEvent()\n }\n\n /** @private */\n onKeydown(e: KeyboardEvent) {\n const code = this.getCode(e)\n let event\n if (code === \"UP\" || code === \"DOWN\") {\n event = this.emitMoveEvent(code)\n } else if (code === \"ENTER\") {\n event = this.emitEnterEvent()\n } else if (code === \"ESC\") {\n event = this.emitEscEvent()\n }\n if (event && event.defaultPrevented) {\n e.preventDefault()\n }\n }\n\n /** @private */\n startListening() {\n this.el.addEventListener(\"input\", this.onInput)\n this.el.addEventListener(\"keydown\", this.onKeydown)\n }\n\n /** @private */\n stopListening() {\n this.el.removeEventListener(\"input\", this.onInput)\n this.el.removeEventListener(\"keydown\", this.onKeydown)\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/textarea.js","\"use strict\";\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nexports.default = function (el, headToCursor, cursorToTail) {\n var curr = el.value,\n // strA + strB1 + strC\n next = headToCursor + (cursorToTail || ''),\n // strA + strB2 + strC\n activeElement = document.activeElement;\n\n // Calculate length of strA and strC\n var aLength = 0,\n cLength = 0;\n while (aLength < curr.length && aLength < next.length && curr[aLength] === next[aLength]) {\n aLength++;\n }\n while (curr.length - cLength - 1 >= 0 && next.length - cLength - 1 >= 0 && curr[curr.length - cLength - 1] === next[next.length - cLength - 1]) {\n cLength++;\n }\n aLength = Math.min(aLength, Math.min(curr.length, next.length) - cLength);\n\n // Select strB1\n el.setSelectionRange(aLength, curr.length - cLength);\n\n // Get strB2\n var strB2 = next.substring(aLength, next.length - cLength);\n\n // Replace strB1 with strB2\n el.focus();\n if (!document.execCommand('insertText', false, strB2)) {\n // Document.execCommand returns false if the command is not supported.\n // Firefox and IE returns false in this case.\n el.value = next;\n el.dispatchEvent(createInputEvent());\n }\n\n // Move cursor to the end of headToCursor\n el.setSelectionRange(headToCursor.length, headToCursor.length);\n\n activeElement && activeElement.focus();\n return el;\n};\n\nfunction createInputEvent() {\n if (typeof Event !== \"undefined\") {\n return new Event(\"input\", { bubbles: true, cancelable: true });\n } else {\n var event = document.createEvent(\"Event\");\n event.initEvent(\"input\", true, true);\n return event;\n }\n}\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./node_modules/undate/lib/update.js\n// module id = 13\n// module chunks = 0","/* jshint browser: true */\n\n(function () {\n\n// The properties that we copy into a mirrored div.\n// Note that some browsers, such as Firefox,\n// do not concatenate properties, i.e. padding-top, bottom etc. -> padding,\n// so we have to do every single property specifically.\nvar properties = [\n 'direction', // RTL support\n 'boxSizing',\n 'width', // on Chrome and IE, exclude the scrollbar, so the mirror div wraps exactly as the textarea does\n 'height',\n 'overflowX',\n 'overflowY', // copy the scrollbar for IE\n\n 'borderTopWidth',\n 'borderRightWidth',\n 'borderBottomWidth',\n 'borderLeftWidth',\n 'borderStyle',\n\n 'paddingTop',\n 'paddingRight',\n 'paddingBottom',\n 'paddingLeft',\n\n // https://developer.mozilla.org/en-US/docs/Web/CSS/font\n 'fontStyle',\n 'fontVariant',\n 'fontWeight',\n 'fontStretch',\n 'fontSize',\n 'fontSizeAdjust',\n 'lineHeight',\n 'fontFamily',\n\n 'textAlign',\n 'textTransform',\n 'textIndent',\n 'textDecoration', // might not make a difference, but better be safe\n\n 'letterSpacing',\n 'wordSpacing',\n\n 'tabSize',\n 'MozTabSize'\n\n];\n\nvar isBrowser = (typeof window !== 'undefined');\nvar isFirefox = (isBrowser && window.mozInnerScreenX != null);\n\nfunction getCaretCoordinates(element, position, options) {\n if(!isBrowser) {\n throw new Error('textarea-caret-position#getCaretCoordinates should only be called in a browser');\n }\n\n var debug = options && options.debug || false;\n if (debug) {\n var el = document.querySelector('#input-textarea-caret-position-mirror-div');\n if ( el ) { el.parentNode.removeChild(el); }\n }\n\n // mirrored div\n var div = document.createElement('div');\n div.id = 'input-textarea-caret-position-mirror-div';\n document.body.appendChild(div);\n\n var style = div.style;\n var computed = window.getComputedStyle? getComputedStyle(element) : element.currentStyle; // currentStyle for IE < 9\n\n // default textarea styles\n style.whiteSpace = 'pre-wrap';\n if (element.nodeName !== 'INPUT')\n style.wordWrap = 'break-word'; // only for textarea-s\n\n // position off-screen\n style.position = 'absolute'; // required to return coordinates properly\n if (!debug)\n style.visibility = 'hidden'; // not 'display: none' because we want rendering\n\n // transfer the element's properties to the div\n properties.forEach(function (prop) {\n style[prop] = computed[prop];\n });\n\n if (isFirefox) {\n // Firefox lies about the overflow property for textareas: https://bugzilla.mozilla.org/show_bug.cgi?id=984275\n if (element.scrollHeight > parseInt(computed.height))\n style.overflowY = 'scroll';\n } else {\n style.overflow = 'hidden'; // for Chrome to not render a scrollbar; IE keeps overflowY = 'scroll'\n }\n\n div.textContent = element.value.substring(0, position);\n // the second special handling for input type=\"text\" vs textarea: spaces need to be replaced with non-breaking spaces - http://stackoverflow.com/a/13402035/1269037\n if (element.nodeName === 'INPUT')\n div.textContent = div.textContent.replace(/\\s/g, '\\u00a0');\n\n var span = document.createElement('span');\n // Wrapping must be replicated *exactly*, including when a long word gets\n // onto the next line, with whitespace at the end of the line before (#7).\n // The *only* reliable way to do that is to copy the *entire* rest of the\n // textarea's content into the created at the caret position.\n // for inputs, just '.' would be enough, but why bother?\n span.textContent = element.value.substring(position) || '.'; // || because a completely empty faux span doesn't render at all\n div.appendChild(span);\n\n var coordinates = {\n top: span.offsetTop + parseInt(computed['borderTopWidth']),\n left: span.offsetLeft + parseInt(computed['borderLeftWidth'])\n };\n\n if (debug) {\n span.style.backgroundColor = '#aaa';\n } else {\n document.body.removeChild(div);\n }\n\n return coordinates;\n}\n\nif (typeof module != 'undefined' && typeof module.exports != 'undefined') {\n module.exports = getCaretCoordinates;\n} else if(isBrowser){\n window.getCaretCoordinates = getCaretCoordinates;\n}\n\n}());\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./node_modules/textarea-caret/index.js\n// module id = 14\n// module chunks = 0"],"sourceRoot":""} \ No newline at end of file diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 0a440aa90..53c0e540f 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -184,8 +184,9 @@ function string2bb(element) { // Autocomplete contacts contacts = { - match: /(^|\s)(@\!*)([^ \n]+)$/, + match: /(^|\s)(@\!*)([^ \n]{3,})$/, index: 3, + cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels, spinelement=false); }, replace: editor_replace, template: contact_format @@ -193,8 +194,9 @@ function string2bb(element) { // Autocomplete forums forums = { - match: /(^|\s)(\!\!*)([^ \n]+)$/, + match: /(^|\s)(\!\!*)([^ \n]{3,})$/, index: 3, + cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'f', extra_channels, spinelement=false); }, replace: editor_replace, template: contact_format @@ -203,8 +205,9 @@ function string2bb(element) { // Autocomplete hashtags tags = { - match: /(^|\s)(\#)([^ \n]{2,})$/, + match: /(^|\s)(\#)([^ \n]{3,})$/, index: 3, + cache: true, search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.toLowerCase().indexOf(term.toLowerCase()) === 0 ? entry : null; })); }); }, replace: function(item) { return "$1$2" + item.text + ' '; }, context: function(text) { return text.toLowerCase(); }, @@ -215,13 +218,20 @@ function string2bb(element) { smilies = { match: /(^|\s)(:[a-z_:]{2,})$/, index: 2, + cache: true, search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); }, //template: function(item) { return item.icon + item.text; }, replace: function(item) { return "$1" + item.text + ' '; }, template: smiley_format }; this.attr('autocomplete','off'); - this.textcomplete([contacts,forums,smilies,tags], {className:'acpopup', zIndex:1020}); + + var Textarea = Textcomplete.editors.Textarea; + var editor = new Textarea(this[0]); + var textcomplete = new Textcomplete(editor); + + textcomplete.register([contacts,forums,smilies,tags], {className:'acpopup', zIndex:1020}); + }; })( jQuery ); @@ -234,6 +244,7 @@ function string2bb(element) { contacts = { match: /(^@)([^\n]{3,})$/, index: 2, + cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'x', [], spinelement='#nav-search-spinner'); }, replace: basic_replace, template: contact_format, @@ -243,6 +254,7 @@ function string2bb(element) { forums = { match: /(^\!)([^\n]{3,})$/, index: 2, + cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'f', [], spinelement='#nav-search-spinner'); }, replace: basic_replace, template: contact_format @@ -252,6 +264,7 @@ function string2bb(element) { tags = { match: /(^\#)([^ \n]{3,})$/, index: 2, + cache: true, search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.toLowerCase().indexOf(term.toLowerCase()) === 0 ? entry : null; })); }); }, replace: function(item) { return "$1" + item.text + ' '; }, context: function(text) { return text.toLowerCase(); }, @@ -259,8 +272,14 @@ function string2bb(element) { }; this.attr('autocomplete', 'off'); - var a = this.textcomplete([contacts,forums,tags], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'}); - a.on('textComplete:select', function(e, value, strategy) { submit_form(this); }); + + var Textarea = Textcomplete.editors.Textarea; + var editor = new Textarea(this[0]); + var textcomplete = new Textcomplete(editor); + + textcomplete.register([contacts,forums,tags], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'}); + + this.on('textComplete:select', function(e, value, strategy) { submit_form(this); }); }; })( jQuery ); @@ -271,21 +290,27 @@ function string2bb(element) { // Autocomplete contacts contacts = { - match: /(^)([^\n]+)$/, + match: /(^)([^\n]{3,})$/, index: 2, + cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, typ,[], spinelement=false); }, replace: basic_replace, template: contact_format, }; this.attr('autocomplete','off'); - var a = this.textcomplete([contacts], {className:'acpopup', zIndex:1020}); + + var Textarea = Textcomplete.editors.Textarea; + var editor = new Textarea(this[0]); + var textcomplete = new Textcomplete(editor); + + textcomplete.register([contacts], {className:'acpopup', zIndex:1020}); if(autosubmit) - a.on('textComplete:select', function(e,value,strategy) { submit_form(this); }); + this.on('textComplete:select', function(e,value,strategy) { submit_form(this); }); if(typeof onselect !== 'undefined') - a.on('textComplete:select', function(e, value, strategy) { onselect(value); }); + this.on('textComplete:select', function(e, value, strategy) { onselect(value); }); }; })( jQuery ); @@ -297,21 +322,27 @@ function string2bb(element) { // Autocomplete contacts names = { - match: /(^)([^\n]+)$/, + match: /(^)([^\n]{3,})$/, index: 2, + cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, typ,[], spinelement=false); }, replace: trim_replace, template: contact_format, }; this.attr('autocomplete','off'); - var a = this.textcomplete([names], {className:'acpopup', zIndex:1020}); + + var Textarea = Textcomplete.editors.Textarea; + var editor = new Textarea(this[0]); + var textcomplete = new Textcomplete(editor); + + textcomplete.register([names], {className:'acpopup', zIndex:1020}); if(autosubmit) - a.on('textComplete:select', function(e,value,strategy) { submit_form(this); }); + this.on('textComplete:select', function(e,value,strategy) { submit_form(this); }); if(typeof onselect !== 'undefined') - a.on('textComplete:select', function(e, value, strategy) { onselect(value); }); + this.on('textComplete:select', function(e, value, strategy) { onselect(value); }); }; })( jQuery ); @@ -375,11 +406,16 @@ function string2bb(element) { }; this.attr('autocomplete','off'); - var a = this.textcomplete([bbco], {className:'acpopup', zIndex:1020}); - a.on('textComplete:select', function(e, value, strategy) { value; }); + var Textarea = Textcomplete.editors.Textarea; + var editor = new Textarea(this[0]); + var textcomplete = new Textcomplete(editor); + + textcomplete.register([bbco], {className:'acpopup', zIndex:1020}); + + this.on('textComplete:select', function(e, value, strategy) { value; }); - a.keypress(function(e){ + this.keypress(function(e){ if (e.keyCode == 13) { var x = listNewLineAutocomplete(this.id); if(x) { diff --git a/view/php/theme_init.php b/view/php/theme_init.php index f2c46da28..dd8dcb5ee 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -15,9 +15,8 @@ head_add_js('jquery.js'); head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js'); head_add_js('/library/sprintf.js/dist/sprintf.min.js'); -//head_add_js('jquery.textinputs.js'); +head_add_js('/library/textcomplete/textcomplete.min.js'); head_add_js('autocomplete.js'); -head_add_js('/library/jquery-textcomplete/jquery.textcomplete.js'); head_add_js('/library/jquery.timeago.js'); head_add_js('/library/readmore.js/readmore.js'); -- cgit v1.2.3 From 8e0fc9e762be30646b0cb36d55f966cb9d1186d0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Apr 2018 13:58:37 +0200 Subject: fix the on select handlers --- view/js/autocomplete.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 53c0e540f..7bbcd6451 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -279,7 +279,7 @@ function string2bb(element) { textcomplete.register([contacts,forums,tags], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'}); - this.on('textComplete:select', function(e, value, strategy) { submit_form(this); }); + this.on('select', function(e, value, strategy) { submit_form(this); }); }; })( jQuery ); @@ -307,10 +307,10 @@ function string2bb(element) { textcomplete.register([contacts], {className:'acpopup', zIndex:1020}); if(autosubmit) - this.on('textComplete:select', function(e,value,strategy) { submit_form(this); }); + this.on('select', function(e,value,strategy) { submit_form(this); }); if(typeof onselect !== 'undefined') - this.on('textComplete:select', function(e, value, strategy) { onselect(value); }); + this.on('select', function(e, value, strategy) { onselect(value); }); }; })( jQuery ); @@ -339,10 +339,10 @@ function string2bb(element) { textcomplete.register([names], {className:'acpopup', zIndex:1020}); if(autosubmit) - this.on('textComplete:select', function(e,value,strategy) { submit_form(this); }); + this.on('select', function(e,value,strategy) { submit_form(this); }); if(typeof onselect !== 'undefined') - this.on('textComplete:select', function(e, value, strategy) { onselect(value); }); + this.on('select', function(e, value, strategy) { onselect(value); }); }; })( jQuery ); @@ -413,7 +413,7 @@ function string2bb(element) { textcomplete.register([bbco], {className:'acpopup', zIndex:1020}); - this.on('textComplete:select', function(e, value, strategy) { value; }); + this.on('select', function(e, value, strategy) { value; }); this.keypress(function(e){ if (e.keyCode == 13) { -- cgit v1.2.3 From 94317854665bc64c53271daada2ada15d238c988 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Apr 2018 14:53:24 +0200 Subject: omit js error if saved searsches are turned off --- view/js/mod_network.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view/js/mod_network.js b/view/js/mod_network.js index 2899bbacd..22a5e9ba6 100644 --- a/view/js/mod_network.js +++ b/view/js/mod_network.js @@ -1,4 +1,5 @@ $(document).ready(function() { - $("#search-text").contact_autocomplete(baseurl + '/search_ac','',true); + if($("#search-text").length) + $("#search-text").contact_autocomplete(baseurl + '/search_ac','',true); }); -- cgit v1.2.3 From 63c76eae0c87a07e5ee0fc7b88a3e6c56bba6969 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Apr 2018 15:40:59 +0200 Subject: a better way to deal with js errors in autocomplete plugins if the object is not available --- view/js/autocomplete.js | 19 +++++++++++++++++++ view/js/mod_network.js | 3 +-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 7bbcd6451..5fbdab27b 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -180,6 +180,10 @@ function string2bb(element) { */ (function( $ ) { $.fn.editor_autocomplete = function(backend_url, extra_channels) { + + if(! this.length) + return; + if (typeof extra_channels === 'undefined') extra_channels = false; // Autocomplete contacts @@ -240,6 +244,10 @@ function string2bb(element) { */ (function( $ ) { $.fn.search_autocomplete = function(backend_url) { + + if(! this.length) + return; + // Autocomplete contacts contacts = { match: /(^@)([^\n]{3,})$/, @@ -285,6 +293,10 @@ function string2bb(element) { (function( $ ) { $.fn.contact_autocomplete = function(backend_url, typ, autosubmit, onselect) { + + if(! this.length) + return; + if(typeof typ === 'undefined') typ = ''; if(typeof autosubmit === 'undefined') autosubmit = false; @@ -317,6 +329,10 @@ function string2bb(element) { (function( $ ) { $.fn.name_autocomplete = function(backend_url, typ, autosubmit, onselect) { + + if(! this.length) + return; + if(typeof typ === 'undefined') typ = ''; if(typeof autosubmit === 'undefined') autosubmit = false; @@ -349,6 +365,9 @@ function string2bb(element) { (function( $ ) { $.fn.bbco_autocomplete = function(type) { + if(! this.length) + return; + if(type=='bbcode') { var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'checklist', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'observer.language','embed', 'highlight', 'url', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']; var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr', ]; diff --git a/view/js/mod_network.js b/view/js/mod_network.js index 22a5e9ba6..2899bbacd 100644 --- a/view/js/mod_network.js +++ b/view/js/mod_network.js @@ -1,5 +1,4 @@ $(document).ready(function() { - if($("#search-text").length) - $("#search-text").contact_autocomplete(baseurl + '/search_ac','',true); + $("#search-text").contact_autocomplete(baseurl + '/search_ac','',true); }); -- cgit v1.2.3 From 4e389b474a333f84e6b4180fe73a3d45264db859 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Apr 2018 15:41:54 +0200 Subject: version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index d79f14617..5cf6cedeb 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.5.1' ); +define ( 'STD_VERSION', '3.5.2' ); define ( 'ZOT_REVISION', '6.0a' ); -- cgit v1.2.3 From baa46e105c99e057f4678f837a8ce20d3b8a580f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Apr 2018 20:08:03 +0200 Subject: if there is more than one textarea we need to work through all of them --- view/js/autocomplete.js | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 5fbdab27b..60552588e 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -231,10 +231,13 @@ function string2bb(element) { this.attr('autocomplete','off'); var Textarea = Textcomplete.editors.Textarea; - var editor = new Textarea(this[0]); - var textcomplete = new Textcomplete(editor); - textcomplete.register([contacts,forums,smilies,tags], {className:'acpopup', zIndex:1020}); + $(this).each(function() { + var editor = new Textarea(this); + var textcomplete = new Textcomplete(editor); + textcomplete.register([contacts,forums,smilies,tags], {className:'acpopup', zIndex:1020}); + }); + }; })( jQuery ); @@ -282,10 +285,11 @@ function string2bb(element) { this.attr('autocomplete', 'off'); var Textarea = Textcomplete.editors.Textarea; - var editor = new Textarea(this[0]); - var textcomplete = new Textcomplete(editor); - - textcomplete.register([contacts,forums,tags], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'}); + $(this).each(function() { + var editor = new Textarea(this); + var textcomplete = new Textcomplete(editor); + textcomplete.register([contacts,forums,tags], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'}); + }); this.on('select', function(e, value, strategy) { submit_form(this); }); }; @@ -313,10 +317,11 @@ function string2bb(element) { this.attr('autocomplete','off'); var Textarea = Textcomplete.editors.Textarea; - var editor = new Textarea(this[0]); - var textcomplete = new Textcomplete(editor); - - textcomplete.register([contacts], {className:'acpopup', zIndex:1020}); + $(this).each(function() { + var editor = new Textarea(this); + var textcomplete = new Textcomplete(editor); + textcomplete.register([contacts], {className:'acpopup', zIndex:1020}); + }); if(autosubmit) this.on('select', function(e,value,strategy) { submit_form(this); }); @@ -349,10 +354,12 @@ function string2bb(element) { this.attr('autocomplete','off'); var Textarea = Textcomplete.editors.Textarea; - var editor = new Textarea(this[0]); - var textcomplete = new Textcomplete(editor); - textcomplete.register([names], {className:'acpopup', zIndex:1020}); + $(this).each(function() { + var editor = new Textarea(this); + var textcomplete = new Textcomplete(editor); + textcomplete.register([names], {className:'acpopup', zIndex:1020}); + }); if(autosubmit) this.on('select', function(e,value,strategy) { submit_form(this); }); @@ -427,10 +434,12 @@ function string2bb(element) { this.attr('autocomplete','off'); var Textarea = Textcomplete.editors.Textarea; - var editor = new Textarea(this[0]); - var textcomplete = new Textcomplete(editor); - textcomplete.register([bbco], {className:'acpopup', zIndex:1020}); + $(this).each(function() { + var editor = new Textarea(this); + var textcomplete = new Textcomplete(editor); + textcomplete.register([bbco], {className:'acpopup', zIndex:1020}); + }); this.on('select', function(e, value, strategy) { value; }); -- cgit v1.2.3 From 433951ab55e6a54d8d643108a439bb0836607555 Mon Sep 17 00:00:00 2001 From: phellmes Date: Thu, 26 Apr 2018 20:58:15 +0200 Subject: Update DE translation strings German strings for development branch and release candidate 3.4 --- view/de-de/hmessages.po | 3205 +++++++++++++++++++++++++---------------------- view/de-de/hstrings.php | 204 +-- 2 files changed, 1856 insertions(+), 1553 deletions(-) diff --git a/view/de-de/hmessages.po b/view/de-de/hmessages.po index 53dcc0d43..8af9dce6b 100644 --- a/view/de-de/hmessages.po +++ b/view/de-de/hmessages.po @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-01 08:51+0100\n" -"PO-Revision-Date: 2018-03-04 23:22+0000\n" +"POT-Creation-Date: 2018-04-23 11:34+0200\n" +"PO-Revision-Date: 2018-04-26 18:46+0000\n" "Last-Translator: Phellmes \n" "Language-Team: German (http://www.transifex.com/Friendica/red-matrix/language/de/)\n" "MIME-Version: 1.0\n" @@ -109,75 +109,79 @@ msgstr "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden" msgid "Can administer my channel" msgstr "Kann meinen Kanal administrieren" -#: ../../Zotlabs/Access/PermissionRoles.php:265 +#: ../../Zotlabs/Access/PermissionRoles.php:283 msgid "Social Networking" msgstr "Soziales Netzwerk" -#: ../../Zotlabs/Access/PermissionRoles.php:266 +#: ../../Zotlabs/Access/PermissionRoles.php:284 +msgid "Social - Federation" +msgstr "Soziales Netzwerk - Föderation (verbundene Netze)" + +#: ../../Zotlabs/Access/PermissionRoles.php:285 msgid "Social - Mostly Public" msgstr "Soziales Netzwerk - Weitgehend öffentlich" -#: ../../Zotlabs/Access/PermissionRoles.php:267 +#: ../../Zotlabs/Access/PermissionRoles.php:286 msgid "Social - Restricted" msgstr "Soziales Netzwerk - Beschränkt" -#: ../../Zotlabs/Access/PermissionRoles.php:268 +#: ../../Zotlabs/Access/PermissionRoles.php:287 msgid "Social - Private" msgstr "Soziales Netzwerk - Privat" -#: ../../Zotlabs/Access/PermissionRoles.php:271 +#: ../../Zotlabs/Access/PermissionRoles.php:290 msgid "Community Forum" msgstr "Forum" -#: ../../Zotlabs/Access/PermissionRoles.php:272 +#: ../../Zotlabs/Access/PermissionRoles.php:291 msgid "Forum - Mostly Public" msgstr "Forum - Weitgehend öffentlich" -#: ../../Zotlabs/Access/PermissionRoles.php:273 +#: ../../Zotlabs/Access/PermissionRoles.php:292 msgid "Forum - Restricted" msgstr "Forum - Beschränkt" -#: ../../Zotlabs/Access/PermissionRoles.php:274 +#: ../../Zotlabs/Access/PermissionRoles.php:293 msgid "Forum - Private" msgstr "Forum - Privat" -#: ../../Zotlabs/Access/PermissionRoles.php:277 +#: ../../Zotlabs/Access/PermissionRoles.php:296 msgid "Feed Republish" msgstr "Teilen von Feeds" -#: ../../Zotlabs/Access/PermissionRoles.php:278 +#: ../../Zotlabs/Access/PermissionRoles.php:297 msgid "Feed - Mostly Public" msgstr "Feeds - Weitgehend öffentlich" -#: ../../Zotlabs/Access/PermissionRoles.php:279 +#: ../../Zotlabs/Access/PermissionRoles.php:298 msgid "Feed - Restricted" msgstr "Feeds - Beschränkt" -#: ../../Zotlabs/Access/PermissionRoles.php:282 +#: ../../Zotlabs/Access/PermissionRoles.php:301 msgid "Special Purpose" msgstr "Für besondere Zwecke" -#: ../../Zotlabs/Access/PermissionRoles.php:283 +#: ../../Zotlabs/Access/PermissionRoles.php:302 msgid "Special - Celebrity/Soapbox" msgstr "Speziell - Mitteilungs-Kanal (keine Kommentare)" -#: ../../Zotlabs/Access/PermissionRoles.php:284 +#: ../../Zotlabs/Access/PermissionRoles.php:303 msgid "Special - Group Repository" msgstr "Speziell - Gruppenarchiv" -#: ../../Zotlabs/Access/PermissionRoles.php:287 -#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:130 -#: ../../Zotlabs/Module/Settings/Channel.php:473 -#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Access/PermissionRoles.php:306 +#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:144 +#: ../../Zotlabs/Module/Settings/Channel.php:479 +#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795 #: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 #: ../../include/selectors.php:140 ../../include/event.php:1315 -#: ../../include/event.php:1322 ../../include/connections.php:689 -#: ../../include/connections.php:696 +#: ../../include/event.php:1322 ../../include/connections.php:697 +#: ../../include/connections.php:704 msgid "Other" msgstr "Andere" -#: ../../Zotlabs/Access/PermissionRoles.php:288 +#: ../../Zotlabs/Access/PermissionRoles.php:307 msgid "Custom/Expert Mode" msgstr "Benutzerdefiniert/Expertenmodus" @@ -187,7 +191,7 @@ msgstr "Benutzerdefiniert/Expertenmodus" #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32 #: ../../Zotlabs/Module/Cards.php:33 ../../Zotlabs/Module/Webpages.php:33 -#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1198 +#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1197 msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht verfügbar." @@ -198,26 +202,27 @@ msgstr "Das angefragte Profil ist nicht verfügbar." #: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271 -#: ../../Zotlabs/Module/Appman.php:86 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:21 #: ../../Zotlabs/Module/Article_edit.php:51 -#: ../../Zotlabs/Module/New_channel.php:77 -#: ../../Zotlabs/Module/New_channel.php:102 +#: ../../Zotlabs/Module/New_channel.php:91 +#: ../../Zotlabs/Module/New_channel.php:116 #: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 #: ../../Zotlabs/Module/Moderate.php:13 -#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:275 -#: ../../Zotlabs/Module/Thing.php:295 ../../Zotlabs/Module/Thing.php:336 +#: ../../Zotlabs/Module/Settings/Features.php:38 +#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280 +#: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67 #: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101 #: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50 -#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:400 +#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404 #: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149 #: ../../Zotlabs/Module/Profile_photo.php:302 #: ../../Zotlabs/Module/Profile_photo.php:315 #: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229 #: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256 -#: ../../Zotlabs/Module/Item.php:1099 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Item.php:1106 ../../Zotlabs/Module/Page.php:34 #: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389 #: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 #: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71 @@ -236,7 +241,7 @@ msgstr "Das angefragte Profil ist nicht verfügbar." #: ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:281 #: ../../Zotlabs/Module/Cover_photo.php:294 -#: ../../Zotlabs/Module/Display.php:406 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 #: ../../Zotlabs/Module/Filestorage.php:85 @@ -248,15 +253,14 @@ msgstr "Das angefragte Profil ist nicht verfügbar." #: ../../Zotlabs/Module/Notifications.php:11 #: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:123 #: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53 -#: ../../addon/gitwiki/Mod_Gitwiki.php:196 -#: ../../addon/gitwiki/Mod_Gitwiki.php:292 ../../addon/pumpio/pumpio.php:40 -#: ../../include/attach.php:150 ../../include/attach.php:197 -#: ../../include/attach.php:270 ../../include/attach.php:284 -#: ../../include/attach.php:293 ../../include/attach.php:366 -#: ../../include/attach.php:380 ../../include/attach.php:387 -#: ../../include/attach.php:469 ../../include/attach.php:1019 -#: ../../include/attach.php:1093 ../../include/attach.php:1258 -#: ../../include/items.php:3656 ../../include/photos.php:27 +#: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:150 +#: ../../include/attach.php:197 ../../include/attach.php:270 +#: ../../include/attach.php:284 ../../include/attach.php:293 +#: ../../include/attach.php:366 ../../include/attach.php:380 +#: ../../include/attach.php:387 ../../include/attach.php:469 +#: ../../include/attach.php:1029 ../../include/attach.php:1103 +#: ../../include/attach.php:1268 ../../include/items.php:3706 +#: ../../include/photos.php:27 msgid "Permission denied." msgstr "Berechtigung verweigert." @@ -265,7 +269,7 @@ msgstr "Berechtigung verweigert." msgid "Block Name" msgstr "Block-Name" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2402 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2422 msgid "Blocks" msgstr "Blöcke" @@ -284,9 +288,9 @@ msgid "Edited" msgstr "Geändert" #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96 -#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:146 +#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:160 #: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:118 -#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801 +#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239 #: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:382 #: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165 @@ -295,43 +299,44 @@ msgstr "Erstelle" #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Article_edit.php:99 -#: ../../Zotlabs/Module/Admin/Profs.php:154 -#: ../../Zotlabs/Module/Settings/Oauth.php:149 -#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:114 -#: ../../Zotlabs/Module/Connections.php:265 -#: ../../Zotlabs/Module/Connections.php:303 -#: ../../Zotlabs/Module/Connections.php:323 ../../Zotlabs/Module/Wiki.php:202 -#: ../../Zotlabs/Module/Wiki.php:358 ../../Zotlabs/Module/Menu.php:112 +#: ../../Zotlabs/Module/Admin/Profs.php:175 +#: ../../Zotlabs/Module/Settings/Oauth2.php:149 +#: ../../Zotlabs/Module/Settings/Oauth.php:150 +#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114 +#: ../../Zotlabs/Module/Connections.php:281 +#: ../../Zotlabs/Module/Connections.php:319 +#: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202 +#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:112 #: ../../Zotlabs/Module/Layouts.php:193 #: ../../Zotlabs/Module/Editwebpage.php:142 -#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Editpost.php:85 -#: ../../Zotlabs/Module/Card_edit.php:99 ../../Zotlabs/Lib/Apps.php:409 -#: ../../Zotlabs/Lib/ThreadItem.php:121 ../../Zotlabs/Storage/Browser.php:288 -#: ../../Zotlabs/Widget/Cdav.php:126 ../../Zotlabs/Widget/Cdav.php:162 -#: ../../addon/gitwiki/Mod_Gitwiki.php:151 -#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1297 -#: ../../include/channel.php:1301 ../../include/menu.php:113 +#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99 +#: ../../Zotlabs/Lib/Apps.php:409 ../../Zotlabs/Lib/ThreadItem.php:121 +#: ../../Zotlabs/Storage/Browser.php:288 ../../Zotlabs/Widget/Cdav.php:126 +#: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296 +#: ../../include/channel.php:1300 ../../include/menu.php:113 msgid "Edit" msgstr "Bearbeiten" #: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102 -#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:241 -#: ../../Zotlabs/Widget/Cdav.php:124 ../../include/conversation.php:1363 +#: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124 +#: ../../include/conversation.php:1366 msgid "Share" msgstr "Teilen" #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 #: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187 #: ../../Zotlabs/Module/Article_edit.php:129 -#: ../../Zotlabs/Module/Admin/Accounts.php:174 +#: ../../Zotlabs/Module/Admin/Accounts.php:175 #: ../../Zotlabs/Module/Admin/Channels.php:149 -#: ../../Zotlabs/Module/Admin/Profs.php:155 -#: ../../Zotlabs/Module/Settings/Oauth.php:150 -#: ../../Zotlabs/Module/Thing.php:262 ../../Zotlabs/Module/Editblock.php:139 -#: ../../Zotlabs/Module/Connections.php:273 +#: ../../Zotlabs/Module/Admin/Profs.php:176 +#: ../../Zotlabs/Module/Settings/Oauth2.php:150 +#: ../../Zotlabs/Module/Settings/Oauth.php:151 +#: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139 +#: ../../Zotlabs/Module/Connections.php:289 #: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654 #: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Group.php:179 -#: ../../Zotlabs/Module/Profiles.php:803 +#: ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/Editwebpage.php:167 #: ../../Zotlabs/Module/Webpages.php:242 #: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:410 @@ -343,7 +348,6 @@ msgstr "Löschen" #: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694 #: ../../Zotlabs/Module/Wiki.php:204 ../../Zotlabs/Module/Layouts.php:198 #: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:60 -#: ../../addon/gitwiki/Mod_Gitwiki.php:153 msgid "View" msgstr "Ansicht" @@ -420,30 +424,31 @@ msgstr "3. Klicke auf [Verbinden]" #: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121 #: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493 -#: ../../Zotlabs/Module/Appman.php:152 +#: ../../Zotlabs/Module/Appman.php:153 #: ../../Zotlabs/Module/Import_items.php:129 #: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349 #: ../../Zotlabs/Module/Connect.php:98 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Plugins.php:438 -#: ../../Zotlabs/Module/Admin/Accounts.php:167 +#: ../../Zotlabs/Module/Admin/Accounts.php:168 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:289 -#: ../../Zotlabs/Module/Admin/Profs.php:157 +#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Account_edit.php:74 #: ../../Zotlabs/Module/Admin/Security.php:104 -#: ../../Zotlabs/Module/Settings/Permcats.php:110 -#: ../../Zotlabs/Module/Settings/Channel.php:488 -#: ../../Zotlabs/Module/Settings/Features.php:47 +#: ../../Zotlabs/Module/Settings/Permcats.php:115 +#: ../../Zotlabs/Module/Settings/Channel.php:495 +#: ../../Zotlabs/Module/Settings/Features.php:79 #: ../../Zotlabs/Module/Settings/Tokens.php:168 +#: ../../Zotlabs/Module/Settings/Oauth2.php:84 #: ../../Zotlabs/Module/Settings/Account.php:118 #: ../../Zotlabs/Module/Settings/Featured.php:54 #: ../../Zotlabs/Module/Settings/Display.php:192 -#: ../../Zotlabs/Module/Settings/Oauth.php:87 -#: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374 -#: ../../Zotlabs/Module/Import.php:529 ../../Zotlabs/Module/Cal.php:345 +#: ../../Zotlabs/Module/Settings/Oauth.php:88 +#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379 +#: ../../Zotlabs/Module/Import.php:530 ../../Zotlabs/Module/Cal.php:345 #: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082 #: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240 #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98 @@ -451,17 +456,17 @@ msgstr "3. Klicke auf [Verbinden]" #: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242 #: ../../Zotlabs/Module/Email_validation.php:40 #: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249 -#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726 -#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 -#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431 -#: ../../Zotlabs/Module/Filestorage.php:160 ../../Zotlabs/Module/Rate.php:166 -#: ../../Zotlabs/Lib/ThreadItem.php:750 +#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:723 +#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Sources.php:114 +#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15 +#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Lib/ThreadItem.php:752 #: ../../Zotlabs/Widget/Eventstools.php:16 #: ../../Zotlabs/Widget/Wiki_pages.php:40 #: ../../Zotlabs/Widget/Wiki_pages.php:97 #: ../../view/theme/redbasic_c/php/config.php:95 #: ../../view/theme/redbasic/php/config.php:93 -#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:273 +#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:275 #: ../../addon/planets/planets.php:153 #: ../../addon/openclipatar/openclipatar.php:53 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 @@ -469,16 +474,16 @@ msgstr "3. Klicke auf [Verbinden]" #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:822 -#: ../../addon/gitwiki/Mod_Gitwiki.php:155 +#: ../../addon/diaspora/diaspora.php:825 #: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84 #: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161 #: ../../addon/mailtest/mailtest.php:100 #: ../../addon/openstreetmap/openstreetmap.php:168 -#: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371 +#: ../../addon/fuzzloc/fuzzloc.php:191 ../../addon/rtof/rtof.php:101 +#: ../../addon/jappixmini/jappixmini.php:371 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1053 +#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1072 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 @@ -487,15 +492,16 @@ msgstr "3. Klicke auf [Verbinden]" #: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:218 #: ../../addon/twitter/twitter.php:265 #: ../../addon/smileybutton/smileybutton.php:219 -#: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48 +#: ../../addon/cart/cart.php:1104 ../../addon/piwik/piwik.php:95 +#: ../../addon/pageheader/pageheader.php:48 #: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69 #: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124 #: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22 msgid "Submit" msgstr "Absenden" -#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:179 -#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:124 +#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191 +#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:133 #: ../../include/nav.php:469 msgid "Articles" msgstr "Artikel" @@ -530,11 +536,11 @@ msgstr "Layout bearbeiten" #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86 #: ../../Zotlabs/Module/Import_items.php:120 -#: ../../Zotlabs/Module/Cloud.php:111 ../../Zotlabs/Module/Group.php:74 +#: ../../Zotlabs/Module/Cloud.php:117 ../../Zotlabs/Module/Group.php:74 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68 #: ../../Zotlabs/Module/Like.php:296 ../../Zotlabs/Web/WebServer.php:122 #: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73 -#: ../../addon/frphotos/frphotos.php:81 ../../addon/redfiles/redfiles.php:109 +#: ../../addon/frphotos/frphotos.php:82 ../../addon/redfiles/redfiles.php:109 #: ../../include/items.php:358 msgid "Permission denied" msgstr "Keine Berechtigung" @@ -547,7 +553,7 @@ msgstr "Ungültiger Profil-Identifikator" msgid "Profile Visibility Editor" msgstr "Profil-Sichtbarkeits-Editor" -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1634 +#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1644 msgid "Profile" msgstr "Profil" @@ -560,7 +566,7 @@ msgid "Visible To" msgstr "Sichtbar für" #: ../../Zotlabs/Module/Profperm.php:140 -#: ../../Zotlabs/Module/Connections.php:140 +#: ../../Zotlabs/Module/Connections.php:200 msgid "All Connections" msgstr "Alle Verbindungen" @@ -575,9 +581,9 @@ msgstr "Zusammenfassung:" #: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787 #: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146 #: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273 -#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:832 +#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:853 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891 #: ../../include/conversation.php:1160 msgid "Unknown" msgstr "Unbekannt" @@ -615,14 +621,14 @@ msgid "End date and time" msgstr "Enddatum und -zeit" #: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473 -#: ../../Zotlabs/Module/Appman.php:142 ../../Zotlabs/Module/Rbmark.php:101 +#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101 #: ../../addon/rendezvous/rendezvous.php:173 msgid "Description" msgstr "Beschreibung" #: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Locs.php:117 #: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509 -#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Module/Pubsites.php:52 +#: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52 #: ../../include/js_strings.php:25 msgid "Location" msgstr "Ort" @@ -687,17 +693,17 @@ msgstr "Alles löschen" #: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188 #: ../../Zotlabs/Module/Admin/Plugins.php:423 -#: ../../Zotlabs/Module/Settings/Oauth.php:88 -#: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Wiki.php:345 ../../Zotlabs/Module/Wiki.php:375 +#: ../../Zotlabs/Module/Settings/Oauth2.php:85 +#: ../../Zotlabs/Module/Settings/Oauth2.php:113 +#: ../../Zotlabs/Module/Settings/Oauth.php:89 +#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Wiki.php:347 ../../Zotlabs/Module/Wiki.php:379 #: ../../Zotlabs/Module/Profile_photo.php:464 #: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66 -#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804 -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:365 +#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:366 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 -#: ../../addon/gitwiki/Mod_Gitwiki.php:244 -#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1386 -#: ../../include/conversation.php:1435 +#: ../../include/conversation.php:1389 ../../include/conversation.php:1438 msgid "Cancel" msgstr "Abbrechen" @@ -708,14 +714,15 @@ msgstr "Entschuldigung, aber das Bearbeiten von wiederkehrenden Veranstaltungen #: ../../Zotlabs/Module/Cdav.php:1170 #: ../../Zotlabs/Module/Sharedwithme.php:105 #: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Settings/Oauth2.php:86 +#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth.php:90 +#: ../../Zotlabs/Module/Settings/Oauth.php:116 #: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906 #: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558 #: ../../Zotlabs/Storage/Browser.php:283 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 -#: ../../addon/gitwiki/Mod_Gitwiki.php:158 msgid "Name" msgstr "Name" @@ -728,76 +735,78 @@ msgid "Title" msgstr "Titel" #: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909 -#: ../../Zotlabs/Module/Profiles.php:789 +#: ../../Zotlabs/Module/Profiles.php:786 msgid "Phone" msgstr "Telefon" #: ../../Zotlabs/Module/Cdav.php:1174 -#: ../../Zotlabs/Module/Admin/Accounts.php:170 -#: ../../Zotlabs/Module/Admin/Accounts.php:182 -#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Admin/Accounts.php:171 +#: ../../Zotlabs/Module/Admin/Accounts.php:183 +#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1775 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1770 msgid "Email" msgstr "E-Mail" #: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911 -#: ../../Zotlabs/Module/Profiles.php:791 +#: ../../Zotlabs/Module/Profiles.php:788 msgid "Instant messenger" msgstr "Sofortnachrichtendienst" #: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912 -#: ../../Zotlabs/Module/Profiles.php:792 +#: ../../Zotlabs/Module/Profiles.php:789 msgid "Website" msgstr "Webseite" #: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118 #: ../../Zotlabs/Module/Admin/Channels.php:160 #: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:502 -#: ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Profiles.php:790 msgid "Address" msgstr "Adresse" #: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914 -#: ../../Zotlabs/Module/Profiles.php:794 +#: ../../Zotlabs/Module/Profiles.php:791 msgid "Note" msgstr "Hinweis" #: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915 -#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1308 -#: ../../include/connections.php:682 +#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308 +#: ../../include/connections.php:690 msgid "Mobile" msgstr "Mobil" #: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916 -#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1309 -#: ../../include/connections.php:683 +#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309 +#: ../../include/connections.php:691 msgid "Home" msgstr "Home" #: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917 -#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1312 -#: ../../include/connections.php:686 +#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312 +#: ../../include/connections.php:694 msgid "Work" msgstr "Arbeit" #: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919 -#: ../../Zotlabs/Module/Profiles.php:799 +#: ../../Zotlabs/Module/Profiles.php:796 #: ../../addon/jappixmini/jappixmini.php:368 msgid "Add Contact" msgstr "Kontakt hinzufügen" #: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920 -#: ../../Zotlabs/Module/Profiles.php:800 +#: ../../Zotlabs/Module/Profiles.php:797 msgid "Add Field" msgstr "Feld hinzufügen" #: ../../Zotlabs/Module/Cdav.php:1186 #: ../../Zotlabs/Module/Admin/Plugins.php:453 -#: ../../Zotlabs/Module/Settings/Oauth.php:42 -#: ../../Zotlabs/Module/Settings/Oauth.php:113 -#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:802 +#: ../../Zotlabs/Module/Settings/Oauth2.php:39 +#: ../../Zotlabs/Module/Settings/Oauth2.php:112 +#: ../../Zotlabs/Module/Settings/Oauth.php:43 +#: ../../Zotlabs/Module/Settings/Oauth.php:114 +#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799 #: ../../Zotlabs/Lib/Apps.php:393 msgid "Update" msgstr "Aktualisieren" @@ -827,7 +836,7 @@ msgid "ZIP Code" msgstr "Postleitzahl" #: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931 -#: ../../Zotlabs/Module/Profiles.php:760 +#: ../../Zotlabs/Module/Profiles.php:757 msgid "Country" msgstr "Land" @@ -843,8 +852,8 @@ msgstr "Standardadressbuch" msgid "This site is not a directory server" msgstr "Diese Webseite ist kein Verzeichnisserver" -#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25 -#: ../../addon/gitwiki/Mod_Gitwiki.php:28 ../../addon/chess/chess.php:508 +#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Ochannel.php:32 +#: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508 msgid "You must be logged in to see this page." msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können." @@ -935,24 +944,24 @@ msgstr "Du hast keine ungelesenen Beiträge..." msgid "Public access denied." msgstr "Öffentlichen Zugriff verweigert." -#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:319 +#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335 #: ../../Zotlabs/Lib/Apps.php:256 ../../Zotlabs/Widget/Sitesearch.php:31 #: ../../include/text.php:1051 ../../include/text.php:1063 #: ../../include/acl_selectors.php:118 ../../include/nav.php:179 msgid "Search" msgstr "Suche" -#: ../../Zotlabs/Module/Search.php:226 +#: ../../Zotlabs/Module/Search.php:230 #, php-format msgid "Items tagged with: %s" msgstr "Beiträge mit Schlagwort: %s" -#: ../../Zotlabs/Module/Search.php:228 +#: ../../Zotlabs/Module/Search.php:232 #, php-format msgid "Search results for: %s" msgstr "Suchergebnisse für: %s" -#: ../../Zotlabs/Module/Pubstream.php:93 +#: ../../Zotlabs/Module/Pubstream.php:95 #: ../../Zotlabs/Widget/Notifications.php:131 msgid "Public Stream" msgstr "Öffentlicher Beitrags-Stream" @@ -1053,7 +1062,7 @@ msgid "Menu Item Permissions" msgstr "Zugriffsrechte des Menü-Elements" #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "(click to open/close)" msgstr "(zum öffnen/schließen anklicken)" @@ -1077,8 +1086,8 @@ msgstr "Magic-Auth verwenden, falls verfügbar" #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 #: ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Admin/Site.php:252 -#: ../../Zotlabs/Module/Settings/Channel.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:259 +#: ../../Zotlabs/Module/Settings/Channel.php:307 #: ../../Zotlabs/Module/Settings/Display.php:100 #: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:697 #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 @@ -1087,7 +1096,7 @@ msgstr "Magic-Auth verwenden, falls verfügbar" #: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681 #: ../../Zotlabs/Module/Filestorage.php:155 #: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1587 +#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1096,9 +1105,9 @@ msgstr "Magic-Auth verwenden, falls verfügbar" #: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 -#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166 -#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166 -#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81 +#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 +#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 #: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 @@ -1116,11 +1125,12 @@ msgstr "Magic-Auth verwenden, falls verfügbar" #: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 #: ../../addon/smileybutton/smileybutton.php:211 #: ../../addon/smileybutton/smileybutton.php:215 -#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 -#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 -#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 +#: ../../addon/cart/cart.php:1075 ../../addon/cart/cart.php:1082 +#: ../../addon/cart/cart.php:1090 ../../addon/authchoose/authchoose.php:67 +#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 +#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 +#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 msgid "No" msgstr "Nein" @@ -1128,8 +1138,8 @@ msgstr "Nein" #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 #: ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Admin/Site.php:254 -#: ../../Zotlabs/Module/Settings/Channel.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Settings/Channel.php:307 #: ../../Zotlabs/Module/Settings/Display.php:100 #: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:697 #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 @@ -1138,7 +1148,7 @@ msgstr "Nein" #: ../../Zotlabs/Module/Profiles.php:681 #: ../../Zotlabs/Module/Filestorage.php:155 #: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1587 +#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1147,9 +1157,9 @@ msgstr "Nein" #: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 -#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166 -#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166 -#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81 +#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 +#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 #: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 @@ -1167,11 +1177,12 @@ msgstr "Nein" #: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 #: ../../addon/smileybutton/smileybutton.php:211 #: ../../addon/smileybutton/smileybutton.php:215 -#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 -#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 -#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 +#: ../../addon/cart/cart.php:1075 ../../addon/cart/cart.php:1082 +#: ../../addon/cart/cart.php:1090 ../../addon/authchoose/authchoose.php:67 +#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 +#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 +#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 msgid "Yes" msgstr "Ja" @@ -1281,8 +1292,8 @@ msgid "Event not found." msgstr "Termin nicht gefunden." #: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73 -#: ../../Zotlabs/Module/Like.php:385 ../../include/conversation.php:119 -#: ../../include/text.php:2007 ../../include/event.php:1153 +#: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119 +#: ../../include/text.php:2008 ../../include/event.php:1153 msgid "event" msgstr "Termin" @@ -1291,9 +1302,9 @@ msgid "Edit event title" msgstr "Termintitel bearbeiten" #: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465 -#: ../../Zotlabs/Module/Appman.php:140 ../../Zotlabs/Module/Appman.php:141 -#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752 -#: ../../include/datetime.php:205 +#: ../../Zotlabs/Module/Appman.php:141 ../../Zotlabs/Module/Appman.php:142 +#: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749 +#: ../../include/datetime.php:211 msgid "Required" msgstr "Benötigt" @@ -1344,12 +1355,12 @@ msgid "Edit Location" msgstr "Ort bearbeiten" #: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:760 -#: ../../include/conversation.php:1330 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:762 +#: ../../include/conversation.php:1333 msgid "Preview" msgstr "Vorschau" -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1402 +#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1405 msgid "Permission settings" msgstr "Berechtigungs-Einstellungen" @@ -1374,7 +1385,7 @@ msgid "Delete event" msgstr "Termin löschen" #: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315 -#: ../../include/text.php:1826 +#: ../../include/text.php:1827 msgid "Link to Source" msgstr "Link zur Quelle" @@ -1391,7 +1402,7 @@ msgid "Create Event" msgstr "Termin anlegen" #: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341 -#: ../../include/channel.php:1637 +#: ../../include/channel.php:1647 msgid "Export" msgstr "Exportieren" @@ -1403,55 +1414,55 @@ msgstr "Termin gelöscht" msgid "Failed to remove event" msgstr "Termin konnte nicht gelöscht werden" -#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55 +#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56 msgid "App installed." msgstr "App installiert." -#: ../../Zotlabs/Module/Appman.php:48 +#: ../../Zotlabs/Module/Appman.php:49 msgid "Malformed app." msgstr "Fehlerhafte App." -#: ../../Zotlabs/Module/Appman.php:129 +#: ../../Zotlabs/Module/Appman.php:130 msgid "Embed code" msgstr "Code einbetten" -#: ../../Zotlabs/Module/Appman.php:135 +#: ../../Zotlabs/Module/Appman.php:136 msgid "Edit App" msgstr "App bearbeiten" -#: ../../Zotlabs/Module/Appman.php:135 +#: ../../Zotlabs/Module/Appman.php:136 msgid "Create App" msgstr "App erstellen" -#: ../../Zotlabs/Module/Appman.php:140 +#: ../../Zotlabs/Module/Appman.php:141 msgid "Name of app" msgstr "Name der App" -#: ../../Zotlabs/Module/Appman.php:141 +#: ../../Zotlabs/Module/Appman.php:142 msgid "Location (URL) of app" msgstr "Ort (URL) der App" -#: ../../Zotlabs/Module/Appman.php:143 +#: ../../Zotlabs/Module/Appman.php:144 msgid "Photo icon URL" msgstr "URL zum Icon" -#: ../../Zotlabs/Module/Appman.php:143 +#: ../../Zotlabs/Module/Appman.php:144 msgid "80 x 80 pixels - optional" msgstr "80 x 80 Pixel – optional" -#: ../../Zotlabs/Module/Appman.php:144 +#: ../../Zotlabs/Module/Appman.php:145 msgid "Categories (optional, comma separated list)" msgstr "Kategorien (optional, kommagetrennte Liste)" -#: ../../Zotlabs/Module/Appman.php:145 +#: ../../Zotlabs/Module/Appman.php:146 msgid "Version ID" msgstr "Versions-ID" -#: ../../Zotlabs/Module/Appman.php:146 +#: ../../Zotlabs/Module/Appman.php:147 msgid "Price of app" msgstr "Preis der App" -#: ../../Zotlabs/Module/Appman.php:147 +#: ../../Zotlabs/Module/Appman.php:148 msgid "Location (URL) to purchase app" msgstr "Ort (URL), um die App zu kaufen" @@ -1464,16 +1475,16 @@ msgid "Hub not found." msgstr "Server nicht gefunden." #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 -#: ../../Zotlabs/Module/Like.php:383 +#: ../../Zotlabs/Module/Like.php:384 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1518 ../../addon/pubcrawl/as.php:1359 -#: ../../include/conversation.php:116 ../../include/text.php:2004 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 +#: ../../include/conversation.php:116 ../../include/text.php:2005 msgid "photo" msgstr "Foto" -#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:383 -#: ../../addon/diaspora/Receiver.php:1518 ../../addon/pubcrawl/as.php:1359 -#: ../../include/conversation.php:144 ../../include/text.php:2010 +#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 +#: ../../include/conversation.php:144 ../../include/text.php:2011 msgid "status" msgstr "Status" @@ -1503,8 +1514,9 @@ msgid "Insert web link" msgstr "Link einfügen" #: ../../Zotlabs/Module/Article_edit.php:117 -#: ../../Zotlabs/Module/Editblock.php:129 -#: ../../Zotlabs/Module/Card_edit.php:117 ../../include/conversation.php:1398 +#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:698 +#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Card_edit.php:117 +#: ../../include/conversation.php:1401 msgid "Title (optional)" msgstr "Titel (optional)" @@ -1527,7 +1539,6 @@ msgid "Imported file is empty." msgstr "Die importierte Datei ist leer." #: ../../Zotlabs/Module/Import_items.php:93 -#: ../../Zotlabs/Module/Import.php:121 #, php-format msgid "Warning: Database versions differ by %1$d updates." msgstr "Achtung: Datenbankversionen unterscheiden sich um %1$d Aktualisierungen." @@ -1546,32 +1557,32 @@ msgid "" msgstr "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren." #: ../../Zotlabs/Module/Import_items.php:127 -#: ../../Zotlabs/Module/Import.php:516 +#: ../../Zotlabs/Module/Import.php:517 msgid "File to Upload" msgstr "Hochzuladende Datei:" -#: ../../Zotlabs/Module/New_channel.php:119 +#: ../../Zotlabs/Module/New_channel.php:133 #: ../../Zotlabs/Module/Manage.php:138 #, php-format msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet." -#: ../../Zotlabs/Module/New_channel.php:132 +#: ../../Zotlabs/Module/New_channel.php:146 #: ../../Zotlabs/Module/Register.php:254 msgid "Name or caption" msgstr "Name oder Titel" -#: ../../Zotlabs/Module/New_channel.php:132 +#: ../../Zotlabs/Module/New_channel.php:146 #: ../../Zotlabs/Module/Register.php:254 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\"" msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ " -#: ../../Zotlabs/Module/New_channel.php:134 +#: ../../Zotlabs/Module/New_channel.php:148 #: ../../Zotlabs/Module/Register.php:256 msgid "Choose a short nickname" msgstr "Wähle einen kurzen Spitznamen" -#: ../../Zotlabs/Module/New_channel.php:134 +#: ../../Zotlabs/Module/New_channel.php:148 #: ../../Zotlabs/Module/Register.php:256 #, php-format msgid "" @@ -1579,38 +1590,47 @@ msgid "" "e.g. nickname%s" msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst, z.B. nickname%s" -#: ../../Zotlabs/Module/New_channel.php:135 +#: ../../Zotlabs/Module/New_channel.php:149 +#: ../../Zotlabs/Module/Settings/Channel.php:539 #: ../../Zotlabs/Module/Register.php:257 msgid "Channel role and privacy" msgstr "Kanaltyp und Privatspäre-Einstellungen" -#: ../../Zotlabs/Module/New_channel.php:135 +#: ../../Zotlabs/Module/New_channel.php:149 #: ../../Zotlabs/Module/Register.php:257 msgid "Select a channel role with your privacy requirements." msgstr "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre." -#: ../../Zotlabs/Module/New_channel.php:135 +#: ../../Zotlabs/Module/New_channel.php:149 #: ../../Zotlabs/Module/Register.php:257 msgid "Read more about roles" msgstr "Mehr Informationen über Rollen" -#: ../../Zotlabs/Module/New_channel.php:138 +#: ../../Zotlabs/Module/New_channel.php:152 msgid "Create Channel" msgstr "Einen neuen Kanal anlegen" -#: ../../Zotlabs/Module/New_channel.php:139 +#: ../../Zotlabs/Module/New_channel.php:153 +msgid "" +"A channel is a unique network identity. It can represent a person (social " +"network profile), a forum (group), a business or celebrity page, a newsfeed," +" and many other things. Channels can make connections with other channels to" +" share information with each other." +msgstr "Ein Kanal ist eine eindeutige Identität. Er kann eine Person (Soziales Netzwerk-Profil), ein Forum (Gruppe), eine Unternehmens- oder Prominenten-Seite, einen Newsfeed oder viele andere Dinge repräsentieren. Kanäle können Verbindungen mit anderen Kanälen eingehen, um Informationen miteinander auszutauschen." + +#: ../../Zotlabs/Module/New_channel.php:153 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 "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen." +"The type of channel you create affects the basic privacy settings, the " +"permissions that are granted to connections/friends, and also the channel's " +"visibility across the network." +msgstr "Die Art des Kanals, den Du erzeugst, beeinflusst die grundlegenden Privatsphäre-Einstellungen, die Rechte, die Verbindungen/Freunden gewährt werden, und auch die Sichtbarkeit des Kanals im gesamten Netzwerk." -#: ../../Zotlabs/Module/New_channel.php:140 +#: ../../Zotlabs/Module/New_channel.php:154 msgid "" "or import an existing channel from another location." msgstr "oder importiere einen bestehenden Kanal von einem anderen Server." -#: ../../Zotlabs/Module/New_channel.php:145 +#: ../../Zotlabs/Module/New_channel.php:159 msgid "Validate" msgstr "Überprüfe" @@ -1656,7 +1676,7 @@ msgid "" msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:600 msgid "Remove Channel" msgstr "Kanal löschen" @@ -1715,7 +1735,7 @@ msgid "" msgstr "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren." #: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262 -#: ../../Zotlabs/Module/Setup.php:745 +#: ../../Zotlabs/Module/Setup.php:749 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "Lies die Datei \"install/INSTALL.txt\"." @@ -1976,115 +1996,107 @@ msgstr "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht instal msgid "Error: zip PHP module required but not installed." msgstr "Fehler: Das zip PHP Modul ist erforderlich, ist aber nicht installiert." -#: ../../Zotlabs/Module/Setup.php:569 +#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579 +msgid ".htconfig.php is writable" +msgstr ".htconfig.php ist beschreibbar" + +#: ../../Zotlabs/Module/Setup.php:575 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\"" " in the top folder of your web server and it is unable to do so." msgstr "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht." -#: ../../Zotlabs/Module/Setup.php:570 +#: ../../Zotlabs/Module/Setup.php:576 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst." -#: ../../Zotlabs/Module/Setup.php:571 -msgid "" -"At the end of this procedure, we will give you a text to save in a file " -"named .htconfig.php in your Red top folder." -msgstr "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Hubzilla-Installation speichern musst." - -#: ../../Zotlabs/Module/Setup.php:572 -msgid "" -"You can alternatively skip this procedure and perform a manual installation." -" Please see the file \"install/INSTALL.txt\" for instructions." -msgstr "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt." - -#: ../../Zotlabs/Module/Setup.php:575 -msgid ".htconfig.php is writable" -msgstr ".htconfig.php ist beschreibbar" +#: ../../Zotlabs/Module/Setup.php:577 +msgid "Please see install/INSTALL.txt for additional information." +msgstr "Lies die Datei \"install/INSTALL.txt\"." -#: ../../Zotlabs/Module/Setup.php:589 +#: ../../Zotlabs/Module/Setup.php:593 msgid "" "This software uses the Smarty3 template engine to render its web views. " "Smarty3 compiles templates to PHP to speed up rendering." msgstr "Diese Software verwendet die Smarty3 Template Engine, um Vorlagen für die Webdarstellung zu verarbeiten. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen." -#: ../../Zotlabs/Module/Setup.php:590 +#: ../../Zotlabs/Module/Setup.php:594 #, php-format msgid "" "In order to store these compiled templates, the web server needs to have " "write access to the directory %s under the top level web folder." msgstr "Um diese kompilierten Vorlagen speichern zu können, braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Hubzilla-Stammverzeichnisses." -#: ../../Zotlabs/Module/Setup.php:591 ../../Zotlabs/Module/Setup.php:612 +#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616 msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has" " write access to this folder." msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat." -#: ../../Zotlabs/Module/Setup.php:592 +#: ../../Zotlabs/Module/Setup.php:596 #, php-format msgid "" "Note: as a security measure, you should give the web server write access to " "%s only--not the template files (.tpl) that it contains." msgstr "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält." -#: ../../Zotlabs/Module/Setup.php:595 +#: ../../Zotlabs/Module/Setup.php:599 #, php-format msgid "%s is writable" msgstr "%s ist beschreibbar" -#: ../../Zotlabs/Module/Setup.php:611 +#: ../../Zotlabs/Module/Setup.php:615 msgid "" "This software uses the store directory to save uploaded files. The web " "server needs to have write access to the store directory under the top level" " web folder" msgstr "Diese Software benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Webserver benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Web-Stammverzeichnisses." -#: ../../Zotlabs/Module/Setup.php:615 +#: ../../Zotlabs/Module/Setup.php:619 msgid "store is writable" msgstr "store ist schreibbar" -#: ../../Zotlabs/Module/Setup.php:647 +#: ../../Zotlabs/Module/Setup.php:651 msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access" " to this site." msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server." -#: ../../Zotlabs/Module/Setup.php:648 +#: ../../Zotlabs/Module/Setup.php:652 msgid "" "If you have https access to your website or allow connections to TCP port " "443 (the https: port), you MUST use a browser-valid certificate. You MUST " "NOT use self-signed certificates!" msgstr "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich." -#: ../../Zotlabs/Module/Setup.php:649 +#: ../../Zotlabs/Module/Setup.php:653 msgid "" "This restriction is incorporated because public posts from you may for " "example contain references to images on your own hub." msgstr "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können." -#: ../../Zotlabs/Module/Setup.php:650 +#: ../../Zotlabs/Module/Setup.php:654 msgid "" "If your certificate is not recognized, members of other sites (who may " "themselves have valid certificates) will get a warning message on their own " "site complaining about security issues." msgstr "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer $Projectname-Hubs (die mit korrekten Zertifikaten ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird)." -#: ../../Zotlabs/Module/Setup.php:651 +#: ../../Zotlabs/Module/Setup.php:655 msgid "" "This can cause usability issues elsewhere (not just on your own site) so we " "must insist on this requirement." msgstr "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen." -#: ../../Zotlabs/Module/Setup.php:652 +#: ../../Zotlabs/Module/Setup.php:656 msgid "" "Providers are available that issue free certificates which are browser-" "valid." msgstr "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind." -#: ../../Zotlabs/Module/Setup.php:654 +#: ../../Zotlabs/Module/Setup.php:658 msgid "" "If you are confident that the certificate is valid and signed by a trusted " "authority, check to see if you have failed to install an intermediate cert. " @@ -2092,37 +2104,37 @@ msgid "" "server communications." msgstr "Wenn Du sicher bist, dass das Zertifikat gültig und von einer vertrauenswürdigen Zertifizierungsstelle signiert ist, prüfe auf ggf. noch zu installierende Zwischenzertifikate (intermediate). Diese werden nicht unbedingt von Browsern benötigt, aber sehr wohl für die Kommunikation zwischen Servern." -#: ../../Zotlabs/Module/Setup.php:656 +#: ../../Zotlabs/Module/Setup.php:660 msgid "SSL certificate validation" msgstr "SSL Zertifikatverifizierung" -#: ../../Zotlabs/Module/Setup.php:662 +#: ../../Zotlabs/Module/Setup.php:666 msgid "" "Url rewrite in .htaccess is not working. Check your server " "configuration.Test: " msgstr "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:" -#: ../../Zotlabs/Module/Setup.php:665 +#: ../../Zotlabs/Module/Setup.php:669 msgid "Url rewrite is working" msgstr "Url rewrite funktioniert" -#: ../../Zotlabs/Module/Setup.php:679 +#: ../../Zotlabs/Module/Setup.php:683 msgid "" "The database configuration file \".htconfig.php\" could not be written. " "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen." -#: ../../Zotlabs/Module/Setup.php:703 +#: ../../Zotlabs/Module/Setup.php:707 #: ../../addon/rendezvous/rendezvous.php:401 msgid "Errors encountered creating database tables." msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten." -#: ../../Zotlabs/Module/Setup.php:743 +#: ../../Zotlabs/Module/Setup.php:747 msgid "

    What next?

    " msgstr "

    Wie geht es jetzt weiter?

    " -#: ../../Zotlabs/Module/Setup.php:744 +#: ../../Zotlabs/Module/Setup.php:748 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the " "poller." @@ -2201,13 +2213,13 @@ msgstr "Letzter Kontakt" #: ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:38 +#: ../../Zotlabs/Module/Settings/Features.php:65 msgid "Off" msgstr "Aus" #: ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:38 +#: ../../Zotlabs/Module/Settings/Features.php:65 msgid "On" msgstr "An" @@ -2261,11 +2273,11 @@ msgid "No failed updates." msgstr "Keine fehlgeschlagenen Aktualisierungen." #: ../../Zotlabs/Module/Admin/Plugins.php:259 -#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89 +#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 -#: ../../Zotlabs/Module/Display.php:410 +#: ../../Zotlabs/Module/Display.php:453 #: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62 -#: ../../include/items.php:3569 +#: ../../include/items.php:3619 msgid "Item not found." msgstr "Element nicht gefunden." @@ -2291,12 +2303,12 @@ msgstr "Aktivieren" #: ../../Zotlabs/Module/Admin/Plugins.php:341 #: ../../Zotlabs/Module/Admin/Plugins.php:436 -#: ../../Zotlabs/Module/Admin/Accounts.php:165 +#: ../../Zotlabs/Module/Admin/Accounts.php:166 #: ../../Zotlabs/Module/Admin/Logs.php:82 #: ../../Zotlabs/Module/Admin/Channels.php:145 #: ../../Zotlabs/Module/Admin/Themes.php:122 #: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:294 #: ../../Zotlabs/Module/Admin/Security.php:86 #: ../../Zotlabs/Module/Admin.php:136 msgid "Administration" @@ -2315,8 +2327,8 @@ msgstr "Umschalten" #: ../../Zotlabs/Module/Admin/Plugins.php:344 #: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242 -#: ../../Zotlabs/Widget/Newmember.php:55 -#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:105 +#: ../../Zotlabs/Widget/Newmember.php:46 +#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:105 #: ../../include/nav.php:192 msgid "Settings" msgstr "Einstellungen" @@ -2424,7 +2436,7 @@ msgstr[1] "%s Konten gelöscht" msgid "Account not found" msgstr "Konto nicht gefunden" -#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2462 +#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2473 #, php-format msgid "Account '%s' deleted" msgstr "Konto '%s' gelöscht" @@ -2439,79 +2451,80 @@ msgstr "Konto '%s' blockiert" msgid "Account '%s' unblocked" msgstr "Konto '%s' freigegeben" -#: ../../Zotlabs/Module/Admin/Accounts.php:166 -#: ../../Zotlabs/Module/Admin/Accounts.php:179 +#: ../../Zotlabs/Module/Admin/Accounts.php:167 +#: ../../Zotlabs/Module/Admin/Accounts.php:180 #: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23 msgid "Accounts" msgstr "Konten" -#: ../../Zotlabs/Module/Admin/Accounts.php:168 +#: ../../Zotlabs/Module/Admin/Accounts.php:169 #: ../../Zotlabs/Module/Admin/Channels.php:148 msgid "select all" msgstr "Alle auswählen" -#: ../../Zotlabs/Module/Admin/Accounts.php:169 +#: ../../Zotlabs/Module/Admin/Accounts.php:170 msgid "Registrations waiting for confirm" msgstr "Registrierungen warten auf Bestätigung" -#: ../../Zotlabs/Module/Admin/Accounts.php:170 +#: ../../Zotlabs/Module/Admin/Accounts.php:171 msgid "Request date" msgstr "Antragsdatum" -#: ../../Zotlabs/Module/Admin/Accounts.php:171 +#: ../../Zotlabs/Module/Admin/Accounts.php:172 msgid "No registrations." msgstr "Keine Registrierungen." -#: ../../Zotlabs/Module/Admin/Accounts.php:172 -#: ../../Zotlabs/Module/Connections.php:287 ../../include/conversation.php:732 +#: ../../Zotlabs/Module/Admin/Accounts.php:173 +#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:732 msgid "Approve" msgstr "Genehmigen" -#: ../../Zotlabs/Module/Admin/Accounts.php:173 +#: ../../Zotlabs/Module/Admin/Accounts.php:174 +#: ../../Zotlabs/Module/Authorize.php:26 msgid "Deny" msgstr "Verweigern" -#: ../../Zotlabs/Module/Admin/Accounts.php:175 +#: ../../Zotlabs/Module/Admin/Accounts.php:176 #: ../../Zotlabs/Module/Connedit.php:622 msgid "Block" msgstr "Blockieren" -#: ../../Zotlabs/Module/Admin/Accounts.php:176 +#: ../../Zotlabs/Module/Admin/Accounts.php:177 #: ../../Zotlabs/Module/Connedit.php:622 msgid "Unblock" msgstr "Freigeben" -#: ../../Zotlabs/Module/Admin/Accounts.php:181 +#: ../../Zotlabs/Module/Admin/Accounts.php:182 msgid "ID" msgstr "ID" -#: ../../Zotlabs/Module/Admin/Accounts.php:183 ../../include/group.php:284 +#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/group.php:284 msgid "All Channels" msgstr "Alle Kanäle" -#: ../../Zotlabs/Module/Admin/Accounts.php:184 +#: ../../Zotlabs/Module/Admin/Accounts.php:185 msgid "Register date" msgstr "Registrierungs-Datum" -#: ../../Zotlabs/Module/Admin/Accounts.php:185 +#: ../../Zotlabs/Module/Admin/Accounts.php:186 msgid "Last login" msgstr "Letzte Anmeldung" -#: ../../Zotlabs/Module/Admin/Accounts.php:186 +#: ../../Zotlabs/Module/Admin/Accounts.php:187 msgid "Expires" msgstr "Verfällt" -#: ../../Zotlabs/Module/Admin/Accounts.php:187 +#: ../../Zotlabs/Module/Admin/Accounts.php:188 msgid "Service Class" msgstr "Service-Klasse" -#: ../../Zotlabs/Module/Admin/Accounts.php:189 +#: ../../Zotlabs/Module/Admin/Accounts.php:190 msgid "" "Selected accounts will be deleted!\\n\\nEverything these accounts had posted" " on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Die ausgewählten Konten werden gelöscht!\\n\\nAlles, was diese Konten auf diesem Hub veröffentlicht haben, wird endgültig gelöscht werden!\\n\\nBist du dir sicher?" -#: ../../Zotlabs/Module/Admin/Accounts.php:190 +#: ../../Zotlabs/Module/Admin/Accounts.php:191 msgid "" "The account {0} will be deleted!\\n\\nEverything this account has posted on " "this site will be permanently deleted!\\n\\nAre you sure?" @@ -2620,7 +2633,7 @@ msgid "Disallow Code" msgstr "Code sperren" #: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1808 ../../include/nav.php:378 +#: ../../include/conversation.php:1811 ../../include/nav.php:378 msgid "Channel" msgstr "Kanal" @@ -2665,552 +2678,549 @@ msgstr "[Experimentell]" msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: ../../Zotlabs/Module/Admin/Site.php:158 +#: ../../Zotlabs/Module/Admin/Site.php:165 msgid "Site settings updated." msgstr "Site-Einstellungen aktualisiert." -#: ../../Zotlabs/Module/Admin/Site.php:184 +#: ../../Zotlabs/Module/Admin/Site.php:191 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3082 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3106 msgid "Default" msgstr "Standard" -#: ../../Zotlabs/Module/Admin/Site.php:195 +#: ../../Zotlabs/Module/Admin/Site.php:202 #: ../../Zotlabs/Module/Settings/Display.php:130 #, php-format msgid "%s - (Incompatible)" msgstr "%s - (Inkompatibel)" -#: ../../Zotlabs/Module/Admin/Site.php:202 +#: ../../Zotlabs/Module/Admin/Site.php:209 msgid "mobile" msgstr "mobil" -#: ../../Zotlabs/Module/Admin/Site.php:204 +#: ../../Zotlabs/Module/Admin/Site.php:211 msgid "experimental" msgstr "experimentell" -#: ../../Zotlabs/Module/Admin/Site.php:206 +#: ../../Zotlabs/Module/Admin/Site.php:213 msgid "unsupported" msgstr "nicht unterstützt" -#: ../../Zotlabs/Module/Admin/Site.php:253 +#: ../../Zotlabs/Module/Admin/Site.php:260 msgid "Yes - with approval" msgstr "Ja - mit Zustimmung" -#: ../../Zotlabs/Module/Admin/Site.php:259 +#: ../../Zotlabs/Module/Admin/Site.php:266 msgid "My site is not a public server" msgstr "Mein Server ist kein öffentlicher Server" -#: ../../Zotlabs/Module/Admin/Site.php:260 +#: ../../Zotlabs/Module/Admin/Site.php:267 msgid "My site has paid access only" msgstr "Meine Seite hat nur bezahlten Zugriff" -#: ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Admin/Site.php:268 msgid "My site has free access only" msgstr "Meine Seite hat nur freien Zugriff" -#: ../../Zotlabs/Module/Admin/Site.php:262 +#: ../../Zotlabs/Module/Admin/Site.php:269 msgid "My site offers free accounts with optional paid upgrades" msgstr "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades" -#: ../../Zotlabs/Module/Admin/Site.php:274 +#: ../../Zotlabs/Module/Admin/Site.php:281 msgid "Beginner/Basic" msgstr "Anfänger/Basis" -#: ../../Zotlabs/Module/Admin/Site.php:275 +#: ../../Zotlabs/Module/Admin/Site.php:282 msgid "Novice - not skilled but willing to learn" msgstr "Anfänger - unerfahren, aber bereit zu lernen" -#: ../../Zotlabs/Module/Admin/Site.php:276 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "Intermediate - somewhat comfortable" msgstr "Fortgeschritten - relativ komfortabel" -#: ../../Zotlabs/Module/Admin/Site.php:277 +#: ../../Zotlabs/Module/Admin/Site.php:284 msgid "Advanced - very comfortable" msgstr "Fortgeschritten - sehr komfortabel" -#: ../../Zotlabs/Module/Admin/Site.php:278 +#: ../../Zotlabs/Module/Admin/Site.php:285 msgid "Expert - I can write computer code" msgstr "Experte - Ich kann Computercode schreiben" -#: ../../Zotlabs/Module/Admin/Site.php:279 +#: ../../Zotlabs/Module/Admin/Site.php:286 msgid "Wizard - I probably know more than you do" msgstr "Zauberer - ich kann wahrscheinlich mehr als Du" -#: ../../Zotlabs/Module/Admin/Site.php:288 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:295 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "Seite" -#: ../../Zotlabs/Module/Admin/Site.php:290 +#: ../../Zotlabs/Module/Admin/Site.php:297 #: ../../Zotlabs/Module/Register.php:269 msgid "Registration" msgstr "Registrierung" -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "File upload" msgstr "Dateiupload" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "Policies" msgstr "Richtlinien" -#: ../../Zotlabs/Module/Admin/Site.php:293 +#: ../../Zotlabs/Module/Admin/Site.php:300 #: ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "Fortgeschritten" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:304 #: ../../addon/statusnet/statusnet.php:891 msgid "Site name" msgstr "Seitenname" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Site default technical skill level" msgstr "Standard-Qualifikationsstufe der Website" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Used to provide a member experience matched to technical comfort level" msgstr "Dies wird verwendet, um eine Benutzererfahrung passend zur technischen Qualifikationsstufe zu bieten." -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Lock the technical skill level setting" msgstr "Sperre die technische Qualifikationsstufe" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Members can set their own technical comfort level by default" msgstr "Benutzer können standardmäßig ihre eigene technische Qualifikationsstufe einstellen" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "Ungefiltertes HTML/CSS/JS ist erlaubt" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "Administrator Information" msgstr "Administrator-Informationen" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden." -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:312 #: ../../Zotlabs/Module/Siteinfo.php:21 msgid "Site Information" msgstr "Seiteninformationen" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Öffentlich sichtbare Beschreibung dieses Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann hier verwendet werden." -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "System language" msgstr "System-Sprache" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "System theme" msgstr "System-Design" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Standard-System-Design – kann durch Nutzerprofile überschieben werden – Design-Einstellungen ändern" -#: ../../Zotlabs/Module/Admin/Site.php:308 -msgid "Mobile system theme" -msgstr "System-Design für mobile Geräte:" - -#: ../../Zotlabs/Module/Admin/Site.php:308 -msgid "Theme for mobile devices" -msgstr "Theme für mobile Geräte" - -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "Allow Feeds as Connections" msgstr "Feeds als Verbindungen erlauben" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "(Heavy system resource usage)" msgstr "(führt zu hoher Systemlast)" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Maximum image size" msgstr "Maximale Bildgröße" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)." -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Does this site allow new member registration?" msgstr "Erlaubt dieser Server die Registrierung neuer Nutzer?" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Invitation only" msgstr "Nur mit Einladung" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "Erlaube die Neuregistrierung von Mitglieder nur mit einem Einladungscode. Die Registrierungs-Politik muss oben auf Ja gesetzt werden." -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Minimum age" msgstr "Mindestalter" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Minimum age (in years) for who may register on this site." msgstr "Mindestalter (in Jahren) für alle, die sich auf dieser Website anmelden möchten." -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Which best describes the types of account offered by this hub?" msgstr "Was ist die passendste Beschreibung der Konten auf diesem Hub?" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Register text" msgstr "Registrierungstext" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Will be displayed prominently on the registration page." msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt." -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Site homepage to show visitors (default: login box)" msgstr "Homepage des Hubs, die Besuchern angezeigt wird (Voreinstellung: Anmeldemaske)" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "Beispiele: 'public', um den Stream aller öffentlichen Beiträge anzuzeigen, 'page/sys/home', um eine System-Webseite namens 'home' anzuzeigen, 'include:home.html', um eine Datei einzufügen." -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "Preserve site homepage URL" msgstr "Homepage-URL schützen" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "Zeigt die Homepage an der Original-URL in einem Frame an, statt auf die eigentliche Adresse der Seite umzuleiten." -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "Accounts abandoned after x days" msgstr "Konten gelten nach X Tagen als unbenutzt" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit." -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "Allowed friend domains" msgstr "Erlaubte Domains für Kontakte" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "Verify Email Addresses" msgstr "E-Mail-Adressen überprüfen" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)." -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "Force publish" msgstr "Veröffentlichung erzwingen" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen." -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "Import Public Streams" msgstr "Öffentliche Beiträge importieren" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "Öffentliche Beiträge von anderen Servern importieren und zur Verfügung stellen. Warnung: Diese Inhalte sind nicht moderiert." -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "Site only Public Streams" msgstr "Öffentlichen Beitragsstrom auf diesen Server beschränken" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "" "Allow access to public content originating only from this site if Imported " "Public Streams are disabled." msgstr "Erlaubt den Zugriff auf öffentliche Beiträge von ausschließlich dieser Website (diesem Server), wenn \"Öffentliche Beiträge importieren\" ausgeschaltet ist." -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Allow anybody on the internet to access the Public streams" msgstr "Allen im Internet Zugriff auf den öffentlichen Beitragsstrom erlauben" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "" "Disable to require authentication before viewing. Warning: this content is " "unmoderated." msgstr "Deaktiviert die erforderliche Authentifizierung vor dem Ansehen. Warnung: Diese Inhalte sind nicht moderiert." -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "Login on Homepage" msgstr "Log-in auf der Startseite" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "Zeigt Besuchern der Homepage eine Anmeldemaske, falls keine anderen Inhalte konfiguriert wurden." -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Enable context help" msgstr "Kontext-Hilfe aktivieren" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "" "Display contextual help for the current page when the help button is " "pressed." msgstr "Zeigt Kontext-sensitive Hilfe für die aktuelle Seite an, wenn der Hilfe-Knopf geklickt wird." -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Reply-to email address for system generated email." msgstr "Antwortadresse (reply-to) für Emails, die vom System generiert wurden." -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:337 msgid "Sender (From) email address for system generated email." msgstr "Absenderadresse (from) für Emails, die vom System generiert wurden." -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Name of email sender for system generated email." msgstr "Name des Versenders von Emails, die vom System generiert wurden." -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Directory Server URL" msgstr "Verzeichnisserver-URL" -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Default directory server" msgstr "Standard-Verzeichnisserver" -#: ../../Zotlabs/Module/Admin/Site.php:335 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "Proxy user" msgstr "Proxy Benutzer" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "Proxy URL" msgstr "Proxy URL" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Network timeout" msgstr "Netzwerk-Timeout" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)." -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "Delivery interval" msgstr "Auslieferung Intervall" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server." -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "Deliveries per process" msgstr "Zustellungen pro Prozess" -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust" " if necessary to tune system performance. Recommend: 1-5." msgstr "Anzahl der Zustellungen, die innerhalb eines einzelnen Betriebssystemprozesses versucht werden. Anpassen, falls nötig, um die System-Performance zu verbessern. Empfehlung: 1-5." -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "Queue Threshold" msgstr "Warteschlangen-Grenzwert" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "" "Always defer immediate delivery if queue contains more than this number of " "entries." msgstr "Unmittelbare Zustellung immer verzögern, wenn die Warteschlange mehr als diese Anzahl von Einträgen enthält." -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "Poll interval" msgstr "Abfrageintervall" -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet." -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "Path to ImageMagick convert program" msgstr "Pfad zum ImageMagick-Programm convert" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "" "If set, use this program to generate photo thumbnails for huge images ( > " "4000 pixels in either dimension), otherwise memory exhaustion may occur. " "Example: /usr/bin/convert" msgstr "Wenn gesetzt, dann verwende dieses Programm zum Erzeugen von Vorschaubildern großer Fotos (>4000 Pixel in beiden Richtungen), anderenfalls kann Speicherüberlauf auftreten. Beispiel: /usr/bin/convert" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:350 msgid "Allow SVG thumbnails in file browser" msgstr "Erlaube SVG-Vorschaubilder im Dateibrowser" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:350 msgid "WARNING: SVG images may contain malicious code." msgstr "Warnung: SVG-Grafiken können Schadcode enthalten." -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "Maximum Load Average" msgstr "Maximales Load Average" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "Expiration period in days for imported (grid/network) content" msgstr "Setze den Zeitraum (in Tagen), ab wann importierte (aus dem Netzwerk) Inhalte ablaufen sollen" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "0 for no expiration of imported content" msgstr "0 = keine Löschung importierter Inhalte" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:353 +msgid "" +"Do not expire any posts which have comments less than this many days ago" +msgstr "Lass keine Beiträge verfallen die Kommentare haben, die jünger als diese Anzahl von Tagen sind." + +#: ../../Zotlabs/Module/Admin/Site.php:355 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "Öffentliche Server: Optionale Einstiegsseite (landing page) für neue Mitglieder vor deren Anmeldung" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:355 #, php-format msgid "Create this page first. Default is %s/register" msgstr "Erstelle zunächst die entsprechende Seite. Standard ist %s/register" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:356 msgid "Page to display after creating a new channel" msgstr "Seite, die nach Erstellung eines neuen Kanals angezeigt werden soll" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:356 msgid "Recommend: profiles, go, or settings" msgstr "Empfohlen: profiles, go oder settings" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Optional: site location" msgstr "Optional: Standort der Website" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Region or country" msgstr "Region oder Land" -#: ../../Zotlabs/Module/Admin/Profs.php:69 +#: ../../Zotlabs/Module/Admin/Profs.php:89 msgid "New Profile Field" msgstr "Neues Profilfeld" -#: ../../Zotlabs/Module/Admin/Profs.php:70 #: ../../Zotlabs/Module/Admin/Profs.php:90 +#: ../../Zotlabs/Module/Admin/Profs.php:110 msgid "Field nickname" msgstr "Kurzname für das Feld" -#: ../../Zotlabs/Module/Admin/Profs.php:70 #: ../../Zotlabs/Module/Admin/Profs.php:90 +#: ../../Zotlabs/Module/Admin/Profs.php:110 msgid "System name of field" msgstr "Systemname des Feldes" -#: ../../Zotlabs/Module/Admin/Profs.php:71 #: ../../Zotlabs/Module/Admin/Profs.php:91 +#: ../../Zotlabs/Module/Admin/Profs.php:111 msgid "Input type" msgstr "Art des Inhalts" -#: ../../Zotlabs/Module/Admin/Profs.php:72 #: ../../Zotlabs/Module/Admin/Profs.php:92 +#: ../../Zotlabs/Module/Admin/Profs.php:112 msgid "Field Name" msgstr "Feldname" -#: ../../Zotlabs/Module/Admin/Profs.php:72 #: ../../Zotlabs/Module/Admin/Profs.php:92 +#: ../../Zotlabs/Module/Admin/Profs.php:112 msgid "Label on profile pages" msgstr "Bezeichnung auf Profilseiten" -#: ../../Zotlabs/Module/Admin/Profs.php:73 #: ../../Zotlabs/Module/Admin/Profs.php:93 +#: ../../Zotlabs/Module/Admin/Profs.php:113 msgid "Help text" msgstr "Hilfetext" -#: ../../Zotlabs/Module/Admin/Profs.php:73 #: ../../Zotlabs/Module/Admin/Profs.php:93 +#: ../../Zotlabs/Module/Admin/Profs.php:113 msgid "Additional info (optional)" msgstr "Zusätzliche Informationen (optional)" -#: ../../Zotlabs/Module/Admin/Profs.php:74 -#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32 +#: ../../Zotlabs/Module/Admin/Profs.php:94 +#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 #: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1052 #: ../../include/text.php:1064 msgid "Save" msgstr "Speichern" -#: ../../Zotlabs/Module/Admin/Profs.php:83 +#: ../../Zotlabs/Module/Admin/Profs.php:103 msgid "Field definition not found" msgstr "Feld-Definition nicht gefunden" -#: ../../Zotlabs/Module/Admin/Profs.php:89 +#: ../../Zotlabs/Module/Admin/Profs.php:109 msgid "Edit Profile Field" msgstr "Profilfeld bearbeiten" -#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30 +#: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:30 msgid "Profile Fields" msgstr "Profil Felder" -#: ../../Zotlabs/Module/Admin/Profs.php:148 +#: ../../Zotlabs/Module/Admin/Profs.php:169 msgid "Basic Profile Fields" msgstr "Notwendige Profil Felder" -#: ../../Zotlabs/Module/Admin/Profs.php:149 +#: ../../Zotlabs/Module/Admin/Profs.php:170 msgid "Advanced Profile Fields" msgstr "Erweiterte Profil Felder" -#: ../../Zotlabs/Module/Admin/Profs.php:149 +#: ../../Zotlabs/Module/Admin/Profs.php:170 msgid "(In addition to basic fields)" msgstr "(zusätzlich zu notwendige Felder)" -#: ../../Zotlabs/Module/Admin/Profs.php:151 +#: ../../Zotlabs/Module/Admin/Profs.php:172 msgid "All available fields" msgstr "Alle verfügbaren Felder" -#: ../../Zotlabs/Module/Admin/Profs.php:152 +#: ../../Zotlabs/Module/Admin/Profs.php:173 msgid "Custom Fields" msgstr "Benutzerdefinierte Felder" -#: ../../Zotlabs/Module/Admin/Profs.php:156 +#: ../../Zotlabs/Module/Admin/Profs.php:177 msgid "Create Custom Field" msgstr "Erstelle benutzerdefiniertes Feld" @@ -3378,51 +3388,55 @@ msgctxt "acl" msgid "Profile" msgstr "Profil" -#: ../../Zotlabs/Module/Moderate.php:55 +#: ../../Zotlabs/Module/Moderate.php:65 msgid "Comment approved" msgstr "Kommentar bestätigt" -#: ../../Zotlabs/Module/Moderate.php:59 +#: ../../Zotlabs/Module/Moderate.php:69 msgid "Comment deleted" msgstr "Kommentar gelöscht" -#: ../../Zotlabs/Module/Settings/Permcats.php:37 +#: ../../Zotlabs/Module/Settings/Permcats.php:23 +msgid "Permission Name is required." +msgstr "Der Name der Berechtigung wird benötigt." + +#: ../../Zotlabs/Module/Settings/Permcats.php:42 msgid "Permission category saved." msgstr "Berechtigungsrolle gespeichert." -#: ../../Zotlabs/Module/Settings/Permcats.php:61 +#: ../../Zotlabs/Module/Settings/Permcats.php:66 msgid "" "Use this form to create permission rules for various classes of people or " "connections." msgstr "Verwende dieses Formular, um Berechtigungsrollen für verschiedene Gruppen von Personen oder Verbindungen zu erstellen." -#: ../../Zotlabs/Module/Settings/Permcats.php:94 +#: ../../Zotlabs/Module/Settings/Permcats.php:99 msgid "Permission Categories" msgstr "Berechtigungsrollen" -#: ../../Zotlabs/Module/Settings/Permcats.php:102 +#: ../../Zotlabs/Module/Settings/Permcats.php:107 msgid "Permission Name" msgstr "Name der Berechtigungsrolle" -#: ../../Zotlabs/Module/Settings/Permcats.php:103 +#: ../../Zotlabs/Module/Settings/Permcats.php:108 #: ../../Zotlabs/Module/Settings/Tokens.php:161 #: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250 msgid "My Settings" msgstr "Meine Einstellungen" -#: ../../Zotlabs/Module/Settings/Permcats.php:105 +#: ../../Zotlabs/Module/Settings/Permcats.php:110 #: ../../Zotlabs/Module/Settings/Tokens.php:163 #: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248 msgid "inherited" msgstr "geerbt" -#: ../../Zotlabs/Module/Settings/Permcats.php:108 +#: ../../Zotlabs/Module/Settings/Permcats.php:113 #: ../../Zotlabs/Module/Settings/Tokens.php:166 #: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253 msgid "Individual Permissions" msgstr "Individuelle Zugriffsrechte" -#: ../../Zotlabs/Module/Settings/Permcats.php:109 +#: ../../Zotlabs/Module/Settings/Permcats.php:114 #: ../../Zotlabs/Module/Settings/Tokens.php:167 #: ../../Zotlabs/Module/Connedit.php:894 msgid "" @@ -3443,7 +3457,7 @@ msgstr "Einige Berechtigungen werden möglicherweise von den globalen extremely permissive (should be used with caution)" msgstr "Komplett offen – extrem ungeschützt (mit großer Vorsicht verwenden!)" -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "Typisch – Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:518 msgid "Private - default private, never open or public" msgstr "Privat – Standard privat, nie offen oder öffentlich" -#: ../../Zotlabs/Module/Settings/Channel.php:512 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "Blocked - default blocked to/from everybody" msgstr "Blockiert – Alle standardmäßig blockiert" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Allow others to tag your posts" msgstr "Erlaube anderen, Deine Beiträge zu verschlagworten" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "Channel Permission Limits" msgstr "Kanal-Berechtigungslimits" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Expire other channel content after this many days" msgstr "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "0 or blank to use the website limit." msgstr "0 oder leer lassen, um den voreingestellten Wert der Webseite zu verwenden." -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 #, php-format msgid "This website expires after %d days." msgstr "Diese Webseite läuft nach %d Tagen ab." -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "This website does not expire imported content." msgstr "Diese Webseite lässt importierte Inhalte nicht verfallen." -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "The website limit takes precedence if lower than your limit." msgstr "Das Verfallslimit der Webseite hat Vorrang, wenn es niedriger als Deines hier ist." -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "Maximum Friend Requests/Day:" msgstr "Maximale Kontaktanfragen pro Tag:" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "May reduce spam activity" msgstr "Kann die Spam-Aktivität verringern" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "Default Privacy Group" msgstr "Standard-Gruppe" -#: ../../Zotlabs/Module/Settings/Channel.php:522 +#: ../../Zotlabs/Module/Settings/Channel.php:529 msgid "Use my default audience setting for the type of object published" msgstr "Verwende Deine eingestellte Standard-Zielgruppe des jeweiligen Inhaltstyps" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:530 msgid "Profile to assign new connections" msgstr "Profil, welches neuen Verbindungen zugewiesen wird" -#: ../../Zotlabs/Module/Settings/Channel.php:532 -msgid "Channel permissions category:" -msgstr "Zugriffsrechte-Kategorie des Kanals:" - -#: ../../Zotlabs/Module/Settings/Channel.php:533 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Default Permissions Group" msgstr "Standard-Berechtigungsgruppe" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "Maximum private messages per day from unknown people:" msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "Useful to reduce spamming" msgstr "Nützlich, um Spam zu verringern" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:549 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "Benachrichtigungs-Einstellungen" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "By default post a status message when:" msgstr "Sende standardmäßig Status-Nachrichten, wenn:" -#: ../../Zotlabs/Module/Settings/Channel.php:544 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "accepting a friend request" msgstr "Du eine Verbindungsanfrage annimmst" -#: ../../Zotlabs/Module/Settings/Channel.php:545 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "joining a forum/community" msgstr "Du einem Forum beitrittst" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "making an interesting profile change" msgstr "Du eine interessante Änderung an Deinem Profil vornimmst" -#: ../../Zotlabs/Module/Settings/Channel.php:547 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "Send a notification email when:" msgstr "Eine E-Mail-Benachrichtigung senden, wenn:" -#: ../../Zotlabs/Module/Settings/Channel.php:548 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "You receive a connection request" msgstr "Du eine Verbindungsanfrage erhältst" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "Your connections are confirmed" msgstr "Eine Verbindung bestätigt wurde" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "Someone writes on your profile wall" msgstr "Jemand auf Deine Pinnwand schreibt" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "Someone writes a followup comment" msgstr "Jemand einen Beitrag kommentiert" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:559 msgid "You receive a private message" msgstr "Du eine private Nachricht erhältst" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "You receive a friend suggestion" msgstr "Du einen Kontaktvorschlag erhältst" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:561 msgid "You are tagged in a post" msgstr "Du in einem Beitrag erwähnt wurdest" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:562 msgid "You are poked/prodded/etc. in a post" msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:564 msgid "Someone likes your post/comment" msgstr "Jemand mag Ihren Beitrag/Kommentar" -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Show visual notifications including:" msgstr "Visuelle Benachrichtigungen anzeigen für:" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "Unseen grid activity" msgstr "Ungesehene Netzwerk-Aktivität" -#: ../../Zotlabs/Module/Settings/Channel.php:563 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Unseen channel activity" msgstr "Ungesehene Kanal-Aktivität" -#: ../../Zotlabs/Module/Settings/Channel.php:564 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "Unseen private messages" msgstr "Ungelesene persönliche Nachrichten" -#: ../../Zotlabs/Module/Settings/Channel.php:564 -#: ../../Zotlabs/Module/Settings/Channel.php:569 -#: ../../Zotlabs/Module/Settings/Channel.php:570 #: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:578 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "Empfohlen" -#: ../../Zotlabs/Module/Settings/Channel.php:565 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "Upcoming events" msgstr "Baldige Termine" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "Events today" msgstr "Heutige Termine" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "Upcoming birthdays" msgstr "Baldige Geburtstage" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "Not available in all themes" msgstr "Nicht in allen Designs verfügbar" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "System (personal) notifications" msgstr "System – (persönliche) Benachrichtigungen" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "System info messages" msgstr "System – Info-Nachrichten" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "System critical alerts" msgstr "System – kritische Warnungen" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "New connections" msgstr "Neue Verbindungen" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "System Registrations" msgstr "System – Registrierungen" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Unseen shared files" msgstr "Ungesehene geteilte Dateien" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "Unseen public activity" msgstr "Ungesehene öffentliche Aktivität" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:582 +msgid "Unseen likes and dislikes" +msgstr "Ungesehene Likes und Dislikes" + +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Email notification hub (hostname)" msgstr "Hub für E-Mail-Benachrichtigungen (Hostname)" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:583 #, php-format msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" msgstr "Wenn Dein Kanal auf mehreren Hubs geklont ist, setze die Einstellung auf deinen bevorzugten Hub. Dies verhindert Mehrfachzustellung von E-Mail-Benachrichtigungen. Beispiel: %s" -#: ../../Zotlabs/Module/Settings/Channel.php:576 -msgid "" -"Also show new wall posts, private messages and connections under Notices" -msgstr "Neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen anzeigen" +#: ../../Zotlabs/Module/Settings/Channel.php:584 +msgid "Show new wall posts, private messages and connections under Notices" +msgstr "Zeige neue Pinnwand Beiträge, private Nachrichten und Verbindungen unter den Notizen an." -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Notify me of events this many days in advance" msgstr "Benachrichtige mich zu Terminen so viele Tage im Voraus" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Must be greater than 0" msgstr "Muss größer als 0 sein" -#: ../../Zotlabs/Module/Settings/Channel.php:584 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Advanced Account/Page Type Settings" msgstr "Erweiterte Konten- und Seitenart-Einstellungen" -#: ../../Zotlabs/Module/Settings/Channel.php:585 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Change the behaviour of this account for special situations" msgstr "Ändere das Verhalten dieses Kontos unter speziellen Umständen" -#: ../../Zotlabs/Module/Settings/Channel.php:587 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Miscellaneous Settings" msgstr "Sonstige Einstellungen" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "Default photo upload folder" msgstr "Voreingestellter Ordner für hochgeladene Fotos" -#: ../../Zotlabs/Module/Settings/Channel.php:588 -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "%Y - current year, %m - current month" msgstr "%Y - aktuelles Jahr, %m - aktueller Monat" -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "Default file upload folder" msgstr "Voreingestellter Ordner für hochgeladene Dateien" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:599 msgid "Personal menu to display in your channel pages" msgstr "Eigenes Menü zur Anzeige auf den Seiten deines Kanals" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:601 msgid "Remove this channel." msgstr "Diesen Kanal löschen" -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:602 msgid "Firefox Share $Projectname provider" msgstr "$Projectname-Provider für Firefox Share" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:603 msgid "Start calendar week on Monday" msgstr "Beginne die kalendarische Woche am Montag" -#: ../../Zotlabs/Module/Settings/Features.php:45 +#: ../../Zotlabs/Module/Settings/Features.php:73 msgid "Additional Features" msgstr "Zusätzliche Funktionen" +#: ../../Zotlabs/Module/Settings/Features.php:74 +#: ../../Zotlabs/Module/Settings/Account.php:116 +msgid "Your technical skill level" +msgstr "Deine technische Qualifikationsstufe" + +#: ../../Zotlabs/Module/Settings/Features.php:74 +#: ../../Zotlabs/Module/Settings/Account.php:116 +msgid "" +"Used to provide a member experience and additional features consistent with " +"your comfort level" +msgstr "Dies wird verwendet, um Dir eine Benutzererfahrung sowie zusätzliche Funktionen passend zu Deiner technischen Qualifikationsstufe zu bieten (Bedienkomfort beim Umgang mit Anwendungen)." + #: ../../Zotlabs/Module/Settings/Tokens.php:31 #, php-format msgid "This channel is limited to %d tokens" @@ -3884,7 +3909,7 @@ msgid "" msgstr "Du kannst auch Dropbox-ähnliche Zugriffslinks an Andere weitergeben, indem du das Login-Passwort an eine entsprechende URL anhängst wie nachfolgend gezeigt. Beispiele:" #: ../../Zotlabs/Module/Settings/Tokens.php:150 -#: ../../Zotlabs/Widget/Settings_menu.php:92 +#: ../../Zotlabs/Widget/Settings_menu.php:100 msgid "Guest Access Tokens" msgstr "Gastzugangstoken" @@ -3905,6 +3930,98 @@ msgstr "Läuft ab (jjjj-mm-tt)" msgid "Their Settings" msgstr "Deren Einstellungen" +#: ../../Zotlabs/Module/Settings/Oauth2.php:35 +msgid "Name and Secret are required" +msgstr "Name und Geheimnis werden benötigt" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:83 +msgid "Add OAuth2 application" +msgstr "OAuth2 Anwendung hinzufügen" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:86 +#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth.php:90 +msgid "Name of application" +msgstr "Name der Anwendung" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth.php:92 +#: ../../Zotlabs/Module/Settings/Oauth.php:118 +#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782 +msgid "Consumer Secret" +msgstr "Consumer Secret" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth.php:91 +#: ../../Zotlabs/Module/Settings/Oauth.php:92 +msgid "Automatically generated - change if desired. Max length 20" +msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth.php:93 +#: ../../Zotlabs/Module/Settings/Oauth.php:119 +msgid "Redirect" +msgstr "Umleitung" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth.php:93 +msgid "" +"Redirect URI - leave blank unless your application specifically requires " +"this" +msgstr "Umleitungs-URl – lasse das leer, solange Deine Anwendung es nicht explizit erfordert" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +msgid "Grant Types" +msgstr "Genehmigungsarten" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +msgid "leave blank unless your application sepcifically requires this" +msgstr "Frei lassen, es sei denn die Anwendung verlangt dies." + +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +msgid "Authorization scope" +msgstr "Rahmen der Berechtigungen" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:102 +msgid "OAuth2 Application not found." +msgstr "OAuth2 Anwendung konnte nicht gefunden werden" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:111 +#: ../../Zotlabs/Module/Settings/Oauth2.php:148 +#: ../../Zotlabs/Module/Settings/Oauth.php:87 +#: ../../Zotlabs/Module/Settings/Oauth.php:113 +#: ../../Zotlabs/Module/Settings/Oauth.php:149 +msgid "Add application" +msgstr "Anwendung hinzufügen" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:147 +msgid "Connected OAuth2 Apps" +msgstr "Verbundene OAuth2 Anwendungen" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:151 +#: ../../Zotlabs/Module/Settings/Oauth.php:152 +msgid "Client key starts with" +msgstr "Client Key beginnt mit" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:152 +#: ../../Zotlabs/Module/Settings/Oauth.php:153 +msgid "No name" +msgstr "Kein Name" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:153 +#: ../../Zotlabs/Module/Settings/Oauth.php:154 +msgid "Remove authorization" +msgstr "Authorisierung aufheben" + #: ../../Zotlabs/Module/Settings/Account.php:20 msgid "Not valid email." msgstr "Keine gültige E-Mail Adresse." @@ -3961,16 +4078,6 @@ msgstr "Bestätige das neue Passwort" msgid "Leave password fields blank unless changing" msgstr "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern" -#: ../../Zotlabs/Module/Settings/Account.php:116 -msgid "Your technical skill level" -msgstr "Deine technische Qualifikationsstufe" - -#: ../../Zotlabs/Module/Settings/Account.php:116 -msgid "" -"Used to provide a member experience and additional features consistent with " -"your comfort level" -msgstr "Dies wird verwendet, um Dir eine Benutzererfahrung sowie zusätzliche Funktionen passend zu Deiner technischen Qualifikationsstufe zu bieten (Bedienkomfort beim Umgang mit Anwendungen)." - #: ../../Zotlabs/Module/Settings/Account.php:120 #: ../../Zotlabs/Module/Removeaccount.php:61 msgid "Remove Account" @@ -4008,11 +4115,11 @@ msgstr "0-99 - Standard 0" msgid "Affinity Slider Settings" msgstr "Beziehungsgrad-Schieberegler-Einstellungen" -#: ../../Zotlabs/Module/Settings/Featured.php:64 +#: ../../Zotlabs/Module/Settings/Featured.php:67 msgid "Addon Settings" msgstr "Addon-Einstellungen" -#: ../../Zotlabs/Module/Settings/Featured.php:65 +#: ../../Zotlabs/Module/Settings/Featured.php:68 msgid "Please save/submit changes to any panel before opening another." msgstr "Bitte speichere alle Änderungen in diesem Bereich, bevor Du einen anderen öffnest." @@ -4129,82 +4236,38 @@ msgstr "Blöcke, deren Inhalt diese Höhe überschreitet, können per Klick verg msgid "Grid page max height of content (in pixels)" msgstr "Maximale Höhe (in Pixel) des Inhalts der Netzwerkseite" -#: ../../Zotlabs/Module/Settings/Oauth.php:34 +#: ../../Zotlabs/Module/Settings/Oauth.php:35 msgid "Name is required" msgstr "Name ist erforderlich" -#: ../../Zotlabs/Module/Settings/Oauth.php:38 +#: ../../Zotlabs/Module/Settings/Oauth.php:39 msgid "Key and Secret are required" msgstr "Schlüssel und Geheimnis werden benötigt" -#: ../../Zotlabs/Module/Settings/Oauth.php:86 -#: ../../Zotlabs/Module/Settings/Oauth.php:112 -#: ../../Zotlabs/Module/Settings/Oauth.php:148 -msgid "Add application" -msgstr "Anwendung hinzufügen" - -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -msgid "Name of application" -msgstr "Name der Anwendung" - -#: ../../Zotlabs/Module/Settings/Oauth.php:90 -#: ../../Zotlabs/Module/Settings/Oauth.php:116 +#: ../../Zotlabs/Module/Settings/Oauth.php:91 +#: ../../Zotlabs/Module/Settings/Oauth.php:117 #: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../Zotlabs/Module/Settings/Oauth.php:90 -#: ../../Zotlabs/Module/Settings/Oauth.php:91 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20" - -#: ../../Zotlabs/Module/Settings/Oauth.php:91 -#: ../../Zotlabs/Module/Settings/Oauth.php:117 -#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782 -msgid "Consumer Secret" -msgstr "Consumer Secret" - -#: ../../Zotlabs/Module/Settings/Oauth.php:92 -#: ../../Zotlabs/Module/Settings/Oauth.php:118 -msgid "Redirect" -msgstr "Umleitung" - -#: ../../Zotlabs/Module/Settings/Oauth.php:92 -msgid "" -"Redirect URI - leave blank unless your application specifically requires " -"this" -msgstr "Umleitungs-URl – lasse das leer, solange Deine Anwendung es nicht explizit erfordert" - -#: ../../Zotlabs/Module/Settings/Oauth.php:93 -#: ../../Zotlabs/Module/Settings/Oauth.php:119 +#: ../../Zotlabs/Module/Settings/Oauth.php:94 +#: ../../Zotlabs/Module/Settings/Oauth.php:120 msgid "Icon url" msgstr "Symbol-URL" -#: ../../Zotlabs/Module/Settings/Oauth.php:93 +#: ../../Zotlabs/Module/Settings/Oauth.php:94 #: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 msgid "Optional" msgstr "Optional" -#: ../../Zotlabs/Module/Settings/Oauth.php:104 +#: ../../Zotlabs/Module/Settings/Oauth.php:105 msgid "Application not found." msgstr "Die Anwendung wurde nicht gefunden." -#: ../../Zotlabs/Module/Settings/Oauth.php:147 +#: ../../Zotlabs/Module/Settings/Oauth.php:148 msgid "Connected Apps" msgstr "Verbundene Apps" -#: ../../Zotlabs/Module/Settings/Oauth.php:151 -msgid "Client key starts with" -msgstr "Client Key beginnt mit" - -#: ../../Zotlabs/Module/Settings/Oauth.php:152 -msgid "No name" -msgstr "Kein Name" - -#: ../../Zotlabs/Module/Settings/Oauth.php:153 -msgid "Remove authorization" -msgstr "Authorisierung aufheben" - #: ../../Zotlabs/Module/Embedphotos.php:140 #: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1350 #: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78 @@ -4218,13 +4281,12 @@ msgid "Edit Album" msgstr "Album bearbeiten" #: ../../Zotlabs/Module/Embedphotos.php:158 -#: ../../Zotlabs/Module/Photos.php:712 ../../Zotlabs/Module/Photos.php:844 -#: ../../Zotlabs/Module/Photos.php:1381 +#: ../../Zotlabs/Module/Photos.php:712 #: ../../Zotlabs/Module/Profile_photo.php:458 -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Storage/Browser.php:277 ../../Zotlabs/Storage/Browser.php:384 -#: ../../Zotlabs/Widget/Cdav.php:133 ../../Zotlabs/Widget/Cdav.php:169 -#: ../../Zotlabs/Widget/Portfolio.php:110 ../../Zotlabs/Widget/Album.php:97 +#: ../../Zotlabs/Module/Cover_photo.php:362 +#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Widget/Cdav.php:133 +#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110 +#: ../../Zotlabs/Widget/Album.php:97 msgid "Upload" msgstr "Hochladen" @@ -4232,60 +4294,60 @@ msgstr "Hochladen" msgid "Some blurb about what to do when you're new here" msgstr "Ein Hinweis, was man tun kann, wenn man neu hier ist" -#: ../../Zotlabs/Module/Thing.php:115 +#: ../../Zotlabs/Module/Thing.php:120 msgid "Thing updated" msgstr "Sache aktualisiert" -#: ../../Zotlabs/Module/Thing.php:167 +#: ../../Zotlabs/Module/Thing.php:172 msgid "Object store: failed" msgstr "Speichern des Objekts fehlgeschlagen" -#: ../../Zotlabs/Module/Thing.php:171 +#: ../../Zotlabs/Module/Thing.php:176 msgid "Thing added" msgstr "Sache hinzugefügt" -#: ../../Zotlabs/Module/Thing.php:197 +#: ../../Zotlabs/Module/Thing.php:202 #, php-format msgid "OBJ: %1$s %2$s %3$s" msgstr "OBJ: %1$s %2$s %3$s" -#: ../../Zotlabs/Module/Thing.php:260 +#: ../../Zotlabs/Module/Thing.php:265 msgid "Show Thing" msgstr "Sache anzeigen" -#: ../../Zotlabs/Module/Thing.php:267 +#: ../../Zotlabs/Module/Thing.php:272 msgid "item not found." msgstr "Eintrag nicht gefunden" -#: ../../Zotlabs/Module/Thing.php:300 +#: ../../Zotlabs/Module/Thing.php:305 msgid "Edit Thing" msgstr "Sache bearbeiten" -#: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:359 +#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364 msgid "Select a profile" msgstr "Wähle ein Profil" -#: ../../Zotlabs/Module/Thing.php:306 ../../Zotlabs/Module/Thing.php:362 +#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 msgid "Post an activity" msgstr "Aktivitätsnachricht senden" -#: ../../Zotlabs/Module/Thing.php:306 ../../Zotlabs/Module/Thing.php:362 +#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 msgid "Only sends to viewers of the applicable profile" msgstr "Nur an Betrachter des ausgewählten Profils senden" -#: ../../Zotlabs/Module/Thing.php:308 ../../Zotlabs/Module/Thing.php:364 +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 msgid "Name of thing e.g. something" msgstr "Name der Sache, z. B. irgendwas" -#: ../../Zotlabs/Module/Thing.php:310 ../../Zotlabs/Module/Thing.php:365 +#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370 msgid "URL of thing (optional)" msgstr "URL der Sache (optional)" -#: ../../Zotlabs/Module/Thing.php:312 ../../Zotlabs/Module/Thing.php:366 +#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371 msgid "URL for photo of thing (optional)" msgstr "URL eines Fotos der Sache (optional)" -#: ../../Zotlabs/Module/Thing.php:314 ../../Zotlabs/Module/Thing.php:367 +#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372 #: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071 #: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235 #: ../../Zotlabs/Module/Filestorage.php:147 @@ -4293,7 +4355,7 @@ msgstr "URL eines Fotos der Sache (optional)" msgid "Permissions" msgstr "Berechtigungen" -#: ../../Zotlabs/Module/Thing.php:357 +#: ../../Zotlabs/Module/Thing.php:362 msgid "Add Thing to your Profile" msgstr "Die Sache Deinem Profil hinzufügen" @@ -4307,56 +4369,56 @@ msgstr "Keine System-Benachrichtigungen mehr." msgid "System Notifications" msgstr "System-Benachrichtigungen" -#: ../../Zotlabs/Module/Follow.php:31 -msgid "Channel added." -msgstr "Kanal hinzugefügt." +#: ../../Zotlabs/Module/Follow.php:36 +msgid "Connection added." +msgstr "Verbindung hinzugefügt" -#: ../../Zotlabs/Module/Import.php:143 +#: ../../Zotlabs/Module/Import.php:144 #, php-format msgid "Your service plan only allows %d channels." msgstr "Dein Vertrag erlaubt nur %d Kanäle." -#: ../../Zotlabs/Module/Import.php:157 +#: ../../Zotlabs/Module/Import.php:158 msgid "No channel. Import failed." msgstr "Kein Kanal. Import fehlgeschlagen." -#: ../../Zotlabs/Module/Import.php:481 +#: ../../Zotlabs/Module/Import.php:482 #: ../../addon/diaspora/import_diaspora.php:139 msgid "Import completed." msgstr "Import abgeschlossen." -#: ../../Zotlabs/Module/Import.php:509 +#: ../../Zotlabs/Module/Import.php:510 msgid "You must be logged in to use this feature." msgstr "Du musst angemeldet sein um diese Funktion zu nutzen." -#: ../../Zotlabs/Module/Import.php:514 +#: ../../Zotlabs/Module/Import.php:515 msgid "Import Channel" msgstr "Kanal importieren" -#: ../../Zotlabs/Module/Import.php:515 +#: ../../Zotlabs/Module/Import.php:516 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 "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk oder aus einer exportierten Sicherheitskopie importieren." -#: ../../Zotlabs/Module/Import.php:517 +#: ../../Zotlabs/Module/Import.php:518 msgid "Or provide the old server/hub details" msgstr "Oder gib die Details Deines bisherigen $Projectname-Hubs ein" -#: ../../Zotlabs/Module/Import.php:518 +#: ../../Zotlabs/Module/Import.php:519 msgid "Your old identity address (xyz@example.com)" msgstr "Bisherige Kanal-Adresse (xyz@example.com)" -#: ../../Zotlabs/Module/Import.php:519 +#: ../../Zotlabs/Module/Import.php:520 msgid "Your old login email address" msgstr "Deine alte Login-E-Mail-Adresse" -#: ../../Zotlabs/Module/Import.php:520 +#: ../../Zotlabs/Module/Import.php:521 msgid "Your old login password" msgstr "Dein altes Passwort" -#: ../../Zotlabs/Module/Import.php:521 +#: ../../Zotlabs/Module/Import.php:522 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" @@ -4364,19 +4426,19 @@ msgid "" "primary location for files, photos, and media." msgstr "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige $Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein." -#: ../../Zotlabs/Module/Import.php:522 +#: ../../Zotlabs/Module/Import.php:523 msgid "Make this hub my primary location" msgstr "Dieser $Pojectname-Hub ist mein primärer Hub." -#: ../../Zotlabs/Module/Import.php:523 +#: ../../Zotlabs/Module/Import.php:524 msgid "Move this channel (disable all previous locations)" msgstr "Verschiebe diesen Kanal (deaktiviere alle vorherigen Adressen/Klone)" -#: ../../Zotlabs/Module/Import.php:524 +#: ../../Zotlabs/Module/Import.php:525 msgid "Import a few months of posts if possible (limited by available memory" msgstr "Importiere die Beiträge einiger Monate, sofern möglich (beschränkt durch verfügbaren Speicher)" -#: ../../Zotlabs/Module/Import.php:525 +#: ../../Zotlabs/Module/Import.php:526 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -4386,16 +4448,16 @@ msgstr "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur msgid "Authentication failed." msgstr "Authentifizierung fehlgeschlagen." -#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1583 -#: ../../include/channel.php:2307 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1590 +#: ../../include/channel.php:2318 msgid "Remote Authentication" msgstr "Entfernte Authentifizierung" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2308 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2319 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "Deine Kanal-Adresse (z. B. channel@example.com)" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2309 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2320 msgid "Authenticate" msgstr "Authentifizieren" @@ -4403,7 +4465,7 @@ msgstr "Authentifizieren" msgid "Permissions denied." msgstr "Berechtigung verweigert." -#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2426 +#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2446 msgid "Import" msgstr "Import" @@ -4463,149 +4525,163 @@ msgstr "Laune" msgid "Set your current mood and tell your friends" msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden" -#: ../../Zotlabs/Module/Connections.php:54 -#: ../../Zotlabs/Module/Connections.php:156 -#: ../../Zotlabs/Module/Connections.php:245 +#: ../../Zotlabs/Module/Connections.php:55 +#: ../../Zotlabs/Module/Connections.php:112 +#: ../../Zotlabs/Module/Connections.php:256 +msgid "Active" +msgstr "Aktiv" + +#: ../../Zotlabs/Module/Connections.php:60 +#: ../../Zotlabs/Module/Connections.php:164 +#: ../../Zotlabs/Module/Connections.php:261 msgid "Blocked" msgstr "Blockiert" -#: ../../Zotlabs/Module/Connections.php:59 -#: ../../Zotlabs/Module/Connections.php:163 -#: ../../Zotlabs/Module/Connections.php:244 +#: ../../Zotlabs/Module/Connections.php:65 +#: ../../Zotlabs/Module/Connections.php:171 +#: ../../Zotlabs/Module/Connections.php:260 msgid "Ignored" msgstr "Ignoriert" -#: ../../Zotlabs/Module/Connections.php:64 -#: ../../Zotlabs/Module/Connections.php:177 -#: ../../Zotlabs/Module/Connections.php:243 +#: ../../Zotlabs/Module/Connections.php:70 +#: ../../Zotlabs/Module/Connections.php:185 +#: ../../Zotlabs/Module/Connections.php:259 msgid "Hidden" msgstr "Versteckt" -#: ../../Zotlabs/Module/Connections.php:69 -#: ../../Zotlabs/Module/Connections.php:170 +#: ../../Zotlabs/Module/Connections.php:75 +#: ../../Zotlabs/Module/Connections.php:178 msgid "Archived/Unreachable" msgstr "Archiviert/Unerreichbar" -#: ../../Zotlabs/Module/Connections.php:74 -#: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116 +#: ../../Zotlabs/Module/Connections.php:80 +#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:116 #: ../../Zotlabs/Module/Notifications.php:52 -#: ../../include/conversation.php:1714 +#: ../../include/conversation.php:1717 msgid "New" msgstr "Neu" -#: ../../Zotlabs/Module/Connections.php:88 -#: ../../Zotlabs/Module/Connections.php:102 +#: ../../Zotlabs/Module/Connections.php:94 +#: ../../Zotlabs/Module/Connections.php:108 #: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26 msgid "All" msgstr "Alle" -#: ../../Zotlabs/Module/Connections.php:133 +#: ../../Zotlabs/Module/Connections.php:140 +msgid "Active Connections" +msgstr "Aktive Verbindungen" + +#: ../../Zotlabs/Module/Connections.php:143 +msgid "Show active connections" +msgstr "Zeige die aktiven Verbindungen an" + +#: ../../Zotlabs/Module/Connections.php:147 #: ../../Zotlabs/Widget/Notifications.php:84 msgid "New Connections" msgstr "Neue Verbindungen" -#: ../../Zotlabs/Module/Connections.php:136 +#: ../../Zotlabs/Module/Connections.php:150 msgid "Show pending (new) connections" msgstr "Ausstehende (neue) Verbindungsanfragen anzeigen" -#: ../../Zotlabs/Module/Connections.php:143 -msgid "Show all connections" -msgstr "Alle Verbindungen anzeigen" - -#: ../../Zotlabs/Module/Connections.php:159 +#: ../../Zotlabs/Module/Connections.php:167 msgid "Only show blocked connections" msgstr "Nur blockierte Verbindungen anzeigen" -#: ../../Zotlabs/Module/Connections.php:166 +#: ../../Zotlabs/Module/Connections.php:174 msgid "Only show ignored connections" msgstr "Nur ignorierte Verbindungen anzeigen" -#: ../../Zotlabs/Module/Connections.php:173 +#: ../../Zotlabs/Module/Connections.php:181 msgid "Only show archived/unreachable connections" msgstr "Nur archivierte/unerreichbare Verbindungen anzeigen" -#: ../../Zotlabs/Module/Connections.php:180 +#: ../../Zotlabs/Module/Connections.php:188 msgid "Only show hidden connections" msgstr "Nur versteckte Verbindungen anzeigen" -#: ../../Zotlabs/Module/Connections.php:241 +#: ../../Zotlabs/Module/Connections.php:203 +msgid "Show all connections" +msgstr "Alle Verbindungen anzeigen" + +#: ../../Zotlabs/Module/Connections.php:257 msgid "Pending approval" msgstr "Wartet auf Genehmigung" -#: ../../Zotlabs/Module/Connections.php:242 +#: ../../Zotlabs/Module/Connections.php:258 msgid "Archived" msgstr "Archiviert" -#: ../../Zotlabs/Module/Connections.php:246 +#: ../../Zotlabs/Module/Connections.php:262 msgid "Not connected at this location" msgstr "An diesem Ort nicht verbunden" -#: ../../Zotlabs/Module/Connections.php:263 +#: ../../Zotlabs/Module/Connections.php:279 #, php-format msgid "%1$s [%2$s]" msgstr "%1$s [%2$s]" -#: ../../Zotlabs/Module/Connections.php:264 +#: ../../Zotlabs/Module/Connections.php:280 msgid "Edit connection" msgstr "Verbindung bearbeiten" -#: ../../Zotlabs/Module/Connections.php:266 +#: ../../Zotlabs/Module/Connections.php:282 msgid "Delete connection" msgstr "Verbindung löschen" -#: ../../Zotlabs/Module/Connections.php:275 +#: ../../Zotlabs/Module/Connections.php:291 msgid "Channel address" msgstr "Kanaladresse" -#: ../../Zotlabs/Module/Connections.php:277 +#: ../../Zotlabs/Module/Connections.php:293 msgid "Network" msgstr "Netzwerk" -#: ../../Zotlabs/Module/Connections.php:280 +#: ../../Zotlabs/Module/Connections.php:296 msgid "Call" msgstr "Anruf" -#: ../../Zotlabs/Module/Connections.php:282 +#: ../../Zotlabs/Module/Connections.php:298 msgid "Status" msgstr "Status" -#: ../../Zotlabs/Module/Connections.php:284 +#: ../../Zotlabs/Module/Connections.php:300 msgid "Connected" msgstr "Verbunden" -#: ../../Zotlabs/Module/Connections.php:286 +#: ../../Zotlabs/Module/Connections.php:302 msgid "Approve connection" msgstr "Verbindung genehmigen" -#: ../../Zotlabs/Module/Connections.php:288 +#: ../../Zotlabs/Module/Connections.php:304 msgid "Ignore connection" msgstr "Verbindung ignorieren" -#: ../../Zotlabs/Module/Connections.php:289 +#: ../../Zotlabs/Module/Connections.php:305 #: ../../Zotlabs/Module/Connedit.php:630 msgid "Ignore" msgstr "Ignorieren" -#: ../../Zotlabs/Module/Connections.php:290 +#: ../../Zotlabs/Module/Connections.php:306 msgid "Recent activity" msgstr "Kürzliche Aktivitäten" -#: ../../Zotlabs/Module/Connections.php:315 ../../Zotlabs/Lib/Apps.php:235 +#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:235 #: ../../include/text.php:973 msgid "Connections" msgstr "Verbindungen" -#: ../../Zotlabs/Module/Connections.php:320 +#: ../../Zotlabs/Module/Connections.php:336 msgid "Search your connections" msgstr "Verbindungen durchsuchen" -#: ../../Zotlabs/Module/Connections.php:321 +#: ../../Zotlabs/Module/Connections.php:337 msgid "Connections search" msgstr "Verbindung suchen" -#: ../../Zotlabs/Module/Connections.php:322 -#: ../../Zotlabs/Module/Directory.php:396 -#: ../../Zotlabs/Module/Directory.php:401 ../../include/contact_widgets.php:23 +#: ../../Zotlabs/Module/Connections.php:338 +#: ../../Zotlabs/Module/Directory.php:401 +#: ../../Zotlabs/Module/Directory.php:406 ../../include/contact_widgets.php:23 msgid "Find" msgstr "Finde" @@ -4707,13 +4783,9 @@ msgstr "oder ein bereits vorhandenes auswählen (Doppelklick)" msgid "Create a status post for this upload" msgstr "Einen Statusbeitrag für diesen Upload erzeugen" -#: ../../Zotlabs/Module/Photos.php:698 -msgid "Caption (optional):" -msgstr "Beschriftung (optional):" - #: ../../Zotlabs/Module/Photos.php:699 -msgid "Description (optional):" -msgstr "Beschreibung (optional):" +msgid "Description (optional)" +msgstr "Beschreibung (optional)" #: ../../Zotlabs/Module/Photos.php:785 msgid "Show Newest First" @@ -4723,6 +4795,10 @@ msgstr "Neueste zuerst anzeigen" msgid "Show Oldest First" msgstr "Älteste zuerst anzeigen" +#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381 +msgid "Add Photos" +msgstr "Fotos hinzufügen" + #: ../../Zotlabs/Module/Photos.php:892 msgid "Permission denied. Access to this item may be restricted." msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden." @@ -4771,10 +4847,6 @@ msgstr "Gib einen Namen für ein neues Album ein" msgid "or select an existing one (doubleclick)" msgstr "oder wähle ein bereits vorhandenes aus (Doppelklick)" -#: ../../Zotlabs/Module/Photos.php:1068 -msgid "Caption" -msgstr "Bildunterschrift" - #: ../../Zotlabs/Module/Photos.php:1070 msgid "Add a Tag" msgstr "Schlagwort hinzufügen" @@ -4801,12 +4873,12 @@ msgid "Please wait" msgstr "Bitte warten" #: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237 -#: ../../Zotlabs/Lib/ThreadItem.php:747 +#: ../../Zotlabs/Lib/ThreadItem.php:749 msgid "This is you" msgstr "Das bist Du" #: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239 -#: ../../Zotlabs/Lib/ThreadItem.php:749 ../../include/js_strings.php:6 +#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/js_strings.php:6 msgid "Comment" msgstr "Kommentar" @@ -4856,8 +4928,8 @@ msgid "View all" msgstr "Alles anzeigen" #: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205 -#: ../../include/conversation.php:1978 ../../include/channel.php:1540 -#: ../../include/taxonomy.php:597 +#: ../../include/conversation.php:1981 ../../include/channel.php:1539 +#: ../../include/taxonomy.php:661 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -4865,7 +4937,7 @@ msgstr[0] "Gefällt mir" msgstr[1] "Gefällt mir" #: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210 -#: ../../include/conversation.php:1981 +#: ../../include/conversation.php:1984 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -4900,78 +4972,76 @@ msgid "Close" msgstr "Schließen" #: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378 -#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:656 +#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:667 msgid "Recent Photos" msgstr "Neueste Fotos" -#: ../../Zotlabs/Module/Wiki.php:30 +#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1135 msgid "Profile Unavailable." msgstr "Profil nicht verfügbar." -#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:108 -#: ../../addon/gitwiki/Mod_Gitwiki.php:42 +#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:114 msgid "Not found" msgstr "Nicht gefunden" -#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/gitwiki/Mod_Gitwiki.php:62 +#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:114 +#: ../../addon/cart/cart.php:1204 ../../addon/cart/manual_payments.php:58 msgid "Invalid channel" msgstr "Ungültiger Kanal" -#: ../../Zotlabs/Module/Wiki.php:124 ../../addon/gitwiki/Mod_Gitwiki.php:107 +#: ../../Zotlabs/Module/Wiki.php:124 msgid "Error retrieving wiki" msgstr "Fehler beim Abrufen des Wiki" -#: ../../Zotlabs/Module/Wiki.php:131 ../../addon/gitwiki/Mod_Gitwiki.php:114 +#: ../../Zotlabs/Module/Wiki.php:131 msgid "Error creating zip file export folder" msgstr "Fehler bei der Erzeugung des Zip-Datei Export-Verzeichnisses " -#: ../../Zotlabs/Module/Wiki.php:182 ../../addon/gitwiki/Mod_Gitwiki.php:132 +#: ../../Zotlabs/Module/Wiki.php:182 msgid "Error downloading wiki: " msgstr "Fehler beim Herunterladen des Wiki:" -#: ../../Zotlabs/Module/Wiki.php:197 ../../addon/gitwiki/Mod_Gitwiki.php:146 -#: ../../include/conversation.php:1925 ../../include/nav.php:494 +#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1928 +#: ../../include/nav.php:494 msgid "Wikis" msgstr "Wikis" -#: ../../Zotlabs/Module/Wiki.php:203 ../../addon/gitwiki/Mod_Gitwiki.php:152 +#: ../../Zotlabs/Module/Wiki.php:203 msgid "Download" msgstr "Herunterladen" #: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Chat.php:256 -#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:145 -#: ../../addon/gitwiki/Mod_Gitwiki.php:154 +#: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Manage.php:145 msgid "Create New" msgstr "Neu anlegen" -#: ../../Zotlabs/Module/Wiki.php:207 ../../addon/gitwiki/Mod_Gitwiki.php:156 +#: ../../Zotlabs/Module/Wiki.php:207 msgid "Wiki name" msgstr "Name des Wiki" -#: ../../Zotlabs/Module/Wiki.php:208 ../../addon/gitwiki/Mod_Gitwiki.php:157 +#: ../../Zotlabs/Module/Wiki.php:208 msgid "Content type" msgstr "Inhaltstyp" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 #: ../../Zotlabs/Widget/Wiki_pages.php:36 #: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40 -#: ../../include/text.php:1868 +#: ../../include/text.php:1869 msgid "Markdown" msgstr "Markdown" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 #: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1866 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1867 msgid "BBcode" msgstr "BBcode" #: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1869 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1870 msgid "Text" msgstr "Text" #: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:284 -#: ../../addon/gitwiki/Mod_Gitwiki.php:159 msgid "Type" msgstr "Typ" @@ -4983,7 +5053,7 @@ msgstr "Alle Arten" msgid "Lock content type" msgstr "Inhaltstyp sperren" -#: ../../Zotlabs/Module/Wiki.php:219 ../../addon/gitwiki/Mod_Gitwiki.php:166 +#: ../../Zotlabs/Module/Wiki.php:219 msgid "Create a status post for this wiki" msgstr "Erzeuge einen Statusbeitrag für dieses Wiki" @@ -4991,138 +5061,147 @@ msgstr "Erzeuge einen Statusbeitrag für dieses Wiki" msgid "Edit Wiki Name" msgstr "Wiki-Namen bearbeiten" -#: ../../Zotlabs/Module/Wiki.php:262 ../../addon/gitwiki/Mod_Gitwiki.php:185 +#: ../../Zotlabs/Module/Wiki.php:262 msgid "Wiki not found" msgstr "Wiki nicht gefunden" -#: ../../Zotlabs/Module/Wiki.php:286 ../../addon/gitwiki/Mod_Gitwiki.php:210 +#: ../../Zotlabs/Module/Wiki.php:286 msgid "Rename page" msgstr "Seite umbenennen" -#: ../../Zotlabs/Module/Wiki.php:305 ../../addon/gitwiki/Mod_Gitwiki.php:214 +#: ../../Zotlabs/Module/Wiki.php:307 msgid "Error retrieving page content" msgstr "Fehler beim Abrufen des Seiteninhalts" -#: ../../Zotlabs/Module/Wiki.php:313 ../../Zotlabs/Module/Wiki.php:315 +#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317 msgid "New page" msgstr "Neue Seite" -#: ../../Zotlabs/Module/Wiki.php:343 ../../addon/gitwiki/Mod_Gitwiki.php:242 +#: ../../Zotlabs/Module/Wiki.php:345 msgid "Revision Comparison" msgstr "Revisionsvergleich" -#: ../../Zotlabs/Module/Wiki.php:344 ../../addon/gitwiki/Mod_Gitwiki.php:243 +#: ../../Zotlabs/Module/Wiki.php:346 msgid "Revert" msgstr "Rückgängig machen" -#: ../../Zotlabs/Module/Wiki.php:351 +#: ../../Zotlabs/Module/Wiki.php:353 msgid "Short description of your changes (optional)" msgstr "Kurze Beschreibung Ihrer Änderungen (optional)" -#: ../../Zotlabs/Module/Wiki.php:358 ../../addon/gitwiki/Mod_Gitwiki.php:252 +#: ../../Zotlabs/Module/Wiki.php:362 msgid "Source" msgstr "Quelle" -#: ../../Zotlabs/Module/Wiki.php:368 ../../addon/gitwiki/Mod_Gitwiki.php:260 +#: ../../Zotlabs/Module/Wiki.php:372 msgid "New page name" msgstr "Neuer Seitenname" -#: ../../Zotlabs/Module/Wiki.php:373 ../../addon/gitwiki/Mod_Gitwiki.php:265 -#: ../../include/conversation.php:1282 +#: ../../Zotlabs/Module/Wiki.php:377 ../../include/conversation.php:1282 msgid "Embed image from photo albums" msgstr "Bild aus Fotoalben einbetten" -#: ../../Zotlabs/Module/Wiki.php:374 ../../addon/gitwiki/Mod_Gitwiki.php:266 -#: ../../include/conversation.php:1385 +#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1388 msgid "Embed an image from your albums" msgstr "Betten Sie ein Bild aus Ihren Alben ein" -#: ../../Zotlabs/Module/Wiki.php:376 +#: ../../Zotlabs/Module/Wiki.php:380 #: ../../Zotlabs/Module/Profile_photo.php:465 -#: ../../Zotlabs/Module/Cover_photo.php:366 -#: ../../addon/gitwiki/Mod_Gitwiki.php:268 ../../include/conversation.php:1387 -#: ../../include/conversation.php:1434 +#: ../../Zotlabs/Module/Cover_photo.php:367 +#: ../../include/conversation.php:1390 ../../include/conversation.php:1437 msgid "OK" msgstr "Ok" -#: ../../Zotlabs/Module/Wiki.php:377 ../../addon/gitwiki/Mod_Gitwiki.php:269 -#: ../../include/conversation.php:1318 +#: ../../Zotlabs/Module/Wiki.php:381 +#: ../../Zotlabs/Module/Profile_photo.php:466 +#: ../../Zotlabs/Module/Cover_photo.php:368 +#: ../../include/conversation.php:1320 msgid "Choose images to embed" msgstr "Wählen Sie Bilder zum Einbetten aus" -#: ../../Zotlabs/Module/Wiki.php:378 ../../addon/gitwiki/Mod_Gitwiki.php:270 -#: ../../include/conversation.php:1319 +#: ../../Zotlabs/Module/Wiki.php:382 +#: ../../Zotlabs/Module/Profile_photo.php:467 +#: ../../Zotlabs/Module/Cover_photo.php:369 +#: ../../include/conversation.php:1321 msgid "Choose an album" msgstr "Wählen Sie ein Album aus" -#: ../../Zotlabs/Module/Wiki.php:379 ../../addon/gitwiki/Mod_Gitwiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:383 +#: ../../Zotlabs/Module/Profile_photo.php:468 +#: ../../Zotlabs/Module/Cover_photo.php:370 msgid "Choose a different album" msgstr "Wählen Sie ein anderes Album aus" -#: ../../Zotlabs/Module/Wiki.php:380 ../../addon/gitwiki/Mod_Gitwiki.php:272 -#: ../../include/conversation.php:1321 +#: ../../Zotlabs/Module/Wiki.php:384 +#: ../../Zotlabs/Module/Profile_photo.php:469 +#: ../../Zotlabs/Module/Cover_photo.php:371 +#: ../../include/conversation.php:1323 msgid "Error getting album list" msgstr "Fehler beim Holen der Albenliste" -#: ../../Zotlabs/Module/Wiki.php:381 ../../addon/gitwiki/Mod_Gitwiki.php:273 -#: ../../include/conversation.php:1322 +#: ../../Zotlabs/Module/Wiki.php:385 +#: ../../Zotlabs/Module/Profile_photo.php:470 +#: ../../Zotlabs/Module/Cover_photo.php:372 +#: ../../include/conversation.php:1324 msgid "Error getting photo link" msgstr "Fehler beim Holen des Fotolinks" -#: ../../Zotlabs/Module/Wiki.php:382 ../../addon/gitwiki/Mod_Gitwiki.php:274 -#: ../../include/conversation.php:1323 +#: ../../Zotlabs/Module/Wiki.php:386 +#: ../../Zotlabs/Module/Profile_photo.php:471 +#: ../../Zotlabs/Module/Cover_photo.php:373 +#: ../../include/conversation.php:1325 msgid "Error getting album" msgstr "Fehler beim Holen des Albums" -#: ../../Zotlabs/Module/Wiki.php:458 ../../addon/gitwiki/Mod_Gitwiki.php:337 +#: ../../Zotlabs/Module/Wiki.php:462 msgid "Error creating wiki. Invalid name." msgstr "Fehler beim Erstellen des Wiki. Ungültiger Name." -#: ../../Zotlabs/Module/Wiki.php:465 +#: ../../Zotlabs/Module/Wiki.php:469 msgid "A wiki with this name already exists." msgstr "Es existiert bereits ein Wiki mit diesem Namen." -#: ../../Zotlabs/Module/Wiki.php:478 ../../addon/gitwiki/Mod_Gitwiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:482 msgid "Wiki created, but error creating Home page." msgstr "Das Wiki wurde erzeugt, aber es gab einen Fehler bei der Erstellung der Startseite" -#: ../../Zotlabs/Module/Wiki.php:485 ../../addon/gitwiki/Mod_Gitwiki.php:353 +#: ../../Zotlabs/Module/Wiki.php:489 msgid "Error creating wiki" msgstr "Fehler beim Erstellen des Wiki" -#: ../../Zotlabs/Module/Wiki.php:508 +#: ../../Zotlabs/Module/Wiki.php:512 msgid "Error updating wiki. Invalid name." msgstr "Fehler beim Aktualisieren des Wikis. Ungültiger Name." -#: ../../Zotlabs/Module/Wiki.php:528 +#: ../../Zotlabs/Module/Wiki.php:532 msgid "Error updating wiki" msgstr "Fehler beim Aktualisieren des Wikis" -#: ../../Zotlabs/Module/Wiki.php:543 +#: ../../Zotlabs/Module/Wiki.php:547 msgid "Wiki delete permission denied." msgstr "Wiki-Löschberechtigung verweigert." -#: ../../Zotlabs/Module/Wiki.php:553 +#: ../../Zotlabs/Module/Wiki.php:557 msgid "Error deleting wiki" msgstr "Fehler beim Löschen des Wiki" -#: ../../Zotlabs/Module/Wiki.php:586 ../../addon/gitwiki/Mod_Gitwiki.php:400 +#: ../../Zotlabs/Module/Wiki.php:590 msgid "New page created" msgstr "Neue Seite erstellt" -#: ../../Zotlabs/Module/Wiki.php:707 +#: ../../Zotlabs/Module/Wiki.php:711 msgid "Cannot delete Home" msgstr "Kann die Startseite nicht löschen" -#: ../../Zotlabs/Module/Wiki.php:771 +#: ../../Zotlabs/Module/Wiki.php:775 msgid "Current Revision" msgstr "Aktuelle Revision" -#: ../../Zotlabs/Module/Wiki.php:771 +#: ../../Zotlabs/Module/Wiki.php:775 msgid "Selected Revision" msgstr "Ausgewählte Revision" -#: ../../Zotlabs/Module/Wiki.php:821 +#: ../../Zotlabs/Module/Wiki.php:825 msgid "You must be authenticated." msgstr "Sie müssen authenzifiziert sein." @@ -5206,7 +5285,7 @@ msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl." #: ../../Zotlabs/Module/Profile_photo.php:120 #: ../../Zotlabs/Module/Profile_photo.php:248 -#: ../../include/photo/photo_driver.php:740 +#: ../../include/photo/photo_driver.php:741 msgid "Profile Photos" msgstr "Profilfotos" @@ -5245,12 +5324,12 @@ msgid "Photo not available." msgstr "Foto nicht verfügbar." #: ../../Zotlabs/Module/Profile_photo.php:455 -#: ../../Zotlabs/Module/Cover_photo.php:358 +#: ../../Zotlabs/Module/Cover_photo.php:359 msgid "Upload File:" msgstr "Datei hochladen:" #: ../../Zotlabs/Module/Profile_photo.php:456 -#: ../../Zotlabs/Module/Cover_photo.php:359 +#: ../../Zotlabs/Module/Cover_photo.php:360 msgid "Select a profile:" msgstr "Wähle ein Profil:" @@ -5268,28 +5347,28 @@ msgstr "Verwenden" #: ../../Zotlabs/Module/Profile_photo.php:462 #: ../../Zotlabs/Module/Profile_photo.php:463 -#: ../../Zotlabs/Module/Cover_photo.php:363 #: ../../Zotlabs/Module/Cover_photo.php:364 +#: ../../Zotlabs/Module/Cover_photo.php:365 msgid "Use a photo from your albums" msgstr "Ein Foto aus meinen Alben verwenden" -#: ../../Zotlabs/Module/Profile_photo.php:467 -#: ../../Zotlabs/Module/Cover_photo.php:369 +#: ../../Zotlabs/Module/Profile_photo.php:473 +#: ../../Zotlabs/Module/Cover_photo.php:376 msgid "Select existing photo" msgstr "Wähle ein vorhandenes Foto aus" -#: ../../Zotlabs/Module/Profile_photo.php:486 -#: ../../Zotlabs/Module/Cover_photo.php:386 +#: ../../Zotlabs/Module/Profile_photo.php:492 +#: ../../Zotlabs/Module/Cover_photo.php:393 msgid "Crop Image" msgstr "Bild zuschneiden" -#: ../../Zotlabs/Module/Profile_photo.php:487 -#: ../../Zotlabs/Module/Cover_photo.php:387 +#: ../../Zotlabs/Module/Profile_photo.php:493 +#: ../../Zotlabs/Module/Cover_photo.php:394 msgid "Please adjust the image cropping for optimum viewing." msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu." -#: ../../Zotlabs/Module/Profile_photo.php:489 -#: ../../Zotlabs/Module/Cover_photo.php:389 +#: ../../Zotlabs/Module/Profile_photo.php:495 +#: ../../Zotlabs/Module/Cover_photo.php:396 msgid "Done Editing" msgstr "Bearbeitung fertigstellen" @@ -5305,61 +5384,61 @@ msgstr "Online" msgid "Unable to locate original post." msgstr "Originalbeitrag nicht gefunden." -#: ../../Zotlabs/Module/Item.php:476 +#: ../../Zotlabs/Module/Item.php:477 msgid "Empty post discarded." msgstr "Leeren Beitrag verworfen." -#: ../../Zotlabs/Module/Item.php:867 +#: ../../Zotlabs/Module/Item.php:874 msgid "Duplicate post suppressed." msgstr "Doppelter Beitrag unterdrückt." -#: ../../Zotlabs/Module/Item.php:1012 +#: ../../Zotlabs/Module/Item.php:1019 msgid "System error. Post not saved." msgstr "Systemfehler. Beitrag nicht gespeichert." -#: ../../Zotlabs/Module/Item.php:1048 +#: ../../Zotlabs/Module/Item.php:1055 msgid "Your comment is awaiting approval." msgstr "Dein Kommentar muss noch bestätigt werden." -#: ../../Zotlabs/Module/Item.php:1153 +#: ../../Zotlabs/Module/Item.php:1160 msgid "Unable to obtain post information from database." msgstr "Beitragsinformationen können nicht aus der Datenbank abgerufen werden." -#: ../../Zotlabs/Module/Item.php:1182 +#: ../../Zotlabs/Module/Item.php:1189 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht." -#: ../../Zotlabs/Module/Item.php:1189 +#: ../../Zotlabs/Module/Item.php:1196 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht." -#: ../../Zotlabs/Module/Ping.php:320 +#: ../../Zotlabs/Module/Ping.php:330 msgid "sent you a private message" msgstr "hat Dir eine private Nachricht geschickt" -#: ../../Zotlabs/Module/Ping.php:372 +#: ../../Zotlabs/Module/Ping.php:383 msgid "added your channel" msgstr "hat deinen Kanal hinzugefügt" -#: ../../Zotlabs/Module/Ping.php:396 +#: ../../Zotlabs/Module/Ping.php:407 msgid "requires approval" msgstr "Zustimmung erforderlich" -#: ../../Zotlabs/Module/Ping.php:406 +#: ../../Zotlabs/Module/Ping.php:417 msgid "g A l F d" msgstr "l, d. F, G:i \\U\\h\\r" -#: ../../Zotlabs/Module/Ping.php:424 +#: ../../Zotlabs/Module/Ping.php:435 msgid "[today]" msgstr "[Heute]" -#: ../../Zotlabs/Module/Ping.php:433 +#: ../../Zotlabs/Module/Ping.php:444 msgid "posted an event" msgstr "hat einen Termin veröffentlicht" -#: ../../Zotlabs/Module/Ping.php:466 +#: ../../Zotlabs/Module/Ping.php:477 msgid "shared a file with you" msgstr "hat eine Datei mit Dir geteilt" @@ -5368,7 +5447,8 @@ msgid "Invalid item." msgstr "Ungültiges Element." #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 -#: ../../Zotlabs/Module/Display.php:133 +#: ../../Zotlabs/Module/Display.php:141 ../../Zotlabs/Module/Display.php:158 +#: ../../Zotlabs/Module/Display.php:175 #: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:167 #: ../../include/help.php:81 msgid "Page not found." @@ -5449,7 +5529,7 @@ msgstr "Foto aktualisieren" msgid "Fetch updated photo" msgstr "Aktualisiertes Profilfoto abrufen" -#: ../../Zotlabs/Module/Connedit.php:615 +#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1042 msgid "Recent Activity" msgstr "Kürzliche Aktivitäten" @@ -5593,11 +5673,11 @@ msgid "" msgstr "Diese Verbindung ist von diesem Standort aus unerreichbar. Standort Unabhängigkeit wird vom anderen Netzwerk nicht unterstützt." #: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238 -#: ../../Zotlabs/Widget/Settings_menu.php:109 +#: ../../Zotlabs/Widget/Settings_menu.php:117 msgid "Connection Default Permissions" msgstr "Standardzugriffsrechte für neue Verbindungen:" -#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4164 +#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4214 #, php-format msgid "Connection: %s" msgstr "Verbindung: %s" @@ -5732,13 +5812,13 @@ msgid "Bookmark this room" msgstr "Lesezeichen für diesen Raum setzen" #: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 -#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1313 +#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1315 msgid "Please enter a link URL:" msgstr "Gib eine URL ein:" #: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294 -#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:764 -#: ../../include/conversation.php:1432 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:766 +#: ../../include/conversation.php:1435 msgid "Encrypt text" msgstr "Text verschlüsseln" @@ -5772,12 +5852,12 @@ msgid "min" msgstr "min" #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:248 -#: ../../include/conversation.php:1831 ../../include/nav.php:401 +#: ../../include/conversation.php:1834 ../../include/nav.php:401 msgid "Photos" msgstr "Fotos" #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:243 -#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1839 +#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1842 #: ../../include/nav.php:409 msgid "Files" msgstr "Dateien" @@ -5818,7 +5898,7 @@ msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden" msgid "Submit and proceed" msgstr "Absenden und fortfahren" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2403 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2423 msgid "Menus" msgstr "Menüs" @@ -5870,7 +5950,7 @@ msgstr "Menü Titel wie er von anderen gesehen wird" msgid "Allow bookmarks" msgstr "Erlaube Lesezeichen" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2404 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2424 msgid "Layouts" msgstr "Layouts" @@ -5892,11 +5972,11 @@ msgstr "Layout-Beschreibung" msgid "Download PDL file" msgstr "PDL-Datei herunterladen" -#: ../../Zotlabs/Module/Cloud.php:114 +#: ../../Zotlabs/Module/Cloud.php:120 msgid "Please refresh page" msgstr "Bitte die Seite neu laden" -#: ../../Zotlabs/Module/Cloud.php:117 +#: ../../Zotlabs/Module/Cloud.php:123 msgid "Unknown error" msgstr "Unbekannter Fehler" @@ -5930,16 +6010,16 @@ msgid "Post not found." msgstr "Beitrag nicht gefunden." #: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160 -#: ../../include/bbcode.php:339 +#: ../../include/bbcode.php:352 msgid "post" msgstr "Beitrag" #: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146 -#: ../../include/text.php:2012 +#: ../../include/text.php:2013 msgid "comment" msgstr "Kommentar" -#: ../../Zotlabs/Module/Tagger.php:117 +#: ../../Zotlabs/Module/Tagger.php:119 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet" @@ -5974,6 +6054,23 @@ msgid "" "channel type and privacy settings." msgstr "Einige individuelle Berechtigungen können basierend auf Deinen Kanal- und Privatsphäre-Einstellungen vorbelegt oder gesperrt sein." +#: ../../Zotlabs/Module/Authorize.php:17 +msgid "Unknown App" +msgstr "Unbekannte Anwendung" + +#: ../../Zotlabs/Module/Authorize.php:22 +msgid "Authorize" +msgstr "Berechtigen" + +#: ../../Zotlabs/Module/Authorize.php:23 +#, php-format +msgid "Do you authorize the app %s to access your channel data?" +msgstr "Willst du die Anwendung %s dazu berechtigen auf die Daten deines Kanals zuzugreifen?" + +#: ../../Zotlabs/Module/Authorize.php:25 +msgid "Allow" +msgstr "Erlauben" + #: ../../Zotlabs/Module/Group.php:24 msgid "Privacy group created." msgstr "Gruppe wurde erstellt." @@ -5983,7 +6080,7 @@ msgid "Could not create privacy group." msgstr "Gruppe konnte nicht erstellt werden." #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143 -#: ../../include/items.php:4131 +#: ../../include/items.php:4181 msgid "Privacy group not found." msgstr "Gruppe nicht gefunden." @@ -6064,15 +6161,15 @@ msgstr "Familienstand" msgid "Romantic Partner" msgstr "Romantische Partner" -#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775 +#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772 msgid "Likes" msgstr "Gefällt" -#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776 +#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773 msgid "Dislikes" msgstr "Gefällt nicht" -#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783 +#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780 msgid "Work/Employment" msgstr "Arbeit/Anstellung" @@ -6109,198 +6206,198 @@ msgstr "Profil aktualisiert." msgid "Hide your connections list from viewers of this profile" msgstr "Deine Verbindungen vor Betrachtern dieses Profils verbergen" -#: ../../Zotlabs/Module/Profiles.php:725 +#: ../../Zotlabs/Module/Profiles.php:722 msgid "Edit Profile Details" msgstr "Bearbeite Profil-Details" -#: ../../Zotlabs/Module/Profiles.php:727 +#: ../../Zotlabs/Module/Profiles.php:724 msgid "View this profile" msgstr "Dieses Profil ansehen" -#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827 -#: ../../include/channel.php:1320 +#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824 +#: ../../include/channel.php:1319 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:726 msgid "Profile Tools" msgstr "Profilwerkzeuge" -#: ../../Zotlabs/Module/Profiles.php:730 +#: ../../Zotlabs/Module/Profiles.php:727 msgid "Change cover photo" msgstr "Titelbild ändern" -#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1290 +#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1289 msgid "Change profile photo" msgstr "Profilfoto ändern" -#: ../../Zotlabs/Module/Profiles.php:732 +#: ../../Zotlabs/Module/Profiles.php:729 msgid "Create a new profile using these settings" msgstr "Neues Profil anlegen und diese Einstellungen übernehmen" -#: ../../Zotlabs/Module/Profiles.php:733 +#: ../../Zotlabs/Module/Profiles.php:730 msgid "Clone this profile" msgstr "Dieses Profil klonen" -#: ../../Zotlabs/Module/Profiles.php:734 +#: ../../Zotlabs/Module/Profiles.php:731 msgid "Delete this profile" msgstr "Dieses Profil löschen" -#: ../../Zotlabs/Module/Profiles.php:735 +#: ../../Zotlabs/Module/Profiles.php:732 msgid "Add profile things" msgstr "Sachen zum Profil hinzufügen" -#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1705 +#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1708 msgid "Personal" msgstr "Persönlich" -#: ../../Zotlabs/Module/Profiles.php:738 -msgid "Relation" +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Relationship" msgstr "Beziehung" -#: ../../Zotlabs/Module/Profiles.php:739 ../../Zotlabs/Widget/Newmember.php:53 +#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:44 #: ../../include/datetime.php:58 msgid "Miscellaneous" msgstr "Verschiedenes" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Import profile from file" msgstr "Profil aus einer Datei importieren" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "Export profile to file" msgstr "Profil in eine Datei exportieren" -#: ../../Zotlabs/Module/Profiles.php:743 +#: ../../Zotlabs/Module/Profiles.php:740 msgid "Your gender" msgstr "Dein Geschlecht" -#: ../../Zotlabs/Module/Profiles.php:744 +#: ../../Zotlabs/Module/Profiles.php:741 msgid "Marital status" msgstr "Familienstand" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Sexual preference" msgstr "Sexuelle Orientierung" -#: ../../Zotlabs/Module/Profiles.php:748 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "Profile name" msgstr "Profilname" -#: ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "This is your default profile." msgstr "Das ist Dein Standardprofil." -#: ../../Zotlabs/Module/Profiles.php:752 +#: ../../Zotlabs/Module/Profiles.php:749 msgid "Your full name" msgstr "Dein voller Name" -#: ../../Zotlabs/Module/Profiles.php:753 +#: ../../Zotlabs/Module/Profiles.php:750 msgid "Title/Description" msgstr "Titel/Beschreibung" -#: ../../Zotlabs/Module/Profiles.php:756 +#: ../../Zotlabs/Module/Profiles.php:753 msgid "Street address" msgstr "Straße und Hausnummer" -#: ../../Zotlabs/Module/Profiles.php:757 +#: ../../Zotlabs/Module/Profiles.php:754 msgid "Locality/City" msgstr "Wohnort" -#: ../../Zotlabs/Module/Profiles.php:758 +#: ../../Zotlabs/Module/Profiles.php:755 msgid "Region/State" msgstr "Region/Bundesstaat" -#: ../../Zotlabs/Module/Profiles.php:759 +#: ../../Zotlabs/Module/Profiles.php:756 msgid "Postal/Zip code" msgstr "Postleitzahl" -#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Profiles.php:762 msgid "Who (if applicable)" msgstr "Wer (falls anwendbar)" -#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Profiles.php:762 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" -#: ../../Zotlabs/Module/Profiles.php:766 +#: ../../Zotlabs/Module/Profiles.php:763 msgid "Since (date)" msgstr "Seit (Datum)" -#: ../../Zotlabs/Module/Profiles.php:769 +#: ../../Zotlabs/Module/Profiles.php:766 msgid "Tell us about yourself" msgstr "Erzähle uns ein wenig von Dir" -#: ../../Zotlabs/Module/Profiles.php:770 +#: ../../Zotlabs/Module/Profiles.php:767 #: ../../addon/openid/MysqlProvider.php:68 msgid "Homepage URL" msgstr "Homepage-URL" -#: ../../Zotlabs/Module/Profiles.php:771 +#: ../../Zotlabs/Module/Profiles.php:768 msgid "Hometown" msgstr "Heimatort" -#: ../../Zotlabs/Module/Profiles.php:772 +#: ../../Zotlabs/Module/Profiles.php:769 msgid "Political views" msgstr "Politische Ansichten" -#: ../../Zotlabs/Module/Profiles.php:773 +#: ../../Zotlabs/Module/Profiles.php:770 msgid "Religious views" msgstr "Religiöse Ansichten" -#: ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Keywords used in directory listings" msgstr "Schlüsselwörter, die in Verzeichnis-Auflistungen verwendet werden" -#: ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Example: fishing photography software" msgstr "Beispiel: Angeln Fotografie Software" -#: ../../Zotlabs/Module/Profiles.php:777 +#: ../../Zotlabs/Module/Profiles.php:774 msgid "Musical interests" msgstr "Musikalische Interessen" -#: ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Profiles.php:775 msgid "Books, literature" msgstr "Bücher, Literatur" -#: ../../Zotlabs/Module/Profiles.php:779 +#: ../../Zotlabs/Module/Profiles.php:776 msgid "Television" msgstr "Fernsehen" -#: ../../Zotlabs/Module/Profiles.php:780 +#: ../../Zotlabs/Module/Profiles.php:777 msgid "Film/Dance/Culture/Entertainment" msgstr "Film/Tanz/Kultur/Unterhaltung" -#: ../../Zotlabs/Module/Profiles.php:781 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Hobbies/Interests" msgstr "Hobbys/Interessen" -#: ../../Zotlabs/Module/Profiles.php:782 +#: ../../Zotlabs/Module/Profiles.php:779 msgid "Love/Romance" msgstr "Liebe/Romantik" -#: ../../Zotlabs/Module/Profiles.php:784 +#: ../../Zotlabs/Module/Profiles.php:781 msgid "School/Education" msgstr "Schule/Ausbildung" -#: ../../Zotlabs/Module/Profiles.php:785 +#: ../../Zotlabs/Module/Profiles.php:782 msgid "Contact information and social networks" msgstr "Kontaktinformation und soziale Netzwerke" -#: ../../Zotlabs/Module/Profiles.php:786 +#: ../../Zotlabs/Module/Profiles.php:783 msgid "My other channels" msgstr "Meine anderen Kanäle" -#: ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Profiles.php:785 msgid "Communications" msgstr "Kommunikation" -#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1316 +#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1315 msgid "Profile Image" msgstr "Profilfoto:" -#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1297 +#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296 #: ../../include/nav.php:117 msgid "Edit Profiles" msgstr "Profile bearbeiten" @@ -6334,11 +6431,11 @@ msgstr "Ein Titelbild hochladen" msgid "Edit your default profile" msgstr "Dein Standardprofil bearbeiten" -#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:43 +#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:34 msgid "View friend suggestions" msgstr "Freundschafts- und Verbindungsvorschläge ansehen" -#: ../../Zotlabs/Module/Go.php:39 ../../Zotlabs/Widget/Newmember.php:42 +#: ../../Zotlabs/Module/Go.php:39 msgid "View the channel directory" msgstr "Das Kanalverzeichnis ansehen" @@ -6415,9 +6512,9 @@ msgstr "%d neue Vorstellungen" msgid "Delegated Channel" msgstr "Delegierte Kanäle" -#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:181 -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1890 -#: ../../include/features.php:114 ../../include/nav.php:458 +#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194 +#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1893 +#: ../../include/features.php:123 ../../include/nav.php:458 msgid "Cards" msgstr "Karten" @@ -6509,7 +6606,7 @@ msgid "Export selected" msgstr "Exportieren ausgewählt" #: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:244 -#: ../../include/conversation.php:1912 ../../include/nav.php:481 +#: ../../include/conversation.php:1915 ../../include/nav.php:481 msgid "Webpages" msgstr "Webseiten" @@ -6582,7 +6679,7 @@ msgstr "Kanal umbenennen" msgid "Item is not editable" msgstr "Element kann nicht bearbeitet werden." -#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:178 +#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144 msgid "Edit post" msgstr "Bearbeite Beitrag" @@ -6669,7 +6766,7 @@ msgid "*" msgstr "*" #: ../../Zotlabs/Module/Sources.php:96 -#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:274 +#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292 msgid "Channel Sources" msgstr "Kanal-Quellen" @@ -6760,165 +6857,169 @@ msgstr "Kanal nicht vorhanden." msgid "Previous action reversed." msgstr "Die vorherige Aktion wurde rückgängig gemacht." -#: ../../Zotlabs/Module/Like.php:436 ../../addon/diaspora/Receiver.php:1547 -#: ../../addon/pubcrawl/as.php:1394 ../../include/conversation.php:160 +#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529 +#: ../../addon/pubcrawl/as.php:1440 ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s gefällt %2$ss %3$s" -#: ../../Zotlabs/Module/Like.php:438 ../../addon/pubcrawl/as.php:1396 +#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442 #: ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s gefällt %2$ss %3$s nicht" -#: ../../Zotlabs/Module/Like.php:440 +#: ../../Zotlabs/Module/Like.php:442 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "%1$s stimmt %2$ss %3$s zu" -#: ../../Zotlabs/Module/Like.php:442 +#: ../../Zotlabs/Module/Like.php:444 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "%1$s lehnt %2$ss %3$s ab" -#: ../../Zotlabs/Module/Like.php:444 +#: ../../Zotlabs/Module/Like.php:446 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "%1$s enthält sich zu %2$ss %3$s" -#: ../../Zotlabs/Module/Like.php:446 ../../addon/diaspora/Receiver.php:2031 +#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%1$s nimmt an %2$ss %3$s teil" -#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2033 +#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%1$s nimmt an %2$ss %3$s nicht teil" -#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2035 +#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%1$s nimmt vielleicht an %2$ss %3$s teil" -#: ../../Zotlabs/Module/Like.php:562 +#: ../../Zotlabs/Module/Like.php:564 msgid "Action completed." msgstr "Aktion durchgeführt." -#: ../../Zotlabs/Module/Like.php:563 +#: ../../Zotlabs/Module/Like.php:565 msgid "Thank you." msgstr "Vielen Dank." -#: ../../Zotlabs/Module/Directory.php:250 +#: ../../Zotlabs/Module/Directory.php:106 +msgid "No default suggestions were found." +msgstr "Es wurden keine Standard Vorschläge gefunden." + +#: ../../Zotlabs/Module/Directory.php:255 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "%d Bewertung" msgstr[1] "%d Bewertungen" -#: ../../Zotlabs/Module/Directory.php:261 +#: ../../Zotlabs/Module/Directory.php:266 msgid "Gender: " msgstr "Geschlecht:" -#: ../../Zotlabs/Module/Directory.php:263 +#: ../../Zotlabs/Module/Directory.php:268 msgid "Status: " msgstr "Status:" -#: ../../Zotlabs/Module/Directory.php:265 +#: ../../Zotlabs/Module/Directory.php:270 msgid "Homepage: " msgstr "Webseite:" -#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1565 +#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1564 msgid "Age:" msgstr "Alter:" -#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1392 +#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1391 #: ../../include/event.php:54 ../../include/event.php:86 msgid "Location:" msgstr "Ort:" -#: ../../Zotlabs/Module/Directory.php:325 +#: ../../Zotlabs/Module/Directory.php:330 msgid "Description:" msgstr "Beschreibung:" -#: ../../Zotlabs/Module/Directory.php:330 ../../include/channel.php:1581 +#: ../../Zotlabs/Module/Directory.php:335 ../../include/channel.php:1593 msgid "Hometown:" msgstr "Heimatstadt:" -#: ../../Zotlabs/Module/Directory.php:332 ../../include/channel.php:1589 +#: ../../Zotlabs/Module/Directory.php:337 ../../include/channel.php:1599 msgid "About:" msgstr "Über:" -#: ../../Zotlabs/Module/Directory.php:333 ../../Zotlabs/Module/Suggest.php:56 +#: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/conversation.php:1052 ../../include/channel.php:1377 -#: ../../include/connections.php:111 +#: ../../include/conversation.php:1052 ../../include/channel.php:1376 +#: ../../include/connections.php:110 msgid "Connect" msgstr "Verbinden" -#: ../../Zotlabs/Module/Directory.php:334 +#: ../../Zotlabs/Module/Directory.php:339 msgid "Public Forum:" msgstr "Öffentliches Forum:" -#: ../../Zotlabs/Module/Directory.php:337 +#: ../../Zotlabs/Module/Directory.php:342 msgid "Keywords: " msgstr "Schlüsselwörter:" -#: ../../Zotlabs/Module/Directory.php:340 +#: ../../Zotlabs/Module/Directory.php:345 msgid "Don't suggest" msgstr "Nicht vorschlagen" -#: ../../Zotlabs/Module/Directory.php:342 +#: ../../Zotlabs/Module/Directory.php:347 msgid "Common connections (estimated):" msgstr "Gemeinsame Verbindungen (geschätzt):" -#: ../../Zotlabs/Module/Directory.php:391 +#: ../../Zotlabs/Module/Directory.php:396 msgid "Global Directory" msgstr "Globales Verzeichnis" -#: ../../Zotlabs/Module/Directory.php:391 +#: ../../Zotlabs/Module/Directory.php:396 msgid "Local Directory" msgstr "Lokales Verzeichnis" -#: ../../Zotlabs/Module/Directory.php:397 +#: ../../Zotlabs/Module/Directory.php:402 msgid "Finding:" msgstr "Ergebnisse:" -#: ../../Zotlabs/Module/Directory.php:400 ../../Zotlabs/Module/Suggest.php:64 +#: ../../Zotlabs/Module/Directory.php:405 ../../Zotlabs/Module/Suggest.php:64 #: ../../include/contact_widgets.php:24 msgid "Channel Suggestions" msgstr "Kanal-Vorschläge" -#: ../../Zotlabs/Module/Directory.php:402 +#: ../../Zotlabs/Module/Directory.php:407 msgid "next page" msgstr "nächste Seite" -#: ../../Zotlabs/Module/Directory.php:402 +#: ../../Zotlabs/Module/Directory.php:407 msgid "previous page" msgstr "vorherige Seite" -#: ../../Zotlabs/Module/Directory.php:403 +#: ../../Zotlabs/Module/Directory.php:408 msgid "Sort options" msgstr "Sortieroptionen" -#: ../../Zotlabs/Module/Directory.php:404 +#: ../../Zotlabs/Module/Directory.php:409 msgid "Alphabetic" msgstr "alphabetisch" -#: ../../Zotlabs/Module/Directory.php:405 +#: ../../Zotlabs/Module/Directory.php:410 msgid "Reverse Alphabetic" msgstr "Entgegengesetzt alphabetisch" -#: ../../Zotlabs/Module/Directory.php:406 +#: ../../Zotlabs/Module/Directory.php:411 msgid "Newest to Oldest" msgstr "Neueste zuerst" -#: ../../Zotlabs/Module/Directory.php:407 +#: ../../Zotlabs/Module/Directory.php:412 msgid "Oldest to Newest" msgstr "Älteste zuerst" -#: ../../Zotlabs/Module/Directory.php:424 +#: ../../Zotlabs/Module/Directory.php:429 msgid "No entries (some entries may be hidden)." msgstr "Keine Einträge gefunden (einige könnten versteckt sein)." @@ -7001,7 +7102,7 @@ msgid "Subject:" msgstr "Betreff:" #: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 -#: ../../include/conversation.php:1382 +#: ../../include/conversation.php:1385 msgid "Attach file" msgstr "Datei anhängen" @@ -7010,7 +7111,7 @@ msgid "Send" msgstr "Absenden" #: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 -#: ../../include/conversation.php:1427 +#: ../../include/conversation.php:1430 msgid "Set expiration date" msgstr "Verfallsdatum" @@ -7232,7 +7333,7 @@ msgstr "ja" msgid "Membership on this site is by invitation only." msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich." -#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1563 +#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1570 #: ../../include/nav.php:164 msgid "Register" msgstr "Registrieren" @@ -7248,34 +7349,34 @@ msgstr "Diese Website erfordert eine Email-Bestätigung. Bitte prüfe Deine Emai msgid "Cover Photos" msgstr "Cover Foto" -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4508 +#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4558 msgid "female" msgstr "weiblich" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4509 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4559 #, php-format msgid "%1$s updated her %2$s" msgstr "%1$s hat ihr %2$s aktualisiert" -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4510 +#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4560 msgid "male" msgstr "männlich" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4511 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4561 #, php-format msgid "%1$s updated his %2$s" msgstr "%1$s hat sein %2$s aktualisiert" -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4513 +#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4563 #, php-format msgid "%1$s updated their %2$s" msgstr "%1$s hat sein/ihr %2$s aktualisiert" -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2059 +#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2070 msgid "cover photo" msgstr "Cover Foto" -#: ../../Zotlabs/Module/Cover_photo.php:360 +#: ../../Zotlabs/Module/Cover_photo.php:361 msgid "Change Cover Photo" msgstr "Titelbild ändern" @@ -7283,7 +7384,7 @@ msgstr "Titelbild ändern" msgid "Documentation Search" msgstr "Suche in der Dokumentation" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1821 +#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1824 #: ../../include/nav.php:391 msgid "About" msgstr "Über" @@ -7308,11 +7409,11 @@ msgstr "$Projectname-Dokumentation" msgid "Contents" msgstr "Inhalt" -#: ../../Zotlabs/Module/Display.php:351 +#: ../../Zotlabs/Module/Display.php:394 msgid "Article" msgstr "Artikel" -#: ../../Zotlabs/Module/Display.php:403 +#: ../../Zotlabs/Module/Display.php:446 msgid "Item has been removed." msgstr "Der Beitrag wurde entfernt." @@ -7344,19 +7445,19 @@ msgstr "Forum" msgid "Search Results For:" msgstr "Suchergebnisse für:" -#: ../../Zotlabs/Module/Network.php:230 +#: ../../Zotlabs/Module/Network.php:229 msgid "Privacy group is empty" msgstr "Gruppe ist leer" -#: ../../Zotlabs/Module/Network.php:240 +#: ../../Zotlabs/Module/Network.php:238 msgid "Privacy group: " msgstr "Gruppe:" -#: ../../Zotlabs/Module/Network.php:268 +#: ../../Zotlabs/Module/Network.php:265 msgid "Invalid connection." msgstr "Ungültige Verbindung." -#: ../../Zotlabs/Module/Network.php:289 ../../addon/redred/redred.php:65 +#: ../../Zotlabs/Module/Network.php:285 ../../addon/redred/redred.php:65 msgid "Invalid channel." msgstr "Ungültiger Kanal." @@ -7557,7 +7658,7 @@ msgid "" "Password reset failed." msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen." -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1591 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1598 msgid "Password Reset" msgstr "Zurücksetzen des Kennworts" @@ -7655,11 +7756,11 @@ msgstr "Teilen-Knopf für Firefox" msgid "Remote Diagnostics" msgstr "Ferndiagnose" -#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:390 +#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:417 msgid "Suggest Channels" msgstr "Kanäle vorschlagen" -#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1582 +#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1589 #: ../../include/nav.php:126 ../../include/nav.php:130 msgid "Login" msgstr "Anmelden" @@ -7668,8 +7769,8 @@ msgstr "Anmelden" msgid "Activity" msgstr "Aktivität" -#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1928 -#: ../../include/features.php:87 ../../include/nav.php:497 +#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1931 +#: ../../include/features.php:96 ../../include/nav.php:497 msgid "Wiki" msgstr "Wiki" @@ -7677,8 +7778,8 @@ msgstr "Wiki" msgid "Channel Home" msgstr "Mein Kanal" -#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1850 -#: ../../include/conversation.php:1853 +#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1853 +#: ../../include/conversation.php:1856 msgid "Events" msgstr "Termine" @@ -7835,9 +7936,8 @@ msgctxt "wiki_history" msgid "Message" msgstr "Nachricht" -#: ../../Zotlabs/Lib/NativeWikiPage.php:597 -#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:706 -#: ../../include/bbcode.php:865 +#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:744 +#: ../../include/bbcode.php:914 msgid "Different viewers will see this text differently" msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen" @@ -7959,61 +8059,61 @@ msgstr "Um diese Nachrichten nicht mehr zu erhalten, passe bitte Deine Benachric msgid "To stop receiving these messages, please adjust your %s." msgstr "Um diese Nachrichten nicht mehr zu erhalten, passe bitte Deine %s an." -#: ../../Zotlabs/Lib/Enotify.php:120 +#: ../../Zotlabs/Lib/Enotify.php:123 #, php-format msgid "%s " msgstr "%s " -#: ../../Zotlabs/Lib/Enotify.php:124 +#: ../../Zotlabs/Lib/Enotify.php:127 #, php-format msgid "[$Projectname:Notify] New mail received at %s" msgstr "[$Projectname:Benachrichtigung] Neue Mail empfangen auf %s" -#: ../../Zotlabs/Lib/Enotify.php:126 +#: ../../Zotlabs/Lib/Enotify.php:129 #, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." -msgstr "%1$s, %2$s hat Dir eine private Nachricht auf %3$s gesendet." +msgid "%1$s sent you a new private message at %2$s." +msgstr "%1$shat dir auf %2$seine private Nachricht geschickt." -#: ../../Zotlabs/Lib/Enotify.php:127 +#: ../../Zotlabs/Lib/Enotify.php:130 #, php-format msgid "%1$s sent you %2$s." msgstr "%1$s hat Dir %2$s geschickt." -#: ../../Zotlabs/Lib/Enotify.php:127 +#: ../../Zotlabs/Lib/Enotify.php:130 msgid "a private message" msgstr "eine private Nachricht" -#: ../../Zotlabs/Lib/Enotify.php:128 +#: ../../Zotlabs/Lib/Enotify.php:131 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten." -#: ../../Zotlabs/Lib/Enotify.php:141 +#: ../../Zotlabs/Lib/Enotify.php:144 msgid "commented on" msgstr "kommentierte" -#: ../../Zotlabs/Lib/Enotify.php:152 +#: ../../Zotlabs/Lib/Enotify.php:155 msgid "liked" msgstr "gefiel" -#: ../../Zotlabs/Lib/Enotify.php:155 +#: ../../Zotlabs/Lib/Enotify.php:158 msgid "disliked" msgstr "missfiel" -#: ../../Zotlabs/Lib/Enotify.php:198 +#: ../../Zotlabs/Lib/Enotify.php:201 #, php-format -msgid "%1$s, %2$s %3$s [zrl=%4$s]a %5$s[/zrl]" -msgstr "%1$s, %2$s %3$s [zrl=%4$s]ein %5$s[/zrl]" +msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" +msgstr "%1$s %2$s [zrl=%3$s]ein %4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:207 +#: ../../Zotlabs/Lib/Enotify.php:209 #, php-format -msgid "%1$s, %2$s %3$s [zrl=%4$s]%5$s's %6$s[/zrl]" -msgstr "%1$s, %2$s %3$s [zrl=%4$s]%5$s's %6$s[/zrl]" +msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" +msgstr "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:217 +#: ../../Zotlabs/Lib/Enotify.php:218 #, php-format -msgid "%1$s, %2$s %3$s [zrl=%4$s]your %5$s[/zrl]" -msgstr "%1$s, %2$s %3$s [zrl=%4$s]Dein %5$s[/zrl]" +msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" +msgstr "%1$s %2$s [zrl=%3$s]dein %4$s[/zrl]" #: ../../Zotlabs/Lib/Enotify.php:230 #, php-format @@ -8027,12 +8127,12 @@ msgstr "[$Projectname:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s #: ../../Zotlabs/Lib/Enotify.php:233 #, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." -msgstr "%1$s, %2$s hat eine Unterhaltung kommentiert, der Du folgst." +msgid "%1$s commented on an item/conversation you have been following." +msgstr "%1$shat einen Beitrag/eine Konversation kommentiert dem/der du folgst." -#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:318 -#: ../../Zotlabs/Lib/Enotify.php:335 ../../Zotlabs/Lib/Enotify.php:361 -#: ../../Zotlabs/Lib/Enotify.php:379 ../../Zotlabs/Lib/Enotify.php:393 +#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:317 +#: ../../Zotlabs/Lib/Enotify.php:333 ../../Zotlabs/Lib/Enotify.php:358 +#: ../../Zotlabs/Lib/Enotify.php:375 ../../Zotlabs/Lib/Enotify.php:388 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren." @@ -8044,152 +8144,150 @@ msgstr "Bitte besuche %s, um diesen Kommentar anzunehmen oder abzulehnen." #: ../../Zotlabs/Lib/Enotify.php:299 #, php-format -msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]" -msgstr "%1$s, %2$s gefällt [zrl=%3$s]dein %4$s[/zrl]" +msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]" +msgstr "%1$s mag [zrl=%2$s]dein %3$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:314 +#: ../../Zotlabs/Lib/Enotify.php:313 #, php-format msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s" msgstr "[$Projectname:Benachrichtigung] Gefällt mir in Unterhaltung #%1$d von %2$s erhalten" -#: ../../Zotlabs/Lib/Enotify.php:315 +#: ../../Zotlabs/Lib/Enotify.php:314 #, php-format -msgid "%1$s, %2$s liked an item/conversation you created." -msgstr "%1$s, %2$s gefällt ein Beitrag oder eine Unterhaltung von Dir" +msgid "%1$s liked an item/conversation you created." +msgstr "%1$sgefällt ein Beitrag/eine Unterhaltung von dir." -#: ../../Zotlabs/Lib/Enotify.php:326 +#: ../../Zotlabs/Lib/Enotify.php:325 #, php-format msgid "[$Projectname:Notify] %s posted to your profile wall" msgstr "[$Projectname:Benachrichtigung] %s schrieb auf Deine Pinnwand" -#: ../../Zotlabs/Lib/Enotify.php:328 +#: ../../Zotlabs/Lib/Enotify.php:327 #, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" -msgstr "%1$s, %2$s hat auf Deine Pinnwand auf %3$s geschrieben" +msgid "%1$s posted to your profile wall at %2$s" +msgstr "%1$shat etwas auf deiner Profilwand auf %2$sveröffentlicht" -#: ../../Zotlabs/Lib/Enotify.php:330 +#: ../../Zotlabs/Lib/Enotify.php:329 #, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" -msgstr "%1$s, %2$s hat auf [zrl=%3$s]Deine Pinnwand[/zrl] geschrieben" +msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" +msgstr "%1$s schrieb auf [zrl=%2$s]Deine Pinnwand[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:354 +#: ../../Zotlabs/Lib/Enotify.php:352 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "[$Projectname:Benachrichtigung] %s hat Dich erwähnt" -#: ../../Zotlabs/Lib/Enotify.php:355 +#: ../../Zotlabs/Lib/Enotify.php:353 #, php-format -msgid "%1$s, %2$s tagged you at %3$s" -msgstr "%1$s, %2$s hat Dich auf %3$s erwähnt" +msgid "%1$s tagged you at %2$s" +msgstr "%1$s hat dich auf %2$s getaggt" -#: ../../Zotlabs/Lib/Enotify.php:356 +#: ../../Zotlabs/Lib/Enotify.php:354 #, php-format -msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." -msgstr "%1$s, %2$s [zrl=%3$s]hat Dich erwähnt[/zrl]." +msgid "%1$s [zrl=%2$s]tagged you[/zrl]." +msgstr "%1$s hat [zrl=%2$s]Dich getagged[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:368 +#: ../../Zotlabs/Lib/Enotify.php:365 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "[$Projectname:Benachrichtigung] %1$s hat Dich angestupst" -#: ../../Zotlabs/Lib/Enotify.php:369 +#: ../../Zotlabs/Lib/Enotify.php:366 #, php-format -msgid "%1$s, %2$s poked you at %3$s" -msgstr "%1$s, %2$s hat Dich auf %3$s angestupst" +msgid "%1$s poked you at %2$s" +msgstr "%1$s hat dich auf %2$s angestupst" -#: ../../Zotlabs/Lib/Enotify.php:370 +#: ../../Zotlabs/Lib/Enotify.php:367 #, php-format -msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." -msgstr "%1$s, %2$s [zrl=%2$s]hat Dich angestupst[/zrl]." +msgid "%1$s [zrl=%2$s]poked you[/zrl]." +msgstr "%1$s [zrl=%2$s]hat dich angestupst.[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:386 +#: ../../Zotlabs/Lib/Enotify.php:382 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "[$Projectname:Benachrichtigung] %s hat Deinen Beitrag verschlagwortet" -#: ../../Zotlabs/Lib/Enotify.php:387 +#: ../../Zotlabs/Lib/Enotify.php:383 #, php-format -msgid "%1$s, %2$s tagged your post at %3$s" -msgstr "%1$s, %2$s hat Deinen Beitrag auf %3$s verschlagwortet" +msgid "%1$s tagged your post at %2$s" +msgstr "%1$s hat Deinen Beitrag auf %2$s getagged" -#: ../../Zotlabs/Lib/Enotify.php:388 +#: ../../Zotlabs/Lib/Enotify.php:384 #, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" -msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen Beitrag[/zrl] verschlagwortet" +msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" +msgstr "%1$s hat [zrl=%2$s]Deinen Beitrag[/zrl] getagged" -#: ../../Zotlabs/Lib/Enotify.php:400 +#: ../../Zotlabs/Lib/Enotify.php:395 msgid "[$Projectname:Notify] Introduction received" msgstr "[$Projectname:Benachrichtigung] Verbindungsanfrage erhalten" -#: ../../Zotlabs/Lib/Enotify.php:401 +#: ../../Zotlabs/Lib/Enotify.php:396 #, php-format -msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" -msgstr "%1$s, Du hast eine neue Verbindungsanfrage von '%2$s' auf %3$s erhalten" +msgid "You've received an new connection request from '%1$s' at %2$s" +msgstr "Du hast auf %2$s eine neue Verbindung von %1$s erhalten." -#: ../../Zotlabs/Lib/Enotify.php:402 +#: ../../Zotlabs/Lib/Enotify.php:397 #, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." -msgstr "%1$s, Du hast [zrl=%2$s]eine neue Verbindungsanfrage[/zrl] von %3$s erhalten." +msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s." +msgstr "Du hast [zrl=%1$s]eine neue Verbindungsanfrage[/zrl] von %2$s erhalten." -#: ../../Zotlabs/Lib/Enotify.php:406 ../../Zotlabs/Lib/Enotify.php:425 +#: ../../Zotlabs/Lib/Enotify.php:400 ../../Zotlabs/Lib/Enotify.php:418 #, php-format msgid "You may visit their profile at %s" msgstr "Du kannst Dir das Profil unter %s ansehen" -#: ../../Zotlabs/Lib/Enotify.php:408 +#: ../../Zotlabs/Lib/Enotify.php:402 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen." -#: ../../Zotlabs/Lib/Enotify.php:415 +#: ../../Zotlabs/Lib/Enotify.php:409 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "[$Projectname:Benachrichtigung] Freundschaftsvorschlag erhalten" -#: ../../Zotlabs/Lib/Enotify.php:416 +#: ../../Zotlabs/Lib/Enotify.php:410 #, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" -msgstr "%1$s, Du hast einen Kontaktvorschlag von „%2$s“ auf %3$s erhalten" +msgid "You've received a friend suggestion from '%1$s' at %2$s" +msgstr "Du hast einen Freundschaftsvorschlag von %1$s auf %2$s erhalten" -#: ../../Zotlabs/Lib/Enotify.php:417 +#: ../../Zotlabs/Lib/Enotify.php:411 #, php-format msgid "" -"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from " -"%4$s." -msgstr "%1$s, Du hast [zrl=%2$s]einen Kontaktvorschlag[/zrl] für %3$s von %4$s erhalten." +"You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." +msgstr "Du hast einen [zrl=%1$s]Freundschaftsvorschlag[/zrl] für %2$s von %3$s erhalten." -#: ../../Zotlabs/Lib/Enotify.php:423 +#: ../../Zotlabs/Lib/Enotify.php:416 msgid "Name:" msgstr "Name:" -#: ../../Zotlabs/Lib/Enotify.php:424 +#: ../../Zotlabs/Lib/Enotify.php:417 msgid "Photo:" msgstr "Foto:" -#: ../../Zotlabs/Lib/Enotify.php:427 +#: ../../Zotlabs/Lib/Enotify.php:420 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen." -#: ../../Zotlabs/Lib/Enotify.php:647 +#: ../../Zotlabs/Lib/Enotify.php:640 msgid "[$Projectname:Notify]" msgstr "[$Projectname:Benachrichtigung]" -#: ../../Zotlabs/Lib/Enotify.php:815 +#: ../../Zotlabs/Lib/Enotify.php:808 msgid "created a new post" msgstr "Neuer Beitrag wurde erzeugt" -#: ../../Zotlabs/Lib/Enotify.php:816 +#: ../../Zotlabs/Lib/Enotify.php:809 #, php-format msgid "commented on %s's post" msgstr "hat %s's Beitrag kommentiert" -#: ../../Zotlabs/Lib/Enotify.php:823 +#: ../../Zotlabs/Lib/Enotify.php:816 #, php-format msgid "edited a post dated %s" msgstr "hat einen Beitrag vom %s bearbeitet" -#: ../../Zotlabs/Lib/Enotify.php:827 +#: ../../Zotlabs/Lib/Enotify.php:820 #, php-format msgid "edited a comment dated %s" msgstr "hat einen Kommentar vom %s bearbeitet" @@ -8198,7 +8296,7 @@ msgstr "hat einen Kommentar vom %s bearbeitet" msgid "Wiki updated successfully" msgstr "Wiki erfolgreich aktualisiert" -#: ../../Zotlabs/Lib/NativeWiki.php:198 +#: ../../Zotlabs/Lib/NativeWiki.php:205 msgid "Wiki files deleted successfully" msgstr "Wiki-Dateien erfolgreich gelöscht" @@ -8272,11 +8370,11 @@ msgstr "Signatur nicht korrekt" msgid "Add Tag" msgstr "Tag hinzufügen" -#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:510 +#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575 msgid "like" msgstr "mag" -#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:511 +#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576 msgid "dislike" msgstr "verurteile" @@ -8369,51 +8467,51 @@ msgstr "Dies ist eine nicht gespeicherte Vorschau" msgid "%s show all" msgstr "%s mehr anzeigen" -#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/conversation.php:1377 +#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1380 msgid "Bold" msgstr "Fett" -#: ../../Zotlabs/Lib/ThreadItem.php:752 ../../include/conversation.php:1378 +#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1381 msgid "Italic" msgstr "Kursiv" -#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1379 +#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1382 msgid "Underline" msgstr "Unterstrichen" -#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1380 +#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1383 msgid "Quote" msgstr "Zitat" -#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1381 +#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1384 msgid "Code" msgstr "Code" -#: ../../Zotlabs/Lib/ThreadItem.php:756 +#: ../../Zotlabs/Lib/ThreadItem.php:758 msgid "Image" msgstr "Bild" -#: ../../Zotlabs/Lib/ThreadItem.php:757 +#: ../../Zotlabs/Lib/ThreadItem.php:759 msgid "Attach File" msgstr "Datei anhängen" -#: ../../Zotlabs/Lib/ThreadItem.php:758 +#: ../../Zotlabs/Lib/ThreadItem.php:760 msgid "Insert Link" msgstr "Link einfügen" -#: ../../Zotlabs/Lib/ThreadItem.php:759 +#: ../../Zotlabs/Lib/ThreadItem.php:761 msgid "Video" msgstr "Video" -#: ../../Zotlabs/Lib/ThreadItem.php:769 +#: ../../Zotlabs/Lib/ThreadItem.php:771 msgid "Your full name (required)" msgstr "Ihr vollständiger Name (erforderlich)" -#: ../../Zotlabs/Lib/ThreadItem.php:770 +#: ../../Zotlabs/Lib/ThreadItem.php:772 msgid "Your email address (required)" msgstr "Ihre E-Mail-Adresse (erforderlich)" -#: ../../Zotlabs/Lib/ThreadItem.php:771 +#: ../../Zotlabs/Lib/ThreadItem.php:773 msgid "Your website URL (optional)" msgstr "Ihre Webseiten-URL (optional)" @@ -8433,7 +8531,7 @@ msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich." msgid "parent" msgstr "Übergeordnetes Verzeichnis" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2821 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2845 msgid "Collection" msgstr "Sammlung" @@ -8466,6 +8564,10 @@ msgstr "Summe" msgid "Shared" msgstr "Geteilt" +#: ../../Zotlabs/Storage/Browser.php:277 +msgid "Add Files" +msgstr "Dateien hinzufügen" + #: ../../Zotlabs/Storage/Browser.php:353 #, php-format msgid "You are using %1$s of your available file storage." @@ -8573,10 +8675,10 @@ msgid "Select an addressbook to import to" msgstr "Adressbuch zum Hineinimportieren auswählen" #: ../../Zotlabs/Widget/Appcategories.php:40 -#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:97 -#: ../../include/contact_widgets.php:141 ../../include/contact_widgets.php:186 -#: ../../include/taxonomy.php:344 ../../include/taxonomy.php:426 -#: ../../include/taxonomy.php:446 ../../include/taxonomy.php:467 +#: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141 +#: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:409 +#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 +#: ../../include/taxonomy.php:532 msgid "Categories" msgstr "Kategorien" @@ -8631,7 +8733,7 @@ msgid "New Message" msgstr "Neue Nachricht" #: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1864 ../../include/conversation.php:1867 +#: ../../include/conversation.php:1867 ../../include/conversation.php:1870 #: ../../include/nav.php:434 ../../include/nav.php:437 msgid "Chatrooms" msgstr "Chaträume" @@ -8674,7 +8776,7 @@ msgstr "Adresse des Kanals eingeben" msgid "Examples: bob@example.com, https://example.com/barbara" msgstr "Beispiele: bob@beispiel.com, http://beispiel.com/barbara" -#: ../../Zotlabs/Widget/Wiki_list.php:15 ../../addon/gitwiki/gitwiki.php:95 +#: ../../Zotlabs/Widget/Wiki_list.php:15 msgid "Wiki List" msgstr "Wikiliste" @@ -8714,7 +8816,7 @@ msgstr "Foto/Bild" msgid "Remove term" msgstr "Eintrag löschen" -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:354 +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:381 msgid "Saved Searches" msgstr "Gespeicherte Suchanfragen" @@ -8727,15 +8829,15 @@ msgid "Notes" msgstr "Notizen" #: ../../Zotlabs/Widget/Wiki_pages.php:32 -#: ../../Zotlabs/Widget/Wiki_pages.php:89 ../../addon/gitwiki/gitwiki.php:81 +#: ../../Zotlabs/Widget/Wiki_pages.php:89 msgid "Add new page" msgstr "Neue Seite hinzufügen" -#: ../../Zotlabs/Widget/Wiki_pages.php:83 ../../addon/gitwiki/gitwiki.php:76 +#: ../../Zotlabs/Widget/Wiki_pages.php:83 msgid "Wiki Pages" msgstr "Wikiseiten" -#: ../../Zotlabs/Widget/Wiki_pages.php:94 ../../addon/gitwiki/gitwiki.php:82 +#: ../../Zotlabs/Widget/Wiki_pages.php:94 msgid "Page name" msgstr "Seitenname" @@ -8756,7 +8858,7 @@ msgid "See more..." msgstr "Mehr anzeigen …" #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:443 +#: ../../include/features.php:470 msgid "Saved Folders" msgstr "Gespeicherte Ordner" @@ -8764,51 +8866,60 @@ msgstr "Gespeicherte Ordner" msgid "Click to show more" msgstr "Klick, um mehr anzuzeigen" -#: ../../Zotlabs/Widget/Newmember.php:33 +#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320 +#: ../../include/taxonomy.php:449 ../../include/taxonomy.php:470 +msgid "Tags" +msgstr "Schlagwörter" + +#: ../../Zotlabs/Widget/Newmember.php:24 msgid "Profile Creation" msgstr "Profilerstellung" -#: ../../Zotlabs/Widget/Newmember.php:35 +#: ../../Zotlabs/Widget/Newmember.php:26 msgid "Upload profile photo" msgstr "Profilfoto hochladen" -#: ../../Zotlabs/Widget/Newmember.php:36 +#: ../../Zotlabs/Widget/Newmember.php:27 msgid "Upload cover photo" msgstr "Titelbild hochladen" -#: ../../Zotlabs/Widget/Newmember.php:37 ../../include/nav.php:119 +#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:119 msgid "Edit your profile" msgstr "Profil bearbeiten" -#: ../../Zotlabs/Widget/Newmember.php:40 +#: ../../Zotlabs/Widget/Newmember.php:31 msgid "Find and Connect with others" msgstr "Finden und Verbinden von/mit Anderen" -#: ../../Zotlabs/Widget/Newmember.php:44 +#: ../../Zotlabs/Widget/Newmember.php:33 +msgid "View the directory" +msgstr "Verzeichnis anzeigen" + +#: ../../Zotlabs/Widget/Newmember.php:35 msgid "Manage your connections" msgstr "Deine Verbindungen verwalten" -#: ../../Zotlabs/Widget/Newmember.php:47 +#: ../../Zotlabs/Widget/Newmember.php:38 msgid "Communicate" msgstr "Kommunizieren" -#: ../../Zotlabs/Widget/Newmember.php:49 +#: ../../Zotlabs/Widget/Newmember.php:40 msgid "View your channel homepage" msgstr "Deine Kanal-Startseite ansehen" -#: ../../Zotlabs/Widget/Newmember.php:50 +#: ../../Zotlabs/Widget/Newmember.php:41 msgid "View your network stream" msgstr "Deine Netzwerk-Aktivitäten ansehen" -#: ../../Zotlabs/Widget/Newmember.php:56 +#: ../../Zotlabs/Widget/Newmember.php:47 msgid "Documentation" msgstr "Dokumentation" -#: ../../Zotlabs/Widget/Newmember.php:67 -msgid "View public stream. Warning: not moderated" -msgstr "Öffentliche Beitragsaktivitäten ansehen. Warnung: Diese Inhalte sind nicht moderiert." +#: ../../Zotlabs/Widget/Newmember.php:58 +msgid "View public stream" +msgstr "Zeige öffentlichen Beitrags-Stream" -#: ../../Zotlabs/Widget/Newmember.php:71 +#: ../../Zotlabs/Widget/Newmember.php:62 ../../include/features.php:60 msgid "New Member Links" msgstr "Links für neue Mitglieder" @@ -8861,14 +8972,18 @@ msgid "Export channel" msgstr "Kanal exportieren" #: ../../Zotlabs/Widget/Settings_menu.php:84 -msgid "Connected apps" -msgstr "Verbundene Apps" +msgid "OAuth1 apps" +msgstr "OAuth1 Anwendungen" -#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:231 +#: ../../Zotlabs/Widget/Settings_menu.php:92 +msgid "OAuth2 apps" +msgstr "OAuth2 Anwendungen" + +#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240 msgid "Permission Groups" msgstr "Berechtigungsrollen" -#: ../../Zotlabs/Widget/Settings_menu.php:117 +#: ../../Zotlabs/Widget/Settings_menu.php:125 msgid "Premium Channel Settings" msgstr "Premium-Kanal-Einstellungen" @@ -9006,53 +9121,57 @@ msgstr "Du hast momentan keine Benachrichtigungen" msgid "Source channel not found." msgstr "Quellkanal nicht gefunden." -#: ../../boot.php:1562 +#: ../../boot.php:1569 msgid "Create an account to access services and applications" msgstr "Erstelle ein Konto, um auf Dienste und Anwendungen zugreifen zu können." -#: ../../boot.php:1581 ../../include/nav.php:111 ../../include/nav.php:140 +#: ../../boot.php:1588 ../../include/nav.php:111 ../../include/nav.php:140 #: ../../include/nav.php:159 msgid "Logout" msgstr "Abmelden" -#: ../../boot.php:1585 +#: ../../boot.php:1592 msgid "Login/Email" msgstr "Anmelden/E-Mail" -#: ../../boot.php:1586 +#: ../../boot.php:1593 msgid "Password" msgstr "Kennwort" -#: ../../boot.php:1587 +#: ../../boot.php:1594 msgid "Remember me" msgstr "Angaben speichern" -#: ../../boot.php:1590 +#: ../../boot.php:1597 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: ../../boot.php:2347 +#: ../../boot.php:2354 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "[$Projectname] Webseiten-SSL-Fehler für %s" -#: ../../boot.php:2352 +#: ../../boot.php:2359 msgid "Website SSL certificate is not valid. Please correct." msgstr "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben." -#: ../../boot.php:2468 +#: ../../boot.php:2475 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "[$Projectname] Cron-Jobs laufen nicht auf %s" -#: ../../boot.php:2473 +#: ../../boot.php:2480 msgid "Cron/Scheduled tasks not running." msgstr "Cron-Aufgaben laufen nicht." -#: ../../boot.php:2474 ../../include/datetime.php:232 +#: ../../boot.php:2481 ../../include/datetime.php:238 msgid "never" msgstr "Nie" +#: ../../store/[data]/smarty3/compiled/a0a1289f91f53b2c12e4e0b45ffe8291540ba895_0.file.cover_photo.tpl.php:123 +msgid "Cover Photo" +msgstr "Cover Foto" + #: ../../view/theme/redbasic_c/php/config.php:16 #: ../../view/theme/redbasic_c/php/config.php:19 #: ../../view/theme/redbasic/php/config.php:16 @@ -9295,6 +9414,10 @@ msgid "" " share their own locations with the group." msgstr "Erstelle ein neues Rendezvous und teile den Zugriffslink mit allen, die Du in die Gruppe einladen möchtest. Die, die den Link öffnen, werden Mitglieder des Rendezvous. Sie können die Standorte der anderen Mitglieder sehen, Marker zur Karte hinzufügen oder ihre eigenen Standorte mit der Gruppe teilen." +#: ../../addon/rendezvous/rendezvous.php:232 +msgid "You have no rendezvous. Press the button above to create a rendezvous!" +msgstr "Du hast kein Rendezvous. Drücke den Knopf oben, um ein Rendezvous zu erstellen!" + #: ../../addon/skeleton/skeleton.php:59 msgid "Some setting" msgstr "Einige Einstellungen" @@ -9307,30 +9430,30 @@ msgstr "Eine Einstellung" msgid "Skeleton Settings" msgstr "Skeleton Einstellungen" -#: ../../addon/gnusoc/gnusoc.php:247 +#: ../../addon/gnusoc/gnusoc.php:249 msgid "GNU-Social Protocol Settings updated." msgstr "GNU social Protokoll Einstellungen aktualisiert" -#: ../../addon/gnusoc/gnusoc.php:266 +#: ../../addon/gnusoc/gnusoc.php:268 msgid "" "The GNU-Social protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "Das GNU-Social-Protokoll unterstützt keine Server-unabhängigen Identitäten. Verbindungen, die Du mit diesem Netzwerk eingehst, können von anderen Orten (Klonen) dieses Kanals aus unerreichbar sein." -#: ../../addon/gnusoc/gnusoc.php:269 +#: ../../addon/gnusoc/gnusoc.php:271 msgid "Enable the GNU-Social protocol for this channel" msgstr "Aktiviere das GNU social Protokoll für diesen Kanal" -#: ../../addon/gnusoc/gnusoc.php:273 +#: ../../addon/gnusoc/gnusoc.php:275 msgid "GNU-Social Protocol Settings" msgstr "GNU social Protokoll Einstellungen" -#: ../../addon/gnusoc/gnusoc.php:464 +#: ../../addon/gnusoc/gnusoc.php:471 msgid "Follow" msgstr "Folgen" -#: ../../addon/gnusoc/gnusoc.php:467 +#: ../../addon/gnusoc/gnusoc.php:474 #, php-format msgid "%1$s is now following %2$s" msgstr "%1$s folgt nun %2$s" @@ -9376,7 +9499,7 @@ msgstr "Zurückkehren nach" msgid "Page to load after image selection." msgstr "Die Seite, die nach Auswahl eines Bildes geladen werden soll." -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1301 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1300 #: ../../include/nav.php:119 msgid "Edit Profile" msgstr "Profil bearbeiten" @@ -9437,7 +9560,7 @@ msgstr "Gezeichnet von: " #: ../../addon/openclipatar/openclipatar.php:182 #: ../../addon/openclipatar/openclipatar.php:194 msgid "Use this image" -msgstr "" +msgstr "Dieses Bild verwenden" #: ../../addon/openclipatar/openclipatar.php:192 msgid "Or select from a free OpenClipart.org image:" @@ -9610,7 +9733,7 @@ msgstr "Dreamwidth-Beitragseinstellungen" #: ../../addon/notifyadmin/notifyadmin.php:34 msgid "New registration" -msgstr "" +msgstr "Neue Registrierung" #: ../../addon/notifyadmin/notifyadmin.php:42 #, php-format @@ -9865,17 +9988,17 @@ msgstr "Geburtsdatum" msgid "OpenID protocol error. No ID returned." msgstr "OpenID-Protokollfehler. Keine Kennung zurückgegeben." -#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:290 +#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:300 msgid "Login failed." msgstr "Login fehlgeschlagen." #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1481 +#: ../../include/selectors.php:66 ../../include/channel.php:1480 msgid "Male" msgstr "Männlich" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1479 +#: ../../include/selectors.php:66 ../../include/channel.php:1478 msgid "Female" msgstr "Weiblich" @@ -10062,39 +10185,39 @@ msgstr "erkläre unsterbliche Liebe" msgid "declared undying love for" msgstr "erklärte unsterbliche Liebe" -#: ../../addon/diaspora/diaspora.php:778 +#: ../../addon/diaspora/diaspora.php:781 msgid "Diaspora Protocol Settings updated." msgstr "Diaspora Protokoll Einstellungen aktualisiert" -#: ../../addon/diaspora/diaspora.php:797 +#: ../../addon/diaspora/diaspora.php:800 msgid "" "The Diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "Das Diaspora-Protokoll unterstützt keine Server-unabhängigen Identitäten. Verbindungen, die Du mit diesem Netzwerk eingehst, können von anderen Orten (Klonen) dieses Kanals aus unerreichbar sein." -#: ../../addon/diaspora/diaspora.php:800 +#: ../../addon/diaspora/diaspora.php:803 msgid "Enable the Diaspora protocol for this channel" msgstr "Das Diaspora Protokoll für diesen Kanal aktivieren" -#: ../../addon/diaspora/diaspora.php:804 +#: ../../addon/diaspora/diaspora.php:807 msgid "Allow any Diaspora member to comment on your public posts" msgstr "Erlaube jedem Diaspora Nutzer deine öffentlichen Beiträge zu kommentieren" -#: ../../addon/diaspora/diaspora.php:808 +#: ../../addon/diaspora/diaspora.php:811 msgid "Prevent your hashtags from being redirected to other sites" msgstr "Verhindern, dass Deine Hashtags zu anderen Seiten umgeleitet werden" -#: ../../addon/diaspora/diaspora.php:812 +#: ../../addon/diaspora/diaspora.php:815 msgid "" "Sign and forward posts and comments with no existing Diaspora signature" msgstr "Signieren und Weiterleiten von Beiträgen und Kommentaren ohne vorhandene Diaspora-Signatur" -#: ../../addon/diaspora/diaspora.php:817 +#: ../../addon/diaspora/diaspora.php:820 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "Verfolgte Hashtags (Komma separierte Liste, ohne die #)" -#: ../../addon/diaspora/diaspora.php:822 +#: ../../addon/diaspora/diaspora.php:825 msgid "Diaspora Protocol Settings" msgstr "Diaspora Protokoll Einstellungen" @@ -10102,7 +10225,7 @@ msgstr "Diaspora Protokoll Einstellungen" msgid "No username found in import file." msgstr "Es wurde kein Nutzername in der importierten Datei gefunden." -#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:62 +#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:67 msgid "Unable to create a unique channel address. Import failed." msgstr "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Import ist fehlgeschlagen." @@ -10161,7 +10284,7 @@ msgstr "computergeneriertes Gesicht" #: ../../addon/gravatar/gravatar.php:127 msgid "retro arcade style face" -msgstr "" +msgstr "Gesicht im Retro-Arcade Stil" #: ../../addon/gravatar/gravatar.php:128 msgid "Hub default profile photo" @@ -10176,7 +10299,7 @@ msgid "" "Libravatar addon is installed, too. Please disable Libravatar addon or this " "Gravatar addon.
    The Libravatar addon will fall back to Gravatar if " "nothing was found at Libravatar." -msgstr "" +msgstr "Das Libravatar Addon ist ebenfalls installiert. Bitte deaktiviere entweder das Libreavatar oder das Gravatar Addon.
    Das Libravatar Addon verwendet als Notfalllösung Gravatar, sollte bei Libravatar kein Profilbild gefunden werden." #: ../../addon/gravatar/gravatar.php:150 #: ../../addon/msgfooter/msgfooter.php:46 ../../addon/xmpp/xmpp.php:91 @@ -10189,7 +10312,7 @@ msgstr "Standard-Avatarbild" #: ../../addon/gravatar/gravatar.php:151 msgid "Select default avatar image if none was found at Gravatar. See README" -msgstr "" +msgstr "Wähle das Standardprofilbild aus, sollte bei Gravatar keines gefunden werden. Beachte auch die README." #: ../../addon/gravatar/gravatar.php:152 msgid "Rating of images" @@ -10197,7 +10320,7 @@ msgstr "Bewertungen der Bilder" #: ../../addon/gravatar/gravatar.php:152 msgid "Select the appropriate avatar rating for your site. See README" -msgstr "" +msgstr "Wähle die für deine Seite angemessene Profilbildeinstufung. Beachte auch die README." #: ../../addon/gravatar/gravatar.php:165 msgid "Gravatar settings updated." @@ -10217,11 +10340,11 @@ msgstr "Basis-URL des Habzilla-Servers" #: ../../addon/hzfiles/hzfiles.php:82 msgid "Since modified date yyyy-mm-dd" -msgstr "" +msgstr "Seit Modifizierungsdatum yyyy-mm-dd" #: ../../addon/hzfiles/hzfiles.php:83 msgid "Until modified date yyyy-mm-dd" -msgstr "" +msgstr "Bis Modifizierungsdatum yyyy-mm-dd" #: ../../addon/visage/visage.php:93 msgid "Recent Channel/Profile Viewers" @@ -10337,6 +10460,32 @@ msgstr "Binde eine Markierung auf der Karte ein." msgid "text to include in all outgoing posts from this site" msgstr "Test der in alle Beiträge angefügt werden soll, die von dieser Seite ausgehen" +#: ../../addon/fuzzloc/fuzzloc.php:148 +msgid "Fuzzloc Settings updated." +msgstr "Fuzzloc-Einstellungen aktualisiert." + +#: ../../addon/fuzzloc/fuzzloc.php:175 +msgid "" +"Fuzzloc allows you to blur your precise location if your channel uses " +"browser location mapping." +msgstr "Fuzzloc erlaubt es Dir, deinen genauen Standort etwas diffuser zu machen (nicht so exakt wie ermittelt), wenn Dein Kanal die Lokalisierungsfunktion des Browsers verwendet." + +#: ../../addon/fuzzloc/fuzzloc.php:178 +msgid "Enable Fuzzloc Plugin" +msgstr "Aktiviere das Fuzzloc-Plugin" + +#: ../../addon/fuzzloc/fuzzloc.php:182 +msgid "Minimum offset in meters" +msgstr "Minimale Verschiebung in Metern" + +#: ../../addon/fuzzloc/fuzzloc.php:186 +msgid "Maximum offset in meters" +msgstr "Maximale Verschiebung in Metern" + +#: ../../addon/fuzzloc/fuzzloc.php:191 +msgid "Fuzzloc Settings" +msgstr "Fuzzloc-Einstellungen" + #: ../../addon/rtof/rtof.php:45 msgid "Post to Friendica" msgstr "Bei Friendica veröffentlichen" @@ -10373,8 +10522,8 @@ msgstr "Friendica-Passwort" msgid "Hubzilla to Friendica Post Settings" msgstr "Hubzilla-zu-Friendica Beitragseinstellungen" -#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1397 -#: ../../include/channel.php:1568 +#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1396 +#: ../../include/channel.php:1567 msgid "Status:" msgstr "Status:" @@ -10436,8 +10585,8 @@ msgid "No channels currently blocked" msgstr "Momentan sind keine Kanäle blockiert" #: ../../addon/superblock/superblock.php:120 -msgid "\"Superblock\" Settings" -msgstr "\"Superblock\"-Einstellungen" +msgid "Superblock Settings" +msgstr "Superblock Einstellungen" #: ../../addon/superblock/superblock.php:345 msgid "Block Completely" @@ -10469,7 +10618,7 @@ msgstr "NoFed-Einstellungen" #: ../../addon/redred/redred.php:45 msgid "Post to Red" -msgstr "" +msgstr "Beitrag bei Red veröffentlichen" #: ../../addon/redred/redred.php:60 msgid "Channel is required." @@ -10485,7 +10634,7 @@ msgstr "Erlaube die Veröffentlichung in anderen Hubzilla Kanälen" #: ../../addon/redred/redred.php:99 msgid "Send public postings to Hubzilla channel by default" -msgstr "" +msgstr "Sende öffentliche Beiträge standardmäßig an den Hubzilla Kanal" #: ../../addon/redred/redred.php:103 msgid "Hubzilla API Path" @@ -10519,55 +10668,55 @@ msgstr "zu erreichende Logdateigröße in Bytes, bevor rotiert wird" msgid "Number of logfiles to retain" msgstr "Anzahl aufzubewahrender rotierter Logdateien" -#: ../../addon/frphotos/frphotos.php:91 +#: ../../addon/frphotos/frphotos.php:92 msgid "Friendica Photo Album Import" msgstr "Friendica-Fotoalbumimport" -#: ../../addon/frphotos/frphotos.php:92 +#: ../../addon/frphotos/frphotos.php:93 msgid "This will import all your Friendica photo albums to this Red channel." msgstr "Hiermit werden all deine Fotoalben von Friendica in diesen Hubzilla Kanal importiert." -#: ../../addon/frphotos/frphotos.php:93 +#: ../../addon/frphotos/frphotos.php:94 msgid "Friendica Server base URL" msgstr "BasisURL des Friendica Servers" -#: ../../addon/frphotos/frphotos.php:94 +#: ../../addon/frphotos/frphotos.php:95 msgid "Friendica Login Username" msgstr "Friendica-Anmeldebenutzername" -#: ../../addon/frphotos/frphotos.php:95 +#: ../../addon/frphotos/frphotos.php:96 msgid "Friendica Login Password" msgstr "Friendica-Anmeldepasswort" -#: ../../addon/pubcrawl/as.php:1101 ../../addon/pubcrawl/as.php:1228 -#: ../../addon/pubcrawl/as.php:1403 ../../include/network.php:1774 +#: ../../addon/pubcrawl/as.php:1146 ../../addon/pubcrawl/as.php:1273 +#: ../../addon/pubcrawl/as.php:1449 ../../include/network.php:1769 msgid "ActivityPub" msgstr "ActivityPub" -#: ../../addon/pubcrawl/pubcrawl.php:1034 +#: ../../addon/pubcrawl/pubcrawl.php:1053 msgid "ActivityPub Protocol Settings updated." msgstr "ActivityPub Protokoll Einstellungen aktualisiert" -#: ../../addon/pubcrawl/pubcrawl.php:1043 +#: ../../addon/pubcrawl/pubcrawl.php:1062 msgid "" "The ActivityPub protocol does not support location independence. Connections" " you make within that network may be unreachable from alternate channel " "locations." -msgstr "" +msgstr "Das ActivityPub-Protokoll unterstützt keine Server-unabhängigen Identitäten. Verbindungen, die Du mit diesem Netzwerk eingehst, können von anderen Orten (Klonen) dieses Kanals aus unerreichbar sein." -#: ../../addon/pubcrawl/pubcrawl.php:1046 +#: ../../addon/pubcrawl/pubcrawl.php:1065 msgid "Enable the ActivityPub protocol for this channel" msgstr "Aktiviere das ActivityPub Protokoll für diesen Kanal" -#: ../../addon/pubcrawl/pubcrawl.php:1049 +#: ../../addon/pubcrawl/pubcrawl.php:1068 msgid "Send multi-media HTML articles" msgstr "Multimedia HTML Artikel versenden" -#: ../../addon/pubcrawl/pubcrawl.php:1049 +#: ../../addon/pubcrawl/pubcrawl.php:1068 msgid "Not supported by some microblog services such as Mastodon" msgstr "Wird von einigen Microblogging-Plattformen wie Mastodon nicht unterstützt" -#: ../../addon/pubcrawl/pubcrawl.php:1053 +#: ../../addon/pubcrawl/pubcrawl.php:1072 msgid "ActivityPub Protocol Settings" msgstr "ActivityPub Protokoll Einstellungen" @@ -10810,11 +10959,11 @@ msgid "" "There are preconfigured OAuth key pairs for some GNU social servers " "available. If you are using one of them, please use these credentials.
    If not feel free to connect to any other GNU social instance (see below)." -msgstr "" +msgstr "Für einige GNU social Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel.
    Falls nicht, stelle stattdessen eine Verbindung zu irgend einem anderen GNU social Server her (siehe unten)." #: ../../addon/statusnet/statusnet.php:327 msgid "Provide your own OAuth Credentials" -msgstr "" +msgstr "Stelle deine eigenen OAuth Credentials zur Verfügung" #: ../../addon/statusnet/statusnet.php:329 msgid "" @@ -10823,7 +10972,7 @@ msgid "" "here and enter the API base root.
    Before you register your own OAuth " "key pair ask the administrator if there is already a key pair for this " "Hubzilla installation at your favourite GNU social installation." -msgstr "" +msgstr "Kein Consumer-Schlüsselpaar für GNU social gefunden. Registriere deinen Hubzilla-Account als Desktop-Client bei deinem GNU social Account, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.
    Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Hubzilla-Servers, ob schon ein Schlüsselpaar für diesen Hubzilla-Server auf diesem GNU social-Server existiert." #: ../../addon/statusnet/statusnet.php:333 msgid "OAuth Consumer Key" @@ -10851,7 +11000,7 @@ msgid "" "security code from GNU social which you have to copy into the input box " "below and submit the form. Only your public posts will be " "posted to GNU social." -msgstr "" +msgstr "Um dich mit deinem GNU social Konto zu verbinden, klicke den Button unten und kopiere dann den Sicherheitscode von GNU social in das Formular weiter unten. Es werden ausschließlich deine öffentlichen Beiträge auf GNU social veröffentlicht." #: ../../addon/statusnet/statusnet.php:370 msgid "Log in with GNU social" @@ -10883,7 +11032,7 @@ msgid "" "details from unknown viewers?) the link potentially included in public " "postings relayed to GNU social will lead the visitor to a blank page " "informing the visitor that the access to your profile has been restricted." -msgstr "" +msgstr "Hinweis: Entsprechend Deiner Privatsphären-Einstellungen (Profil-Details vor nicht angemeldeten Besuchern verbergen?) kann ein ggf. zu GNU social geteilter Link in öffentlichen Beiträgen Besucher auf eine leere Seite führen, die darüber informiert, dass der Zugriff zu Deinem Profil eingeschränkt ist." #: ../../addon/statusnet/statusnet.php:411 msgid "Allow posting to GNU social" @@ -10951,13 +11100,13 @@ msgstr "Du musst einen Gegner wählen, der nicht du selbst ist" #: ../../addon/chess/chess.php:444 msgid "Random color chosen." -msgstr "" +msgstr "Zufällige Farbe gewählt." #: ../../addon/chess/chess.php:452 msgid "Error creating new game." msgstr "Fehler beim Erstellen eines neuen Spiels." -#: ../../addon/chess/chess.php:486 ../../include/channel.php:1152 +#: ../../addon/chess/chess.php:486 ../../include/channel.php:1151 msgid "Requested channel is not available." msgstr "Angeforderter Kanal nicht verfügbar." @@ -11020,11 +11169,11 @@ msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twi #: ../../addon/twitter/twitter.php:247 msgid "Twitter post length" -msgstr "" +msgstr "Länge von Twitter Beiträgen" #: ../../addon/twitter/twitter.php:247 msgid "Maximum tweet length" -msgstr "" +msgstr "Maximale Länge eines Tweets" #: ../../addon/twitter/twitter.php:252 msgid "Send public postings to Twitter by default" @@ -11052,6 +11201,78 @@ msgstr "Verstecke die Schaltfläche und zeige die Smilies direkt an." msgid "Smileybutton Settings" msgstr "Smileyknopf-Einstellungen" +#: ../../addon/cart/myshop.php:138 +msgid "Order Not Found" +msgstr "Bestellung nicht gefunden" + +#: ../../addon/cart/cart.php:810 +msgid "Order cannot be checked out." +msgstr "Bestellvorgang kann nicht fortgesetzt werden." + +#: ../../addon/cart/cart.php:1073 +msgid "Enable Shopping Cart" +msgstr "Aktiviere die Warenkorb-Funktion." + +#: ../../addon/cart/cart.php:1080 +msgid "Enable Test Catalog" +msgstr "Aktiviere den Test-Warenbestand" + +#: ../../addon/cart/cart.php:1088 +msgid "Enable Manual Payments" +msgstr "Aktiviere manuelle Zahlungen" + +#: ../../addon/cart/cart.php:1103 +msgid "Base Cart Settings" +msgstr "Warenkorb-Grundeinstellungen" + +#: ../../addon/cart/cart.php:1151 +msgid "Add Item" +msgstr "Füge den Artikel hinzu" + +#: ../../addon/cart/cart.php:1165 +msgid "Call cart_post_" +msgstr "" + +#: ../../addon/cart/cart.php:1195 +msgid "Cart Not Enabled (profile: " +msgstr "" + +#: ../../addon/cart/cart.php:1226 ../../addon/cart/manual_payments.php:36 +msgid "Order not found." +msgstr "Bestellung nicht gefunden." + +#: ../../addon/cart/cart.php:1262 ../../addon/cart/cart.php:1389 +msgid "No Order Found" +msgstr "Keine Bestellung gefunden" + +#: ../../addon/cart/cart.php:1270 +msgid "call: " +msgstr "" + +#: ../../addon/cart/cart.php:1273 +msgid "An unknown error has occurred Please start again." +msgstr "Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal." + +#: ../../addon/cart/cart.php:1414 +msgid "Invalid Payment Type. Please start again." +msgstr "Unbekannte Zahlungsmethode. Bitte versuche es noch einmal." + +#: ../../addon/cart/cart.php:1421 +msgid "Order not found" +msgstr "Bestellung nicht gefunden" + +#: ../../addon/cart/manual_payments.php:9 +msgid "Error: order mismatch. Please try again." +msgstr "Fehler: Bestellungen stimmen nicht überein. Bitte versuche es noch einmal." + +#: ../../addon/cart/manual_payments.php:29 +msgid "Manual payments are not enabled." +msgstr "Manuelle Zahlungen sind nicht aktiviert." + +#: ../../addon/cart/manual_payments.php:44 +msgid "Finished" +msgstr "Fertig" + #: ../../addon/piwik/piwik.php:85 msgid "" "This website is tracked using the     Piwik " @@ -11096,156 +11317,156 @@ msgstr "Ermögliche Frontend-JavaScript-Fehlertracking" msgid "This feature requires Piwik >= 2.2.0" msgstr "Diese Funktion erfordert Piwik >= 2.2.0" -#: ../../addon/tour/tour.php:75 +#: ../../addon/tour/tour.php:76 msgid "Edit your profile and change settings." msgstr "Bearbeite dein Profil und ändere die Einstellungen." -#: ../../addon/tour/tour.php:76 +#: ../../addon/tour/tour.php:77 msgid "Click here to see activity from your connections." msgstr "Klicke hier, um die Aktivitäten Deiner Verbindungen zu sehen." -#: ../../addon/tour/tour.php:77 +#: ../../addon/tour/tour.php:78 msgid "Click here to see your channel home." msgstr "Klicke hier, um Deine Kanal-Hauptseite zu sehen." -#: ../../addon/tour/tour.php:78 +#: ../../addon/tour/tour.php:79 msgid "You can access your private messages from here." msgstr "Hierüber kannst Du auf Deine privaten Nachrichten zugreifen." -#: ../../addon/tour/tour.php:79 +#: ../../addon/tour/tour.php:80 msgid "Create new events here." msgstr "Neue Termine hier erstellen" -#: ../../addon/tour/tour.php:80 +#: ../../addon/tour/tour.php:81 msgid "" "You can accept new connections and change permissions for existing ones " "here. You can also e.g. create groups of contacts." msgstr "Du kannst hier neue Verbindungen akzeptieren sowie die Einstellungen bereits vorhandener Vebindungen bearbeiten. Außerdem kannst Du Verbindungen in Gruppen zusammenfassen." -#: ../../addon/tour/tour.php:81 +#: ../../addon/tour/tour.php:82 msgid "System notifications will arrive here" msgstr "Systembenachrichtigungen werden hier eintreffen" -#: ../../addon/tour/tour.php:82 +#: ../../addon/tour/tour.php:83 msgid "Search for content and users" msgstr "Nach Inhalt von Benutzern suchen" -#: ../../addon/tour/tour.php:83 +#: ../../addon/tour/tour.php:84 msgid "Browse for new contacts" msgstr "Schaue nach möglichen neuen Verbindungen." -#: ../../addon/tour/tour.php:84 +#: ../../addon/tour/tour.php:85 msgid "Launch installed apps" msgstr "Installierte Apps starten" -#: ../../addon/tour/tour.php:85 +#: ../../addon/tour/tour.php:86 msgid "Looking for help? Click here." msgstr "Du benötigst Hilfe? Klicke hier." -#: ../../addon/tour/tour.php:86 +#: ../../addon/tour/tour.php:87 msgid "" "New events have occurred in your network. Click here to see what has " "happened!" msgstr "In Deinem Netzwerk gibt es neue Ereignisse. Klicke hier, um zu sehen, was passiert ist!" -#: ../../addon/tour/tour.php:87 +#: ../../addon/tour/tour.php:88 msgid "You have received a new private message. Click here to see from who!" msgstr "Du hast eine neue private Nachricht erhalten. Klicke hier, um zu sehen, von wem!" -#: ../../addon/tour/tour.php:88 +#: ../../addon/tour/tour.php:89 msgid "There are events this week. Click here too see which!" msgstr "Es gibt neue Termine diese Woche. Klicke hier, um zu sehen, welche!" -#: ../../addon/tour/tour.php:89 +#: ../../addon/tour/tour.php:90 msgid "You have received a new introduction. Click here to see who!" msgstr "Du hast eine neue Verbindungsanfrage erhalten. Klicke hier, um zu sehen, wer es ist!" -#: ../../addon/tour/tour.php:90 +#: ../../addon/tour/tour.php:91 msgid "" "There is a new system notification. Click here to see what has happened!" msgstr "Es gibt eine neue Systembenachrichtigung. Klicke hier, um zu sehen, was passiert ist!" -#: ../../addon/tour/tour.php:93 +#: ../../addon/tour/tour.php:94 msgid "Click here to share text, images, videos and sound." msgstr "Klicke hier, um Texte, Bilder, Videos und Klänge zu teilen." -#: ../../addon/tour/tour.php:94 +#: ../../addon/tour/tour.php:95 msgid "You can write an optional title for your update (good for long posts)." msgstr "Du kannst Deinem Beitrag einen optionalen Titel geben (gut für lange Beiträge)." -#: ../../addon/tour/tour.php:95 +#: ../../addon/tour/tour.php:96 msgid "Entering some categories here makes it easier to find your post later." msgstr "Ein paar Kategorien hier einzugeben, macht es leichter, Deinen Beitrag später wiederzufinden." -#: ../../addon/tour/tour.php:96 +#: ../../addon/tour/tour.php:97 msgid "Share photos, links, location, etc." msgstr "Teile Photos, Links, Standort, usw." -#: ../../addon/tour/tour.php:97 +#: ../../addon/tour/tour.php:98 msgid "" "Only want to share content for a while? Make it expire at a certain date." msgstr "Du möchtest diesen Inhalt nur für eine Weile teilen? Dann lass ihn zu einem bestimmten Datum ablaufen." -#: ../../addon/tour/tour.php:98 +#: ../../addon/tour/tour.php:99 msgid "You can password protect content." msgstr "Du kannst Inhalte mit einem Passwort schützen." -#: ../../addon/tour/tour.php:99 +#: ../../addon/tour/tour.php:100 msgid "Choose who you share with." msgstr "Wähle aus, mit wem Du teilen möchtest." -#: ../../addon/tour/tour.php:101 +#: ../../addon/tour/tour.php:102 msgid "Click here when you are done." msgstr "Klicke hier, wenn Du fertig bist." -#: ../../addon/tour/tour.php:104 +#: ../../addon/tour/tour.php:105 msgid "Adjust from which channels posts should be displayed." msgstr "Lege fest, von welchen Kanälen Beiträge angezeigt werden sollen." -#: ../../addon/tour/tour.php:105 +#: ../../addon/tour/tour.php:106 msgid "Only show posts from channels in the specified privacy group." msgstr "Zeige nur Beträge von Kanälen, die in einer bestimmten Gruppe sind." -#: ../../addon/tour/tour.php:109 +#: ../../addon/tour/tour.php:110 msgid "Easily find posts containing tags (keywords preceded by the \"#\" symbol)." msgstr "Finde Beiträge, die bestimmte Tags enthalten (Stichworte, die mit dem \"#\"-Symbol beginnen)." -#: ../../addon/tour/tour.php:110 +#: ../../addon/tour/tour.php:111 msgid "Easily find posts in given category." msgstr "Finde Beiträge in bestimmten Kategorien." -#: ../../addon/tour/tour.php:111 +#: ../../addon/tour/tour.php:112 msgid "Easily find posts by date." msgstr "Finde Beiträge anhand des Datums." -#: ../../addon/tour/tour.php:112 +#: ../../addon/tour/tour.php:113 msgid "" "Suggested users who have volounteered to be shown as suggestions, and who we" " think you might find interesting." msgstr "Vorgeschlagene Kanäle, die in ihren Einstellungen zugestimmt haben, als Vorschläge angezeigt zu werden, und die Du eventuell interessant finden könntest." -#: ../../addon/tour/tour.php:113 +#: ../../addon/tour/tour.php:114 msgid "Here you see channels you have connected to." msgstr "Hier siehst du die Kanäle, mit denen Du verbunden bist." -#: ../../addon/tour/tour.php:114 +#: ../../addon/tour/tour.php:115 msgid "Save your search so you can repeat it at a later date." msgstr "Speichere Deine Suche, so dass Du sie später leicht erneut durchführen kannst." -#: ../../addon/tour/tour.php:117 +#: ../../addon/tour/tour.php:118 msgid "" "If you see this icon you can be sure that the sender is who it say it is. It" " is normal that it is not always possible to verify the sender, so the icon " "will be missing sometimes. There is usually no need to worry about that." msgstr "Wenn Du dieses Symbol siehst, kannst Du weitgehend sicher sein, dass der Ansender dem angegebenen entspricht. Nicht immer ist es möglich, den Absender zu verifizieren, daher fehlt das Symbol mitunter. Das ist aber in der Regel kein Grund zur Sorge." -#: ../../addon/tour/tour.php:118 +#: ../../addon/tour/tour.php:119 msgid "" "Danger! It seems someone tried to forge a message! This message is not " "necessarily from who it says it is from!" msgstr "Vorsicht! Es kann sein, dass jemand versucht, eine Nachricht zu fälschen! Diese Nachricht muss nicht unbedingt vom angegebenen Absender stammen!" -#: ../../addon/tour/tour.php:125 +#: ../../addon/tour/tour.php:126 msgid "" "Welcome to Hubzilla! Would you like to see a tour of the UI?

    You can " "pause it at any time and continue where you left off by reloading the page, " @@ -11466,7 +11687,7 @@ msgid "" "If enabled, members will automatically login to an ejabberd server that has " "to be installed on this machine with synchronized credentials via the " "\"auth_ejabberd.php\" script." -msgstr "" +msgstr "Wenn aktiviert, werden die Mitglieder automatisch auf dem EJabber Server, der auf dieser Maschine installiert ist, angemeldet und die Zugangsdaten werden über das \"auth_ejabberd.php\"-Script synchronisiert." #: ../../addon/wholikesme/wholikesme.php:29 msgid "Who likes me?" @@ -11478,7 +11699,7 @@ msgstr "Du bist nun bei pumpio authenzifiziert." #: ../../addon/pumpio/pumpio.php:149 msgid "return to the featured settings page" -msgstr "" +msgstr "Zur Funktions-Einstellungsseite zurückkehren" #: ../../addon/pumpio/pumpio.php:163 msgid "Post to Pump.io" @@ -11557,7 +11778,7 @@ msgstr "$Projectname suchen" #: ../../addon/redfiles/redfiles.php:119 msgid "Redmatrix File Storage Import" -msgstr "" +msgstr "Import des Redmatrix Datei Speichers" #: ../../addon/redfiles/redfiles.php:120 msgid "This will import all your Redmatrix cloud files to this channel." @@ -11644,11 +11865,11 @@ msgstr "Transsexuell" msgid "Hermaphrodite" msgstr "Zwitter" -#: ../../include/selectors.php:49 ../../include/channel.php:1485 +#: ../../include/selectors.php:49 ../../include/channel.php:1484 msgid "Neuter" msgstr "Geschlechtslos" -#: ../../include/selectors.php:49 ../../include/channel.php:1487 +#: ../../include/selectors.php:49 ../../include/channel.php:1486 msgid "Non-specific" msgstr "unklar" @@ -11894,10 +12115,6 @@ msgstr "Unterhaltung folgen" msgid "Unfollow Thread" msgstr "Unterhaltung nicht mehr folgen" -#: ../../include/conversation.php:1042 -msgid "Activity/Posts" -msgstr "Aktivitäten/Beiträge" - #: ../../include/conversation.php:1062 msgid "Edit Connection" msgstr "Verbindung bearbeiten" @@ -11959,175 +12176,175 @@ msgstr "Standort" msgid "Clear browser location" msgstr "Browser-Standort löschen" -#: ../../include/conversation.php:1314 +#: ../../include/conversation.php:1316 msgid "Tag term:" msgstr "Schlagwort:" -#: ../../include/conversation.php:1315 +#: ../../include/conversation.php:1317 msgid "Where are you right now?" msgstr "Wo bist Du jetzt grade?" -#: ../../include/conversation.php:1320 +#: ../../include/conversation.php:1322 msgid "Choose a different album..." msgstr "Wählen Sie ein anderes Album aus..." -#: ../../include/conversation.php:1324 +#: ../../include/conversation.php:1326 msgid "Comments enabled" msgstr "Kommentare aktiviert" -#: ../../include/conversation.php:1325 +#: ../../include/conversation.php:1327 msgid "Comments disabled" msgstr "Kommentare deaktiviert" -#: ../../include/conversation.php:1372 +#: ../../include/conversation.php:1375 msgid "Page link name" msgstr "Link zur Seite" -#: ../../include/conversation.php:1375 +#: ../../include/conversation.php:1378 msgid "Post as" msgstr "Veröffentlichen als" -#: ../../include/conversation.php:1389 +#: ../../include/conversation.php:1392 msgid "Toggle voting" msgstr "Umfragewerkzeug aktivieren" -#: ../../include/conversation.php:1392 +#: ../../include/conversation.php:1395 msgid "Disable comments" msgstr "Kommentare deaktivieren" -#: ../../include/conversation.php:1393 +#: ../../include/conversation.php:1396 msgid "Toggle comments" msgstr "Kommentare umschalten" -#: ../../include/conversation.php:1401 +#: ../../include/conversation.php:1404 msgid "Categories (optional, comma-separated list)" msgstr "Kategorien (optional, kommagetrennte Liste)" -#: ../../include/conversation.php:1424 +#: ../../include/conversation.php:1427 msgid "Other networks and post services" msgstr "Andere Netzwerke und Platformen" -#: ../../include/conversation.php:1430 +#: ../../include/conversation.php:1433 msgid "Set publish date" msgstr "Veröffentlichungsdatum festlegen" -#: ../../include/conversation.php:1690 +#: ../../include/conversation.php:1693 msgid "Commented Order" msgstr "Neueste Kommentare" -#: ../../include/conversation.php:1693 +#: ../../include/conversation.php:1696 msgid "Sort by Comment Date" msgstr "Nach Kommentardatum sortiert" -#: ../../include/conversation.php:1697 +#: ../../include/conversation.php:1700 msgid "Posted Order" msgstr "Neueste Beiträge" -#: ../../include/conversation.php:1700 +#: ../../include/conversation.php:1703 msgid "Sort by Post Date" msgstr "Nach Beitragsdatum sortiert" -#: ../../include/conversation.php:1708 +#: ../../include/conversation.php:1711 msgid "Posts that mention or involve you" msgstr "Beiträge mit Beteiligung Deinerseits" -#: ../../include/conversation.php:1717 +#: ../../include/conversation.php:1720 msgid "Activity Stream - by date" msgstr "Activity Stream – nach Datum sortiert" -#: ../../include/conversation.php:1723 +#: ../../include/conversation.php:1726 msgid "Starred" msgstr "Markiert" -#: ../../include/conversation.php:1726 +#: ../../include/conversation.php:1729 msgid "Favourite Posts" msgstr "Markierte Beiträge" -#: ../../include/conversation.php:1733 +#: ../../include/conversation.php:1736 msgid "Spam" msgstr "Spam" -#: ../../include/conversation.php:1736 +#: ../../include/conversation.php:1739 msgid "Posts flagged as SPAM" msgstr "Nachrichten, die als SPAM markiert wurden" -#: ../../include/conversation.php:1811 ../../include/nav.php:381 +#: ../../include/conversation.php:1814 ../../include/nav.php:381 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" -#: ../../include/conversation.php:1824 ../../include/nav.php:394 +#: ../../include/conversation.php:1827 ../../include/nav.php:394 msgid "Profile Details" msgstr "Profil-Details" -#: ../../include/conversation.php:1834 ../../include/nav.php:404 -#: ../../include/photos.php:655 +#: ../../include/conversation.php:1837 ../../include/nav.php:404 +#: ../../include/photos.php:666 msgid "Photo Albums" msgstr "Fotoalben" -#: ../../include/conversation.php:1842 ../../include/nav.php:412 +#: ../../include/conversation.php:1845 ../../include/nav.php:412 msgid "Files and Storage" msgstr "Dateien und Speicher" -#: ../../include/conversation.php:1879 ../../include/nav.php:447 +#: ../../include/conversation.php:1882 ../../include/nav.php:447 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../../include/conversation.php:1882 ../../include/nav.php:450 +#: ../../include/conversation.php:1885 ../../include/nav.php:450 msgid "Saved Bookmarks" msgstr "Gespeicherte Lesezeichen" -#: ../../include/conversation.php:1893 ../../include/nav.php:461 +#: ../../include/conversation.php:1896 ../../include/nav.php:461 msgid "View Cards" msgstr "Karten anzeigen" -#: ../../include/conversation.php:1901 +#: ../../include/conversation.php:1904 msgid "articles" msgstr "Artikel" -#: ../../include/conversation.php:1904 ../../include/nav.php:472 +#: ../../include/conversation.php:1907 ../../include/nav.php:472 msgid "View Articles" msgstr "Artikel anzeigen" -#: ../../include/conversation.php:1915 ../../include/nav.php:484 +#: ../../include/conversation.php:1918 ../../include/nav.php:484 msgid "View Webpages" msgstr "Webseiten anzeigen" -#: ../../include/conversation.php:1984 +#: ../../include/conversation.php:1987 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "Zusage" msgstr[1] "Zusagen" -#: ../../include/conversation.php:1987 +#: ../../include/conversation.php:1990 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "Absage" msgstr[1] "Absagen" -#: ../../include/conversation.php:1990 +#: ../../include/conversation.php:1993 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] " Unentschlossen" msgstr[1] "Unentschlossene" -#: ../../include/conversation.php:1993 +#: ../../include/conversation.php:1996 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "Zustimmung" msgstr[1] "Zustimmungen" -#: ../../include/conversation.php:1996 +#: ../../include/conversation.php:1999 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "Ablehnung" msgstr[1] "Ablehnungen" -#: ../../include/conversation.php:1999 +#: ../../include/conversation.php:2002 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -12155,12 +12372,16 @@ msgstr "Nur dieser Hub" msgid "%1$s's bookmarks" msgstr "%1$ss Lesezeichen" -#: ../../include/import.php:41 +#: ../../include/import.php:25 +msgid "Unable to import a removed channel." +msgstr "Nicht möglich, einen gelöschten Kanal zu importieren." + +#: ../../include/import.php:46 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen." -#: ../../include/import.php:106 +#: ../../include/import.php:111 msgid "Cloned channel not found. Import failed." msgstr "Geklonter Kanal nicht gefunden. Import fehlgeschlagen." @@ -12405,7 +12626,7 @@ msgstr "Dezember" msgid "Unknown Attachment" msgstr "Unbekannter Anhang" -#: ../../include/text.php:1434 ../../include/feedutils.php:852 +#: ../../include/text.php:1434 ../../include/feedutils.php:860 msgid "unknown" msgstr "unbekannt" @@ -12421,107 +12642,107 @@ msgstr "aus der Datei entfernen" msgid "Download binary/encrypted content" msgstr "Binären/verschlüsselten Inhalt herunterladen" -#: ../../include/text.php:1848 ../../include/language.php:397 +#: ../../include/text.php:1849 ../../include/language.php:397 msgid "default" msgstr "Standard" -#: ../../include/text.php:1856 +#: ../../include/text.php:1857 msgid "Page layout" msgstr "Seiten-Layout" -#: ../../include/text.php:1856 +#: ../../include/text.php:1857 msgid "You can create your own with the layouts tool" msgstr "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen" -#: ../../include/text.php:1867 +#: ../../include/text.php:1868 msgid "HTML" msgstr "HTML" -#: ../../include/text.php:1870 +#: ../../include/text.php:1871 msgid "Comanche Layout" msgstr "Comanche-Layout" -#: ../../include/text.php:1875 +#: ../../include/text.php:1876 msgid "PHP" msgstr "PHP" -#: ../../include/text.php:1884 +#: ../../include/text.php:1885 msgid "Page content type" msgstr "Art des Seiteninhalts" -#: ../../include/text.php:2017 +#: ../../include/text.php:2018 msgid "activity" msgstr "Aktivität" -#: ../../include/text.php:2099 +#: ../../include/text.php:2100 msgid "a-z, 0-9, -, and _ only" msgstr "nur a-z, 0-9, - und _" -#: ../../include/text.php:2399 +#: ../../include/text.php:2419 msgid "Design Tools" msgstr "Gestaltungswerkzeuge" -#: ../../include/text.php:2405 +#: ../../include/text.php:2425 msgid "Pages" msgstr "Seiten" -#: ../../include/text.php:2427 +#: ../../include/text.php:2447 msgid "Import website..." msgstr "Webseite importieren..." -#: ../../include/text.php:2428 +#: ../../include/text.php:2448 msgid "Select folder to import" msgstr "Ordner zum Importieren auswählen" -#: ../../include/text.php:2429 +#: ../../include/text.php:2449 msgid "Import from a zipped folder:" msgstr "Aus einem gezippten Ordner importieren:" -#: ../../include/text.php:2430 +#: ../../include/text.php:2450 msgid "Import from cloud files:" msgstr "Aus Cloud-Dateien importieren:" -#: ../../include/text.php:2431 +#: ../../include/text.php:2451 msgid "/cloud/channel/path/to/folder" msgstr "/Cloud/Kanal/Pfad/zum/Ordner" -#: ../../include/text.php:2432 +#: ../../include/text.php:2452 msgid "Enter path to website files" msgstr "Pfad zu Webseitendateien eingeben" -#: ../../include/text.php:2433 +#: ../../include/text.php:2453 msgid "Select folder" msgstr "Ordner auswählen" -#: ../../include/text.php:2434 +#: ../../include/text.php:2454 msgid "Export website..." msgstr "Webseite exportieren..." -#: ../../include/text.php:2435 +#: ../../include/text.php:2455 msgid "Export to a zip file" msgstr "In eine ZIP-Datei exportieren" -#: ../../include/text.php:2436 +#: ../../include/text.php:2456 msgid "website.zip" msgstr "website.zip" -#: ../../include/text.php:2437 +#: ../../include/text.php:2457 msgid "Enter a name for the zip file." msgstr "Geben Sie einen für die ZIP-Datei ein." -#: ../../include/text.php:2438 +#: ../../include/text.php:2458 msgid "Export to cloud files" msgstr "In Cloud-Dateien exportieren" -#: ../../include/text.php:2439 +#: ../../include/text.php:2459 msgid "/path/to/export/folder" msgstr "/Pfad/zum/exportierenden/Ordner" -#: ../../include/text.php:2440 +#: ../../include/text.php:2460 msgid "Enter a path to a cloud files destination." msgstr "Gib den Pfad zu einem Datei-Speicherort in der Cloud ein." -#: ../../include/text.php:2441 +#: ../../include/text.php:2461 msgid "Specify folder" msgstr "Ordner angeben" @@ -12569,7 +12790,7 @@ msgstr "Gemeinsame Verbindungen" msgid "View all %d common connections" msgstr "Zeige alle %d gemeinsamen Verbindungen" -#: ../../include/markdown.php:158 ../../include/bbcode.php:343 +#: ../../include/markdown.php:158 ../../include/bbcode.php:356 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "%1$s schrieb den folgenden %2$s %3$s" @@ -12586,23 +12807,27 @@ msgstr "Adresse des Kanals fehlt." msgid "Response from remote channel was incomplete." msgstr "Antwort des entfernten Kanals war unvollständig." -#: ../../include/follow.php:101 +#: ../../include/follow.php:96 +msgid "Premium channel - please visit:" +msgstr "Premium-Kanal - bitte gehe zu:" + +#: ../../include/follow.php:110 msgid "Channel was deleted and no longer exists." msgstr "Kanal wurde gelöscht und existiert nicht mehr." -#: ../../include/follow.php:156 +#: ../../include/follow.php:165 msgid "Remote channel or protocol unavailable." msgstr "Externer Kanal oder Protokoll nicht verfügbar." -#: ../../include/follow.php:179 +#: ../../include/follow.php:188 msgid "Channel discovery failed." msgstr "Kanalsuche fehlgeschlagen" -#: ../../include/follow.php:191 +#: ../../include/follow.php:200 msgid "Protocol disabled." msgstr "Protokoll deaktiviert." -#: ../../include/follow.php:202 +#: ../../include/follow.php:211 msgid "Cannot connect to yourself." msgstr "Du kannst Dich nicht mit Dir selbst verbinden." @@ -12922,39 +13147,39 @@ msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte errei msgid "File upload failed. Possible system limit or action terminated." msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess." -#: ../../include/attach.php:959 +#: ../../include/attach.php:969 msgid "Stored file could not be verified. Upload failed." msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen." -#: ../../include/attach.php:1033 ../../include/attach.php:1049 +#: ../../include/attach.php:1043 ../../include/attach.php:1059 msgid "Path not available." msgstr "Pfad nicht verfügbar." -#: ../../include/attach.php:1098 ../../include/attach.php:1263 +#: ../../include/attach.php:1108 ../../include/attach.php:1273 msgid "Empty pathname" msgstr "Leere Pfadangabe" -#: ../../include/attach.php:1124 +#: ../../include/attach.php:1134 msgid "duplicate filename or path" msgstr "doppelter Dateiname oder Pfad" -#: ../../include/attach.php:1149 +#: ../../include/attach.php:1159 msgid "Path not found." msgstr "Pfad nicht gefunden." -#: ../../include/attach.php:1217 +#: ../../include/attach.php:1227 msgid "mkdir failed." msgstr "mkdir fehlgeschlagen." -#: ../../include/attach.php:1221 +#: ../../include/attach.php:1231 msgid "database storage failed." msgstr "Speichern in der Datenbank fehlgeschlagen." -#: ../../include/attach.php:1269 +#: ../../include/attach.php:1279 msgid "Empty path" msgstr "Leere Pfadangabe" -#: ../../include/security.php:532 +#: ../../include/security.php:541 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." @@ -12964,67 +13189,67 @@ msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinli msgid "(Unknown)" msgstr "(Unbekannt)" -#: ../../include/items.php:1129 +#: ../../include/items.php:1133 msgid "Visible to anybody on the internet." msgstr "Für jeden im Internet sichtbar." -#: ../../include/items.php:1131 +#: ../../include/items.php:1135 msgid "Visible to you only." msgstr "Nur für Dich sichtbar." -#: ../../include/items.php:1133 +#: ../../include/items.php:1137 msgid "Visible to anybody in this network." msgstr "Für jedes $Projectname-Mitglied sichtbar." -#: ../../include/items.php:1135 +#: ../../include/items.php:1139 msgid "Visible to anybody authenticated." msgstr "Für jeden sichtbar, der angemeldet ist." -#: ../../include/items.php:1137 +#: ../../include/items.php:1141 #, php-format msgid "Visible to anybody on %s." msgstr "Für jeden auf %s sichtbar." -#: ../../include/items.php:1139 +#: ../../include/items.php:1143 msgid "Visible to all connections." msgstr "Für alle Verbindungen sichtbar." -#: ../../include/items.php:1141 +#: ../../include/items.php:1145 msgid "Visible to approved connections." msgstr "Nur für akzeptierte Verbindungen sichtbar." -#: ../../include/items.php:1143 +#: ../../include/items.php:1147 msgid "Visible to specific connections." msgstr "Sichtbar für bestimmte Verbindungen." -#: ../../include/items.php:4147 +#: ../../include/items.php:4197 msgid "Privacy group is empty." msgstr "Gruppe ist leer." -#: ../../include/items.php:4154 +#: ../../include/items.php:4204 #, php-format msgid "Privacy group: %s" msgstr "Gruppe: %s" -#: ../../include/items.php:4166 +#: ../../include/items.php:4216 msgid "Connection not found." msgstr "Die Verbindung wurde nicht gefunden." -#: ../../include/items.php:4515 +#: ../../include/items.php:4565 msgid "profile photo" msgstr "Profilfoto" -#: ../../include/items.php:4706 +#: ../../include/items.php:4756 #, php-format msgid "[Edited %s]" msgstr "[%s wurde bearbeitet]" -#: ../../include/items.php:4706 +#: ../../include/items.php:4756 msgctxt "edit_activity" msgid "Post" msgstr "Beitrag" -#: ../../include/items.php:4706 +#: ../../include/items.php:4756 msgctxt "edit_activity" msgid "Comment" msgstr "Kommentar" @@ -13061,120 +13286,120 @@ msgstr "Standard-Profil" msgid "Unable to retrieve modified identity" msgstr "Geänderte Identität kann nicht empfangen werden" -#: ../../include/channel.php:1298 +#: ../../include/channel.php:1297 msgid "Create New Profile" msgstr "Neues Profil erstellen" -#: ../../include/channel.php:1319 +#: ../../include/channel.php:1318 msgid "Visible to everybody" msgstr "Für jeden sichtbar" -#: ../../include/channel.php:1396 ../../include/channel.php:1524 +#: ../../include/channel.php:1395 ../../include/channel.php:1523 msgid "Gender:" msgstr "Geschlecht:" -#: ../../include/channel.php:1398 ../../include/channel.php:1579 +#: ../../include/channel.php:1397 ../../include/channel.php:1591 msgid "Homepage:" msgstr "Homepage:" -#: ../../include/channel.php:1399 +#: ../../include/channel.php:1398 msgid "Online Now" msgstr "gerade online" -#: ../../include/channel.php:1452 +#: ../../include/channel.php:1451 msgid "Change your profile photo" msgstr "Dein Profilfoto ändern" -#: ../../include/channel.php:1483 +#: ../../include/channel.php:1482 msgid "Trans" msgstr "Trans" -#: ../../include/channel.php:1529 +#: ../../include/channel.php:1528 msgid "Like this channel" msgstr "Dieser Kanal gefällt mir" -#: ../../include/channel.php:1553 +#: ../../include/channel.php:1552 msgid "j F, Y" msgstr "j. F Y" -#: ../../include/channel.php:1554 +#: ../../include/channel.php:1553 msgid "j F" msgstr "j. F" -#: ../../include/channel.php:1561 +#: ../../include/channel.php:1560 msgid "Birthday:" msgstr "Geburtstag:" -#: ../../include/channel.php:1574 +#: ../../include/channel.php:1573 #, php-format msgid "for %1$d %2$s" msgstr "seit %1$d %2$s" -#: ../../include/channel.php:1577 -msgid "Sexual Preference:" -msgstr "Sexuelle Orientierung:" - -#: ../../include/channel.php:1583 +#: ../../include/channel.php:1585 msgid "Tags:" msgstr "Schlagworte:" -#: ../../include/channel.php:1585 +#: ../../include/channel.php:1589 +msgid "Sexual Preference:" +msgstr "Sexuelle Orientierung:" + +#: ../../include/channel.php:1595 msgid "Political Views:" msgstr "Politische Ansichten:" -#: ../../include/channel.php:1587 +#: ../../include/channel.php:1597 msgid "Religion:" msgstr "Religion:" -#: ../../include/channel.php:1591 +#: ../../include/channel.php:1601 msgid "Hobbies/Interests:" msgstr "Hobbys/Interessen:" -#: ../../include/channel.php:1593 +#: ../../include/channel.php:1603 msgid "Likes:" msgstr "Gefällt:" -#: ../../include/channel.php:1595 +#: ../../include/channel.php:1605 msgid "Dislikes:" msgstr "Gefällt nicht:" -#: ../../include/channel.php:1597 +#: ../../include/channel.php:1607 msgid "Contact information and Social Networks:" msgstr "Kontaktinformation und soziale Netzwerke:" -#: ../../include/channel.php:1599 +#: ../../include/channel.php:1609 msgid "My other channels:" msgstr "Meine anderen Kanäle:" -#: ../../include/channel.php:1601 +#: ../../include/channel.php:1611 msgid "Musical interests:" msgstr "Musikalische Interessen:" -#: ../../include/channel.php:1603 +#: ../../include/channel.php:1613 msgid "Books, literature:" msgstr "Bücher, Literatur:" -#: ../../include/channel.php:1605 +#: ../../include/channel.php:1615 msgid "Television:" msgstr "Fernsehen:" -#: ../../include/channel.php:1607 +#: ../../include/channel.php:1617 msgid "Film/dance/culture/entertainment:" msgstr "Film/Tanz/Kultur/Unterhaltung:" -#: ../../include/channel.php:1609 +#: ../../include/channel.php:1619 msgid "Love/Romance:" msgstr "Liebe/Romantik:" -#: ../../include/channel.php:1611 +#: ../../include/channel.php:1621 msgid "Work/employment:" msgstr "Arbeit/Anstellung:" -#: ../../include/channel.php:1613 +#: ../../include/channel.php:1623 msgid "School/education:" msgstr "Schule/Ausbildung:" -#: ../../include/channel.php:1636 +#: ../../include/channel.php:1646 msgid "Like this thing" msgstr "Gefällt mir" @@ -13214,19 +13439,19 @@ msgstr "In Bearbeitung" msgid "Cancelled" msgstr "gestrichen" -#: ../../include/event.php:1310 ../../include/connections.php:684 +#: ../../include/event.php:1310 ../../include/connections.php:692 msgid "Home, Voice" msgstr "Zuhause, Sprache" -#: ../../include/event.php:1311 ../../include/connections.php:685 +#: ../../include/event.php:1311 ../../include/connections.php:693 msgid "Home, Fax" msgstr "Zuhause, Fax" -#: ../../include/event.php:1313 ../../include/connections.php:687 +#: ../../include/event.php:1313 ../../include/connections.php:695 msgid "Work, Voice" msgstr "Arbeit, Sprache" -#: ../../include/event.php:1314 ../../include/connections.php:688 +#: ../../include/event.php:1314 ../../include/connections.php:696 msgid "Work, Fax" msgstr "Arbeit, Fax" @@ -13234,43 +13459,43 @@ msgstr "Arbeit, Fax" msgid "view full size" msgstr "In Vollbildansicht anschauen" -#: ../../include/network.php:1769 ../../include/network.php:1770 +#: ../../include/network.php:1764 ../../include/network.php:1765 msgid "Friendica" msgstr "Friendica" -#: ../../include/network.php:1771 +#: ../../include/network.php:1766 msgid "OStatus" msgstr "OStatus" -#: ../../include/network.php:1772 +#: ../../include/network.php:1767 msgid "GNU-Social" msgstr "GNU-Social" -#: ../../include/network.php:1773 +#: ../../include/network.php:1768 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:1776 +#: ../../include/network.php:1771 msgid "Diaspora" msgstr "Diaspora" -#: ../../include/network.php:1777 +#: ../../include/network.php:1772 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:1778 +#: ../../include/network.php:1773 msgid "Zot" msgstr "Zot" -#: ../../include/network.php:1779 +#: ../../include/network.php:1774 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:1780 +#: ../../include/network.php:1775 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1781 +#: ../../include/network.php:1776 msgid "MySpace" msgstr "MySpace" @@ -13312,17 +13537,17 @@ msgstr "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der msgid "Cannot locate DNS info for database server '%s'" msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden" -#: ../../include/bbcode.php:198 ../../include/bbcode.php:1151 -#: ../../include/bbcode.php:1154 ../../include/bbcode.php:1159 -#: ../../include/bbcode.php:1162 ../../include/bbcode.php:1165 -#: ../../include/bbcode.php:1168 ../../include/bbcode.php:1173 -#: ../../include/bbcode.php:1176 ../../include/bbcode.php:1181 -#: ../../include/bbcode.php:1184 ../../include/bbcode.php:1187 -#: ../../include/bbcode.php:1190 +#: ../../include/bbcode.php:198 ../../include/bbcode.php:1200 +#: ../../include/bbcode.php:1203 ../../include/bbcode.php:1208 +#: ../../include/bbcode.php:1211 ../../include/bbcode.php:1214 +#: ../../include/bbcode.php:1217 ../../include/bbcode.php:1222 +#: ../../include/bbcode.php:1225 ../../include/bbcode.php:1230 +#: ../../include/bbcode.php:1233 ../../include/bbcode.php:1236 +#: ../../include/bbcode.php:1239 msgid "Image/photo" msgstr "Bild/Foto" -#: ../../include/bbcode.php:237 ../../include/bbcode.php:1201 +#: ../../include/bbcode.php:237 ../../include/bbcode.php:1250 msgid "Encrypted content" msgstr "Verschlüsselter Inhalt" @@ -13338,565 +13563,587 @@ msgid "" "to install it on this site." msgstr "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren." -#: ../../include/bbcode.php:335 +#: ../../include/bbcode.php:348 msgid "card" msgstr "Karte" -#: ../../include/bbcode.php:337 +#: ../../include/bbcode.php:350 msgid "article" msgstr "Artikel" -#: ../../include/bbcode.php:420 ../../include/bbcode.php:428 +#: ../../include/bbcode.php:433 ../../include/bbcode.php:441 msgid "Click to open/close" msgstr "Klicke zum Öffnen/Schließen" -#: ../../include/bbcode.php:428 +#: ../../include/bbcode.php:441 msgid "spoiler" msgstr "Spoiler" -#: ../../include/bbcode.php:441 +#: ../../include/bbcode.php:454 msgid "View article" msgstr "Artikel ansehen" -#: ../../include/bbcode.php:441 +#: ../../include/bbcode.php:454 msgid "View summary" msgstr "Zusammenfassung ansehen" -#: ../../include/bbcode.php:1139 +#: ../../include/bbcode.php:1188 msgid "$1 wrote:" msgstr "$1 schrieb:" -#: ../../include/oembed.php:328 +#: ../../include/oembed.php:329 msgid " by " msgstr "von" -#: ../../include/oembed.php:329 +#: ../../include/oembed.php:330 msgid " on " msgstr "am" -#: ../../include/oembed.php:358 +#: ../../include/oembed.php:359 msgid "Embedded content" msgstr "Eingebetteter Inhalt" -#: ../../include/oembed.php:367 +#: ../../include/oembed.php:368 msgid "Embedding disabled" msgstr "Einbetten deaktiviert" -#: ../../include/zid.php:346 +#: ../../include/zid.php:347 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "OpenWebAuth: %1$s heißt %2$s willkommen" -#: ../../include/features.php:54 +#: ../../include/features.php:56 msgid "General Features" msgstr "Allgemeine Funktionen" -#: ../../include/features.php:60 +#: ../../include/features.php:61 +msgid "Display new member quick links menu" +msgstr "Zeigt neuen Mitgliedern ein Menü mit Schnell-Links zu wichtigen Funktionen" + +#: ../../include/features.php:69 msgid "Advanced Profiles" msgstr "Erweiterte Profile" -#: ../../include/features.php:61 +#: ../../include/features.php:70 msgid "Additional profile sections and selections" msgstr "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung" -#: ../../include/features.php:69 +#: ../../include/features.php:78 msgid "Profile Import/Export" msgstr "Profil-Import/Export" -#: ../../include/features.php:70 +#: ../../include/features.php:79 msgid "Save and load profile details across sites/channels" msgstr "Ermöglicht das Speichern von Profilen, um sie in einen anderen Kanal zu importieren" -#: ../../include/features.php:78 +#: ../../include/features.php:87 msgid "Web Pages" msgstr "Webseiten" -#: ../../include/features.php:79 +#: ../../include/features.php:88 msgid "Provide managed web pages on your channel" msgstr "Ermöglicht das Erstellen von Webseiten in Deinem Kanal" -#: ../../include/features.php:88 +#: ../../include/features.php:97 msgid "Provide a wiki for your channel" msgstr "Stelle ein Wiki in Deinem Kanal zur Verfügung" -#: ../../include/features.php:105 +#: ../../include/features.php:114 msgid "Private Notes" msgstr "Private Notizen" -#: ../../include/features.php:106 +#: ../../include/features.php:115 msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "Aktiviert ein Werkzeug mit dem Notizen und Erinnerungen gespeichert werden können (Hinweis: nicht verschlüsselt)" -#: ../../include/features.php:115 +#: ../../include/features.php:124 msgid "Create personal planning cards" msgstr "Erstelle persönliche (Notiz-)Karten zur Planung/Koordination oder ähnlichen Zwecken" -#: ../../include/features.php:125 +#: ../../include/features.php:134 msgid "Create interactive articles" msgstr "Erstelle interaktive Artikel" -#: ../../include/features.php:133 +#: ../../include/features.php:142 msgid "Navigation Channel Select" msgstr "Kanal-Auswahl in der Navigationsleiste" -#: ../../include/features.php:134 +#: ../../include/features.php:143 msgid "Change channels directly from within the navigation dropdown menu" msgstr "Ermöglicht den direkten Wechsel zu anderen Kanälen über das Navigationsmenü" -#: ../../include/features.php:142 +#: ../../include/features.php:151 msgid "Photo Location" msgstr "Aufnahmeort" -#: ../../include/features.php:143 +#: ../../include/features.php:152 msgid "If location data is available on uploaded photos, link this to a map." msgstr "Verlinkt den Aufnahmeort von Fotos (falls verfügbar) auf einer Karte" -#: ../../include/features.php:151 +#: ../../include/features.php:160 msgid "Access Controlled Chatrooms" msgstr "Zugriffskontrollierte Chaträume" -#: ../../include/features.php:152 +#: ../../include/features.php:161 msgid "Provide chatrooms and chat services with access control." msgstr "Bieten Sie Chaträume und Chatdienste mit Zugriffskontrolle an." -#: ../../include/features.php:161 +#: ../../include/features.php:170 msgid "Smart Birthdays" msgstr "Smarte Geburtstage" -#: ../../include/features.php:162 +#: ../../include/features.php:171 msgid "" "Make birthday events timezone aware in case your friends are scattered " "across the planet." msgstr "Stellt für Geburtstage einen Zeitzonenbezug her, falls deine Freunde über den ganzen Planeten verstreut sind." -#: ../../include/features.php:170 +#: ../../include/features.php:179 msgid "Event Timezone Selection" msgstr "Termin-Zeitzonenauswahl" -#: ../../include/features.php:171 +#: ../../include/features.php:180 msgid "Allow event creation in timezones other than your own." msgstr "Ermögliche das Erstellen von Terminen in anderen Zeitzonen als Deiner eigenen." -#: ../../include/features.php:180 +#: ../../include/features.php:189 msgid "Premium Channel" msgstr "Premium-Kanal" -#: ../../include/features.php:181 +#: ../../include/features.php:190 msgid "" "Allows you to set restrictions and terms on those that connect with your " "channel" msgstr "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen" -#: ../../include/features.php:189 +#: ../../include/features.php:198 msgid "Advanced Directory Search" msgstr "Erweiterte Verzeichnissuche" -#: ../../include/features.php:190 +#: ../../include/features.php:199 msgid "Allows creation of complex directory search queries" msgstr "Ermöglicht die Erstellung komplexer Verzeichnis-Suchabfragen" -#: ../../include/features.php:198 +#: ../../include/features.php:207 msgid "Advanced Theme and Layout Settings" msgstr "Erweiterte Design- und Layout-Einstellungen" -#: ../../include/features.php:199 +#: ../../include/features.php:208 msgid "Allows fine tuning of themes and page layouts" msgstr "Erlaubt die Feineinstellung von Designs und Seitenlayouts" -#: ../../include/features.php:208 +#: ../../include/features.php:217 msgid "Access Control and Permissions" msgstr "Zugriffskontrolle und Berechtigungen" -#: ../../include/features.php:212 ../../include/group.php:328 +#: ../../include/features.php:221 ../../include/group.php:328 msgid "Privacy Groups" msgstr "Gruppen" -#: ../../include/features.php:213 +#: ../../include/features.php:222 msgid "Enable management and selection of privacy groups" msgstr "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren" -#: ../../include/features.php:221 +#: ../../include/features.php:230 msgid "Multiple Profiles" msgstr "Mehrfachprofile" -#: ../../include/features.php:222 +#: ../../include/features.php:231 msgid "Ability to create multiple profiles" msgstr "Ermöglicht das Anlegen mehrerer Profile pro Kanal" -#: ../../include/features.php:232 +#: ../../include/features.php:241 msgid "Provide alternate connection permission roles." msgstr "Stelle benutzerdefinierte Berechtigungsrollen für Verbindungen zur Verfügung." -#: ../../include/features.php:240 -msgid "OAuth Clients" -msgstr "OAuth Clients" +#: ../../include/features.php:249 +msgid "OAuth1 Clients" +msgstr "OAuth1 Clients" -#: ../../include/features.php:241 -msgid "Manage authenticatication tokens for mobile and remote apps." -msgstr "Verwalte Tokens für den Zugriff von mobilen bzw. externen Anwendungen." +#: ../../include/features.php:250 +msgid "Manage OAuth1 authenticatication tokens for mobile and remote apps." +msgstr "Verwalte OAuth1-Tokens für den Zugriff von mobilen bzw. externen Anwendungen." -#: ../../include/features.php:249 +#: ../../include/features.php:258 +msgid "OAuth2 Clients" +msgstr "OAuth2 Clients" + +#: ../../include/features.php:259 +msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps." +msgstr "Verwalte OAuth2-Tokens für den Zugriff von mobilen bzw. externen Anwendungen." + +#: ../../include/features.php:267 msgid "Access Tokens" msgstr "Zugangstokens" -#: ../../include/features.php:250 +#: ../../include/features.php:268 msgid "Create access tokens so that non-members can access private content." msgstr "Erzeuge Tokens für den Zugriff von Nicht-Mitgliedern auf private Inhalte." -#: ../../include/features.php:261 +#: ../../include/features.php:279 msgid "Post Composition Features" msgstr "Nachbearbeitungsfunktionen" -#: ../../include/features.php:265 +#: ../../include/features.php:283 msgid "Large Photos" msgstr "Große Fotos" -#: ../../include/features.php:266 +#: ../../include/features.php:284 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "Große Vorschaubilder (1024px) in Beiträgen anzeigen. Falls nicht aktiviert, werden kleine Vorschaubilder (640px) verwendet." -#: ../../include/features.php:275 +#: ../../include/features.php:293 msgid "Automatically import channel content from other channels or feeds" msgstr "Ermöglicht den automatischen Import von Inhalten für diesen Kanal von anderen Kanälen oder Feeds" -#: ../../include/features.php:283 +#: ../../include/features.php:301 msgid "Even More Encryption" msgstr "Noch mehr Verschlüsselung" -#: ../../include/features.php:284 +#: ../../include/features.php:302 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "Ermöglicht optional die zusätzliche Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Schlüssel)" -#: ../../include/features.php:292 +#: ../../include/features.php:310 msgid "Enable Voting Tools" msgstr "Umfragewerkzeuge aktivieren" -#: ../../include/features.php:293 +#: ../../include/features.php:311 msgid "Provide a class of post which others can vote on" msgstr "Aktiviert die Umfragewerkzeuge, um anderen die Möglichkeit zu geben, einem Beitrag zuzustimmen, ihn abzulehnen oder sich zu enthalten. (Muss im Beitrag selbst noch aktiviert werden.)" -#: ../../include/features.php:301 +#: ../../include/features.php:319 msgid "Disable Comments" msgstr "Kommentare deaktivieren" -#: ../../include/features.php:302 +#: ../../include/features.php:320 msgid "Provide the option to disable comments for a post" msgstr "Ermöglicht, die Kommentarfunktion für einzelne Beiträge abzuschalten" -#: ../../include/features.php:310 +#: ../../include/features.php:328 msgid "Delayed Posting" msgstr "Verzögertes Senden" -#: ../../include/features.php:311 +#: ../../include/features.php:329 msgid "Allow posts to be published at a later date" msgstr "Ermöglicht es, Beiträge zu einem späteren Zeitpunkt zu veröffentlichen" -#: ../../include/features.php:319 +#: ../../include/features.php:337 msgid "Content Expiration" msgstr "Verfall von Inhalten" -#: ../../include/features.php:320 +#: ../../include/features.php:338 msgid "Remove posts/comments and/or private messages at a future time" msgstr "Ermöglicht das automatische Löschen von Beiträgen, Kommentaren und/oder privaten Nachrichten zu einem zukünftigen Datum." -#: ../../include/features.php:328 +#: ../../include/features.php:346 msgid "Suppress Duplicate Posts/Comments" msgstr "Doppelte Beiträge unterdrücken" -#: ../../include/features.php:329 +#: ../../include/features.php:347 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "Verhindert, dass innerhalb von zwei Minuten Beiträge mit identischem Inhalt veröffentlicht werden." -#: ../../include/features.php:340 +#: ../../include/features.php:355 +msgid "Auto-save drafts of posts and comments" +msgstr "Auto-Speicherung von Beitrags- und Kommentarentwürfen" + +#: ../../include/features.php:356 +msgid "" +"Automatically saves post and comment drafts in local browser storage to help" +" prevent accidental loss of compositions" +msgstr "Speichert Deine Beitrags- und Kommentarentwürfe automatisch im lokalen Browserspeicher und hilft so, versehentlichem Verlust dieser Inhalte vorzubeugen" + +#: ../../include/features.php:367 msgid "Network and Stream Filtering" msgstr "Netzwerk- und Stream-Filter" -#: ../../include/features.php:344 +#: ../../include/features.php:371 msgid "Search by Date" msgstr "Suche nach Datum" -#: ../../include/features.php:345 +#: ../../include/features.php:372 msgid "Ability to select posts by date ranges" msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen" -#: ../../include/features.php:355 +#: ../../include/features.php:382 msgid "Save search terms for re-use" msgstr "Ermöglicht das Abspeichern von Suchbegriffen zur Wiederverwendung" -#: ../../include/features.php:363 +#: ../../include/features.php:390 msgid "Network Personal Tab" msgstr "Persönlicher Netzwerkreiter" -#: ../../include/features.php:364 +#: ../../include/features.php:391 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "Aktiviert einen Reiter in der Grid-Ansicht, der nur Netzwerk-Beiträge anzeigt, mit denen Du interagiert hast" -#: ../../include/features.php:372 +#: ../../include/features.php:399 msgid "Network New Tab" msgstr "Netzwerkreiter Neu" -#: ../../include/features.php:373 +#: ../../include/features.php:400 msgid "Enable tab to display all new Network activity" msgstr "Aktiviert einen Reiter in der Grid-Ansicht, der alle neuen Netzwerkaktivitäten anzeigt" -#: ../../include/features.php:381 +#: ../../include/features.php:408 msgid "Affinity Tool" msgstr "Beziehungs-Tool" -#: ../../include/features.php:382 +#: ../../include/features.php:409 msgid "Filter stream activity by depth of relationships" msgstr "Aktiviert ein Werkzeug in der Grid-Ansicht, das den Stream nach Grad der Beziehung filtern kann" -#: ../../include/features.php:391 +#: ../../include/features.php:418 msgid "Show friend and connection suggestions" msgstr "Freund- und Verbindungsvorschläge anzeigen" -#: ../../include/features.php:399 +#: ../../include/features.php:426 msgid "Connection Filtering" msgstr "Filter für Verbindungen" -#: ../../include/features.php:400 +#: ../../include/features.php:427 msgid "Filter incoming posts from connections based on keywords/content" msgstr "Ermöglicht die Filterung eingehender Beiträge anhand von Schlüsselwörtern (muss an der Verbindung konfiguriert werden)" -#: ../../include/features.php:412 +#: ../../include/features.php:439 msgid "Post/Comment Tools" msgstr "Beitrag-/Kommentar-Tools" -#: ../../include/features.php:416 +#: ../../include/features.php:443 msgid "Community Tagging" msgstr "Gemeinschaftliches Verschlagworten" -#: ../../include/features.php:417 +#: ../../include/features.php:444 msgid "Ability to tag existing posts" msgstr "Ermöglicht das Verschlagworten existierender Beiträge" -#: ../../include/features.php:425 +#: ../../include/features.php:452 msgid "Post Categories" msgstr "Beitrags-Kategorien" -#: ../../include/features.php:426 +#: ../../include/features.php:453 msgid "Add categories to your posts" msgstr "Aktiviert Kategorien für Beiträge" -#: ../../include/features.php:434 +#: ../../include/features.php:461 msgid "Emoji Reactions" msgstr "Emoji Reaktionen" -#: ../../include/features.php:435 +#: ../../include/features.php:462 msgid "Add emoji reaction ability to posts" msgstr "Aktiviert Emoji-Reaktionen für Beiträge" -#: ../../include/features.php:444 +#: ../../include/features.php:471 msgid "Ability to file posts under folders" msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln" -#: ../../include/features.php:452 +#: ../../include/features.php:479 msgid "Dislike Posts" msgstr "Gefällt-mir-nicht-Beiträge" -#: ../../include/features.php:453 +#: ../../include/features.php:480 msgid "Ability to dislike posts/comments" msgstr "Aktiviert die „Gefällt mir nicht“-Schaltfläche" -#: ../../include/features.php:461 +#: ../../include/features.php:488 msgid "Star Posts" msgstr "Beiträge mit Sternchen versehen" -#: ../../include/features.php:462 +#: ../../include/features.php:489 msgid "Ability to mark special posts with a star indicator" msgstr "Ermöglicht die lokale Markierung spezieller Beiträge mit einem Sternchen-Symbol" -#: ../../include/features.php:470 +#: ../../include/features.php:497 msgid "Tag Cloud" msgstr "Schlagwort-Wolke" -#: ../../include/features.php:471 +#: ../../include/features.php:498 msgid "Provide a personal tag cloud on your channel page" msgstr "Aktiviert die Anzeige einer Schlagwort-Wolke (Tag Cloud) auf Deiner Kanal-Seite" -#: ../../include/taxonomy.php:384 ../../include/taxonomy.php:405 -msgid "Tags" -msgstr "Schlagwörter" +#: ../../include/taxonomy.php:320 +msgid "Trending" +msgstr "Meistbeachtet" -#: ../../include/taxonomy.php:487 +#: ../../include/taxonomy.php:552 msgid "Keywords" msgstr "Schlüsselwörter" -#: ../../include/taxonomy.php:508 +#: ../../include/taxonomy.php:573 msgid "have" msgstr "habe" -#: ../../include/taxonomy.php:508 +#: ../../include/taxonomy.php:573 msgid "has" msgstr "hat" -#: ../../include/taxonomy.php:509 +#: ../../include/taxonomy.php:574 msgid "want" msgstr "will" -#: ../../include/taxonomy.php:509 +#: ../../include/taxonomy.php:574 msgid "wants" msgstr "will" -#: ../../include/taxonomy.php:510 +#: ../../include/taxonomy.php:575 msgid "likes" msgstr "gefällt" -#: ../../include/taxonomy.php:511 +#: ../../include/taxonomy.php:576 msgid "dislikes" msgstr "missfällt" -#: ../../include/account.php:35 +#: ../../include/account.php:36 msgid "Not a valid email address" msgstr "Ungültige E-Mail-Adresse" -#: ../../include/account.php:37 +#: ../../include/account.php:38 msgid "Your email domain is not among those allowed on this site" msgstr "Deine E-Mail-Adresse ist auf dieser Seite nicht erlaubt" -#: ../../include/account.php:43 +#: ../../include/account.php:44 msgid "Your email address is already registered at this site." msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert." -#: ../../include/account.php:75 +#: ../../include/account.php:76 msgid "An invitation is required." msgstr "Eine Einladung wird benötigt." -#: ../../include/account.php:79 +#: ../../include/account.php:80 msgid "Invitation could not be verified." msgstr "Die Einladung konnte nicht bestätigt werden." -#: ../../include/account.php:157 +#: ../../include/account.php:158 msgid "Please enter the required information." msgstr "Bitte gib die benötigten Informationen ein." -#: ../../include/account.php:224 +#: ../../include/account.php:225 msgid "Failed to store account information." msgstr "Speichern der Nutzerkontodaten fehlgeschlagen." -#: ../../include/account.php:313 +#: ../../include/account.php:314 #, php-format msgid "Registration confirmation for %s" msgstr "Registrierungsbestätigung für %s" -#: ../../include/account.php:382 +#: ../../include/account.php:383 #, php-format msgid "Registration request at %s" msgstr "Registrierungsanfrage auf %s" -#: ../../include/account.php:404 +#: ../../include/account.php:405 msgid "your registration password" msgstr "Dein Registrierungspasswort" -#: ../../include/account.php:410 ../../include/account.php:472 +#: ../../include/account.php:411 ../../include/account.php:473 #, php-format msgid "Registration details for %s" msgstr "Registrierungsdetails für %s" -#: ../../include/account.php:483 +#: ../../include/account.php:484 msgid "Account approved." msgstr "Nutzerkonto bestätigt." -#: ../../include/account.php:523 +#: ../../include/account.php:524 #, php-format msgid "Registration revoked for %s" msgstr "Registrierung für %s wurde widerrufen" -#: ../../include/account.php:802 ../../include/account.php:804 +#: ../../include/account.php:803 ../../include/account.php:805 msgid "Click here to upgrade." msgstr "Klicke hier, um das Upgrade durchzuführen." -#: ../../include/account.php:810 +#: ../../include/account.php:811 msgid "This action exceeds the limits set by your subscription plan." msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements." -#: ../../include/account.php:815 +#: ../../include/account.php:816 msgid "This action is not available under your subscription plan." msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar." -#: ../../include/datetime.php:134 +#: ../../include/datetime.php:140 msgid "Birthday" msgstr "Geburtstag" -#: ../../include/datetime.php:134 +#: ../../include/datetime.php:140 msgid "Age: " msgstr "Alter:" -#: ../../include/datetime.php:134 +#: ../../include/datetime.php:140 msgid "YYYY-MM-DD or MM-DD" msgstr "JJJJ-MM-TT oder MM-TT" -#: ../../include/datetime.php:238 +#: ../../include/datetime.php:244 msgid "less than a second ago" msgstr "Vor weniger als einer Sekunde" -#: ../../include/datetime.php:256 +#: ../../include/datetime.php:262 #, php-format msgctxt "e.g. 22 hours ago, 1 minute ago" msgid "%1$d %2$s ago" msgstr "vor %1$d %2$s" -#: ../../include/datetime.php:267 +#: ../../include/datetime.php:273 msgctxt "relative_date" msgid "year" msgid_plural "years" msgstr[0] "Jahr" msgstr[1] "Jahre" -#: ../../include/datetime.php:270 +#: ../../include/datetime.php:276 msgctxt "relative_date" msgid "month" msgid_plural "months" msgstr[0] "Monat" msgstr[1] "Monate" -#: ../../include/datetime.php:273 +#: ../../include/datetime.php:279 msgctxt "relative_date" msgid "week" msgid_plural "weeks" msgstr[0] "Woche" msgstr[1] "Wochen" -#: ../../include/datetime.php:276 +#: ../../include/datetime.php:282 msgctxt "relative_date" msgid "day" msgid_plural "days" msgstr[0] "Tag" msgstr[1] "Tage" -#: ../../include/datetime.php:279 +#: ../../include/datetime.php:285 msgctxt "relative_date" msgid "hour" msgid_plural "hours" msgstr[0] "Stunde" msgstr[1] "Stunden" -#: ../../include/datetime.php:282 +#: ../../include/datetime.php:288 msgctxt "relative_date" msgid "minute" msgid_plural "minutes" msgstr[0] "Minute" msgstr[1] "Minuten" -#: ../../include/datetime.php:285 +#: ../../include/datetime.php:291 msgctxt "relative_date" msgid "second" msgid_plural "seconds" msgstr[0] "Sekunde" msgstr[1] "Sekunden" -#: ../../include/datetime.php:514 +#: ../../include/datetime.php:520 #, php-format msgid "%1$s's birthday" msgstr "%1$ss Geburtstag" -#: ../../include/datetime.php:515 +#: ../../include/datetime.php:521 #, php-format msgid "Happy Birthday %1$s" msgstr "Alles Gute zum Geburtstag, %1$s" @@ -13950,16 +14197,16 @@ msgid "Help and documentation" msgstr "Hilfe und Dokumentation" #: ../../include/nav.php:179 -msgid "Search site @name, #tag, ?docs, content" -msgstr "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt" +msgid "Search site @name, !forum, #tag, ?docs, content" +msgstr "Hub durchsuchen: @Name, !Forum, #Schlagwort, ?Dokumentation, Inhalt" #: ../../include/nav.php:199 msgid "Site Setup and Configuration" msgstr "Seiten-Einrichtung und -Konfiguration" #: ../../include/nav.php:290 -msgid "@name, #tag, ?doc, content" -msgstr "@Name, #Schlagwort, ?Dokumentation, Inhalt" +msgid "@name, !forum, #tag, ?doc, content" +msgstr "@Name, !Forum, #Schlagwort, ?Dokumentation, Inhalt" #: ../../include/nav.php:291 msgid "Please wait..." @@ -13986,38 +14233,38 @@ msgstr "Bild überschreitet das Webseitenlimit von %lu Bytes" msgid "Image file is empty." msgstr "Bilddatei ist leer." -#: ../../include/photos.php:322 +#: ../../include/photos.php:326 msgid "Photo storage failed." msgstr "Fotospeicherung fehlgeschlagen." -#: ../../include/photos.php:364 +#: ../../include/photos.php:375 msgid "a new photo" msgstr "ein neues Foto" -#: ../../include/photos.php:368 +#: ../../include/photos.php:379 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "%1$s hat %2$s auf %3$s veröffentlicht" -#: ../../include/photos.php:660 +#: ../../include/photos.php:671 msgid "Upload New Photos" msgstr "Neue Fotos hochladen" -#: ../../include/zot.php:767 +#: ../../include/zot.php:772 msgid "Invalid data packet" msgstr "Ungültiges Datenpaket" -#: ../../include/zot.php:794 +#: ../../include/zot.php:799 msgid "Unable to verify channel signature" msgstr "Konnte die Signatur des Kanals nicht verifizieren" -#: ../../include/zot.php:2529 +#: ../../include/zot.php:2552 #, php-format msgid "Unable to verify site signature for %s" msgstr "Kann die Signatur der Seite von %s nicht verifizieren" -#: ../../include/zot.php:4180 +#: ../../include/zot.php:4219 msgid "invalid target signature" msgstr "Ungültige Signatur des Ziels" @@ -14048,23 +14295,27 @@ msgstr "Gruppe hinzufügen" msgid "Channels not in any privacy group" msgstr "Kanäle, die in keiner Gruppe sind" -#: ../../include/connections.php:128 +#: ../../include/connections.php:133 msgid "New window" msgstr "Neues Fenster" -#: ../../include/connections.php:129 +#: ../../include/connections.php:134 msgid "Open the selected location in a different window or browser tab" msgstr "Öffne die markierte Adresse in einem neuen Browserfenster oder Tab" -#: ../../include/auth.php:148 +#: ../../include/auth.php:152 +msgid "Delegation session ended." +msgstr "" + +#: ../../include/auth.php:156 msgid "Logged out." msgstr "Ausgeloggt." -#: ../../include/auth.php:263 +#: ../../include/auth.php:273 msgid "Email validation is incomplete. Please check your email." msgstr "E-Mail-Bestätigung nicht abgeschlossen. Bitte prüfe Deine E-Mails (ggf. Spam-Filterung mit berücksichtigen)." -#: ../../include/auth.php:279 +#: ../../include/auth.php:289 msgid "Failed authentication" msgstr "Authentifizierung fehlgeschlagen" diff --git a/view/de-de/hstrings.php b/view/de-de/hstrings.php index a96dd02b7..749afef5d 100644 --- a/view/de-de/hstrings.php +++ b/view/de-de/hstrings.php @@ -24,6 +24,7 @@ App::$strings["Can chat with me"] = "Kann mit mir chatten"; App::$strings["Can source my public posts in derived channels"] = "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden"; App::$strings["Can administer my channel"] = "Kann meinen Kanal administrieren"; App::$strings["Social Networking"] = "Soziales Netzwerk"; +App::$strings["Social - Federation"] = "Soziales Netzwerk - Föderation (verbundene Netze)"; App::$strings["Social - Mostly Public"] = "Soziales Netzwerk - Weitgehend öffentlich"; App::$strings["Social - Restricted"] = "Soziales Netzwerk - Beschränkt"; App::$strings["Social - Private"] = "Soziales Netzwerk - Privat"; @@ -280,7 +281,8 @@ App::$strings["Channel role and privacy"] = "Kanaltyp und Privatspäre-Einstellu App::$strings["Select a channel role with your privacy requirements."] = "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre."; App::$strings["Read more about roles"] = "Mehr Informationen über Rollen"; App::$strings["Create Channel"] = "Einen neuen Kanal anlegen"; -App::$strings["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."] = "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen."; +App::$strings["A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things. Channels can make connections with other channels to share information with each other."] = "Ein Kanal ist eine eindeutige Identität. Er kann eine Person (Soziales Netzwerk-Profil), ein Forum (Gruppe), eine Unternehmens- oder Prominenten-Seite, einen Newsfeed oder viele andere Dinge repräsentieren. Kanäle können Verbindungen mit anderen Kanälen eingehen, um Informationen miteinander auszutauschen."; +App::$strings["The type of channel you create affects the basic privacy settings, the permissions that are granted to connections/friends, and also the channel's visibility across the network."] = "Die Art des Kanals, den Du erzeugst, beeinflusst die grundlegenden Privatsphäre-Einstellungen, die Rechte, die Verbindungen/Freunden gewährt werden, und auch die Sichtbarkeit des Kanals im gesamten Netzwerk."; App::$strings["or import an existing channel from another location."] = "oder importiere einen bestehenden Kanal von einem anderen Server."; App::$strings["Validate"] = "Überprüfe"; App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden."; @@ -362,11 +364,10 @@ App::$strings["Error: PDO database PHP module required but not installed."] = "F App::$strings["Error: mb_string PHP module required but not installed."] = "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."; App::$strings["Error: xml PHP module required for DAV but not installed."] = "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert."; App::$strings["Error: zip PHP module required but not installed."] = "Fehler: Das zip PHP Modul ist erforderlich, ist aber nicht installiert."; +App::$strings[".htconfig.php is writable"] = ".htconfig.php ist beschreibbar"; App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht."; App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst."; -App::$strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Hubzilla-Installation speichern musst."; -App::$strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."; -App::$strings[".htconfig.php is writable"] = ".htconfig.php ist beschreibbar"; +App::$strings["Please see install/INSTALL.txt for additional information."] = "Lies die Datei \"install/INSTALL.txt\"."; App::$strings["This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Diese Software verwendet die Smarty3 Template Engine, um Vorlagen für die Webdarstellung zu verarbeiten. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen."; App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "Um diese kompilierten Vorlagen speichern zu können, braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Hubzilla-Stammverzeichnisses."; App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat."; @@ -551,8 +552,6 @@ App::$strings["Publicly visible description of this site. Displayed on siteinfo App::$strings["System language"] = "System-Sprache"; App::$strings["System theme"] = "System-Design"; App::$strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Standard-System-Design – kann durch Nutzerprofile überschieben werden – Design-Einstellungen ändern"; -App::$strings["Mobile system theme"] = "System-Design für mobile Geräte:"; -App::$strings["Theme for mobile devices"] = "Theme für mobile Geräte"; App::$strings["Allow Feeds as Connections"] = "Feeds als Verbindungen erlauben"; App::$strings["(Heavy system resource usage)"] = "(führt zu hoher Systemlast)"; App::$strings["Maximum image size"] = "Maximale Bildgröße"; @@ -612,6 +611,7 @@ App::$strings["Maximum Load Average"] = "Maximales Load Average"; App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"; App::$strings["Expiration period in days for imported (grid/network) content"] = "Setze den Zeitraum (in Tagen), ab wann importierte (aus dem Netzwerk) Inhalte ablaufen sollen"; App::$strings["0 for no expiration of imported content"] = "0 = keine Löschung importierter Inhalte"; +App::$strings["Do not expire any posts which have comments less than this many days ago"] = "Lass keine Beiträge verfallen die Kommentare haben, die jünger als diese Anzahl von Tagen sind."; App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Öffentliche Server: Optionale Einstiegsseite (landing page) für neue Mitglieder vor deren Anmeldung"; App::$strings["Create this page first. Default is %s/register"] = "Erstelle zunächst die entsprechende Seite. Standard ist %s/register"; App::$strings["Page to display after creating a new channel"] = "Seite, die nach Erstellung eines neuen Kanals angezeigt werden soll"; @@ -673,6 +673,7 @@ App::$strings["Visible to:"] = "Sichtbar für:"; App::$strings["__ctx:acl__ Profile"] = "Profil"; App::$strings["Comment approved"] = "Kommentar bestätigt"; App::$strings["Comment deleted"] = "Kommentar gelöscht"; +App::$strings["Permission Name is required."] = "Der Name der Berechtigung wird benötigt."; App::$strings["Permission category saved."] = "Berechtigungsrolle gespeichert."; App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Verwende dieses Formular, um Berechtigungsrollen für verschiedene Gruppen von Personen oder Verbindungen zu erstellen."; App::$strings["Permission Categories"] = "Berechtigungsrollen"; @@ -728,7 +729,6 @@ App::$strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern App::$strings["Default Privacy Group"] = "Standard-Gruppe"; App::$strings["Use my default audience setting for the type of object published"] = "Verwende Deine eingestellte Standard-Zielgruppe des jeweiligen Inhaltstyps"; App::$strings["Profile to assign new connections"] = "Profil, welches neuen Verbindungen zugewiesen wird"; -App::$strings["Channel permissions category:"] = "Zugriffsrechte-Kategorie des Kanals:"; App::$strings["Default Permissions Group"] = "Standard-Berechtigungsgruppe"; App::$strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"; App::$strings["Useful to reduce spamming"] = "Nützlich, um Spam zu verringern"; @@ -763,9 +763,10 @@ App::$strings["New connections"] = "Neue Verbindungen"; App::$strings["System Registrations"] = "System – Registrierungen"; App::$strings["Unseen shared files"] = "Ungesehene geteilte Dateien"; App::$strings["Unseen public activity"] = "Ungesehene öffentliche Aktivität"; +App::$strings["Unseen likes and dislikes"] = "Ungesehene Likes und Dislikes"; App::$strings["Email notification hub (hostname)"] = "Hub für E-Mail-Benachrichtigungen (Hostname)"; App::$strings["If your channel is mirrored to multiple hubs, set this to your preferred location. This will prevent duplicate email notifications. Example: %s"] = "Wenn Dein Kanal auf mehreren Hubs geklont ist, setze die Einstellung auf deinen bevorzugten Hub. Dies verhindert Mehrfachzustellung von E-Mail-Benachrichtigungen. Beispiel: %s"; -App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen anzeigen"; +App::$strings["Show new wall posts, private messages and connections under Notices"] = "Zeige neue Pinnwand Beiträge, private Nachrichten und Verbindungen unter den Notizen an."; App::$strings["Notify me of events this many days in advance"] = "Benachrichtige mich zu Terminen so viele Tage im Voraus"; App::$strings["Must be greater than 0"] = "Muss größer als 0 sein"; App::$strings["Advanced Account/Page Type Settings"] = "Erweiterte Konten- und Seitenart-Einstellungen"; @@ -779,6 +780,8 @@ App::$strings["Remove this channel."] = "Diesen Kanal löschen"; App::$strings["Firefox Share \$Projectname provider"] = "\$Projectname-Provider für Firefox Share"; App::$strings["Start calendar week on Monday"] = "Beginne die kalendarische Woche am Montag"; App::$strings["Additional Features"] = "Zusätzliche Funktionen"; +App::$strings["Your technical skill level"] = "Deine technische Qualifikationsstufe"; +App::$strings["Used to provide a member experience and additional features consistent with your comfort level"] = "Dies wird verwendet, um Dir eine Benutzererfahrung sowie zusätzliche Funktionen passend zu Deiner technischen Qualifikationsstufe zu bieten (Bedienkomfort beim Umgang mit Anwendungen)."; App::$strings["This channel is limited to %d tokens"] = "Dieser Kanal ist auf %d Token begrenzt"; App::$strings["Name and Password are required."] = "Name und Passwort sind erforderlich."; App::$strings["Token saved."] = "Token gespeichert."; @@ -789,6 +792,22 @@ App::$strings["Login Name"] = "Anmeldename"; App::$strings["Login Password"] = "Anmeldepasswort"; App::$strings["Expires (yyyy-mm-dd)"] = "Läuft ab (jjjj-mm-tt)"; App::$strings["Their Settings"] = "Deren Einstellungen"; +App::$strings["Name and Secret are required"] = "Name und Geheimnis werden benötigt"; +App::$strings["Add OAuth2 application"] = "OAuth2 Anwendung hinzufügen"; +App::$strings["Name of application"] = "Name der Anwendung"; +App::$strings["Consumer Secret"] = "Consumer Secret"; +App::$strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"; +App::$strings["Redirect"] = "Umleitung"; +App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "Umleitungs-URl – lasse das leer, solange Deine Anwendung es nicht explizit erfordert"; +App::$strings["Grant Types"] = "Genehmigungsarten"; +App::$strings["leave blank unless your application sepcifically requires this"] = "Frei lassen, es sei denn die Anwendung verlangt dies."; +App::$strings["Authorization scope"] = "Rahmen der Berechtigungen"; +App::$strings["OAuth2 Application not found."] = "OAuth2 Anwendung konnte nicht gefunden werden"; +App::$strings["Add application"] = "Anwendung hinzufügen"; +App::$strings["Connected OAuth2 Apps"] = "Verbundene OAuth2 Anwendungen"; +App::$strings["Client key starts with"] = "Client Key beginnt mit"; +App::$strings["No name"] = "Kein Name"; +App::$strings["Remove authorization"] = "Authorisierung aufheben"; App::$strings["Not valid email."] = "Keine gültige E-Mail Adresse."; App::$strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."; App::$strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."; @@ -803,8 +822,6 @@ App::$strings["Current Password"] = "Aktuelles Passwort"; App::$strings["Enter New Password"] = "Gib ein neues Passwort ein"; App::$strings["Confirm New Password"] = "Bestätige das neue Passwort"; App::$strings["Leave password fields blank unless changing"] = "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern"; -App::$strings["Your technical skill level"] = "Deine technische Qualifikationsstufe"; -App::$strings["Used to provide a member experience and additional features consistent with your comfort level"] = "Dies wird verwendet, um Dir eine Benutzererfahrung sowie zusätzliche Funktionen passend zu Deiner technischen Qualifikationsstufe zu bieten (Bedienkomfort beim Umgang mit Anwendungen)."; App::$strings["Remove Account"] = "Konto entfernen"; App::$strings["Remove this account including all its channels"] = "Dieses Konto inklusive all seiner Kanäle löschen"; App::$strings["Affinity Slider settings updated."] = "Die Beziehungsgrad-Schieberegler-Einstellungen wurden aktualisiert."; @@ -845,20 +862,11 @@ App::$strings["click to expand content exceeding this height"] = "Blöcke, deren App::$strings["Grid page max height of content (in pixels)"] = "Maximale Höhe (in Pixel) des Inhalts der Netzwerkseite"; App::$strings["Name is required"] = "Name ist erforderlich"; App::$strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt"; -App::$strings["Add application"] = "Anwendung hinzufügen"; -App::$strings["Name of application"] = "Name der Anwendung"; App::$strings["Consumer Key"] = "Consumer Key"; -App::$strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"; -App::$strings["Consumer Secret"] = "Consumer Secret"; -App::$strings["Redirect"] = "Umleitung"; -App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "Umleitungs-URl – lasse das leer, solange Deine Anwendung es nicht explizit erfordert"; App::$strings["Icon url"] = "Symbol-URL"; App::$strings["Optional"] = "Optional"; App::$strings["Application not found."] = "Die Anwendung wurde nicht gefunden."; App::$strings["Connected Apps"] = "Verbundene Apps"; -App::$strings["Client key starts with"] = "Client Key beginnt mit"; -App::$strings["No name"] = "Kein Name"; -App::$strings["Remove authorization"] = "Authorisierung aufheben"; App::$strings["View Photo"] = "Foto ansehen"; App::$strings["Edit Album"] = "Album bearbeiten"; App::$strings["Upload"] = "Hochladen"; @@ -880,7 +888,7 @@ App::$strings["Permissions"] = "Berechtigungen"; App::$strings["Add Thing to your Profile"] = "Die Sache Deinem Profil hinzufügen"; App::$strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr."; App::$strings["System Notifications"] = "System-Benachrichtigungen"; -App::$strings["Channel added."] = "Kanal hinzugefügt."; +App::$strings["Connection added."] = "Verbindung hinzugefügt"; App::$strings["Your service plan only allows %d channels."] = "Dein Vertrag erlaubt nur %d Kanäle."; App::$strings["No channel. Import failed."] = "Kein Kanal. Import fehlgeschlagen."; App::$strings["Import completed."] = "Import abgeschlossen."; @@ -915,19 +923,22 @@ App::$strings["Create new app"] = "Neue App erstellen"; App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s ist %2\$s"; App::$strings["Mood"] = "Laune"; App::$strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"; +App::$strings["Active"] = "Aktiv"; App::$strings["Blocked"] = "Blockiert"; App::$strings["Ignored"] = "Ignoriert"; App::$strings["Hidden"] = "Versteckt"; App::$strings["Archived/Unreachable"] = "Archiviert/Unerreichbar"; App::$strings["New"] = "Neu"; App::$strings["All"] = "Alle"; +App::$strings["Active Connections"] = "Aktive Verbindungen"; +App::$strings["Show active connections"] = "Zeige die aktiven Verbindungen an"; App::$strings["New Connections"] = "Neue Verbindungen"; App::$strings["Show pending (new) connections"] = "Ausstehende (neue) Verbindungsanfragen anzeigen"; -App::$strings["Show all connections"] = "Alle Verbindungen anzeigen"; App::$strings["Only show blocked connections"] = "Nur blockierte Verbindungen anzeigen"; App::$strings["Only show ignored connections"] = "Nur ignorierte Verbindungen anzeigen"; App::$strings["Only show archived/unreachable connections"] = "Nur archivierte/unerreichbare Verbindungen anzeigen"; App::$strings["Only show hidden connections"] = "Nur versteckte Verbindungen anzeigen"; +App::$strings["Show all connections"] = "Alle Verbindungen anzeigen"; App::$strings["Pending approval"] = "Wartet auf Genehmigung"; App::$strings["Archived"] = "Archiviert"; App::$strings["Not connected at this location"] = "An diesem Ort nicht verbunden"; @@ -969,10 +980,10 @@ App::$strings["Upload Photos"] = "Fotos hochladen"; App::$strings["Enter an album name"] = "Namen für ein neues Album eingeben"; App::$strings["or select an existing album (doubleclick)"] = "oder ein bereits vorhandenes auswählen (Doppelklick)"; App::$strings["Create a status post for this upload"] = "Einen Statusbeitrag für diesen Upload erzeugen"; -App::$strings["Caption (optional):"] = "Beschriftung (optional):"; -App::$strings["Description (optional):"] = "Beschreibung (optional):"; +App::$strings["Description (optional)"] = "Beschreibung (optional)"; App::$strings["Show Newest First"] = "Neueste zuerst anzeigen"; App::$strings["Show Oldest First"] = "Älteste zuerst anzeigen"; +App::$strings["Add Photos"] = "Fotos hinzufügen"; App::$strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."; App::$strings["Photo not available"] = "Foto nicht verfügbar"; App::$strings["Use as profile photo"] = "Als Profilfoto verwenden"; @@ -985,7 +996,6 @@ App::$strings["Rotate CCW (left)"] = "Drehen gegen UZS (links)"; App::$strings["Move photo to album"] = "Foto in Album verschieben"; App::$strings["Enter a new album name"] = "Gib einen Namen für ein neues Album ein"; App::$strings["or select an existing one (doubleclick)"] = "oder wähle ein bereits vorhandenes aus (Doppelklick)"; -App::$strings["Caption"] = "Bildunterschrift"; App::$strings["Add a Tag"] = "Schlagwort hinzufügen"; App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Beispiele: @ben, @Karl_Prester, @lieschen@example.com"; App::$strings["Flag as adult in album view"] = "In der Albumansicht als nicht jugendfrei markieren"; @@ -1260,6 +1270,10 @@ App::$strings["Warning: Changing some settings could render your channel inopera App::$strings["If enabled, connection requests will be approved without your interaction"] = "Ist dies aktiviert, werden Verbindungsanfragen ohne Deine aktive Zustimmung bestätigt."; App::$strings["Automatic approval settings"] = "Einstellungen für automatische Bestätigung"; App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "Einige individuelle Berechtigungen können basierend auf Deinen Kanal- und Privatsphäre-Einstellungen vorbelegt oder gesperrt sein."; +App::$strings["Unknown App"] = "Unbekannte Anwendung"; +App::$strings["Authorize"] = "Berechtigen"; +App::$strings["Do you authorize the app %s to access your channel data?"] = "Willst du die Anwendung %s dazu berechtigen auf die Daten deines Kanals zuzugreifen?"; +App::$strings["Allow"] = "Erlauben"; App::$strings["Privacy group created."] = "Gruppe wurde erstellt."; App::$strings["Could not create privacy group."] = "Gruppe konnte nicht erstellt werden."; App::$strings["Privacy group not found."] = "Gruppe nicht gefunden."; @@ -1304,7 +1318,7 @@ App::$strings["Clone this profile"] = "Dieses Profil klonen"; App::$strings["Delete this profile"] = "Dieses Profil löschen"; App::$strings["Add profile things"] = "Sachen zum Profil hinzufügen"; App::$strings["Personal"] = "Persönlich"; -App::$strings["Relation"] = "Beziehung"; +App::$strings["Relationship"] = "Beziehung"; App::$strings["Miscellaneous"] = "Verschiedenes"; App::$strings["Import profile from file"] = "Profil aus einer Datei importieren"; App::$strings["Export profile to file"] = "Profil in eine Datei exportieren"; @@ -1458,6 +1472,7 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss % App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt vielleicht an %2\$ss %3\$s teil"; App::$strings["Action completed."] = "Aktion durchgeführt."; App::$strings["Thank you."] = "Vielen Dank."; +App::$strings["No default suggestions were found."] = "Es wurden keine Standard Vorschläge gefunden."; App::$strings["%d rating"] = array( 0 => "%d Bewertung", 1 => "%d Bewertungen", @@ -1729,44 +1744,44 @@ App::$strings["To stop receiving these messages, please adjust your Notification App::$strings["To stop receiving these messages, please adjust your %s."] = "Um diese Nachrichten nicht mehr zu erhalten, passe bitte Deine %s an."; App::$strings["%s "] = "%s "; App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Benachrichtigung] Neue Mail empfangen auf %s"; -App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat Dir eine private Nachricht auf %3\$s gesendet."; +App::$strings["%1\$s sent you a new private message at %2\$s."] = "%1\$shat dir auf %2\$seine private Nachricht geschickt."; App::$strings["%1\$s sent you %2\$s."] = "%1\$s hat Dir %2\$s geschickt."; App::$strings["a private message"] = "eine private Nachricht"; App::$strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."; App::$strings["commented on"] = "kommentierte"; App::$strings["liked"] = "gefiel"; App::$strings["disliked"] = "missfiel"; -App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]a %5\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s]ein %5\$s[/zrl]"; -App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]%5\$s's %6\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s]%5\$s's %6\$s[/zrl]"; -App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]your %5\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s]Dein %5\$s[/zrl]"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]ein %4\$s[/zrl]"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]dein %4\$s[/zrl]"; App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Benachrichtigung] Moderierter Kommantar in Unterhaltung #%1\$d von %2\$s"; App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s"; -App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat eine Unterhaltung kommentiert, der Du folgst."; +App::$strings["%1\$s commented on an item/conversation you have been following."] = "%1\$shat einen Beitrag/eine Konversation kommentiert dem/der du folgst."; App::$strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."; App::$strings["Please visit %s to approve or reject this comment."] = "Bitte besuche %s, um diesen Kommentar anzunehmen oder abzulehnen."; -App::$strings["%1\$s, %2\$s liked [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s gefällt [zrl=%3\$s]dein %4\$s[/zrl]"; +App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = "%1\$s mag [zrl=%2\$s]dein %3\$s[/zrl]"; App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Benachrichtigung] Gefällt mir in Unterhaltung #%1\$d von %2\$s erhalten"; -App::$strings["%1\$s, %2\$s liked an item/conversation you created."] = "%1\$s, %2\$s gefällt ein Beitrag oder eine Unterhaltung von Dir"; +App::$strings["%1\$s liked an item/conversation you created."] = "%1\$sgefällt ein Beitrag/eine Unterhaltung von dir."; App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = "[\$Projectname:Benachrichtigung] %s schrieb auf Deine Pinnwand"; -App::$strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s hat auf Deine Pinnwand auf %3\$s geschrieben"; -App::$strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s hat auf [zrl=%3\$s]Deine Pinnwand[/zrl] geschrieben"; +App::$strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$shat etwas auf deiner Profilwand auf %2\$sveröffentlicht"; +App::$strings["%1\$s posted to [zrl=%2\$s]your wall[/zrl]"] = "%1\$s schrieb auf [zrl=%2\$s]Deine Pinnwand[/zrl]"; App::$strings["[\$Projectname:Notify] %s tagged you"] = "[\$Projectname:Benachrichtigung] %s hat Dich erwähnt"; -App::$strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s hat Dich auf %3\$s erwähnt"; -App::$strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]hat Dich erwähnt[/zrl]."; +App::$strings["%1\$s tagged you at %2\$s"] = "%1\$s hat dich auf %2\$s getaggt"; +App::$strings["%1\$s [zrl=%2\$s]tagged you[/zrl]."] = "%1\$s hat [zrl=%2\$s]Dich getagged[/zrl]."; App::$strings["[\$Projectname:Notify] %1\$s poked you"] = "[\$Projectname:Benachrichtigung] %1\$s hat Dich angestupst"; -App::$strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat Dich auf %3\$s angestupst"; -App::$strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]hat Dich angestupst[/zrl]."; +App::$strings["%1\$s poked you at %2\$s"] = "%1\$s hat dich auf %2\$s angestupst"; +App::$strings["%1\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s [zrl=%2\$s]hat dich angestupst.[/zrl]."; App::$strings["[\$Projectname:Notify] %s tagged your post"] = "[\$Projectname:Benachrichtigung] %s hat Deinen Beitrag verschlagwortet"; -App::$strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s hat Deinen Beitrag auf %3\$s verschlagwortet"; -App::$strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen Beitrag[/zrl] verschlagwortet"; +App::$strings["%1\$s tagged your post at %2\$s"] = "%1\$s hat Deinen Beitrag auf %2\$s getagged"; +App::$strings["%1\$s tagged [zrl=%2\$s]your post[/zrl]"] = "%1\$s hat [zrl=%2\$s]Deinen Beitrag[/zrl] getagged"; App::$strings["[\$Projectname:Notify] Introduction received"] = "[\$Projectname:Benachrichtigung] Verbindungsanfrage erhalten"; -App::$strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, Du hast eine neue Verbindungsanfrage von '%2\$s' auf %3\$s erhalten"; -App::$strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, Du hast [zrl=%2\$s]eine neue Verbindungsanfrage[/zrl] von %3\$s erhalten."; +App::$strings["You've received an new connection request from '%1\$s' at %2\$s"] = "Du hast auf %2\$s eine neue Verbindung von %1\$s erhalten."; +App::$strings["You've received [zrl=%1\$s]a new connection request[/zrl] from %2\$s."] = "Du hast [zrl=%1\$s]eine neue Verbindungsanfrage[/zrl] von %2\$s erhalten."; App::$strings["You may visit their profile at %s"] = "Du kannst Dir das Profil unter %s ansehen"; App::$strings["Please visit %s to approve or reject the connection request."] = "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen."; App::$strings["[\$Projectname:Notify] Friend suggestion received"] = "[\$Projectname:Benachrichtigung] Freundschaftsvorschlag erhalten"; -App::$strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, Du hast einen Kontaktvorschlag von „%2\$s“ auf %3\$s erhalten"; -App::$strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, Du hast [zrl=%2\$s]einen Kontaktvorschlag[/zrl] für %3\$s von %4\$s erhalten."; +App::$strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Du hast einen Freundschaftsvorschlag von %1\$s auf %2\$s erhalten"; +App::$strings["You've received [zrl=%1\$s]a friend suggestion[/zrl] for %2\$s from %3\$s."] = "Du hast einen [zrl=%1\$s]Freundschaftsvorschlag[/zrl] für %2\$s von %3\$s erhalten."; App::$strings["Name:"] = "Name:"; App::$strings["Photo:"] = "Foto:"; App::$strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."; @@ -1842,6 +1857,7 @@ App::$strings["Schedule Inbox"] = "Posteingang für überwachte Kalender"; App::$strings["Schedule Outbox"] = "Postausgang für überwachte Kalender"; App::$strings["Total"] = "Summe"; App::$strings["Shared"] = "Geteilt"; +App::$strings["Add Files"] = "Dateien hinzufügen"; App::$strings["You are using %1\$s of your available file storage."] = "Sie verwenden %1\$s von Ihrem verfügbaren Dateispeicher."; App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s%)"] = "Sie verwenden %1\$s von %2\$s verfügbarem Dateispeicher. (%3\$s%)"; App::$strings["WARNING:"] = "WARNUNG:"; @@ -1913,17 +1929,19 @@ App::$strings["Suggestions"] = "Vorschläge"; App::$strings["See more..."] = "Mehr anzeigen …"; App::$strings["Saved Folders"] = "Gespeicherte Ordner"; App::$strings["Click to show more"] = "Klick, um mehr anzuzeigen"; +App::$strings["Tags"] = "Schlagwörter"; App::$strings["Profile Creation"] = "Profilerstellung"; App::$strings["Upload profile photo"] = "Profilfoto hochladen"; App::$strings["Upload cover photo"] = "Titelbild hochladen"; App::$strings["Edit your profile"] = "Profil bearbeiten"; App::$strings["Find and Connect with others"] = "Finden und Verbinden von/mit Anderen"; +App::$strings["View the directory"] = "Verzeichnis anzeigen"; App::$strings["Manage your connections"] = "Deine Verbindungen verwalten"; App::$strings["Communicate"] = "Kommunizieren"; App::$strings["View your channel homepage"] = "Deine Kanal-Startseite ansehen"; App::$strings["View your network stream"] = "Deine Netzwerk-Aktivitäten ansehen"; App::$strings["Documentation"] = "Dokumentation"; -App::$strings["View public stream. Warning: not moderated"] = "Öffentliche Beitragsaktivitäten ansehen. Warnung: Diese Inhalte sind nicht moderiert."; +App::$strings["View public stream"] = "Zeige öffentlichen Beitrags-Stream"; App::$strings["New Member Links"] = "Links für neue Mitglieder"; App::$strings["Member registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten"; App::$strings["Inspect queue"] = "Warteschlange kontrollieren"; @@ -1937,7 +1955,8 @@ App::$strings["Addon settings"] = "Addon-Einstellungen"; App::$strings["Display settings"] = "Anzeige-Einstellungen"; App::$strings["Manage locations"] = "Klon-Adressen verwalten"; App::$strings["Export channel"] = "Kanal exportieren"; -App::$strings["Connected apps"] = "Verbundene Apps"; +App::$strings["OAuth1 apps"] = "OAuth1 Anwendungen"; +App::$strings["OAuth2 apps"] = "OAuth2 Anwendungen"; App::$strings["Permission Groups"] = "Berechtigungsrollen"; App::$strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen"; App::$strings["Bookmarked Chatrooms"] = "Gespeicherte Chatrooms"; @@ -1983,6 +2002,7 @@ App::$strings["Website SSL certificate is not valid. Please correct."] = "Das SS App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Cron-Jobs laufen nicht auf %s"; App::$strings["Cron/Scheduled tasks not running."] = "Cron-Aufgaben laufen nicht."; App::$strings["never"] = "Nie"; +App::$strings["Cover Photo"] = "Cover Foto"; App::$strings["Focus (Hubzilla default)"] = "Focus (Voreinstellung für Hubzilla)"; App::$strings["Theme settings"] = "Design-Einstellungen"; App::$strings["Narrow navbar"] = "Schmale Navigationsleiste"; @@ -2032,6 +2052,7 @@ App::$strings["Reminder note"] = "Erinnerungshinweis"; App::$strings["Enter a note to be displayed when you are within the specified proximity..."] = "Gib eine Nachricht ein, die angezeigt werden soll, wenn Du Dich in der festgelegten Nähe befindest..."; App::$strings["Add new rendezvous"] = "Neues Rendezvous hinzufügen"; App::$strings["Create a new rendezvous and share the access link with those you wish to invite to the group. Those who open the link become members of the rendezvous. They can view other member locations, add markers to the map, or share their own locations with the group."] = "Erstelle ein neues Rendezvous und teile den Zugriffslink mit allen, die Du in die Gruppe einladen möchtest. Die, die den Link öffnen, werden Mitglieder des Rendezvous. Sie können die Standorte der anderen Mitglieder sehen, Marker zur Karte hinzufügen oder ihre eigenen Standorte mit der Gruppe teilen."; +App::$strings["You have no rendezvous. Press the button above to create a rendezvous!"] = "Du hast kein Rendezvous. Drücke den Knopf oben, um ein Rendezvous zu erstellen!"; App::$strings["Some setting"] = "Einige Einstellungen"; App::$strings["A setting"] = "Eine Einstellung"; App::$strings["Skeleton Settings"] = "Skeleton Einstellungen"; @@ -2065,7 +2086,7 @@ App::$strings["Preferred IDs Message"] = "Nachricht für bevorzugte IDs"; App::$strings["Message to display above preferred results."] = "Nachricht, die über den Ergebnissen mit den bevorzugten IDs angezeigt werden soll."; App::$strings["Uploaded by: "] = "Hochgeladen von: "; App::$strings["Drawn by: "] = "Gezeichnet von: "; -App::$strings["Use this image"] = ""; +App::$strings["Use this image"] = "Dieses Bild verwenden"; App::$strings["Or select from a free OpenClipart.org image:"] = "Oder wähle ein freies Bild von OpenClipart.org:"; App::$strings["Search Term"] = "Suchbegriff"; App::$strings["Unknown error. Please try again later."] = "Unbekannter Fehler. Bitte versuchen Sie es später erneut."; @@ -2106,7 +2127,7 @@ App::$strings["Dreamwidth username"] = "Dreamwidth-Benutzername"; App::$strings["Dreamwidth password"] = "Dreamwidth-Passwort"; App::$strings["Post to Dreamwidth by default"] = "Standardmäßig auf auf Dreamwidth posten"; App::$strings["Dreamwidth Post Settings"] = "Dreamwidth-Beitragseinstellungen"; -App::$strings["New registration"] = ""; +App::$strings["New registration"] = "Neue Registrierung"; App::$strings["Message sent to %s. New account registration: %s"] = "Nachricht gesendet an %s. Neue Kontoregistrierung: %s"; App::$strings["Hubzilla Directory Stats"] = "Hubzilla-Verzeichnisstatistiken"; App::$strings["Total Hubs"] = "Hubs insgesamt"; @@ -2239,21 +2260,21 @@ App::$strings["generic profile image"] = "generisches Profilbild"; App::$strings["random geometric pattern"] = "zufälliges geometrisches Muster"; App::$strings["monster face"] = "Monstergesicht"; App::$strings["computer generated face"] = "computergeneriertes Gesicht"; -App::$strings["retro arcade style face"] = ""; +App::$strings["retro arcade style face"] = "Gesicht im Retro-Arcade Stil"; App::$strings["Hub default profile photo"] = "Standard-Profilfoto für diesen Hub"; App::$strings["Information"] = "Information"; -App::$strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
    The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = ""; +App::$strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
    The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Das Libravatar Addon ist ebenfalls installiert. Bitte deaktiviere entweder das Libreavatar oder das Gravatar Addon.
    Das Libravatar Addon verwendet als Notfalllösung Gravatar, sollte bei Libravatar kein Profilbild gefunden werden."; App::$strings["Save Settings"] = "Einstellungen speichern"; App::$strings["Default avatar image"] = "Standard-Avatarbild"; -App::$strings["Select default avatar image if none was found at Gravatar. See README"] = ""; +App::$strings["Select default avatar image if none was found at Gravatar. See README"] = "Wähle das Standardprofilbild aus, sollte bei Gravatar keines gefunden werden. Beachte auch die README."; App::$strings["Rating of images"] = "Bewertungen der Bilder"; -App::$strings["Select the appropriate avatar rating for your site. See README"] = ""; +App::$strings["Select the appropriate avatar rating for your site. See README"] = "Wähle die für deine Seite angemessene Profilbildeinstufung. Beachte auch die README."; App::$strings["Gravatar settings updated."] = "Gravatar-Einstellungen aktualisiert."; App::$strings["Hubzilla File Storage Import"] = "Hubzilla-Datenspeicher-Import"; App::$strings["This will import all your cloud files from another server."] = "Hiermit werden alle Deine Cloud-Dateien von einem anderen Server importiert."; App::$strings["Hubzilla Server base URL"] = "Basis-URL des Habzilla-Servers"; -App::$strings["Since modified date yyyy-mm-dd"] = ""; -App::$strings["Until modified date yyyy-mm-dd"] = ""; +App::$strings["Since modified date yyyy-mm-dd"] = "Seit Modifizierungsdatum yyyy-mm-dd"; +App::$strings["Until modified date yyyy-mm-dd"] = "Bis Modifizierungsdatum yyyy-mm-dd"; App::$strings["Recent Channel/Profile Viewers"] = "Kürzliche Kanal/Profil Besucher"; App::$strings["This plugin/addon has not been configured."] = "Dieses Plugin/Addon wurde noch nicht konfiguriert."; App::$strings["Please visit the Visage settings on %s"] = "Bitte rufe die Visage Einstellungen auf %s auf"; @@ -2281,6 +2302,12 @@ App::$strings["The default zoom level. (1:world, 18:highest, also depends on til App::$strings["Include marker on map"] = "Markierung auf der Karte einschließen"; App::$strings["Include a marker on the map."] = "Binde eine Markierung auf der Karte ein."; App::$strings["text to include in all outgoing posts from this site"] = "Test der in alle Beiträge angefügt werden soll, die von dieser Seite ausgehen"; +App::$strings["Fuzzloc Settings updated."] = "Fuzzloc-Einstellungen aktualisiert."; +App::$strings["Fuzzloc allows you to blur your precise location if your channel uses browser location mapping."] = "Fuzzloc erlaubt es Dir, deinen genauen Standort etwas diffuser zu machen (nicht so exakt wie ermittelt), wenn Dein Kanal die Lokalisierungsfunktion des Browsers verwendet."; +App::$strings["Enable Fuzzloc Plugin"] = "Aktiviere das Fuzzloc-Plugin"; +App::$strings["Minimum offset in meters"] = "Minimale Verschiebung in Metern"; +App::$strings["Maximum offset in meters"] = "Maximale Verschiebung in Metern"; +App::$strings["Fuzzloc Settings"] = "Fuzzloc-Einstellungen"; App::$strings["Post to Friendica"] = "Bei Friendica veröffentlichen"; App::$strings["rtof Settings saved."] = "rtof-Einstellungen gespeichert."; App::$strings["Allow posting to Friendica"] = "Erlaube die Veröffentlichung bei Friendica"; @@ -2305,7 +2332,7 @@ App::$strings["Configuration Help"] = "Konfigurationshilfe"; App::$strings["Jappix Mini Settings"] = "Jappix Mini Einstellungen"; App::$strings["Currently blocked"] = "Derzeit blockiert"; App::$strings["No channels currently blocked"] = "Momentan sind keine Kanäle blockiert"; -App::$strings["\"Superblock\" Settings"] = "\"Superblock\"-Einstellungen"; +App::$strings["Superblock Settings"] = "Superblock Einstellungen"; App::$strings["Block Completely"] = "Vollständig blockieren"; App::$strings["superblock settings updated"] = "Superblock Einstellungen aktualisiert"; App::$strings["Federate"] = "Beitrag verteilen"; @@ -2313,11 +2340,11 @@ App::$strings["nofed Settings saved."] = "nofed Einstellungen gespeichert"; App::$strings["Allow Federation Toggle"] = "Umschalter zur Beitragsverteilung bereitstellen"; App::$strings["Federate posts by default"] = "Beiträge standardmäßig verteilen"; App::$strings["NoFed Settings"] = "NoFed-Einstellungen"; -App::$strings["Post to Red"] = ""; +App::$strings["Post to Red"] = "Beitrag bei Red veröffentlichen"; App::$strings["Channel is required."] = "Kanal ist erforderlich."; App::$strings["redred Settings saved."] = "redred-Einstellungen gespeichert."; App::$strings["Allow posting to another Hubzilla Channel"] = "Erlaube die Veröffentlichung in anderen Hubzilla Kanälen"; -App::$strings["Send public postings to Hubzilla channel by default"] = ""; +App::$strings["Send public postings to Hubzilla channel by default"] = "Sende öffentliche Beiträge standardmäßig an den Hubzilla Kanal"; App::$strings["Hubzilla API Path"] = "Hubzilla-API-Pfad"; App::$strings["Hubzilla login name"] = "Hubzilla-Anmeldename"; App::$strings["Hubzilla channel name"] = "Hubzilla-Kanalname"; @@ -2333,7 +2360,7 @@ App::$strings["Friendica Login Username"] = "Friendica-Anmeldebenutzername"; App::$strings["Friendica Login Password"] = "Friendica-Anmeldepasswort"; App::$strings["ActivityPub"] = "ActivityPub"; App::$strings["ActivityPub Protocol Settings updated."] = "ActivityPub Protokoll Einstellungen aktualisiert"; -App::$strings["The ActivityPub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = ""; +App::$strings["The ActivityPub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Das ActivityPub-Protokoll unterstützt keine Server-unabhängigen Identitäten. Verbindungen, die Du mit diesem Netzwerk eingehst, können von anderen Orten (Klonen) dieses Kanals aus unerreichbar sein."; App::$strings["Enable the ActivityPub protocol for this channel"] = "Aktiviere das ActivityPub Protokoll für diesen Kanal"; App::$strings["Send multi-media HTML articles"] = "Multimedia HTML Artikel versenden"; App::$strings["Not supported by some microblog services such as Mastodon"] = "Wird von einigen Microblogging-Plattformen wie Mastodon nicht unterstützt"; @@ -2389,22 +2416,22 @@ App::$strings["Please contact your site administrator.
    The provided API URL App::$strings["We could not contact the GNU social API with the Path you entered."] = "Mit dem angegebenen Pfad war es uns nicht möglich, die GNU social API zu erreichen."; App::$strings["GNU social settings updated."] = "GNU social Einstellungen aktualisiert."; App::$strings["Globally Available GNU social OAuthKeys"] = "Global verfügbare GNU social OAuthKeys"; -App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
    If not feel free to connect to any other GNU social instance (see below)."] = ""; -App::$strings["Provide your own OAuth Credentials"] = ""; -App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
    Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = ""; +App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
    If not feel free to connect to any other GNU social instance (see below)."] = "Für einige GNU social Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel.
    Falls nicht, stelle stattdessen eine Verbindung zu irgend einem anderen GNU social Server her (siehe unten)."; +App::$strings["Provide your own OAuth Credentials"] = "Stelle deine eigenen OAuth Credentials zur Verfügung"; +App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
    Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Kein Consumer-Schlüsselpaar für GNU social gefunden. Registriere deinen Hubzilla-Account als Desktop-Client bei deinem GNU social Account, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.
    Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Hubzilla-Servers, ob schon ein Schlüsselpaar für diesen Hubzilla-Server auf diesem GNU social-Server existiert."; App::$strings["OAuth Consumer Key"] = "OAuth Consumer Key"; App::$strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; App::$strings["Base API Path"] = "Basis Pfad der API"; App::$strings["Remember the trailing /"] = "Denke an das abschließende /"; App::$strings["GNU social application name"] = "GNU social Anwendungsname"; -App::$strings["To connect to your GNU social account click the button below to get a security code from GNU social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU social."] = ""; +App::$strings["To connect to your GNU social account click the button below to get a security code from GNU social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU social."] = "Um dich mit deinem GNU social Konto zu verbinden, klicke den Button unten und kopiere dann den Sicherheitscode von GNU social in das Formular weiter unten. Es werden ausschließlich deine öffentlichen Beiträge auf GNU social veröffentlicht."; App::$strings["Log in with GNU social"] = "Mit GNU social anmelden"; App::$strings["Copy the security code from GNU social here"] = "Kopiere den Sicherheitscode von GNU social hier her"; App::$strings["Cancel Connection Process"] = "Verbindungsprozes abbrechen"; App::$strings["Current GNU social API is"] = "Aktuelle GNU social API ist"; App::$strings["Cancel GNU social Connection"] = "GNU social Verbindung trennen"; App::$strings["Currently connected to: "] = "Momentan verbunden mit:"; -App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Entsprechend Deiner Privatsphären-Einstellungen (Profil-Details vor nicht angemeldeten Besuchern verbergen?) kann ein ggf. zu GNU social geteilter Link in öffentlichen Beiträgen Besucher auf eine leere Seite führen, die darüber informiert, dass der Zugriff zu Deinem Profil eingeschränkt ist."; App::$strings["Allow posting to GNU social"] = "Erlaube die Veröffentlichung bei GNU social"; App::$strings["If enabled your public postings can be posted to the associated GNU-social account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen GNU social Konto veröffentlicht werden."; App::$strings["Post to GNU social by default"] = "Standardmäßig bei GNU social veröffentlichen"; @@ -2420,7 +2447,7 @@ App::$strings["Invalid game."] = "Ungültiges Spiel."; App::$strings["You are not a player in this game."] = "Sie sind kein Spieler in diesem Spiel."; App::$strings["You must be a local channel to create a game."] = "Um ein Spiel zu eröffnen, musst du ein lokaler Kanal sein"; App::$strings["You must select one opponent that is not yourself."] = "Du musst einen Gegner wählen, der nicht du selbst ist"; -App::$strings["Random color chosen."] = ""; +App::$strings["Random color chosen."] = "Zufällige Farbe gewählt."; App::$strings["Error creating new game."] = "Fehler beim Erstellen eines neuen Spiels."; App::$strings["Requested channel is not available."] = "Angeforderter Kanal nicht verfügbar."; App::$strings["You must select a local channel /chess/channelname"] = "Du musst einen lokalen Kanal/Schach(Kanalnamen aufwählen"; @@ -2434,14 +2461,32 @@ App::$strings["Copy the PIN from Twitter here"] = "PIN von Twitter hier her kopi App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Entsprechend Deiner Privatsphären-Einstellungen (Profil-Details vor nicht angemeldeten Besuchern verbergen?) kann ein ggf. zu Twitter geteilter Link Besucher auf eine leere Seite führen, die darüber informiert, dass der Zugriff zu Deinem Profil eingeschränkt ist."; App::$strings["Allow posting to Twitter"] = "Erlaube die Veröffentlichung bei Twitter"; App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Konto veröffentlicht werden."; -App::$strings["Twitter post length"] = ""; -App::$strings["Maximum tweet length"] = ""; +App::$strings["Twitter post length"] = "Länge von Twitter Beiträgen"; +App::$strings["Maximum tweet length"] = "Maximale Länge eines Tweets"; App::$strings["Send public postings to Twitter by default"] = "Standardmäßig öffentliche Beiträge bei Twitter veröffentlichen"; App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Wenn aktiv werden deine öffentlichen Beiträge bei dem verbundenen Twitter Konto veröffentlicht werden."; App::$strings["Twitter Post Settings"] = "Twitter-Beitragseinstellungen"; App::$strings["Deactivate the feature"] = "Diese Funktion abschalten"; App::$strings["Hide the button and show the smilies directly."] = "Verstecke die Schaltfläche und zeige die Smilies direkt an."; App::$strings["Smileybutton Settings"] = "Smileyknopf-Einstellungen"; +App::$strings["Order Not Found"] = "Bestellung nicht gefunden"; +App::$strings["Order cannot be checked out."] = "Bestellvorgang kann nicht fortgesetzt werden."; +App::$strings["Enable Shopping Cart"] = "Aktiviere die Warenkorb-Funktion."; +App::$strings["Enable Test Catalog"] = "Aktiviere den Test-Warenbestand"; +App::$strings["Enable Manual Payments"] = "Aktiviere manuelle Zahlungen"; +App::$strings["Base Cart Settings"] = "Warenkorb-Grundeinstellungen"; +App::$strings["Add Item"] = "Füge den Artikel hinzu"; +App::$strings["Call cart_post_"] = ""; +App::$strings["Cart Not Enabled (profile: "] = ""; +App::$strings["Order not found."] = "Bestellung nicht gefunden."; +App::$strings["No Order Found"] = "Keine Bestellung gefunden"; +App::$strings["call: "] = ""; +App::$strings["An unknown error has occurred Please start again."] = "Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal."; +App::$strings["Invalid Payment Type. Please start again."] = "Unbekannte Zahlungsmethode. Bitte versuche es noch einmal."; +App::$strings["Order not found"] = "Bestellung nicht gefunden"; +App::$strings["Error: order mismatch. Please try again."] = "Fehler: Bestellungen stimmen nicht überein. Bitte versuche es noch einmal."; +App::$strings["Manual payments are not enabled."] = "Manuelle Zahlungen sind nicht aktiviert."; +App::$strings["Finished"] = "Fertig"; App::$strings["This website is tracked using the Piwik analytics tool."] = "Diese Website verwendet Piwik, um die Besucherzugriffe auszuwerten."; App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Wenn Du nicht möchtest, dass Deine Besuche zu diesem Zweck gespeichert werden, kannst Du ein Cookie setzen, welches Piwik davon abhält, Deine weiteren Besuche auf dieser Website zu verfolgen (Opt-out)."; App::$strings["Piwik Base URL"] = "Piwik Basis-URL"; @@ -2536,10 +2581,10 @@ App::$strings["Jabber BOSH server"] = "Jabber BOSH Server"; App::$strings["XMPP Settings"] = "XMPP-Einstellungen"; App::$strings["Jabber BOSH host"] = "Jabber BOSH Host"; App::$strings["Use central userbase"] = "Zentrale Benutzerbasis verwenden"; -App::$strings["If enabled, members will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = ""; +App::$strings["If enabled, members will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Wenn aktiviert, werden die Mitglieder automatisch auf dem EJabber Server, der auf dieser Maschine installiert ist, angemeldet und die Zugangsdaten werden über das \"auth_ejabberd.php\"-Script synchronisiert."; App::$strings["Who likes me?"] = "Wer mag mich?"; App::$strings["You are now authenticated to pumpio."] = "Du bist nun bei pumpio authenzifiziert."; -App::$strings["return to the featured settings page"] = ""; +App::$strings["return to the featured settings page"] = "Zur Funktions-Einstellungsseite zurückkehren"; App::$strings["Post to Pump.io"] = "Bei pumpio veröffentlichen"; App::$strings["Pump.io servername"] = "Pump.io-Servername"; App::$strings["Without \"http://\" or \"https://\""] = "Ohne \"http://\" oder \"https://\""; @@ -2558,7 +2603,7 @@ App::$strings["Authentication successful but rejected: account creation is disab App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Suche %1\$s (%2\$s)"; App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname"; App::$strings["Search \$Projectname"] = "\$Projectname suchen"; -App::$strings["Redmatrix File Storage Import"] = ""; +App::$strings["Redmatrix File Storage Import"] = "Import des Redmatrix Datei Speichers"; App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Hiermit werden alle deine Daten aus der Redmatrix Cloud in diesen Kanal importiert."; App::$strings["file"] = "Datei"; App::$strings["Send email to all members"] = "E-Mail an alle Mitglieder senden"; @@ -2641,7 +2686,6 @@ App::$strings["Delete Selected Items"] = "Lösche die ausgewählten Elemente"; App::$strings["View Source"] = "Quelle anzeigen"; App::$strings["Follow Thread"] = "Unterhaltung folgen"; App::$strings["Unfollow Thread"] = "Unterhaltung nicht mehr folgen"; -App::$strings["Activity/Posts"] = "Aktivitäten/Beiträge"; App::$strings["Edit Connection"] = "Verbindung bearbeiten"; App::$strings["Message"] = "Nachricht"; App::$strings["%s likes this."] = "%s gefällt das."; @@ -2725,6 +2769,7 @@ App::$strings["Safe Mode"] = "Sicherer Modus"; App::$strings["Public Forums Only"] = "Nur öffentliche Foren"; App::$strings["This Website Only"] = "Nur dieser Hub"; App::$strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen"; +App::$strings["Unable to import a removed channel."] = "Nicht möglich, einen gelöschten Kanal zu importieren."; App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen."; App::$strings["Cloned channel not found. Import failed."] = "Geklonter Kanal nicht gefunden. Import fehlgeschlagen."; App::$strings["prev"] = "vorherige"; @@ -2834,6 +2879,7 @@ App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folg App::$strings["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert "; App::$strings["Channel location missing."] = "Adresse des Kanals fehlt."; App::$strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig."; +App::$strings["Premium channel - please visit:"] = "Premium-Kanal - bitte gehe zu:"; App::$strings["Channel was deleted and no longer exists."] = "Kanal wurde gelöscht und existiert nicht mehr."; App::$strings["Remote channel or protocol unavailable."] = "Externer Kanal oder Protokoll nicht verfügbar."; App::$strings["Channel discovery failed."] = "Kanalsuche fehlgeschlagen"; @@ -2958,8 +3004,8 @@ App::$strings["j F, Y"] = "j. F Y"; App::$strings["j F"] = "j. F"; App::$strings["Birthday:"] = "Geburtstag:"; App::$strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s"; -App::$strings["Sexual Preference:"] = "Sexuelle Orientierung:"; App::$strings["Tags:"] = "Schlagworte:"; +App::$strings["Sexual Preference:"] = "Sexuelle Orientierung:"; App::$strings["Political Views:"] = "Politische Ansichten:"; App::$strings["Religion:"] = "Religion:"; App::$strings["Hobbies/Interests:"] = "Hobbys/Interessen:"; @@ -3024,6 +3070,7 @@ App::$strings["Embedded content"] = "Eingebetteter Inhalt"; App::$strings["Embedding disabled"] = "Einbetten deaktiviert"; App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s heißt %2\$s willkommen"; App::$strings["General Features"] = "Allgemeine Funktionen"; +App::$strings["Display new member quick links menu"] = "Zeigt neuen Mitgliedern ein Menü mit Schnell-Links zu wichtigen Funktionen"; App::$strings["Advanced Profiles"] = "Erweiterte Profile"; App::$strings["Additional profile sections and selections"] = "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung"; App::$strings["Profile Import/Export"] = "Profil-Import/Export"; @@ -3057,8 +3104,10 @@ App::$strings["Enable management and selection of privacy groups"] = "Auswahl un App::$strings["Multiple Profiles"] = "Mehrfachprofile"; App::$strings["Ability to create multiple profiles"] = "Ermöglicht das Anlegen mehrerer Profile pro Kanal"; App::$strings["Provide alternate connection permission roles."] = "Stelle benutzerdefinierte Berechtigungsrollen für Verbindungen zur Verfügung."; -App::$strings["OAuth Clients"] = "OAuth Clients"; -App::$strings["Manage authenticatication tokens for mobile and remote apps."] = "Verwalte Tokens für den Zugriff von mobilen bzw. externen Anwendungen."; +App::$strings["OAuth1 Clients"] = "OAuth1 Clients"; +App::$strings["Manage OAuth1 authenticatication tokens for mobile and remote apps."] = "Verwalte OAuth1-Tokens für den Zugriff von mobilen bzw. externen Anwendungen."; +App::$strings["OAuth2 Clients"] = "OAuth2 Clients"; +App::$strings["Manage OAuth2 authenticatication tokens for mobile and remote apps."] = "Verwalte OAuth2-Tokens für den Zugriff von mobilen bzw. externen Anwendungen."; App::$strings["Access Tokens"] = "Zugangstokens"; App::$strings["Create access tokens so that non-members can access private content."] = "Erzeuge Tokens für den Zugriff von Nicht-Mitgliedern auf private Inhalte."; App::$strings["Post Composition Features"] = "Nachbearbeitungsfunktionen"; @@ -3077,6 +3126,8 @@ App::$strings["Content Expiration"] = "Verfall von Inhalten"; App::$strings["Remove posts/comments and/or private messages at a future time"] = "Ermöglicht das automatische Löschen von Beiträgen, Kommentaren und/oder privaten Nachrichten zu einem zukünftigen Datum."; App::$strings["Suppress Duplicate Posts/Comments"] = "Doppelte Beiträge unterdrücken"; App::$strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Verhindert, dass innerhalb von zwei Minuten Beiträge mit identischem Inhalt veröffentlicht werden."; +App::$strings["Auto-save drafts of posts and comments"] = "Auto-Speicherung von Beitrags- und Kommentarentwürfen"; +App::$strings["Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions"] = "Speichert Deine Beitrags- und Kommentarentwürfe automatisch im lokalen Browserspeicher und hilft so, versehentlichem Verlust dieser Inhalte vorzubeugen"; App::$strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter"; App::$strings["Search by Date"] = "Suche nach Datum"; App::$strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"; @@ -3104,7 +3155,7 @@ App::$strings["Star Posts"] = "Beiträge mit Sternchen versehen"; App::$strings["Ability to mark special posts with a star indicator"] = "Ermöglicht die lokale Markierung spezieller Beiträge mit einem Sternchen-Symbol"; App::$strings["Tag Cloud"] = "Schlagwort-Wolke"; App::$strings["Provide a personal tag cloud on your channel page"] = "Aktiviert die Anzeige einer Schlagwort-Wolke (Tag Cloud) auf Deiner Kanal-Seite"; -App::$strings["Tags"] = "Schlagwörter"; +App::$strings["Trending"] = "Meistbeachtet"; App::$strings["Keywords"] = "Schlüsselwörter"; App::$strings["have"] = "habe"; App::$strings["has"] = "hat"; @@ -3175,9 +3226,9 @@ App::$strings["Take me home"] = "Bringe mich nach Hause (eigener Kanal)"; App::$strings["Log me out of this site"] = "Logge mich von dieser Seite aus"; App::$strings["Create an account"] = "Erzeuge ein Konto"; App::$strings["Help and documentation"] = "Hilfe und Dokumentation"; -App::$strings["Search site @name, #tag, ?docs, content"] = "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt"; +App::$strings["Search site @name, !forum, #tag, ?docs, content"] = "Hub durchsuchen: @Name, !Forum, #Schlagwort, ?Dokumentation, Inhalt"; App::$strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration"; -App::$strings["@name, #tag, ?doc, content"] = "@Name, #Schlagwort, ?Dokumentation, Inhalt"; +App::$strings["@name, !forum, #tag, ?doc, content"] = "@Name, !Forum, #Schlagwort, ?Dokumentation, Inhalt"; App::$strings["Please wait..."] = "Bitte warten..."; App::$strings["Add Apps"] = "Apps hinzufügen"; App::$strings["Arrange Apps"] = "Apps anordnen"; @@ -3200,6 +3251,7 @@ App::$strings["Add privacy group"] = "Gruppe hinzufügen"; App::$strings["Channels not in any privacy group"] = "Kanäle, die in keiner Gruppe sind"; App::$strings["New window"] = "Neues Fenster"; App::$strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browserfenster oder Tab"; +App::$strings["Delegation session ended."] = ""; App::$strings["Logged out."] = "Ausgeloggt."; App::$strings["Email validation is incomplete. Please check your email."] = "E-Mail-Bestätigung nicht abgeschlossen. Bitte prüfe Deine E-Mails (ggf. Spam-Filterung mit berücksichtigen)."; App::$strings["Failed authentication"] = "Authentifizierung fehlgeschlagen"; -- cgit v1.2.3 From 00a95f4b91711cc28c9b170cfdc8ea6626d803a6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Apr 2018 22:44:40 +0200 Subject: minor fixes for dark schema --- view/theme/redbasic/schema/dark.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index d0154bfb1..dbee67c84 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -1,5 +1,4 @@ .generic-content-wrapper { - border: 1px solid #111; background-color: transparent; } @@ -148,7 +147,8 @@ option { background-color:#111; } -.modal-content { +.modal-content, +#notifications_wrapper { background-color: #111; } -- cgit v1.2.3 From 38e99c83544ca89edabe6f0786c5faac39f07e95 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 26 Apr 2018 17:25:58 -0700 Subject: set the 'force' flag on attach_mkdir when initiated from a DAV operation. This will report success if it already exists rather than throwing an exception. --- Zotlabs/Storage/Directory.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index a2ae0fee8..d063eed40 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -389,8 +389,12 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo ); if ($r) { + + // When initiated from DAV, set the 'force' flag on attach_mkdir(). This will cause the operation to report success even if the + // folder already exists. + require_once('include/attach.php'); - $result = attach_mkdir($r[0], $this->auth->observer, array('filename' => $name, 'folder' => $this->folder_hash)); + $result = attach_mkdir($r[0], $this->auth->observer, array('filename' => $name, 'folder' => $this->folder_hash, 'force' => true)); if($result['success']) { $sync = attach_export_data($r[0],$result['data']['hash']); -- cgit v1.2.3 From ce13fef6aaf4a99fdecd9ff5374028e5ff117651 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 26 Apr 2018 19:21:08 -0700 Subject: more testing of attach_move() uncovered some issues --- include/attach.php | 130 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 57 deletions(-) diff --git a/include/attach.php b/include/attach.php index 363005029..27bf0218a 100644 --- a/include/attach.php +++ b/include/attach.php @@ -2286,33 +2286,22 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { if(! ($c && $resource_id)) return false; + + // find the resource to be moved + $r = q("select * from attach where hash = '%s' and uid = %d limit 1", dbesc($resource_id), intval($channel_id) ); - if(! $r) + if(! $r) { + logger('resource_id not found'); return false; + } $oldstorepath = dbunescbin($r[0]['content']); - if($r[0]['is_dir']) { - $move_success = true; - $x = q("select hash from attach where folder = '%s' and uid = %d", - dbesc($r[0]['hash']), - intval($channel_id) - ); - if($x) { - foreach($x as $xv) { - $rs = attach_move($channel_id,$xv['hash'],$r[0]['hash']); - if(! $rs) { - $move_success = false; - break; - } - } - } - return $move_success; - } + // find the resource we are moving to if($new_folder_hash) { $n = q("select * from attach where hash = '%s' and uid = %d and is_dir = 1 limit 1", @@ -2326,6 +2315,10 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { $newstorepath = dbunescbin($n[0]['content']) . '/' . $resource_id; } else { + + // root directory + + $newdirname = EMPTY_STR; $newstorepath = 'store/' . $c['channel_address'] . '/' . $resource_id; } @@ -2335,56 +2328,61 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { $filename = $r[0]['filename']; - $s = q("select filename, id, hash, filesize from attach where filename = '%s' and folder = '%s' ", - dbesc($filename), - dbesc($new_folder_hash) - ); + // don't do duplicate check unless our parent folder has changed. - if($s) { - $overwrite = get_pconfig($channel_id,'system','overwrite_dup_files'); - if($overwrite) { - /// @fixme - return; - } - else { - if(strpos($filename,'.') !== false) { - $basename = substr($filename,0,strrpos($filename,'.')); - $ext = substr($filename,strrpos($filename,'.')); + if($r[0]['folder'] !== $new_folder_hash) { + + $s = q("select filename, id, hash, filesize from attach where filename = '%s' and folder = '%s' ", + dbesc($filename), + dbesc($new_folder_hash) + ); + + if($s) { + $overwrite = get_pconfig($channel_id,'system','overwrite_dup_files'); + if($overwrite) { + /// @fixme + return; } else { - $basename = $filename; - $ext = ''; - } + if(strpos($filename,'.') !== false) { + $basename = substr($filename,0,strrpos($filename,'.')); + $ext = substr($filename,strrpos($filename,'.')); + } + else { + $basename = $filename; + $ext = ''; + } - $matches = false; - if(preg_match('/(.*?)\([0-9]{1,}\)$/',$basename,$matches)) - $basename = $matches[1]; + $matches = false; + if(preg_match('/(.*?)\([0-9]{1,}\)$/',$basename,$matches)) + $basename = $matches[1]; - $v = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' ", - dbesc($basename . $ext), - dbesc($basename . '(%)' . $ext), - dbesc($new_folder_hash) - ); + $v = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' ", + dbesc($basename . $ext), + dbesc($basename . '(%)' . $ext), + dbesc($new_folder_hash) + ); - if($v) { - $x = 1; + if($v) { + $x = 1; - do { - $found = false; - foreach($v as $vv) { - if($vv['filename'] === $basename . '(' . $x . ')' . $ext) { - $found = true; - break; + do { + $found = false; + foreach($v as $vv) { + if($vv['filename'] === $basename . '(' . $x . ')' . $ext) { + $found = true; + break; + } } + if($found) + $x++; } - if($found) - $x++; + while($found); + $filename = $basename . '(' . $x . ')' . $ext; } - while($found); - $filename = $basename . '(' . $x . ')' . $ext; + else + $filename = $basename . $ext; } - else - $filename = $basename . $ext; } } @@ -2423,6 +2421,24 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { ); } + if($r[0]['is_dir']) { + $move_success = true; + $x = q("select hash from attach where folder = '%s' and uid = %d", + dbesc($r[0]['hash']), + intval($channel_id) + ); + if($x) { + foreach($x as $xv) { + $rs = attach_move($channel_id,$xv['hash'],$r[0]['hash']); + if(! $rs) { + $move_success = false; + break; + } + } + } + return $move_success; + } + return true; } -- cgit v1.2.3 From 7b445a5b39b887135854ba1b9aa6d9867d584ae5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 26 Apr 2018 20:27:14 -0700 Subject: where possible strip zid parameter from links that get pasted into posts so that they will get a correct zid when rendered --- include/bbcode.php | 8 +++++--- include/text.php | 2 +- include/zid.php | 6 +++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 340fe6b25..345b5b025 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -85,12 +85,14 @@ function tryoembed($match) { function nakedoembed($match) { $url = ((count($match) == 2) ? $match[1] : $match[2]); - $o = oembed_fetch_url($url); + $strip_url = strip_escaped_zids($url); + + $o = oembed_fetch_url($strip_url); if ($o['type'] == 'error') - return $match[0]; + return str_replace($url,$strip_url,$match[0]); - return '[embed]' . $url . '[/embed]'; + return '[embed]' . $strip_url . '[/embed]'; } function tryzrlaudio($match) { diff --git a/include/text.php b/include/text.php index ede62f582..24f8e1623 100644 --- a/include/text.php +++ b/include/text.php @@ -3307,6 +3307,7 @@ function cleanup_bbcode($body) { * First protect any url inside certain bbcode tags so we don't double link it. */ + $body = preg_replace_callback('/\[code(.*?)\[\/(code)\]/ism','\red_escape_codeblock',$body); $body = preg_replace_callback('/\[url(.*?)\[\/(url)\]/ism','\red_escape_codeblock',$body); $body = preg_replace_callback('/\[zrl(.*?)\[\/(zrl)\]/ism','\red_escape_codeblock',$body); @@ -3336,7 +3337,6 @@ function cleanup_bbcode($body) { $body = scale_external_images($body,false); - return $body; } diff --git a/include/zid.php b/include/zid.php index 5275c6d5a..fe06948ba 100644 --- a/include/zid.php +++ b/include/zid.php @@ -60,7 +60,7 @@ function zid($s, $address = '') { $url_match = true; if ($mine && $myaddr && (! $url_match)) - $zurl = $s . (($num_slashes >= 3) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr); + $zurl = $s . (($num_slashes >= 3) ? '' : '/') . (($achar === '?') ? '?f=&' : '&') . 'zid=' . urlencode($myaddr); else $zurl = $s; @@ -103,6 +103,10 @@ function strip_zats($s) { return preg_replace('/[\?&]zat=(.*?)(&|$)/ism','$2',$s); } +function strip_escaped_zids($s) { + $x = preg_replace('/&\;zid=(.*?)(&|$)/ism','$2',$s); + return strip_query_param($x,'f'); +} function clean_query_string($s = '') { -- cgit v1.2.3 From 09ef1b1bb68a4517b090f05f947b5af1acb89bd5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 27 Apr 2018 02:34:52 -0700 Subject: sql error --- Zotlabs/Storage/Directory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index d063eed40..7068ee15a 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -169,7 +169,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo $x = attach_syspaths($this->auth->owner_id,$this->folder_hash); - $y = q("update attach set display_path = '%s where hash = '%s' and uid = %d", + $y = q("update attach set display_path = '%s' where hash = '%s' and uid = %d", dbesc($x['path']), dbesc($this->folder_hash), intval($this->auth->owner_id) -- cgit v1.2.3 From 8c7bf6d2f362ef705ef04a06542f8c23bee81d89 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 28 Apr 2018 14:13:56 -0700 Subject: remove unused function --- include/network.php | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/include/network.php b/include/network.php index c41d87af0..72f1dacaf 100644 --- a/include/network.php +++ b/include/network.php @@ -368,27 +368,6 @@ function z_post_url($url, $params, $redirects = 0, $opts = array()) { return($ret); } -/** - * @brief Like z_post_url() but with an application/json HTTP header. - * - * Add a "Content-Type: application/json" HTTP-header to $opts and call z_post_url(). - * - * @see z_post_url() - * - * @param string $url - * @param array $params - * @param number $redirects default 0 - * @param array $opts (optional) curl options - * @return z_post_url() - */ -function z_post_url_json($url, $params, $redirects = 0, $opts = array()) { - - $opts = array_merge($opts, array('headers' => array('Content-Type: application/json'))); - - return z_post_url($url,json_encode($params),$redirects,$opts); -} - - function json_return_and_die($x, $content_type = 'application/json') { header("Content-type: $content_type"); echo json_encode($x); @@ -779,7 +758,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) * @brief xml2array() will convert the given XML text to an array in the XML structure. * * Link: http://www.bin-co.com/php/scripts/xml2array/ - * Portions significantly re-written by mike@macgirvin.com for Friendica + * Portions significantly re-written by mike@macgirvin.com * (namespaces, lowercase tags, get_attribute default changed, more...) * * Examples: $array = xml2array(file_get_contents('feed.xml')); @@ -1160,8 +1139,6 @@ function discover_by_webbie($webbie, $protocol = '') { $network = null; -// $webbie = strtolower($webbie); - $x = webfinger_rfc7033($webbie, true); if($x && array_key_exists('links',$x) && $x['links']) { foreach($x['links'] as $link) { -- cgit v1.2.3 From f77aaf1defc3ab8861cb008188badf08f14cd4c5 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Sun, 29 Apr 2018 14:57:16 +0200 Subject: Create /doc/context/fr/apps/help.html --- doc/context/fr/apps/help.html | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/context/fr/apps/help.html diff --git a/doc/context/fr/apps/help.html b/doc/context/fr/apps/help.html new file mode 100644 index 000000000..65eb63d84 --- /dev/null +++ b/doc/context/fr/apps/help.html @@ -0,0 +1,7 @@ +

    +
    Informations de base
    +
    Cette page vous montre quelles applications sont disponibles pour votre canal, y compris les applications centrales et celles fournies par les greffons. Pour ajouter une application au menu de l'application, cliquez sur le bouton étoile l'application dans la liste ci-dessous.
    +
    Gérer les applications
    +
    Appuyez sur le bouton «Gérer les applications» pour ouvrir une page où vous pouvez éditer le nom, les catégories et autres propriétés de vos applications. +
    +
    -- cgit v1.2.3 From eb30658c689e6473957648d1f51dea8c58840434 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Sun, 29 Apr 2018 15:05:41 +0200 Subject: Create /doc/context/fr/appman/help.html --- doc/context/fr/appman/help.html | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/context/fr/appman/help.html diff --git a/doc/context/fr/appman/help.html b/doc/context/fr/appman/help.html new file mode 100644 index 000000000..1c845a16a --- /dev/null +++ b/doc/context/fr/appman/help.html @@ -0,0 +1,5 @@ +dl class="dl-horizontal"> +
    Information de base
    +
    Modifiez les propriétés individuelles de l'application que vous avez sélectionnée. Les catégories vous permettent de trier vos applications pour vous aider à les trouver plus facilement dans la liste. La prise en charge des applications personnalisées que vous ou votre administrateur pouvez choisir de créer inclut des champs tels que «Prix de l'application» et «Lieu d'achat» qui ne sont pas applicables aux applications centrales Hubzilla. +
    + -- cgit v1.2.3 From 52803a30b6304a3c8bccf2585f8df4138ae3098b Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Sun, 29 Apr 2018 15:09:14 +0200 Subject: Create /doc/context/fr/apps/edit/help.html --- doc/context/fr/apps/edit/index.html | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/context/fr/apps/edit/index.html diff --git a/doc/context/fr/apps/edit/index.html b/doc/context/fr/apps/edit/index.html new file mode 100644 index 000000000..93fd8dec6 --- /dev/null +++ b/doc/context/fr/apps/edit/index.html @@ -0,0 +1,4 @@ +
    +
    Informations de base
    +
    Modifiez ou supprimez vos applications à l'aide des boutons de contrôle situés à côté de chaque icône d'application dans la liste.
    +
    -- cgit v1.2.3 From 1e79107d0ea1af4ca6a95ac7f07e290e92a1e5d5 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Sun, 29 Apr 2018 15:21:30 +0200 Subject: Create /doc/context/fr/cards/help.html --- doc/context/fr/cards/help.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/context/fr/cards/help.html diff --git a/doc/context/fr/cards/help.html b/doc/context/fr/cards/help.html new file mode 100644 index 000000000..a58a9a73e --- /dev/null +++ b/doc/context/fr/cards/help.html @@ -0,0 +1,20 @@ +
    +
    Informations de base
    +
    Les cartes représentent un domaine persistant de collaboration qui est distinct du volet social. Ils sont un peu plus légers que les pages web et les wikis pour une organisation rapide de l'information et ont l'avantage de permettre la collaboration et le commentaire. Ils sont bien adaptés pour aider à organiser des tâches complexes où il y a des mises à jour et des retours d'information fréquents. +
    +
    Ajouter une carte
    +
    + La création d'une nouvelle carte est très similaire à la composition d'un nouveau message.

    +
      +
    • + Nom du lien de page : Le nom du lien de page est le nom de la carte pour l'URL statique. +
      • +
    • + Titre : Le titre est affiché en haut de la carte. +
      • +
    • + Catégories : Si la fonction catégories de messages est activée pour votre chaîne, vous pouvez ajouter des catégories à la carte. Ces catégories remplissent la liste des catégories sur le panneau de gauche et permettent de filtrer votre collection de cartes. +
      • +
    +
    +
    -- cgit v1.2.3 From 900663b85f322159d8ba872de1a8a4e8033d2f0a Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Sun, 29 Apr 2018 15:37:19 +0200 Subject: Create /doc/context/fr/chat/help.html --- doc/context/fr/chat/help.html | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/context/fr/chat/help.html diff --git a/doc/context/fr/chat/help.html b/doc/context/fr/chat/help.html new file mode 100644 index 000000000..5f354c3c6 --- /dev/null +++ b/doc/context/fr/chat/help.html @@ -0,0 +1,8 @@ +
    +
    Informations de base
    +
    Créez et utilisez des salons de discussion pour communiquer en temps réel, en utilisant le système standard de permissions Hubzilla pour le contrôle d'accès aux salons de discussion.
    +
    Créer un nouveau salon de discussion
    +
    Utilisez le bouton «Nouveau» pour créer un nouveau salon de discussion. Entrez un nom et la durée de conservation des messages.
    +
    Discussion
    +
    Entrez votre message dans la boîte de message et cliquez sur «Envoyer». Vous pouvez définir un statut en sélectionnant le bouton du menu de la salle de discussion à côté du bouton «Envoyer». D'autres personnes «dans la salon» sont visibles dans le panneau latéral du panneau «Membres du Salon».
    +
    -- cgit v1.2.3 From 8d87b529f522ec3192f8769ea959ba81fcf27a36 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Sun, 29 Apr 2018 20:37:28 +0200 Subject: Create /doc/context/fr/appman/help.html --- doc/context/fr/appman/help.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/context/fr/appman/help.html b/doc/context/fr/appman/help.html index 1c845a16a..d65f78378 100644 --- a/doc/context/fr/appman/help.html +++ b/doc/context/fr/appman/help.html @@ -1,4 +1,4 @@ -dl class="dl-horizontal"> +
    Information de base
    Modifiez les propriétés individuelles de l'application que vous avez sélectionnée. Les catégories vous permettent de trier vos applications pour vous aider à les trouver plus facilement dans la liste. La prise en charge des applications personnalisées que vous ou votre administrateur pouvez choisir de créer inclut des champs tels que «Prix de l'application» et «Lieu d'achat» qui ne sont pas applicables aux applications centrales Hubzilla.
    -- cgit v1.2.3 From aa15867c9538e416aaa46de0fef8f2a92b69bf05 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 29 Apr 2018 17:50:35 -0700 Subject: Update issues on postgres --- Zotlabs/Update/_1208.php | 2 +- Zotlabs/Update/_1209.php | 2 +- Zotlabs/Update/_1211.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Update/_1208.php b/Zotlabs/Update/_1208.php index 4cbcf4322..840252694 100644 --- a/Zotlabs/Update/_1208.php +++ b/Zotlabs/Update/_1208.php @@ -8,7 +8,7 @@ class _1208 { if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { $r1 = q("ALTER TABLE poll ADD poll_author text NOT NULL"); - $r2 = q("create index \"poll_author_idx\" on poll \"poll_author\""); + $r2 = q("create index \"poll_author_idx\" on poll (\"poll_author\") "); $r = ($r1 && $r2); } diff --git a/Zotlabs/Update/_1209.php b/Zotlabs/Update/_1209.php index 5ec449395..dc95c3166 100644 --- a/Zotlabs/Update/_1209.php +++ b/Zotlabs/Update/_1209.php @@ -8,7 +8,7 @@ class _1209 { if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { $r1 = q("ALTER TABLE poll_elm ADD pelm_order numeric(6) NOT NULL DEFAULT '0' "); - $r2 = q("create index \"pelm_order_idx\" on poll_elm \"pelm_order\""); + $r2 = q("create index \"pelm_order_idx\" on poll_elm (\"pelm_order\")"); $r = ($r1 && $r2); } diff --git a/Zotlabs/Update/_1211.php b/Zotlabs/Update/_1211.php index 739a5670d..7068ecbd3 100644 --- a/Zotlabs/Update/_1211.php +++ b/Zotlabs/Update/_1211.php @@ -8,7 +8,7 @@ class _1211 { if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { $r1 = q("ALTER TABLE channel ADD channel_active timestamp NOT NULL DEFAULT '0001-01-01 00:00:00' "); - $r2 = q("create index \"channel_active\" on channel_active \"channel_active\""); + $r2 = q("create index \"channel_active\" on channel_active (\"channel_active\")"); $r = ($r1 && $r2); } -- cgit v1.2.3 From c0141a7d5e25aa872bd965be97c95d2fe69e6eb5 Mon Sep 17 00:00:00 2001 From: HappyPony Date: Mon, 30 Apr 2018 06:12:35 +0200 Subject: Russian translation for cards --- doc/context/ru/cards/help.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/context/ru/cards/help.html diff --git a/doc/context/ru/cards/help.html b/doc/context/ru/cards/help.html new file mode 100644 index 000000000..ccdf9d6d9 --- /dev/null +++ b/doc/context/ru/cards/help.html @@ -0,0 +1,16 @@ +
    Резюме
    +
    Карточки используются для командной работы в виртуальном пространстве дополнительно к ленте сообщений. Карточки являются болле компактными по сравнению с веб-страницами и вики и предназначены для быстрой организации работы. Преимущество карточек в возможности совместной работы и комментирования. Карточки могут помочь организовать и упростить работу, связанную с частыми изменениями и с обсуждением в проекте. +
    +
    Добавить карточку
    +
    + Создание новой карточки подобно написанию нового поста.

    • + Имя ссылки для веб-страницы: Имя ссылки для веб-страницы - это имя карточки для статической URL +
      • +
    • + Заголовок: Текст заголовка карточки +
      • +
    • + Категории: Если Инструмент "Категории сообщения" в вашем канале разрешён, то вы можете присвоить карточке определённую категорию. Эта категория появится в списке Категорий в левой колонке и разрешает быстрый выбор записей определённой категории из картотеки одним щёлчком мышки. +
      • +
    +
    -- cgit v1.2.3 From e841e482589cfc8f9734e313350b6e2b78ea6940 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 29 Apr 2018 23:05:38 -0700 Subject: hubzilla issue #1119 - xml2array has issues with some unicode sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array. --- include/network.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/network.php b/include/network.php index 72f1dacaf..8b7490a8a 100644 --- a/include/network.php +++ b/include/network.php @@ -648,6 +648,7 @@ function parse_xml_string($s, $strict = true) { libxml_use_internal_errors(true); + $x = @simplexml_load_string($s2); if($x === false) { logger('libxml: parse: error: ' . $s2, LOGGER_DATA); @@ -661,6 +662,16 @@ function parse_xml_string($s, $strict = true) { return $x; } + +function sxml2array ( $xmlObject, $out = array () ) +{ + foreach ( (array) $xmlObject as $index => $node ) + $out[$index] = ( is_object ( $node ) ) ? sxml2array ( $node ) : $node; + + return $out; +} + + /** * @brief Scales an external image. * -- cgit v1.2.3 From f28d6ad59e373537bf31d0e80ec155b3d92c76f8 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 08:46:55 +0200 Subject: Create /doc/context/fr/cloud/help.html --- doc/context/fr/cloud/help.html | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/context/fr/cloud/help.html diff --git a/doc/context/fr/cloud/help.html b/doc/context/fr/cloud/help.html new file mode 100644 index 000000000..c72e2ca1b --- /dev/null +++ b/doc/context/fr/cloud/help.html @@ -0,0 +1,7 @@ +
    +
    Informations de base
    +
    Cette page affiche les fichiers cloud d'un canal. Les fichiers visibles par l'observateur dépendent des permissions individuelles définies par le propriétaire du canal. Si vous avez l'autorisation de créer/télécharger des fichiers, vous verrez des boutons de contrôle au-dessus de la liste des fichiers. +
    +
    Onglets de contenu de la chaîne
    +
    Les onglets de contenu du canal sont des liens vers d'autres contenus publiés par le canal. L'onglet A propos permet d'accéder au profil du canal. L'onglet Photos permet d'accéder aux galeries de photos de la chaîne. L'onglet Fichiers permet d'accéder aux fichiers généraux partagés publiés par le canal.
    +
    -- cgit v1.2.3 From b6ec8bf687160ad9922157f154ef00ac53908f96 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 08:56:53 +0200 Subject: Create /doc/context/fr/connections/help.html --- doc/context/fr/connections/help.html | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/context/fr/connections/help.html diff --git a/doc/context/fr/connections/help.html b/doc/context/fr/connections/help.html new file mode 100644 index 000000000..38e581866 --- /dev/null +++ b/doc/context/fr/connections/help.html @@ -0,0 +1,8 @@ +
    +
    Informations de base
    +
    Cette page affiche une liste de toutes les connexions de ce canal. La liste peut être triée et filtrée à l'aide du bouton de menu à côté du bouton de recherche.
    +
    Détails de connexion
    +
    Chaque entrée de liste affiche les détails d'une connexion spécifique. Une image d'avatar translucide indique une connexion archivée.
    +
    État de la connexion
    +
    Une connexion peut être dans différents états :
    • Archivé
    • Ignoré
    • Bloqué
    • Caché
    +
    -- cgit v1.2.3 From d59c6aa8870c77225c3e44daaa97b4c91f269d16 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 09:00:25 +0200 Subject: Create /doc/context/fr/connections/ifpending/help.html --- doc/context/fr/connections/ifpending/help.html | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/context/fr/connections/ifpending/help.html diff --git a/doc/context/fr/connections/ifpending/help.html b/doc/context/fr/connections/ifpending/help.html new file mode 100644 index 000000000..38e581866 --- /dev/null +++ b/doc/context/fr/connections/ifpending/help.html @@ -0,0 +1,8 @@ +
    +
    Informations de base
    +
    Cette page affiche une liste de toutes les connexions de ce canal. La liste peut être triée et filtrée à l'aide du bouton de menu à côté du bouton de recherche.
    +
    Détails de connexion
    +
    Chaque entrée de liste affiche les détails d'une connexion spécifique. Une image d'avatar translucide indique une connexion archivée.
    +
    État de la connexion
    +
    Une connexion peut être dans différents états :
    • Archivé
    • Ignoré
    • Bloqué
    • Caché
    +
    -- cgit v1.2.3 From 5b0991fabc1e632b42b6b9c001a177ec5cb81408 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 09:11:27 +0200 Subject: Create /doc/context/fr/connedit/help.html --- doc/context/fr/connedit/help.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/context/fr/connedit/help.html diff --git a/doc/context/fr/connedit/help.html b/doc/context/fr/connedit/help.html new file mode 100644 index 000000000..c9b784d3e --- /dev/null +++ b/doc/context/fr/connedit/help.html @@ -0,0 +1,13 @@ +
    +
    Informations de base
    +
    Cette page vous permet de modifier ou d'éditer les paramètres individuels pour une connexion particulière ou de supprimer complètement une connexion. Vous êtes peut-être arrivé sur cette page après avoir créé ou approuvé une nouvelle connexion. Si c'est le cas, vous n'êtes pas tenu de faire quoi que ce soit. Votre connexion a déjà été établie. Vous pouvez les ajouter à un groupe ou ajuster des permissions spéciales, et cette page est présentée de façon à ce que vous puissiez le faire pendant que l'occasion se présente. +
    +
    Outils de connexion
    +
    Le menu Outils de connexion permet d'accéder à plusieurs paramètres. Afficher le profil, Afficher l'activité récente, Rafraîchir les autorisations, définir ou réinitialiser les indicateurs (Bloquer, Ignorer, Archiver, Cacher) et supprimer la connexion.
    +
    Groupes de protection de la vie privée
    +
    Chaque connexion peut être assignée à un ou plusieurs groupes de confidentialité pour regrouper des collections d'amis ayant accès à des messages, médias et autres contenus spécifiques. Vous pouvez les ajouter à un groupe de confidentialité existant ici, ou créer un nouveau groupe de confidentialité. Lorsque vous les ajoutez à un groupe existant, l'action est immédiate et vous n'avez pas besoin de soumettre un formulaire.
    +
    Permissions individuelles
    +
    L'octroi de permissions est généralement automatique et n'exige aucune action de votre part. Cependant, il se peut que vous souhaitiez ajuster des paramètres spécifiques pour cette connexion qui sont différents des autres.
    +
    Paramètres spécifiques aux fonctions
    +
    Un certain nombre de paramètres individuels sont contrôlés par des fonctions supplémentaires qui peuvent ou non être activées sur votre hub ou pour votre canal. Plusieurs fonctions optionnelles ont des paramètres pour chaque connexion, et ceux-ci peuvent être définis sur cette page par le biais d'onglets de formulaire supplémentaires qui peuvent être présents.
    +
    -- cgit v1.2.3 From 7d3dfc3ed8d530cdf7e268b4e2fc4e815b4c5f79 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 30 Apr 2018 09:13:26 +0200 Subject: missing class --- Zotlabs/Widget/Tasklist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Widget/Tasklist.php b/Zotlabs/Widget/Tasklist.php index 3961eecce..56342bd17 100644 --- a/Zotlabs/Widget/Tasklist.php +++ b/Zotlabs/Widget/Tasklist.php @@ -21,7 +21,7 @@ class Tasklist { '; $o .= '
    ' . '

    ' . t('Tasks') . '

    '; - $o .= '
    '; + $o .= '
    '; $o .= '
    '; return $o; -- cgit v1.2.3 From 98cfad5f2d285b39aea5f9c3c5233a335812694f Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 09:19:30 +0200 Subject: Create /doc/context/fr/events/help.html --- doc/context/fr/events/help.html | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/context/fr/events/help.html diff --git a/doc/context/fr/events/help.html b/doc/context/fr/events/help.html new file mode 100644 index 000000000..aafd49703 --- /dev/null +++ b/doc/context/fr/events/help.html @@ -0,0 +1,8 @@ +
    +
    Informations de base
    +
    Cette page affiche un calendrier des événements qui vous appartiennent et que vous partagez avec d'autres canaux.
    +
    Vue du calendrier
    +
    Le calendrier peut être affiché en mode mois, semaine ou jour en utilisant les options du panneau latéral.
    +
    Exportation/Importation
    +
    Exporter ou importer des événements de calendrier en utilisant des fichiers au format standard iCalendar (.ics).
    +
    -- cgit v1.2.3 From b223e364c6221aa3c680505fda4acfd6a1790272 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 30 Apr 2018 10:28:32 +0200 Subject: Revert "hubzilla issue #1119 - xml2array has issues with some unicode sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array." This reverts commit f620274c6a68ae9a2a6a5142947aa199862087fc. --- include/network.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/include/network.php b/include/network.php index 8b7490a8a..72f1dacaf 100644 --- a/include/network.php +++ b/include/network.php @@ -648,7 +648,6 @@ function parse_xml_string($s, $strict = true) { libxml_use_internal_errors(true); - $x = @simplexml_load_string($s2); if($x === false) { logger('libxml: parse: error: ' . $s2, LOGGER_DATA); @@ -662,16 +661,6 @@ function parse_xml_string($s, $strict = true) { return $x; } - -function sxml2array ( $xmlObject, $out = array () ) -{ - foreach ( (array) $xmlObject as $index => $node ) - $out[$index] = ( is_object ( $node ) ) ? sxml2array ( $node ) : $node; - - return $out; -} - - /** * @brief Scales an external image. * -- cgit v1.2.3 From feb5d3af89cc8709f2774e0dc867f7c849cc80f7 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 30 Apr 2018 11:51:14 +0200 Subject: fix another pgsql update error --- Zotlabs/Update/_1211.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Update/_1211.php b/Zotlabs/Update/_1211.php index 7068ecbd3..26e25536d 100644 --- a/Zotlabs/Update/_1211.php +++ b/Zotlabs/Update/_1211.php @@ -8,7 +8,7 @@ class _1211 { if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { $r1 = q("ALTER TABLE channel ADD channel_active timestamp NOT NULL DEFAULT '0001-01-01 00:00:00' "); - $r2 = q("create index \"channel_active\" on channel_active (\"channel_active\")"); + $r2 = q("create index \"channel_active_idx\" on channel (\"channel_active\")"); $r = ($r1 && $r2); } -- cgit v1.2.3 From 95f1366f0cb37664ab50dd83ebeb08e831319213 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 12:22:42 +0200 Subject: Create /doc/context/fr/mail/help.html --- doc/context/fr/mail/help.html | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/context/fr/mail/help.html diff --git a/doc/context/fr/mail/help.html b/doc/context/fr/mail/help.html new file mode 100644 index 000000000..fcf4eff21 --- /dev/null +++ b/doc/context/fr/mail/help.html @@ -0,0 +1,10 @@ +
    +
    Informations de base
    +
    Les messages affichés dans courrier privé ne sont visibles que pour vous et le destinataire unique.
    +
    Vue combinée
    +
    Les conversations complètes peuvent être visualisées dans un fil continu en sélectionnant Vue combinée . Les conversations disponibles sont affichées sous le menu dans le panneau latéral.
    +
    Boîte de réception/Boîte d'envoi
    +
    Les messages individuels envoyés sont visualisés en sélectionnant Boîte d'envoi, et les messages entrants sont visualisés en utilisant le filtre Boîte de réception.
    +
    Nouveau message.
    +
    Les messages individuels ont des rapports de livraison qui peuvent être visualisés à l'aide du menu déroulant. Les messages peuvent également être rappelés à partir du même menu, ce qui peut empêcher le destinataire de voir le message s'il ne l'a pas déjà lu.
    +
    -- cgit v1.2.3 From 897dd7f380ce2b06e34e3dc2da25f93dff57a44c Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 12:30:55 +0200 Subject: Create /doc/context/photos/help.html --- doc/context/fr/photos/help.html | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/context/fr/photos/help.html diff --git a/doc/context/fr/photos/help.html b/doc/context/fr/photos/help.html new file mode 100644 index 000000000..8609e9849 --- /dev/null +++ b/doc/context/fr/photos/help.html @@ -0,0 +1,6 @@ +
    +
    Informations de base
    +
    Cette page affiche les albums photos du canal. Les images visibles pour l'observateur dépendent des permissions d'images individuelles.
    +
    Onglets de contenu du canal
    +
    Les onglets de contenu du canal sont des liens vers d'autres contenus publiés par le canal. L'onglet A propos permet d'accéder au profil de canal. L'onglet Photos permet d'accéder aux galeries de photos des chaînes. L'onglet Fichiers permet d'accéder aux fichiers généraux partagés publiés par le canal.
    +
    -- cgit v1.2.3 From 75f73fffe121a2f1b028f421ad0c7f4f71a4d7dc Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 12:35:46 +0200 Subject: Create /doc/context/fr/profile/help.html --- doc/context/fr/profile/help.html | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/context/fr/profile/help.html diff --git a/doc/context/fr/profile/help.html b/doc/context/fr/profile/help.html new file mode 100644 index 000000000..26559db6f --- /dev/null +++ b/doc/context/fr/profile/help.html @@ -0,0 +1,6 @@ +
    +
    Informations de base
    +
    Ceci est la page de profil d'un canal. Il affiche typiquement des informations décrivant le canal. Si le canal représente une personne dans un réseau social, par exemple, le profil peut fournir des informations de contact et d'autres détails personnels sur la personne. Les canaux peuvent avoir plusieurs profils, où le profil affiché dépend de l'observateur.
    +
    Onglets de contenu du canal
    +
    Les onglets de contenu du canal sont des liens vers d'autres contenus publiés par le canal. L'onglet A propos permet d'accéder au profil de canal. L'onglet Photos permet d'accéder aux galeries de photos des chaînes. L'onglet Fichiers permet d'accéder aux fichiers généraux partagés publiés par le canal.
    +
    -- cgit v1.2.3 From 14953fa5c97dd24f026004a44a7d4ff240861ae7 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 14:02:26 +0200 Subject: Create /doc/context/fr/settings/account/help.html --- doc/context/fr/settings/account/help.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/context/fr/settings/account/help.html diff --git a/doc/context/fr/settings/account/help.html b/doc/context/fr/settings/account/help.html new file mode 100644 index 000000000..ed8e7f374 --- /dev/null +++ b/doc/context/fr/settings/account/help.html @@ -0,0 +1,18 @@ +
    +
    Informations de base
    +
    + Une fois que vous avez enregistré un compte dans la matrice, vous avez également créé un profil et un canal. +
    +
    Compte
    +
    + Vous avez un compte. Il contient votre compte de courriel et votre mot de passe. Avec votre compte, vous accédez à votre profil et votre canal. Pensez à votre compte comme la façon dont vous vous authentifiez sur un site Hubzilla. Il vous permet de faire des choses, comme créer des profils et des canaux avec lesquels vous pouvez vous connecter à d'autres personnes. +
    +
    Profile
    +
    + Vous vous êtes sûrement inscrit à d'autres services Internet, comme les forums ou les communautés en ligne. Pour chacun d'entre eux, vous avez fourni des informations sur vous-même, telles que la date de naissance, le pays, l'âge et autres. Contrairement à d'autres services, Hubzilla vous offre l'avantage de créer plus de profils. Vous pouvez ainsi faire la distinction entre les profils qui s'adressent à tous (votre profil public) et vos collègues de travail, votre famille et votre partenaire. Pensez à votre profil comme étant l'information de base sur vous-même que vous donnez aux autres. +
    +
    Channel
    +
    + Lors de l'enregistrement, vous avez créé votre premier canal. Oui, en plus de plusieurs profils, vous pouvez avoir plusieurs canaux. Cela pourrait être un peu confus au début, mais mettons les choses au clair. Vous avez déjà créé un canal. Vous pouvez utiliser celui-ci pour le public, pour communiquer avec les gens sur la vie de tous les jours. Mais vous êtes peut-être un lecteur de livres passionné et beaucoup de gens s'ennuient. Ainsi, vous ouvrez un second canal juste pour les amateurs de livres, où vous pouvez tous parler de livres autant que vous le souhaitez. Il s'agit évidemment d'un nouveau flux de messages, avec un nouveau profil (ou nouveaux profils) et des contacts complètement différents. Certaines connexions peuvent exister dans les deux canaux, mais il y en aura qui sont exclusives à l'un d'entre eux. Vous-même vous changez entre les deux comme vous le feriez dans la vie réelle lorsque vous parlez à des gens que vous rencontrez dans la rue ou à des gens que vous rencontrez pour parler de livres spécifiquement. Vous pouvez même vous connecter à vous-même, ou mieux : à votre autre canal .
    Penser un canal comme différents espaces dédiés à différents sujets où vous rencontrez différentes personnes.    . +
    +
    -- cgit v1.2.3 From 7f244a8039b9dc2c342fa18f758a56e6027afade Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 14:04:38 +0200 Subject: Create /doc/context/fr/settings/channel/help.html --- doc/context/fr/settings/channel/help.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/context/fr/settings/channel/help.html diff --git a/doc/context/fr/settings/channel/help.html b/doc/context/fr/settings/channel/help.html new file mode 100644 index 000000000..ed8e7f374 --- /dev/null +++ b/doc/context/fr/settings/channel/help.html @@ -0,0 +1,18 @@ +
    +
    Informations de base
    +
    + Une fois que vous avez enregistré un compte dans la matrice, vous avez également créé un profil et un canal. +
    +
    Compte
    +
    + Vous avez un compte. Il contient votre compte de courriel et votre mot de passe. Avec votre compte, vous accédez à votre profil et votre canal. Pensez à votre compte comme la façon dont vous vous authentifiez sur un site Hubzilla. Il vous permet de faire des choses, comme créer des profils et des canaux avec lesquels vous pouvez vous connecter à d'autres personnes. +
    +
    Profile
    +
    + Vous vous êtes sûrement inscrit à d'autres services Internet, comme les forums ou les communautés en ligne. Pour chacun d'entre eux, vous avez fourni des informations sur vous-même, telles que la date de naissance, le pays, l'âge et autres. Contrairement à d'autres services, Hubzilla vous offre l'avantage de créer plus de profils. Vous pouvez ainsi faire la distinction entre les profils qui s'adressent à tous (votre profil public) et vos collègues de travail, votre famille et votre partenaire. Pensez à votre profil comme étant l'information de base sur vous-même que vous donnez aux autres. +
    +
    Channel
    +
    + Lors de l'enregistrement, vous avez créé votre premier canal. Oui, en plus de plusieurs profils, vous pouvez avoir plusieurs canaux. Cela pourrait être un peu confus au début, mais mettons les choses au clair. Vous avez déjà créé un canal. Vous pouvez utiliser celui-ci pour le public, pour communiquer avec les gens sur la vie de tous les jours. Mais vous êtes peut-être un lecteur de livres passionné et beaucoup de gens s'ennuient. Ainsi, vous ouvrez un second canal juste pour les amateurs de livres, où vous pouvez tous parler de livres autant que vous le souhaitez. Il s'agit évidemment d'un nouveau flux de messages, avec un nouveau profil (ou nouveaux profils) et des contacts complètement différents. Certaines connexions peuvent exister dans les deux canaux, mais il y en aura qui sont exclusives à l'un d'entre eux. Vous-même vous changez entre les deux comme vous le feriez dans la vie réelle lorsque vous parlez à des gens que vous rencontrez dans la rue ou à des gens que vous rencontrez pour parler de livres spécifiquement. Vous pouvez même vous connecter à vous-même, ou mieux : à votre autre canal .
    Penser un canal comme différents espaces dédiés à différents sujets où vous rencontrez différentes personnes.    . +
    +
    -- cgit v1.2.3 From f094ac19d117253c201b6c5113d06241d95bd71b Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 14:16:02 +0200 Subject: Create /doc/context/fr/settings/tokens --- doc/context/fr/settings/tokens | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/context/fr/settings/tokens diff --git a/doc/context/fr/settings/tokens b/doc/context/fr/settings/tokens new file mode 100644 index 000000000..6be17a615 --- /dev/null +++ b/doc/context/fr/settings/tokens @@ -0,0 +1,20 @@ +
    +
    Jetons d'accès invités
    +
    + Afin de faciliter le partage de ressources privées avec des non-membres ou des membres de nœuds de fédération à découverte d'identification limitée, Hubzilla devrait fournir aux membres un mécanisme pour créer et gérer des logins temporaires («jetables»), alias «Zot Access Tokens». Ces jetons/accréditations peuvent être utilisés pour s'authentifier sur un site hubzilla dans le seul but d'accéder à des ressources privilégiées ou contrôlées (fichiers, photos, posts, pages web, salons de discussion, etc. +
    +
    Créer un jeton
    +
    + Le formulaire à créer/éditer accepte trois paramètres, un nom lisible par l'homme, un mot de passe ou un jeton d'accès, et une expiration facultative. Une fois expiré, le jeton d'accès n'est plus valide, ne peut plus être utilisé et sera automatiquement supprimé de la liste des comptes temporaires. Le champ mot de passe dans les formulaires de création/édition affiche le texte du jeton d'accès et non un mot de passe masqué. +
    +
    Partager un jeton
    +
    + Nous ne spécifions pas de mécanismes pour partager ces jetons avec d'autres. Toute méthode de communication peut être utilisée. Tous les jetons que vous avez créés sont ajoutés au sélecteur de liste de contrôle d'accès et peuvent être utilisés partout où des listes de contrôle d'accès sont fournies. + + Exemple : Un visiteur arrive sur votre site. Elle a un jeton d'accès que vous lui avez fourni et tente de visiter l'un de vos albums photos (qui ne peut être visionné que par vous-même et une identité temporaire). La permission est refusée. + + Le visiteur sélectionne maintenant «Login» dans la barre de navigation du menu. Ceci présente une page de connexion. Elle entre le nom et le mot de passe que vous lui avez fournis, et elle peut maintenant voir l'album photo restreint. + + Alternativement, vous pouvez partager un lien vers un fichier protégé en ajoutant un paramètre «&zat=abc123» à l'URL, où la chaîne «abc123» est la clé d'accès ou le mot de passe pour la connexion temporaire. Aucune autre négociation n'est nécessaire et le dossier est présenté. +
    +
    -- cgit v1.2.3 From 9c5ddf079a7fcee3eba5f84fe39c66f636701cad Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 14:27:05 +0200 Subject: Create /doc/context/fr/webpages/help.html --- doc/context/fr/webpages/help.html | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/context/fr/webpages/help.html diff --git a/doc/context/fr/webpages/help.html b/doc/context/fr/webpages/help.html new file mode 100644 index 000000000..c9d34c08f --- /dev/null +++ b/doc/context/fr/webpages/help.html @@ -0,0 +1,8 @@ +
    +
    Informations de base
    +
    Vous pouvez créer des sites Web modulaires, conscients de l'identité, composés d'éléments partageables.
    +
    Pages
    +
    Cette page énumère vos "pages", qui sont assignées des URLs où les gens peuvent visiter votre site. La structure des pages est généralement décrite par une mise en page associée , et leur contenu est construit à partir d'une collection de blocs.
    +
    Outils de portage de site Web
    +
    Les outils de portation de site Web vous permettent d'importer/exporter plusieurs éléments de pages Web (pages, mises en page, mises en page, blocs). Vous pouvez importer soit à partir d'un fichier zip téléchargé, soit à partir d'un dossier de fichiers cloud existant. Vous pouvez exporter vers un fichier zip contenant un groupe choisi d'éléments de page Web sous une forme compatible avec l'outil d'importation, ou vous pouvez exporter directement vers un dossier de fichiers dans le cloud. en savoir plus...
    +
    -- cgit v1.2.3 From d872a0ca86c2ec50f5be75cf6ee53dd7101fc12c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 30 Apr 2018 14:33:35 +0200 Subject: activitypub xchans do not have an xchan_addr. use xchan_url for the follow button if we do not find an xchan_addr --- include/connections.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/connections.php b/include/connections.php index e5bf07d96..32baa94bd 100644 --- a/include/connections.php +++ b/include/connections.php @@ -127,7 +127,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { return replace_macros(get_markup_template('xchan_vcard.tpl'),array( '$name' => $xchan['xchan_name'], '$photo' => ((is_array(App::$profile) && array_key_exists('photo',App::$profile)) ? App::$profile['photo'] : $xchan['xchan_photo_l']), - '$follow' => $xchan['xchan_addr'], + '$follow' => (($xchan['xchan_addr']) ? $xchan['xchan_addr'] : $xchan['xchan_url']), '$link' => zid($xchan['xchan_url']), '$connect' => $connect, '$newwin' => (($mode === 'chanview') ? t('New window') : ''), -- cgit v1.2.3 From 57cb4ccb7439940dac06ee4393e2a067f1a7c673 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 30 Apr 2018 14:36:19 +0200 Subject: Create /doc/context/fr/wiki/help.html --- doc/context/fr/wiki/help.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/context/fr/wiki/help.html diff --git a/doc/context/fr/wiki/help.html b/doc/context/fr/wiki/help.html new file mode 100644 index 000000000..af46899e4 --- /dev/null +++ b/doc/context/fr/wiki/help.html @@ -0,0 +1,13 @@ +
    +
    Informations de base
    +
    Chaque wiki est une collection de pages, composée sous forme de fichiers texte au format Markdown.
    +
    Liste des wikis
    +
    Les wikis appartenant au canal que vous avez la permission de voir sont listés dans le panneau latéral.
    +
    Historique de la page
    +
    Chaque révision d'une page est sauvegardée pour permettre un retour rapide. Cliquez sur l'onglet History pour afficher l'historique des révisions de page, y compris la date et l'auteur de chacune d'entre elles. Le bouton Revenir chargera la révision sélectionnée mais n'enregistrera pas automatiquement la page.
    +
    Pages
    +
    La liste des pages du wiki est listée dans le panneau Pages Wiki. Avant d'enregistrer les modifications de page à l'aide du menu déroulant Page, vous pouvez entrer un message personnalisé à afficher dans le visualiseur d'historique de page avec la révision.
    +
    + + + -- cgit v1.2.3 From 32423a7706c45d0d7187444f50eac33ca4fdfaa0 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 30 Apr 2018 22:30:59 -0700 Subject: parent folder permissions weren't being checked back to the cloud root directory in all cases --- Zotlabs/Module/Photo.php | 70 +++++++++++++++--------------------------------- include/attach.php | 39 ++++++++++++++++++--------- 2 files changed, 47 insertions(+), 62 deletions(-) diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 8a110f925..b3171fe75 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -127,69 +127,45 @@ class Photo extends \Zotlabs\Web\Controller { } } - $r = q("SELECT uid FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1", + $r = q("SELECT uid, photo_usage FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1", dbesc($photo), intval($resolution) ); if($r) { - - $allowed = (($r[0]['uid']) ? perm_is_allowed($r[0]['uid'],$observer_xchan,'view_storage') : true); - - $sql_extra = permissions_sql($r[0]['uid']); - if(! $sql_extra) - $sql_extra = ' and true '; - - // Only check permissions on normal photos. Those photos we don't check includes - // profile photos, xchan photos (which are also profile photos), 'thing' photos, - // and cover photos - - $sql_extra = " and (( photo_usage = 0 $sql_extra ) or photo_usage != 0 )"; + $allowed = (-1); + if(intval($r[0]['photo_usage'])) { + $allowed = 1; + if(intval($r[0]['photo_usage']) === PHOTO_COVER) + if($resolution < PHOTO_RES_COVER_1200) + $allowed = (-1); + if(intval($r[0]['photo_usage']) === PHOTO_PROFILE) + if(! in_array($resolution,[4,5,6])) + $allowed = (-1); + } + if($allowed === (-1)) + $allowed = attach_can_view($r[0]['uid'],$observer_xchan,$photo); + $channel = channelx_by_n($r[0]['uid']); // Now we'll see if we can access the photo - $r = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1", + $e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1", dbesc($photo), intval($resolution) ); - // viewing cover photos is allowed unless a plugin chooses to block it. - - if($r && intval($r[0]['photo_usage']) === PHOTO_COVER && $resolution >= PHOTO_RES_COVER_1200) - $allowed = 1; - - $d = [ 'imgscale' => $resolution, 'resource_id' => $photo, 'photo' => $r, 'allowed' => $allowed ]; - call_hooks('get_photo',$d); + $exists = (($e) ? true : false); - $resolution = $d['imgscale']; - $photo = $d['resource_id']; - $r = $d['photo']; - $allowed = $d['allowed']; - - if($r && $allowed) { - $data = dbunescbin($r[0]['content']); - $mimetype = $r[0]['mimetype']; - if(intval($r[0]['os_storage'])) { + if($exists && $allowed) { + $data = dbunescbin($e[0]['content']); + $mimetype = $e[0]['mimetype']; + if(intval($e[0]['os_storage'])) { $streaming = $data; } } else { - - // Does the picture exist? It may be a remote person with no credentials, - // but who should otherwise be able to view it. Show a default image to let - // them know permissions was denied. It may be possible to view the image - // through an authenticated profile visit. - // There won't be many completely unauthorised people seeing this because - // they won't have the photo link, so there's a reasonable chance that the person - // might be able to obtain permission to view it. - - $r = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1", - dbesc($photo), - intval($resolution) - ); - - if($r) { + if(! $allowed) { logger('mod_photo: forbidden. ' . \App::$query_string); $observer = \App::get_observer(); logger('mod_photo: observer = ' . (($observer) ? $observer['xchan_addr'] : '(not authenticated)')); @@ -201,9 +177,6 @@ class Photo extends \Zotlabs\Web\Controller { } } - - - if(! isset($data)) { if(isset($resolution)) { switch($resolution) { @@ -295,7 +268,6 @@ class Photo extends \Zotlabs\Web\Controller { } killme(); - // NOTREACHED } } diff --git a/include/attach.php b/include/attach.php index 27bf0218a..0d2b43b58 100644 --- a/include/attach.php +++ b/include/attach.php @@ -266,14 +266,12 @@ function attach_by_hash($hash, $observer_hash, $rev = 0) { return $ret; } - if(! perm_is_allowed($r[0]['uid'], $observer_hash, 'view_storage')) { + if(! attach_can_view($r[0]['uid'], $observer_hash, $hash)) { $ret['message'] = t('Permission denied.'); return $ret; } - $sql_extra = permissions_sql($r[0]['uid'],$observer_hash); - - // Now we'll see if we can access the attachment + // We've already checked for existence and permissions $r = q("SELECT * FROM attach WHERE hash = '%s' and uid = %d $sql_extra LIMIT 1", dbesc($hash), @@ -281,20 +279,12 @@ function attach_by_hash($hash, $observer_hash, $rev = 0) { ); if(! $r) { - $ret['message'] = t('Permission denied.'); + $ret['message'] = t('Unknown error.'); return $ret; } $r[0]['content'] = dbunescbin($r[0]['content']); - if($r[0]['folder']) { - $x = attach_can_view_folder($r[0]['uid'],$observer_hash,$r[0]['folder']); - if(! $x) { - $ret['message'] = t('Permission denied.'); - return $ret; - } - } - $ret['success'] = true; $ret['data'] = $r[0]; @@ -302,6 +292,29 @@ function attach_by_hash($hash, $observer_hash, $rev = 0) { } +function attach_can_view($uid,$ob_hash,$resource) { + + $sql_extra = permissions_sql($uid,$ob_hash); + $hash = $resource; + + if(! perm_is_allowed($uid,$ob_hash,'view_storage')) { + return false; + } + + $r = q("select folder from attach where hash = '%s' and uid = %d $sql_extra", + dbesc($hash), + intval($uid) + ); + if(! $r) { + return false; + } + + return attach_can_view_folder($uid,$ob_hash,$r[0]['folder']); + +} + + + function attach_can_view_folder($uid,$ob_hash,$folder_hash) { $sql_extra = permissions_sql($uid,$ob_hash); -- cgit v1.2.3 From 3f75dd108374d24674436c58deb9d2a795fbf604 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 May 2018 10:34:23 +0200 Subject: Revert "Revert "hubzilla issue #1119 - xml2array has issues with some unicode sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array."" This reverts commit b223e364c6221aa3c680505fda4acfd6a1790272. --- include/network.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/network.php b/include/network.php index 72f1dacaf..8b7490a8a 100644 --- a/include/network.php +++ b/include/network.php @@ -648,6 +648,7 @@ function parse_xml_string($s, $strict = true) { libxml_use_internal_errors(true); + $x = @simplexml_load_string($s2); if($x === false) { logger('libxml: parse: error: ' . $s2, LOGGER_DATA); @@ -661,6 +662,16 @@ function parse_xml_string($s, $strict = true) { return $x; } + +function sxml2array ( $xmlObject, $out = array () ) +{ + foreach ( (array) $xmlObject as $index => $node ) + $out[$index] = ( is_object ( $node ) ) ? sxml2array ( $node ) : $node; + + return $out; +} + + /** * @brief Scales an external image. * -- cgit v1.2.3 From 08bcd29eeee1166d62791b04c7de4a6c1a4e7456 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 1 May 2018 16:15:59 -0700 Subject: hubzilla issue #1149, don't duplicate addressbook entries on repeated channel imports --- Zotlabs/Module/Import.php | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 81c405f00..58f0c60d5 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -363,11 +363,27 @@ class Import extends \Zotlabs\Web\Controller { continue; } - abook_store_lowlevel($abook); + $r = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($abook['abook_xchan']), + intval($channel['channel_id']) + ); + if($r) { + foreach($abook as $k => $v) { + $r = q("UPDATE abook SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE abook_xchan = '%s' AND abook_channel = %d", + dbesc($k), + dbesc($v), + dbesc($abook['abook_xchan']), + intval($channel['channel_id']) + ); + } + } + else { + abook_store_lowlevel($abook); - $friends ++; - if(intval($abook['abook_feed'])) - $feeds ++; + $friends ++; + if(intval($abook['abook_feed'])) + $feeds ++; + } translate_abook_perms_inbound($channel,$abook_copy); -- cgit v1.2.3 From db930b794dc228f24549d7ef8052be8110990e1f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 1 May 2018 16:54:54 -0700 Subject: provide warnings about profile photo and cover photo permissions --- Zotlabs/Module/Cover_photo.php | 1 + Zotlabs/Module/Profile_photo.php | 1 + view/tpl/cover_photo.tpl | 3 +++ view/tpl/profile_photo.tpl | 4 +++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index d76c1b408..76e80156c 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -355,6 +355,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { $o .= replace_macros($tpl,array( '$user' => \App::$channel['channel_address'], + '$info' => t('Your cover photo may be visible to anybody on the internet'), '$existing' => get_cover_photo(local_channel(),'array',PHOTO_RES_COVER_850), '$lbl_upfile' => t('Upload File:'), '$lbl_profiles' => t('Select a profile:'), diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index 2ce8686b9..751c4338f 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -451,6 +451,7 @@ class Profile_photo extends \Zotlabs\Web\Controller { $o .= replace_macros($tpl,array( '$user' => \App::$channel['channel_address'], + '$info' => ((count($profiles) > 1) ? t('Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile') : t('Your profile photo is visible to anybody on the internet and may be distributed to other websites.')), '$importfile' => (($importing) ? \App::$data['importfile'] : ''), '$lbl_upfile' => t('Upload File:'), '$lbl_profiles' => t('Select a profile:'), diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl index 92efcdf02..5a5bf2286 100755 --- a/view/tpl/cover_photo.tpl +++ b/view/tpl/cover_photo.tpl @@ -86,6 +86,9 @@

    {{$title}}

    + {{if $info}} +
    {{$info}}
    + {{/if}} {{if $existing}} {{t('Cover Photo')}} {{/if}} diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index e48d05330..819502df5 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -94,7 +94,9 @@
    - + {{if $info}} +
    {{$info}}
    + {{/if}} {{if $importfile}} {{else}} -- cgit v1.2.3 From cd200ee7064159e4bc253fefe04ddf6ba25d4dde Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 1 May 2018 19:38:32 -0700 Subject: The channel import page seems to have missed the big theme cleanup of the last couple of years. --- Zotlabs/Module/Import.php | 19 ++++++++------ include/dba/dba_driver.php | 25 +++++++++++++++++++ view/css/mod_import.css | 37 ---------------------------- view/tpl/channel_import.tpl | 60 ++++++++++++++++++++------------------------- 4 files changed, 62 insertions(+), 79 deletions(-) delete mode 100644 view/css/mod_import.css diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 58f0c60d5..c36e4723a 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -532,16 +532,19 @@ class Import extends \Zotlabs\Web\Controller { '$desc' => t('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.'), '$label_filename' => t('File to Upload'), '$choice' => t('Or provide the old server/hub details'), - '$label_old_address' => t('Your old identity address (xyz@example.com)'), - '$label_old_email' => t('Your old login email address'), - '$label_old_pass' => t('Your old login password'), + + '$old_address' => [ 'old_address', t('Your old identity address (xyz@example.com)'), '', ''], + '$email' => [ 'email', t('Your old login email address'), '', '' ], + '$password' => [ 'password', t('Your old login password'), '', '' ], + '$import_posts' => [ 'import_posts', t('Import a few months of posts if possible (limited by available memory'), false, '', [ t('No'), t('Yes') ]], + '$common' => t('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.'), - '$label_import_primary' => t('Make this hub my primary location'), - '$label_import_moving' => t('Move this channel (disable all previous locations)'), - '$label_import_posts' => t('Import a few months of posts if possible (limited by available memory'), + + '$make_primary' => [ 'make_primary', t('Make this hub my primary location'), false, '', [ t('No'), t('Yes') ] ], + '$moving' => [ 'moving', t('Move this channel (disable all previous locations)'), false, '', [ t('No'), t('Yes') ] ], + '$pleasewait' => t('This process may take several minutes to complete. Please submit the form only once and leave this page open until finished.'), - '$email' => '', - '$pass' => '', + '$form_security_token' => get_form_security_token('channel_import'), '$submit' => t('Submit') )); diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index b3298b673..9e9f24bb3 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -460,3 +460,28 @@ function db_logger($s,$level = LOGGER_NORMAL,$syslog = LOG_INFO) { \DBA::$logging = false; \DBA::$dba->debug = $saved; } + + +function db_columns($table) { + + if($table) { + if(ACTIVE_DBTYPE === DBTYPE_POSTGRES) { + $r = q("SELECT column_name as field FROM information_schema.columns WHERE table_schema = 'public' AND table_name = '%s'", + dbesc($table) + ); + if($r) { + return ids_to_array($r,'field'); + } + } + else { + $r = q("show columns in %s", + dbesc($table) + ); + if($r) { + return ids_to_array($r,'Field'); + } + } + } + + return []; +} \ No newline at end of file diff --git a/view/css/mod_import.css b/view/css/mod_import.css deleted file mode 100644 index 8b988b324..000000000 --- a/view/css/mod_import.css +++ /dev/null @@ -1,37 +0,0 @@ -h2 { - margin-left: 15%; - margin-top: 8%; -} - -#import-channel-form { - font-size: 1.4em; - margin-left: 15%; - margin-top: 5%; - width: 50%; -} - - - -#import-channel-form .descriptive-paragraph { - color: #888; - margin-left: 20px; - margin-bottom: 25px; -} - -.import-label { - float: left; - width: 275px; -} - -.import-input { - float: left; - width: 275px; - padding: 5px; -} - - -.import-field-end { - clear: both; - margin-bottom: 20px; -} - diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl index baffe9b06..d702a2437 100755 --- a/view/tpl/channel_import.tpl +++ b/view/tpl/channel_import.tpl @@ -1,43 +1,35 @@ -

    {{$title}}

    +
    +
    +

    {{$title}}

    +
    +
    +
    -
    - -
    {{$desc}}
    + + +
    {{$desc}}
    - - -
    + + +
    -
    {{$choice}}
    +
    {{$choice}}
    - - -
    + {{include file="field_input.tpl" field=$old_address}} + {{include file="field_input.tpl" field=$email}} + {{include file="field_password.tpl" field=$password}} + {{include file="field_checkbox.tpl" field=$import_posts}} - - -
    +
    {{$common}}
    - - -
    + {{include file="field_checkbox.tpl" field=$make_primary}} + {{include file="field_checkbox.tpl" field=$moving}} - - -
    +
    {{$pleasewait}}
    -
    {{$common}}
    + +
    - - -
    - - - -
    - - -
    - -
    {{$pleasewait}}
    -
    + +
    +
    -- cgit v1.2.3 From 7a55ead97db94284146612364b8ce1c59de8771f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 1 May 2018 20:29:07 -0700 Subject: new feature (post 3.4): allow a different username to be used when importing. --- Zotlabs/Module/Import.php | 18 +++++++++++++++++- include/import.php | 7 ++++++- view/tpl/channel_import.tpl | 1 + 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index c36e4723a..d031bf16b 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -6,6 +6,7 @@ require_once('include/zot.php'); require_once('include/channel.php'); require_once('include/import.php'); require_once('include/perm_upgrade.php'); +require_once('library/urlify/URLify.php'); /** @@ -38,6 +39,7 @@ class Import extends \Zotlabs\Web\Controller { $filename = basename($_FILES['filename']['name']); $filesize = intval($_FILES['filename']['size']); $filetype = $_FILES['filename']['type']; + $newname = trim(strtolower($_REQUEST['newname'])); // import channel from file if($src) { @@ -146,7 +148,20 @@ class Import extends \Zotlabs\Web\Controller { } } - $channel = import_channel($data['channel'], $account_id, $seize); + if($newname) { + $x = false; + + if(get_config('system','unicode_usernames')) { + $x = punify(mb_strtolower($newname)); + } + + if((! $x) || strlen($x) > 64) { + $x = strtolower(\URLify::transliterate($newname)); + } + $newname = $x; + } + + $channel = import_channel($data['channel'], $account_id, $seize, $newname); } else { $moving = false; @@ -542,6 +557,7 @@ class Import extends \Zotlabs\Web\Controller { '$make_primary' => [ 'make_primary', t('Make this hub my primary location'), false, '', [ t('No'), t('Yes') ] ], '$moving' => [ 'moving', t('Move this channel (disable all previous locations)'), false, '', [ t('No'), t('Yes') ] ], + '$newname' => [ 'newname', t('Use this channel nickname instead of the one provided'), '', t('Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site.')], '$pleasewait' => t('This process may take several minutes to complete. Please submit the form only once and leave this page open until finished.'), diff --git a/include/import.php b/include/import.php index 0d3fb8c32..ae6a0ab6a 100644 --- a/include/import.php +++ b/include/import.php @@ -14,7 +14,7 @@ require_once('include/perm_upgrade.php'); * @param int $seize * @return boolean|array */ -function import_channel($channel, $account_id, $seize) { +function import_channel($channel, $account_id, $seize, $newname = '') { if(! array_key_exists('channel_system',$channel)) { $channel['channel_system'] = (($channel['channel_pageflags'] & 0x1000) ? 1 : 0); @@ -30,6 +30,11 @@ function import_channel($channel, $account_id, $seize) { $channel['channel_hash'] = make_xchan_hash($channel['channel_guid'],$channel['channel_guid_sig']); + if($newname) { + $channel['channel_address'] = $newname; + } + + // Check for duplicate channels $r = q("select * from channel where (channel_guid = '%s' or channel_hash = '%s' or channel_address = '%s' ) limit 1", diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl index d702a2437..c7cbb1742 100755 --- a/view/tpl/channel_import.tpl +++ b/view/tpl/channel_import.tpl @@ -24,6 +24,7 @@ {{include file="field_checkbox.tpl" field=$make_primary}} {{include file="field_checkbox.tpl" field=$moving}} + {{include file="field_input.tpl" field=$newname}}
    {{$pleasewait}}
    -- cgit v1.2.3 From 285781b8870d1c36cf90a3b38a448719b8bf9d21 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 2 May 2018 13:49:22 -0700 Subject: hubzilla issue #1151 - activitypub mention gets bookmarked --- include/network.php | 4 ++-- include/text.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/network.php b/include/network.php index 8b7490a8a..a00ede6bf 100644 --- a/include/network.php +++ b/include/network.php @@ -797,7 +797,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = if($namespaces) $parser = @xml_parser_create_ns("UTF-8",':'); else - $parser = @xml_parser_create(); + $parser = @xml_parser_create('UTF-8'); if(! $parser) { logger('xml2array: xml_parser_create: no resource'); @@ -807,7 +807,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8"); // http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); - xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1); + xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0); @xml_parse_into_struct($parser, trim($contents), $xml_values); @xml_parser_free($parser); diff --git a/include/text.php b/include/text.php index 24f8e1623..dc3a155de 100644 --- a/include/text.php +++ b/include/text.php @@ -3313,9 +3313,9 @@ function cleanup_bbcode($body) { $body = preg_replace_callback('/\[zrl(.*?)\[\/(zrl)\]/ism','\red_escape_codeblock',$body); - $body = preg_replace_callback("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\ + $body = preg_replace_callback("/([^\]\='".'"'."\/\{]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\ +\,\(\)]+)/ismu", '\nakedoembed', $body); - $body = preg_replace_callback("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\ + $body = preg_replace_callback("/([^\]\='".'"'."\/\{]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\ +\,\(\)]+)/ismu", '\red_zrl_callback', $body); $body = preg_replace_callback('/\[\$b64zrl(.*?)\[\/(zrl)\]/ism','\red_unescape_codeblock',$body); -- cgit v1.2.3 From a24d254404b3e26b105e621b37bbd0652539b91e Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Wed, 2 May 2018 23:15:04 +0200 Subject: Update composer autoload cache. Should add to Prepare RC Release documentation: composer dump-autoload --no-dev --- vendor/composer/autoload_classmap.php | 9 +++++++++ vendor/composer/autoload_static.php | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 26a230615..e7e1de1d0 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -925,6 +925,8 @@ return array( 'Zotlabs\\Module\\Notes' => $baseDir . '/Zotlabs/Module/Notes.php', 'Zotlabs\\Module\\Notifications' => $baseDir . '/Zotlabs/Module/Notifications.php', 'Zotlabs\\Module\\Notify' => $baseDir . '/Zotlabs/Module/Notify.php', + 'Zotlabs\\Module\\OAuth2TestVehicle' => $baseDir . '/Zotlabs/Module/Oauth2testvehicle.php', + 'Zotlabs\\Module\\Ochannel' => $baseDir . '/Zotlabs/Module/Ochannel.php', 'Zotlabs\\Module\\Oembed' => $baseDir . '/Zotlabs/Module/Oembed.php', 'Zotlabs\\Module\\Oep' => $baseDir . '/Zotlabs/Module/Oep.php', 'Zotlabs\\Module\\Oexchange' => $baseDir . '/Zotlabs/Module/Oexchange.php', @@ -974,6 +976,7 @@ return array( 'Zotlabs\\Module\\Settings\\Featured' => $baseDir . '/Zotlabs/Module/Settings/Featured.php', 'Zotlabs\\Module\\Settings\\Features' => $baseDir . '/Zotlabs/Module/Settings/Features.php', 'Zotlabs\\Module\\Settings\\Oauth' => $baseDir . '/Zotlabs/Module/Settings/Oauth.php', + 'Zotlabs\\Module\\Settings\\Oauth2' => $baseDir . '/Zotlabs/Module/Settings/Oauth2.php', 'Zotlabs\\Module\\Settings\\Permcats' => $baseDir . '/Zotlabs/Module/Settings/Permcats.php', 'Zotlabs\\Module\\Settings\\Tokens' => $baseDir . '/Zotlabs/Module/Settings/Tokens.php', 'Zotlabs\\Module\\Setup' => $baseDir . '/Zotlabs/Module/Setup.php', @@ -1027,6 +1030,7 @@ return array( 'Zotlabs\\Storage\\Directory' => $baseDir . '/Zotlabs/Storage/Directory.php', 'Zotlabs\\Storage\\File' => $baseDir . '/Zotlabs/Storage/File.php', 'Zotlabs\\Storage\\GitRepo' => $baseDir . '/Zotlabs/Storage/GitRepo.php', + 'Zotlabs\\Storage\\ZotOauth2Pdo' => $baseDir . '/Zotlabs/Storage/ZotOauth2Pdo.php', 'Zotlabs\\Text\\Tagadelic' => $baseDir . '/Zotlabs/Text/Tagadelic.php', 'Zotlabs\\Thumbs\\Epubthumb' => $baseDir . '/Zotlabs/Thumbs/Epubthumb.php', 'Zotlabs\\Thumbs\\Mp3audio' => $baseDir . '/Zotlabs/Thumbs/Mp3audio.php', @@ -1243,6 +1247,9 @@ return array( 'Zotlabs\\Update\\_1207' => $baseDir . '/Zotlabs/Update/_1207.php', 'Zotlabs\\Update\\_1208' => $baseDir . '/Zotlabs/Update/_1208.php', 'Zotlabs\\Update\\_1209' => $baseDir . '/Zotlabs/Update/_1209.php', + 'Zotlabs\\Update\\_1210' => $baseDir . '/Zotlabs/Update/_1210.php', + 'Zotlabs\\Update\\_1211' => $baseDir . '/Zotlabs/Update/_1211.php', + 'Zotlabs\\Update\\_1212' => $baseDir . '/Zotlabs/Update/_1212.php', 'Zotlabs\\Web\\CheckJS' => $baseDir . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php', @@ -1261,6 +1268,7 @@ return array( 'Zotlabs\\Widget\\Appcloud' => $baseDir . '/Zotlabs/Widget/Appcloud.php', 'Zotlabs\\Widget\\Archive' => $baseDir . '/Zotlabs/Widget/Archive.php', 'Zotlabs\\Widget\\Bookmarkedchats' => $baseDir . '/Zotlabs/Widget/Bookmarkedchats.php', + 'Zotlabs\\Widget\\Catcloud' => $baseDir . '/Zotlabs/Widget/Catcloud.php', 'Zotlabs\\Widget\\Catcloud_wall' => $baseDir . '/Zotlabs/Widget/Catcloud_wall.php', 'Zotlabs\\Widget\\Categories' => $baseDir . '/Zotlabs/Widget/Categories.php', 'Zotlabs\\Widget\\Cdav' => $baseDir . '/Zotlabs/Widget/Cdav.php', @@ -1294,6 +1302,7 @@ return array( 'Zotlabs\\Widget\\Portfolio' => $baseDir . '/Zotlabs/Widget/Portfolio.php', 'Zotlabs\\Widget\\Profile' => $baseDir . '/Zotlabs/Widget/Profile.php', 'Zotlabs\\Widget\\Pubsites' => $baseDir . '/Zotlabs/Widget/Pubsites.php', + 'Zotlabs\\Widget\\Pubtagcloud' => $baseDir . '/Zotlabs/Widget/Pubtagcloud.php', 'Zotlabs\\Widget\\Random_block' => $baseDir . '/Zotlabs/Widget/Random_block.php', 'Zotlabs\\Widget\\Rating' => $baseDir . '/Zotlabs/Widget/Rating.php', 'Zotlabs\\Widget\\Savedsearch' => $baseDir . '/Zotlabs/Widget/Savedsearch.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index d9b5ba2a6..11f2c01d6 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -1079,6 +1079,8 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Notes' => __DIR__ . '/../..' . '/Zotlabs/Module/Notes.php', 'Zotlabs\\Module\\Notifications' => __DIR__ . '/../..' . '/Zotlabs/Module/Notifications.php', 'Zotlabs\\Module\\Notify' => __DIR__ . '/../..' . '/Zotlabs/Module/Notify.php', + 'Zotlabs\\Module\\OAuth2TestVehicle' => __DIR__ . '/../..' . '/Zotlabs/Module/Oauth2testvehicle.php', + 'Zotlabs\\Module\\Ochannel' => __DIR__ . '/../..' . '/Zotlabs/Module/Ochannel.php', 'Zotlabs\\Module\\Oembed' => __DIR__ . '/../..' . '/Zotlabs/Module/Oembed.php', 'Zotlabs\\Module\\Oep' => __DIR__ . '/../..' . '/Zotlabs/Module/Oep.php', 'Zotlabs\\Module\\Oexchange' => __DIR__ . '/../..' . '/Zotlabs/Module/Oexchange.php', @@ -1128,6 +1130,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Settings\\Featured' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Featured.php', 'Zotlabs\\Module\\Settings\\Features' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Features.php', 'Zotlabs\\Module\\Settings\\Oauth' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Oauth.php', + 'Zotlabs\\Module\\Settings\\Oauth2' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Oauth2.php', 'Zotlabs\\Module\\Settings\\Permcats' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Permcats.php', 'Zotlabs\\Module\\Settings\\Tokens' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Tokens.php', 'Zotlabs\\Module\\Setup' => __DIR__ . '/../..' . '/Zotlabs/Module/Setup.php', @@ -1181,6 +1184,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Storage\\Directory' => __DIR__ . '/../..' . '/Zotlabs/Storage/Directory.php', 'Zotlabs\\Storage\\File' => __DIR__ . '/../..' . '/Zotlabs/Storage/File.php', 'Zotlabs\\Storage\\GitRepo' => __DIR__ . '/../..' . '/Zotlabs/Storage/GitRepo.php', + 'Zotlabs\\Storage\\ZotOauth2Pdo' => __DIR__ . '/../..' . '/Zotlabs/Storage/ZotOauth2Pdo.php', 'Zotlabs\\Text\\Tagadelic' => __DIR__ . '/../..' . '/Zotlabs/Text/Tagadelic.php', 'Zotlabs\\Thumbs\\Epubthumb' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Epubthumb.php', 'Zotlabs\\Thumbs\\Mp3audio' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Mp3audio.php', @@ -1397,6 +1401,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Update\\_1207' => __DIR__ . '/../..' . '/Zotlabs/Update/_1207.php', 'Zotlabs\\Update\\_1208' => __DIR__ . '/../..' . '/Zotlabs/Update/_1208.php', 'Zotlabs\\Update\\_1209' => __DIR__ . '/../..' . '/Zotlabs/Update/_1209.php', + 'Zotlabs\\Update\\_1210' => __DIR__ . '/../..' . '/Zotlabs/Update/_1210.php', + 'Zotlabs\\Update\\_1211' => __DIR__ . '/../..' . '/Zotlabs/Update/_1211.php', + 'Zotlabs\\Update\\_1212' => __DIR__ . '/../..' . '/Zotlabs/Update/_1212.php', 'Zotlabs\\Web\\CheckJS' => __DIR__ . '/../..' . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php', @@ -1415,6 +1422,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Widget\\Appcloud' => __DIR__ . '/../..' . '/Zotlabs/Widget/Appcloud.php', 'Zotlabs\\Widget\\Archive' => __DIR__ . '/../..' . '/Zotlabs/Widget/Archive.php', 'Zotlabs\\Widget\\Bookmarkedchats' => __DIR__ . '/../..' . '/Zotlabs/Widget/Bookmarkedchats.php', + 'Zotlabs\\Widget\\Catcloud' => __DIR__ . '/../..' . '/Zotlabs/Widget/Catcloud.php', 'Zotlabs\\Widget\\Catcloud_wall' => __DIR__ . '/../..' . '/Zotlabs/Widget/Catcloud_wall.php', 'Zotlabs\\Widget\\Categories' => __DIR__ . '/../..' . '/Zotlabs/Widget/Categories.php', 'Zotlabs\\Widget\\Cdav' => __DIR__ . '/../..' . '/Zotlabs/Widget/Cdav.php', @@ -1448,6 +1456,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Widget\\Portfolio' => __DIR__ . '/../..' . '/Zotlabs/Widget/Portfolio.php', 'Zotlabs\\Widget\\Profile' => __DIR__ . '/../..' . '/Zotlabs/Widget/Profile.php', 'Zotlabs\\Widget\\Pubsites' => __DIR__ . '/../..' . '/Zotlabs/Widget/Pubsites.php', + 'Zotlabs\\Widget\\Pubtagcloud' => __DIR__ . '/../..' . '/Zotlabs/Widget/Pubtagcloud.php', 'Zotlabs\\Widget\\Random_block' => __DIR__ . '/../..' . '/Zotlabs/Widget/Random_block.php', 'Zotlabs\\Widget\\Rating' => __DIR__ . '/../..' . '/Zotlabs/Widget/Rating.php', 'Zotlabs\\Widget\\Savedsearch' => __DIR__ . '/../..' . '/Zotlabs/Widget/Savedsearch.php', -- cgit v1.2.3 From 406ea67bbc9b67ca4bd80d80eb012bc68afc5262 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 2 May 2018 17:39:12 -0700 Subject: Provide admin delete ability if the viewer is admin but has no existing delete authority. For 3.5+ as a new string is involved. --- Zotlabs/Lib/ThreadItem.php | 4 ++++ Zotlabs/Module/Item.php | 21 ++++++++++++++------- include/items.php | 1 - 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 61a012f9d..b7fc8e65d 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -141,6 +141,10 @@ class ThreadItem { 'delete' => t('Delete'), ); } + elseif(is_site_admin()) { + $drop = [ 'dropping' => true, 'delete' => t('Admin Delete') ]; + } + // FIXME if($observer_is_pageowner) { $multidrop = array( diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index bba1dc02d..87f83e877 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -1084,7 +1084,7 @@ class Item extends \Zotlabs\Web\Controller { if((argc() == 3) && (argv(1) === 'drop') && intval(argv(2))) { require_once('include/items.php'); - $i = q("select id, uid, author_xchan, owner_xchan, source_xchan, item_type from item where id = %d limit 1", + $i = q("select id, uid, item_origin, author_xchan, owner_xchan, source_xchan, item_type from item where id = %d limit 1", intval(argv(2)) ); @@ -1094,14 +1094,21 @@ class Item extends \Zotlabs\Web\Controller { if(local_channel() && local_channel() == $i[0]['uid']) $local_delete = true; - $sys = get_sys_channel(); - if(is_site_admin() && $sys['channel_id'] == $i[0]['uid']) - $can_delete = true; - + // The site admin can delete any post/item on the site. + // If the item originated on this site+channel the deletion will propagate downstream. + // Otherwise just the local copy is removed. + + if(is_site_admin()) { + $local_delete = true; + if(intval($i[0]['item_origin'])) + $can_delete = true; + } + $ob_hash = get_observer_hash(); - if($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) + if($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) { $can_delete = true; - + } + if(! ($can_delete || $local_delete)) { notice( t('Permission denied.') . EOL); return; diff --git a/include/items.php b/include/items.php index 8bc4595b6..2c9d84ef3 100755 --- a/include/items.php +++ b/include/items.php @@ -3561,7 +3561,6 @@ function item_expire($uid,$days,$comment_days = 7) { drop_item($item['id'],false); } -// Zotlabs\Daemon\Master::Summon(array('Notifier','expire',$uid)); } function retain_item($id) { -- cgit v1.2.3 From 9713436f497a031e4369130dda40b415ff285fd8 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 2 May 2018 18:23:42 -0700 Subject: backend work to allow admin to delete photos. Still requires frontend work to give admin access to either the photos and/or the delete link. --- Zotlabs/Module/Item.php | 15 ++++++++++----- Zotlabs/Module/Photos.php | 41 +++++++++++++++++++++++------------------ include/photos.php | 26 ++++++++++++++++++++------ 3 files changed, 53 insertions(+), 29 deletions(-) diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 87f83e877..fd99c4a64 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -1084,6 +1084,8 @@ class Item extends \Zotlabs\Web\Controller { if((argc() == 3) && (argv(1) === 'drop') && intval(argv(2))) { require_once('include/items.php'); + + $i = q("select id, uid, item_origin, author_xchan, owner_xchan, source_xchan, item_type from item where id = %d limit 1", intval(argv(2)) ); @@ -1091,9 +1093,16 @@ class Item extends \Zotlabs\Web\Controller { if($i) { $can_delete = false; $local_delete = false; - if(local_channel() && local_channel() == $i[0]['uid']) + + if(local_channel() && local_channel() == $i[0]['uid']) { $local_delete = true; + } + $ob_hash = get_observer_hash(); + if($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) { + $can_delete = true; + } + // The site admin can delete any post/item on the site. // If the item originated on this site+channel the deletion will propagate downstream. // Otherwise just the local copy is removed. @@ -1104,10 +1113,6 @@ class Item extends \Zotlabs\Web\Controller { $can_delete = true; } - $ob_hash = get_observer_hash(); - if($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) { - $can_delete = true; - } if(! ($can_delete || $local_delete)) { notice( t('Permission denied.') . EOL); diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index a143c4d4c..e21f3025c 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -102,14 +102,7 @@ class Photos extends \Zotlabs\Web\Controller { if($_REQUEST['dropalbum'] == t('Delete Album')) { - - // This is dangerous because we combined file storage and photos into one interface - // This function will remove all photos from any directory with the same name since - // we have not passed the path value. - - // The correct solution would be to use a full pathname from your storage root for 'album' - // We also need to prevent/block removing the storage root folder. - + $folder_hash = ''; $r = q("select * from attach where is_dir = 1 and uid = %d and hash = '%s'", @@ -124,7 +117,8 @@ class Photos extends \Zotlabs\Web\Controller { $res = array(); - + $admin_delete = false; + // get the list of photos we are about to delete if(remote_channel() && (! local_channel())) { @@ -133,6 +127,10 @@ class Photos extends \Zotlabs\Web\Controller { elseif(local_channel()) { $str = photos_album_get_db_idstr(local_channel(),$album); } + elseif(is_site_admin()) { + $str = photos_album_get_db_idstr_admin($page_owner_uid,$album); + $admin_delete = true; + } else { $str = null; } @@ -145,7 +143,7 @@ class Photos extends \Zotlabs\Web\Controller { ); if($r) { foreach($r as $i) { - attach_delete($page_owner_uid, $i['resource_id'], 1 ); + attach_delete($page_owner_uid, $i['resource_id'], true ); } } @@ -158,12 +156,14 @@ class Photos extends \Zotlabs\Web\Controller { // @FIXME do the same for the linked attach if($folder_hash) { - attach_delete($page_owner_uid,$folder_hash, 1); - - $sync = attach_export_data(\App::$data['channel'],$folder_hash, true); + attach_delete($page_owner_uid, $folder_hash, true ); + + if(! $admin_delete) { + $sync = attach_export_data(\App::$data['channel'],$folder_hash, true); - if($sync) - build_sync_packet($page_owner_uid,array('file' => array($sync))); + if($sync) + build_sync_packet($page_owner_uid,array('file' => array($sync))); + } } } @@ -181,17 +181,22 @@ class Photos extends \Zotlabs\Web\Controller { $r = q("SELECT id, resource_id FROM photo WHERE ( xchan = '%s' or uid = %d ) AND resource_id = '%s' LIMIT 1", dbesc($ob_hash), intval(local_channel()), - dbesc(\App::$argv[2]) + dbesc(argv(2)) ); if($r) { - attach_delete($page_owner_uid, $r[0]['resource_id'], 1 ); + attach_delete($page_owner_uid, $r[0]['resource_id'], true ); $sync = attach_export_data(\App::$data['channel'],$r[0]['resource_id'], true); if($sync) build_sync_packet($page_owner_uid,array('file' => array($sync))); } - + elseif(is_site_admin()) { + // If the admin deletes a photo, don't sync + attach_delete($page_owner_uid, argv(2), true); + } + + goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']); } diff --git a/include/photos.php b/include/photos.php index 9ae0e6874..495043bbf 100644 --- a/include/photos.php +++ b/include/photos.php @@ -786,17 +786,31 @@ function photos_album_get_db_idstr($channel_id, $album, $remote_xchan = '') { ); } if ($r) { - $arr = array(); - foreach ($r as $rr) { - $arr[] = "'" . dbesc($rr['hash']) . "'" ; - } - $str = implode(',',$arr); - return $str; + return ids_to_querystr($r,'hash',true); } return false; } +function photos_album_get_db_idstr_admin($channel_id, $album) { + + if(! is_site_admin()) + return false; + + $r = q("SELECT hash from attach where uid = %d and folder = '%s' ", + intval($channel_id), + dbesc($album) + ); + + if ($r) { + return ids_to_querystr($r,'hash',true); + } + + return false; +} + + + /** * @brief Creates a new photo item. * -- cgit v1.2.3 From e9f49d9d9c02ef6b2f5259f9a323a8a2a2d75af5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 2 May 2018 20:08:59 -0700 Subject: admin delete of files --- Zotlabs/Module/Filestorage.php | 39 +++++++++++++++++++++++++++++++-------- Zotlabs/Storage/Browser.php | 4 +++- include/attach.php | 2 +- view/js/main.js | 2 ++ view/tpl/cloud_directory.tpl | 4 ++-- 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php index 5c8557e5a..cd9ab601d 100644 --- a/Zotlabs/Module/Filestorage.php +++ b/Zotlabs/Module/Filestorage.php @@ -66,7 +66,7 @@ class Filestorage extends \Zotlabs\Web\Controller { $perms = get_all_perms($owner, $ob_hash); - if(! $perms['view_storage']) { + if(! ($perms['view_storage'] || is_site_admin())){ notice( t('Permission denied.') . EOL); return; } @@ -75,15 +75,29 @@ class Filestorage extends \Zotlabs\Web\Controller { // need to return for anyone other than the owner, despite the perms check for now. $is_owner = (((local_channel()) && ($owner == local_channel())) ? true : false); - if(! $is_owner) { + if(! ($is_owner || is_site_admin())){ info( t('Permission Denied.') . EOL ); return; } if(argc() > 3 && argv(3) === 'delete') { + + if(argc() > 4 && argv(4) === 'json') + $json_return = true; + + + $admin_delete = false; + if(! $perms['write_storage']) { - notice( t('Permission denied.') . EOL); - return; + if(is_site_admin()) { + $admin_delete = true; + } + else { + notice( t('Permission denied.') . EOL); + if($json_return) + json_return_and_die([ 'success' => false ]); + return; + } } $file = intval(argv(2)); @@ -92,22 +106,31 @@ class Filestorage extends \Zotlabs\Web\Controller { intval($owner) ); if(! $r) { + if($json_return) + json_return_and_die([ 'success' => false ]); + notice( t('File not found.') . EOL); goaway(z_root() . '/cloud/' . $which); } $f = $r[0]; - $channel = \App::get_channel(); + + $channel = channelx_by_n($owner); $url = get_cloud_url($channel['channel_id'], $channel['channel_address'], $f['hash']); attach_delete($owner, $f['hash']); - $sync = attach_export_data($channel, $f['hash'], true); - if($sync) { - build_sync_packet($channel['channel_id'], array('file' => array($sync))); + if(! $admin_delete) { + $sync = attach_export_data($channel, $f['hash'], true); + if($sync) { + build_sync_packet($channel['channel_id'], array('file' => array($sync))); + } } + if(json_return) + json_return_and_die([ 'success' => true ]); + goaway(dirname($url)); } diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 508c39d22..f4f906ad1 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -241,7 +241,7 @@ class Browser extends DAV\Browser\Plugin { // put the array for this file together $ft['attachId'] = $this->findAttachIdByHash($attachHash); - $ft['fileStorageUrl'] = substr($fullPath, 0, strpos($fullPath, "cloud/")) . "filestorage/" . $this->auth->getCurrentUser(); + $ft['fileStorageUrl'] = substr($fullPath, 0, strpos($fullPath, "cloud/")) . "filestorage/" . $this->auth->owner_nick; $ft['icon'] = $icon; $ft['photo_icon'] = $photo_icon; $ft['attachIcon'] = (($size) ? $attachIcon : ''); @@ -276,6 +276,8 @@ class Browser extends DAV\Browser\Plugin { '$create' => t('Create'), '$upload' => t('Add Files'), '$is_owner' => $is_owner, + '$is_admin' => is_site_admin(), + '$admin_delete' => t('Admin Delete'), '$parentpath' => $parentpath, '$cpath' => bin2hex(\App::$query_string), '$tiles' => intval($_SESSION['cloud_tiles']), diff --git a/include/attach.php b/include/attach.php index 0d2b43b58..2a9badaac 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1585,8 +1585,8 @@ function get_cloud_url($channel_id, $channel_name, $attachHash) { } } while ($parentHash); - $url = z_root() . '/cloud/' . $channel_name . '/' . $parentFullPath . find_filename_by_hash($channel_id, $attachHash); + $url = z_root() . '/cloud/' . $channel_name . '/' . $parentFullPath . find_filename_by_hash($channel_id, $attachHash); return $url; } diff --git a/view/js/main.js b/view/js/main.js index acb9b462f..3e24e8177 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1057,7 +1057,9 @@ function doprofilelike(ident, verb) { $.get('like/' + ident + '?verb=' + verb, function() { window.location.href=window.location.href; }); } + function dropItem(url, object) { + var confirm = confirmDelete(); if(confirm) { $('body').css('cursor', 'wait'); diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 1f0addc95..51178a9ba 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -65,10 +65,10 @@ {{$item.attachIcon}} - + {{else}} - + {{if $is_admin}}{{else}}{{/if}} {{/if}} {{*{{$item.type}}*}} {{$item.sizeFormatted}} -- cgit v1.2.3 From 6bf5eea64670996fafb80f92a4b8ec6a44f22bb0 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 2 May 2018 22:05:55 -0700 Subject: make the cloud logging a bit less verbose until we actually need it. --- Zotlabs/Module/Oep.php | 2 +- Zotlabs/Storage/File.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php index ec40bf9db..0f20a5f9a 100644 --- a/Zotlabs/Module/Oep.php +++ b/Zotlabs/Module/Oep.php @@ -72,7 +72,7 @@ class Oep extends \Zotlabs\Web\Controller { $url = $args['url']; $maxwidth = intval($args['maxwidth']); $maxheight = intval($args['maxheight']); - logger('processing display'); + if(preg_match('#//(.*?)/display/(.*?)(&|\?|$)#',$url,$matches)) { $res = $matches[2]; } diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php index 53d5d3476..4610aceb7 100644 --- a/Zotlabs/Storage/File.php +++ b/Zotlabs/Storage/File.php @@ -49,7 +49,7 @@ class File extends DAV\Node implements DAV\IFile { $this->data = $data; $this->auth = $auth; - logger(print_r($this->data, true), LOGGER_DATA); + // logger(print_r($this->data, true), LOGGER_DATA); } /** -- cgit v1.2.3 From 459ec78a5e3cb09ee908fd7810bbb0b80b2e4713 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 2 May 2018 22:59:21 -0700 Subject: provide easy access to the autoperms setting for forum and repository channels. This may be needed in the future to protect an existing forum from assault by spammers with changing identities. The forum can quickly be turned into membership by approval and either left that way permanently or hopefully reversed at a later date. Previously this would require switching to expert mode or setting a pconfig manually. --- Zotlabs/Module/Settings/Channel.php | 15 +++++++++++++-- view/tpl/settings.tpl | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 65b9b197e..beb62a3a3 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -146,6 +146,7 @@ class Channel { $unkmail = (((x($_POST,'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0); $cntunkmail = ((x($_POST,'cntunkmail')) ? intval($_POST['cntunkmail']) : 0); $suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0); + $autoperms = ((x($_POST,'autoperms')) ? intval($_POST['autoperms']) : 0); $post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0); $post_joingroup = (($_POST['post_joingroup'] == 1) ? 1: 0); @@ -252,6 +253,7 @@ class Channel { set_pconfig(local_channel(),'system','default_permcat',$defpermcat); set_pconfig(local_channel(),'system','email_notify_host',$mailhost); set_pconfig(local_channel(),'system','profile_assign',$profile_assign); + set_pconfig(local_channel(),'system','autoperms',$autoperms); $r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d", dbesc($username), @@ -479,13 +481,21 @@ class Channel { if($permissions_role === 'social_party') $permissions_role = 'social_federation'; - + if(in_array($permissions_role,['forum','repository'])) + $autoperms = replace_macros(get_markup_template('field_checkbox.tpl'), [ + '$field' => [ 'autoperms',t('Automatic membership approval'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('If enabled, connection requests will be approved without your interaction'), $yes_no ]]); + else + $autoperms = ''; + $permissions_set = (($permissions_role != 'custom') ? true : false); $perm_roles = \Zotlabs\Access\PermissionRoles::roles(); if((get_account_techlevel() < 4) && $permissions_role !== 'custom') unset($perm_roles[t('Other')]); + + + $vnotify = get_pconfig(local_channel(),'system','vnotify'); $always_show_in_notices = get_pconfig(local_channel(),'system','always_show_in_notices'); if($vnotify === false) @@ -497,6 +507,7 @@ class Channel { $disable_discover_tab = intval(get_config('system','disable_discover_tab',1)) == 1; $site_firehose = intval(get_config('system','site_firehose',0)) == 1; + $o .= replace_macros($stpl,array( '$ptitle' => t('Channel Settings'), @@ -553,7 +564,7 @@ class Channel { '$unkmail' => $unkmail, '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), intval($channel['channel_max_anon_mail']) ,t("Useful to reduce spamming")), - + '$autoperms' => $autoperms, '$h_not' => t('Notification Settings'), '$activity_options' => t('By default post a status message when:'), '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, '', $yes_no), diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index d258f1992..b5e871c36 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -45,6 +45,7 @@
    {{include file="field_select_grouped.tpl" field=$role}} + {{$autoperms}}
    -- cgit v1.2.3 From ae35ac0cec3f6bf3373ff901dabe20f35ec1933a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 3 May 2018 13:14:12 +0200 Subject: quick fix for issue #1150 - needs improvement and review of other textcomplete implementations. --- view/js/autocomplete.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 60552588e..b7ebe3293 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -353,19 +353,22 @@ function string2bb(element) { this.attr('autocomplete','off'); + var aItem; var Textarea = Textcomplete.editors.Textarea; $(this).each(function() { var editor = new Textarea(this); var textcomplete = new Textcomplete(editor); textcomplete.register([names], {className:'acpopup', zIndex:1020}); + textcomplete.on('select', function() { aItem = textcomplete.dropdown.getActiveItem(); }); }); if(autosubmit) - this.on('select', function(e,value,strategy) { submit_form(this); }); + this.on('select', function() { submit_form(this); }); if(typeof onselect !== 'undefined') - this.on('select', function(e, value, strategy) { onselect(value); }); + this.on('select', function() { onselect(aItem.searchResult.data); }); + }; })( jQuery ); -- cgit v1.2.3 From 61a8a161397ef6af6e1e9f2b4efa62a925e87879 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 3 May 2018 17:37:16 -0700 Subject: add changes from ae35ac0cec3f6bf337 to contact_autocomplete so channel source completion will work correctly --- view/js/autocomplete.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index b7ebe3293..97bb62fef 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -321,13 +321,14 @@ function string2bb(element) { var editor = new Textarea(this); var textcomplete = new Textcomplete(editor); textcomplete.register([contacts], {className:'acpopup', zIndex:1020}); + textcomplete.on('select', function() { aItem = textcomplete.dropdown.getActiveItem(); }); }); if(autosubmit) - this.on('select', function(e,value,strategy) { submit_form(this); }); + this.on('select', function() { submit_form(this); }); if(typeof onselect !== 'undefined') - this.on('select', function(e, value, strategy) { onselect(value); }); + this.on('select', function() { onselect(aItem.searchResult.data); }); }; })( jQuery ); -- cgit v1.2.3 From b52e9731e39125f5911fe6795ef34eb1f183d4b3 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 3 May 2018 20:14:58 -0700 Subject: tagging changes: + (old style forum mentions), and underscore space replacement are no longer supported. --- Zotlabs/Module/Item.php | 10 ---- doc/member/member_guide.bb | 12 ++--- include/text.php | 127 ++++++++------------------------------------- 3 files changed, 28 insertions(+), 121 deletions(-) diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index fd99c4a64..640b4fa5c 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -528,16 +528,6 @@ class Item extends \Zotlabs\Web\Controller { // and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.) // we may need virtual or template classes to implement the possible alternatives - // If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it, if our pconfig is set. - - if((! $parent) && (get_pconfig($profile_uid,'system','tagifonlyrecip')) && (substr_count($str_contact_allow,'<') == 1) && ($str_group_allow == '') && ($str_contact_deny == '') && ($str_group_deny == '')) { - $x = q("select abook_id, abconfig.v from abook left join abconfig on abook_xchan = abconfig.xchan and abook_channel = abconfig.chan and cat= 'their_perms' and abconfig.k = 'tag_deliver' and abconfig.v = 1 and abook_xchan = '%s' and abook_channel = %d limit 1", - dbesc(str_replace(array('<','>'),array('',''),$str_contact_allow)), - intval($profile_uid) - ); - if($x) - $body .= "\n\n@group+" . $x[0]['abook_id'] . "\n"; - } $body = cleanup_bbcode($body); diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb index e36e1c497..7cd403d75 100644 --- a/doc/member/member_guide.bb +++ b/doc/member/member_guide.bb @@ -359,7 +359,7 @@ The [b]![/b] character designates a deliverable mention to a forum or special ch !Gardening - mention the Gardening Forum and also post to the Gardening "network" (e.g. send to all the forum members; if you have permission to do so) [/code] -Note: In previous releases, forums were delivered by using @forum+ with a plus sign at the end. This mechanism is still used occasionally but is deprecated and !forum is now preferred. +Note: In previous releases, forums were delivered by using @forum+ with a plus sign at the end. This mechanism is no longer supported. [h4]Private Mentions[/h4] If you wish to restrict a post to a single person or a number of people, you can do this by selecting channels or privacy groups from the privacy tool. You can also just tag them with a privacy tag. A privacy tag is a name preceded by the two characters @! - and in addition to tagging these channels, will also change the privacy permissions of the post to only include them. You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda. This mechanism over-rides the privacy selector. @@ -383,17 +383,17 @@ Bookmarks indicate a link which can be saved to your bookmark folder. They use t Where possible please use the auto-complete window to select tag and mention recipients, because it will generate a coded tag which uniquely identifies one channel. Names are sometimes ambiguous. However, you can "manually" tag a channel by matching the channel name or address. [code] -@Robert Johnson +@billy [/code] -will tag Robert Johnson, but we can only match one space. If the name was "Blind Lemon Jefferson" it won't be found unless you enclose the entire name in double quotes or change the spaces to underscores. +will tag a connection whose name or network address is 'billy' (exact match). If you have two connections with a name or network address of billy, for instance billy@server1.hubzilla.org and billy@server2.hubzilla2.org, you will need to supply the complete address or the results will be ambiguous and the wrong person may be tagged. [code] -@"Blind Lemon Jefferson" -@Blind_Lemon_Jefferson +@"Robert Johnson" [/code] -are both equivalent. +will tag Robert Johnson. The double quotes are required if the tagged name contains space characters. + [h3]Web Pages[/h3] diff --git a/include/text.php b/include/text.php index dc3a155de..c7417a19b 100644 --- a/include/text.php +++ b/include/text.php @@ -830,27 +830,7 @@ function get_tags($s) { } } - // Match full names against @tags including the space between first and last - // We will look these up afterward to see if they are full names or not recognisable. - - // The lookbehind is used to prevent a match in the middle of a word - // '=' needs to be avoided because when the replacement is made (in handle_tag()) it has to be ignored there - // Feel free to allow '=' if the issue with '=' is solved in handle_tag() - // added / ? and [ to avoid issues with hashchars in url paths - - // added ; to single word tags to allow emojis and other unicode character constructs in bbcode - // (this would actually be &#xnnnnn; but the ampersand will have been escaped to & by the time we see it.) - - if(preg_match_all('/(? $success, 'access_tag' => $access_tag); if($success['replaced']) $tagged[] = $tag; -- cgit v1.2.3 From 56113b0bde6ea78f1ac0c61eb6ca9324900035c2 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 3 May 2018 23:20:09 -0700 Subject: check for directories --- util/update_widget_repo | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/util/update_widget_repo b/util/update_widget_repo index 045122619..8ef5eba27 100755 --- a/util/update_widget_repo +++ b/util/update_widget_repo @@ -25,6 +25,10 @@ for a in "${filelist[@]}" ; do # echo 'ignoring git' continue; fi + if [ ! -d ../extend/widget/$1/$base ]; then +# echo $a 'not a directory' + continue; + fi if [ -x $base ]; then # echo $base 'file exists' continue; -- cgit v1.2.3 From ace8252569289b42361404a33e7e650a7c6aa716 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 4 May 2018 09:34:44 +0200 Subject: update changelog --- CHANGELOG | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 472dad3e6..62645b2b1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ -Hubzilla 3.4 (????-??-??) +Hubzilla 3.4 (2018-05-04) + - Provide warnings about profile photo and cover photo permissions + - Don't duplicate addressbook entries on repeated channel imports + - Where possible strip zid parameter from links that get pasted into posts so that they will get a correct zid when rendered - Rename boxy schema to Focus-Boxy - Rename BS-Default schema to Focus-Light - Mark simple_* schemas unmaintained and deprecated - they will be removed in next release if nobody steps up to maintain them. @@ -54,6 +57,7 @@ Hubzilla 3.4 (????-??-??) - Fix pending registrations visible in admin accounts Addons + Pubcrawl: fix issues with "private" messages Pubcrawl: fix issues with postgresql Fuzzloc: new addon to blur your browser location Pubcrawl: implement follow by webfinger -- cgit v1.2.3 From 998dd582068a2ffd31f3388aaefe4d639d7eb9c0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 4 May 2018 09:37:22 +0200 Subject: switch DIRECTORY_FALLBACK_MASTER to https://zotadel.net --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 5cf6cedeb..981ca8837 100755 --- a/boot.php +++ b/boot.php @@ -81,7 +81,7 @@ define ( 'DIRECTORY_MODE_STANDALONE', 0x0100); // A detached (off the grid) hub // point to go out and find the rest of the world. define ( 'DIRECTORY_REALM', 'RED_GLOBAL'); -define ( 'DIRECTORY_FALLBACK_MASTER', 'https://gravizot.de'); +define ( 'DIRECTORY_FALLBACK_MASTER', 'https://zotadel.net'); $DIRECTORY_FALLBACK_SERVERS = array( 'https://hubzilla.zottel.net', -- cgit v1.2.3 From 76e644e18af572e5ea96223a2ad3c48f5e34be37 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 4 May 2018 12:00:59 +0200 Subject: bump version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 981ca8837..f7c7e645a 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.5.2' ); +define ( 'STD_VERSION', '3.5.3' ); define ( 'ZOT_REVISION', '6.0a' ); -- cgit v1.2.3 From 34f6d9f7142833ef74355b49fb9cf47f93dcea20 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 4 May 2018 13:54:12 +0200 Subject: missing basetag --- include/text.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index c7417a19b..5be44c3cb 100644 --- a/include/text.php +++ b/include/text.php @@ -2559,6 +2559,8 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i $basetag = substr($tag,7); $basetag = substr($basetag,0,-6); } + else + $basetag = substr($tag,1); //create text for link @@ -2587,6 +2589,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i 'url' => $url, 'contact' => $r[0] ]; + } //is it a person tag? @@ -3334,4 +3337,4 @@ function unique_multidim_array($array, $key) { $i++; } return $temp_array; -} \ No newline at end of file +} -- cgit v1.2.3 From 97cb1089377681aa0f7b1c14aa86e00be4ce6ca6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 4 May 2018 22:03:51 +0200 Subject: missing permission description --- Zotlabs/Module/Wiki.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 7dc8eb1bc..322a3933c 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -95,7 +95,7 @@ class Wiki extends \Zotlabs\Web\Controller { $owner['channel_deny_gid']) ? 'lock' : 'unlock' ), - 'acl' => populate_acl($owner_acl), + 'acl' => populate_acl($owner_acl, false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_wiki')), 'allow_cid' => acl2json($owner_acl['allow_cid']), 'allow_gid' => acl2json($owner_acl['allow_gid']), 'deny_cid' => acl2json($owner_acl['deny_cid']), -- cgit v1.2.3 From 90cf238019a06e4f76a4523e9f78243edd3c14f6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 4 May 2018 22:13:45 +0200 Subject: fix too big buttons in wiki list --- view/css/mod_wiki.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css index e0b02b414..998b932db 100644 --- a/view/css/mod_wiki.css +++ b/view/css/mod_wiki.css @@ -33,7 +33,7 @@ width: 100%; } -td i { +td > i { padding: 7px 5px; cursor: pointer; } @@ -68,4 +68,4 @@ code { #wiki-content-container code { background: #F5F5F5; -} \ No newline at end of file +} -- cgit v1.2.3 From 4a26f0d2d42825646d574531bbb89c7b17df9d69 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 4 May 2018 13:44:34 -0700 Subject: turn skip white back on - (xml actually doesn't parse if you disable this) --- include/network.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/network.php b/include/network.php index a00ede6bf..8b7490a8a 100644 --- a/include/network.php +++ b/include/network.php @@ -797,7 +797,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = if($namespaces) $parser = @xml_parser_create_ns("UTF-8",':'); else - $parser = @xml_parser_create('UTF-8'); + $parser = @xml_parser_create(); if(! $parser) { logger('xml2array: xml_parser_create: no resource'); @@ -807,7 +807,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8"); // http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); - xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0); + xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1); @xml_parse_into_struct($parser, trim($contents), $xml_values); @xml_parser_free($parser); -- cgit v1.2.3 From f995ef012444617ead1760d16f712ca0051dc68b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 4 May 2018 22:46:43 +0200 Subject: set XML_OPTION_SKIP_WHITE to 1 again --- include/network.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/network.php b/include/network.php index a00ede6bf..c55660da8 100644 --- a/include/network.php +++ b/include/network.php @@ -807,7 +807,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8"); // http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); - xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0); + xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1); @xml_parse_into_struct($parser, trim($contents), $xml_values); @xml_parser_free($parser); @@ -2052,4 +2052,4 @@ function jsonld_document_loader($url) { } return []; -} \ No newline at end of file +} -- cgit v1.2.3 From 6e91d85bcb3e98874f4c5d06ccaf1bca26577872 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 4 May 2018 15:17:15 -0700 Subject: If somebody precisely clicks the down-arrow on the author photo it should probably also trigger the dropdown --- view/tpl/conv_item.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index a408a83d2..dd83bd9e9 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -31,7 +31,7 @@
    {{$item.name}} {{if $item.thread_author_menu}} - +
    {{foreach $item.thread_author_menu as $mitem}} {{$mitem.title}} -- cgit v1.2.3 From 367937e479a40647a69dd2c3eb8d9b3c0122ef1c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 4 May 2018 15:20:07 -0700 Subject: removed the fakelink attribute as it changed the colour of the down arrow. We probably do want to change the hover cursor but not the colour. --- view/tpl/conv_item.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index dd83bd9e9..f954e1d7c 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -31,7 +31,7 @@
    {{$item.name}} {{if $item.thread_author_menu}} - +
    {{foreach $item.thread_author_menu as $mitem}} {{$mitem.title}} -- cgit v1.2.3 From 733a5ccb08e0f6ac3e9ec7908b3b73957e0f7117 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 5 May 2018 07:32:35 +0200 Subject: use cursor-pointer class instead of fakelink to avoid the link color for the dropdown caret --- view/tpl/conv_item.tpl | 2 +- view/tpl/conv_list.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index dd83bd9e9..f72737d82 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -31,7 +31,7 @@
    {{$item.name}} {{if $item.thread_author_menu}} - +
    {{foreach $item.thread_author_menu as $mitem}} {{$mitem.title}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index f94a2f24f..c6da3d8a4 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -31,7 +31,7 @@
    {{$item.name}} {{if $item.thread_author_menu}} - +
    {{foreach $item.thread_author_menu as $mitem}} {{$mitem.title}} -- cgit v1.2.3 From 192b69b11a05adee52e09d434bab004e0b0d07d1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 5 May 2018 08:38:20 +0200 Subject: update nginx conf to address issue #1155 --- install/sample-nginx.conf | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/install/sample-nginx.conf b/install/sample-nginx.conf index 4121ff2ec..839f208ae 100644 --- a/install/sample-nginx.conf +++ b/install/sample-nginx.conf @@ -73,29 +73,32 @@ server { client_max_body_size 20m; client_body_buffer_size 128k; + include mime.types; + # rewrite to front controller as default rule location / { - if ($is_args != "") { - rewrite ^/(.*) /index.php?q=$uri&$args last; + if (!-e $request_filename) { + rewrite ^(.*)$ /index.php?q=$1; } - rewrite ^/(.*) /index.php?q=$uri last; } # make sure webfinger and other well known services aren't blocked # by denying dot files and rewrite request to the front controller location ^~ /.well-known/ { allow all; - rewrite ^/(.*) /index.php?q=$uri&$args last; + if (!-e $request_filename) { + rewrite ^(.*)$ /index.php?q=$1; + } } # statically serve these file types when possible # otherwise fall back to front controller # allow browser to cache them # added .htm for advanced source code editor library - location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|map|ttf|woff|woff2|svg)$ { - expires 30d; - try_files $uri /index.php?q=$uri&$args; - } + # location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|map|ttf|woff|woff2|svg)$ { + # expires 30d; + # try_files $uri /index.php?q=$uri&$args; + # } # block these file types location ~* \.(tpl|md|tgz|log|out)$ { -- cgit v1.2.3 From c6e65ec6dab38ee67afe1d07f5c003413cfdf67e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 5 May 2018 00:39:53 -0700 Subject: support '@' paths --- Zotlabs/Module/Wfinger.php | 3 ++- boot.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php index 81d4beaed..88cb3e879 100644 --- a/Zotlabs/Module/Wfinger.php +++ b/Zotlabs/Module/Wfinger.php @@ -109,7 +109,8 @@ class Wfinger extends \Zotlabs\Web\Controller { $aliases = array( z_root() . (($pchan) ? '/pchan/' : '/channel/') . $r[0]['channel_address'], - z_root() . '/~' . $r[0]['channel_address'] + z_root() . '/~' . $r[0]['channel_address'], + z_root() . '/@' . $r[0]['channel_address'] ); if($h) { diff --git a/boot.php b/boot.php index 5cf6cedeb..40b38985b 100755 --- a/boot.php +++ b/boot.php @@ -886,7 +886,7 @@ class App { // unix style "homedir" - if(substr(self::$cmd, 0, 1) === '~') + if((substr(self::$cmd, 0, 1) === '~') || (substr(self::$cmd, 0, 1) === '@')) self::$cmd = 'channel/' . substr(self::$cmd, 1); /* -- cgit v1.2.3 From c41c04cf112b18bd8e5acc02c48455946c0121a2 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 5 May 2018 01:43:14 -0700 Subject: log all possible return conditions from check_item_source(), use consistent xchan --- include/items.php | 49 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/include/items.php b/include/items.php index 2c9d84ef3..99dfca6d7 100755 --- a/include/items.php +++ b/include/items.php @@ -3032,36 +3032,51 @@ function start_delivery_chain($channel, $item, $item_id, $parent) { * @param array $item */ function check_item_source($uid, $item) { + + $xchan = (($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']); + $r = q("select * from source where src_channel_id = %d and ( src_xchan = '%s' or src_xchan = '*' ) limit 1", intval($uid), - dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']) + dbesc($xchan) ); - if(! $r) + if(! $r) { + logger('source: no source record for this channel and source', LOGGER_DEBUG); return false; + } - $x = q("select abook_their_perms, abook_feed from abook where abook_channel = %d and abook_xchan = '%s' limit 1", + $x = q("select abook_feed from abook where abook_channel = %d and abook_xchan = '%s' limit 1", intval($uid), - dbesc($item['owner_xchan']) + dbesc($xchan) ); - if(! $x) + if(! $x) { + logger('source: not connected to this channel.'); return false; + } - if(! get_abconfig($uid,$item['owner_xchan'],'their_perms','republish')) + if(! get_abconfig($uid,$xchan,'their_perms','republish')) { + logger('source: no republish permission'); return false; + } - if($item['item_private'] && (! intval($x[0]['abook_feed']))) + if($item['item_private'] && (! intval($x[0]['abook_feed']))) { + logger('source: item is private'); return false; + } - if($r[0]['src_channel_xchan'] === $item['owner_xchan']) + if($r[0]['src_channel_xchan'] === $xchan) { + logger('source: cannot source yourself'); return false; + } // since we now have connection filters with more features, the source filter is redundant and can probably go away - if(! $r[0]['src_patt']) + if(! $r[0]['src_patt']) { + logger('source: success'); return true; + } require_once('include/html2plain.php'); @@ -3077,17 +3092,25 @@ function check_item_source($uid, $item) { if(! $w) continue; if(substr($w,0,1) === '#' && $tags) { - foreach($tags as $t) - if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($w,1)) || (substr($w,1) === '*'))) + foreach($tags as $t) { + if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($w,1)) || (substr($w,1) === '*'))) { + logger('source: tag filter success'); return true; + } + } } - elseif((strpos($w,'/') === 0) && preg_match($w,$text)) + elseif((strpos($w,'/') === 0) && preg_match($w,$text)) { + logger('source: preg filter success'); return true; - elseif(stristr($text,$w) !== false) + } + elseif(stristr($text,$w) !== false) { + logger('source: text filter success'); return true; + } } } + logger('source: filter fail'); return false; } -- cgit v1.2.3 From b47b917eb0a8bcc8e07a8978bf9a18a2e199d96c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 5 May 2018 01:52:35 -0700 Subject: check_item_source: always log uid --- include/items.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/items.php b/include/items.php index 99dfca6d7..9d6e53c1e 100755 --- a/include/items.php +++ b/include/items.php @@ -3033,6 +3033,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent) { */ function check_item_source($uid, $item) { + logger('source: uid: ' . $uid, LOGGER_DEBUG); $xchan = (($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']); $r = q("select * from source where src_channel_id = %d and ( src_xchan = '%s' or src_xchan = '*' ) limit 1", -- cgit v1.2.3 From 70a0a833632fe125306e309414475efedb0e29bc Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 5 May 2018 02:56:57 -0700 Subject: more updates and clarifications re: tag/mention documentation --- doc/member/member_guide.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb index 7cd403d75..76150fee8 100644 --- a/doc/member/member_guide.bb +++ b/doc/member/member_guide.bb @@ -374,12 +374,12 @@ The above mechanisms only apply to "top-level" posts you create. Mentioning a ch [h4]Topical Tags (also known as Hashtags)[/h4] Topical tags are indicated by preceding the tag name with the # character. This will create a link in the post to a generalised site search for the term provided. For example, #[zrl=[baseurl]/search?tag=cars]cars[/zrl] will provide a search link for all posts mentioning 'cars' on your site. Topical tags are generally a minimum of three characters in length. Shorter search terms are not likely to yield any search results, although this depends on the database configuration. -Topical tags are also not linked if they are purely numeric, e.g. #1. If you wish to use a numeric hashtag, please add some descriptive text such as #2012-elections. +Topical tags are also not normally linked if they are purely numeric, e.g. #1. If you wish to use a numeric hashtag, please add some descriptive text such as #2012-elections or enclose the entire tag in double quotes (for example #"2012"). Doubles quotes are also required if the tag contains spaces (#"My Tag") and may be required if the tag contains punctuation characters (#"EndsWithPeriod." or #"Exciting!!!"). [h4]Bookmarks[/h4] Bookmarks indicate a link which can be saved to your bookmark folder. They use the sequence #^ followed by the link. Often these are generated automatically. If the 'bookmarker' addon is installed, this sequence will be converted to a bookmark icon when viewing the post or comment online, and clicking the icon will save the bookmark. If the bookmarker addon is not installed, the post 'dropdown menu' contains a link for saving the bookmark or bookmarks. -[h4]Spaces in Tags and Mentions[/h4] +[h4]Manual Mentions[/h4] Where possible please use the auto-complete window to select tag and mention recipients, because it will generate a coded tag which uniquely identifies one channel. Names are sometimes ambiguous. However, you can "manually" tag a channel by matching the channel name or address. [code] -- cgit v1.2.3 From 26a7c88ddf78bbbca1c303fc4d60bd2780c611de Mon Sep 17 00:00:00 2001 From: Einer von Vielen Date: Sat, 5 May 2018 20:46:41 +0200 Subject: Install imagemagick --- .homeinstall/hubzilla-setup.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.homeinstall/hubzilla-setup.sh b/.homeinstall/hubzilla-setup.sh index 3ad9aa37f..a38e36b73 100755 --- a/.homeinstall/hubzilla-setup.sh +++ b/.homeinstall/hubzilla-setup.sh @@ -136,17 +136,17 @@ function check_config { # backup is important and should be checked if [ -n "$backup_device_name" ] then - device_mounted=0 + if [ ! -d "$backup_mount_point" ] + then + mkdir "$backup_mount_point" + fi + device_mounted=0 if fdisk -l | grep -i "$backup_device_name.*linux" then print_info "ok - filesystem of external device is linux" if [ -n "$backup_device_pass" ] then echo "$backup_device_pass" | cryptsetup luksOpen $backup_device_name cryptobackup - if [ ! -d /media/hubzilla_backup ] - then - mkdir /media/hubzilla_backup - fi if mount /dev/mapper/cryptobackup /media/hubzilla_backup then device_mounted=1 @@ -246,6 +246,11 @@ function install_apache { nocheck_install "apache2 apache2-utils" } +function install_imagemagick { + print_info "installing imagemagick..." + nocheck_install "imagemagick" +} + function install_curl { print_info "installing curl..." nocheck_install "curl" @@ -801,6 +806,7 @@ update_upgrade install_curl install_sendmail install_apache +install_imagemagick install_php install_mysql install_phpmyadmin -- cgit v1.2.3 From acb0604a71486ab557180e6f1bb9863f98e387b5 Mon Sep 17 00:00:00 2001 From: Einer von Vielen Date: Sat, 5 May 2018 20:50:06 +0200 Subject: Instructions for imagemagick and failed DNS check. Some minor corrections. --- .homeinstall/README.md | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/.homeinstall/README.md b/.homeinstall/README.md index 8b23b9c44..fdfdcbfc7 100644 --- a/.homeinstall/README.md +++ b/.homeinstall/README.md @@ -39,7 +39,7 @@ Software - mkdir -p /var/www - cd /var/www - git clone https://github.com/redmatrix/hubzilla.git html - - cd /html/.homeinstall + - cd html/.homeinstall - cp hubzilla-config.txt.template hubzilla-config.txt - nano hubzilla-config.txt - Read the comments carefully @@ -50,6 +50,20 @@ Software - reboot + Open your domain with a browser and step throught the initial configuration of hubzilla. +## Troubleshooting + +If the check of the mail address fails when you try to register the very first user in the browser. Do... + + cd /var/www/html + util/config system.do_not_check_dns 1 + +## Optional - Set path to imagemagick + +In Admin settings of hubzilla or via terminal + + cd /var/www/html + util/config system.imagick_convert_path /usr/bin/convert + # Step-by-Step in Detail ## Preparations Hardware @@ -120,7 +134,7 @@ There are two ways to get a domain... The cost are around 10,- € once and 1,50 € per month (2017). -### Method 2 Register a (free) Subdomain +The cost are around 10,- € once and 1,50 € per month (2017). ...for example register at freedns.afraid.org @@ -189,9 +203,16 @@ Leave db type "MySQL" untouched. Follow the instructions in the next pages. +Recommended: Set path to imagemagick + +- in admin settings of hubzilla or +- via terminal + + util/config system.imagick_convert_path /usr/bin/convert + After the daily script was executed at 05:30 (am) -- look at var/www/html/hubzilla-daily.log +- look at /var/www/html/hubzilla-daily.log - check your backup on the external drive - optionally view the daily log under yourdomain.org/admin/logs/ - set the logfile to var/www/html/hubzilla-daily.log @@ -213,4 +234,12 @@ to boot the Rapsi to the client console. DO NOT FORGET TO CHANGE THE DEFAULT PASSWORD FOR USER PI! +On a Raspian Stretch (Debian 9) the validation of the mail address fails for the very first user. +This used to happen on some *bsd distros but there was some work to fix that a year ago (2017). + +So if your system isn't registered in DNS or DNS isn't active do + + cd /var/www/html + util/config system.do_not_check_dns 1 + -- cgit v1.2.3 From 8ee4a54c1072e58454c59582757a82f045b3b8f7 Mon Sep 17 00:00:00 2001 From: Einer von Vielen Date: Sat, 5 May 2018 21:01:26 +0200 Subject: Corrected description for getting a domain. --- .homeinstall/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.homeinstall/README.md b/.homeinstall/README.md index fdfdcbfc7..885a544e8 100644 --- a/.homeinstall/README.md +++ b/.homeinstall/README.md @@ -134,7 +134,7 @@ There are two ways to get a domain... The cost are around 10,- € once and 1,50 € per month (2017). -The cost are around 10,- € once and 1,50 € per month (2017). +### Method 2: Register a free domain ...for example register at freedns.afraid.org -- cgit v1.2.3 From 1b959a4731dfeac3fa6a9f8443ef2fe82538ccdc Mon Sep 17 00:00:00 2001 From: Einer von Vielen Date: Sat, 5 May 2018 21:08:15 +0200 Subject: Corrected description for getting a domain. --- .homeinstall/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.homeinstall/README.md b/.homeinstall/README.md index 885a544e8..7870e65dd 100644 --- a/.homeinstall/README.md +++ b/.homeinstall/README.md @@ -134,7 +134,7 @@ There are two ways to get a domain... The cost are around 10,- € once and 1,50 € per month (2017). -### Method 2: Register a free domain +### Method 2: Register a free subdomain ...for example register at freedns.afraid.org -- cgit v1.2.3 From b2218574ee56c1611fa2869c5b2630ff4f41803c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 5 May 2018 16:19:23 -0700 Subject: allow uninstall of plugins which no longer exists via cmdline tool --- include/plugin.php | 8 +++++++- util/addons | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/plugin.php b/include/plugin.php index 4545e1e8d..28d27619f 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -53,10 +53,15 @@ function unload_plugin($plugin){ * @return boolean */ function uninstall_plugin($plugin) { + unload_plugin($plugin); - if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) + if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) { + q("DELETE FROM addon WHERE aname = '%s' ", + dbesc($plugin) + ); return false; + } logger("Addons: uninstalling " . $plugin); //$t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php'); @@ -73,6 +78,7 @@ function uninstall_plugin($plugin) { q("DELETE FROM addon WHERE aname = '%s' ", dbesc($plugin) ); + } /** diff --git a/util/addons b/util/addons index 150a7ca09..3d772bf73 100755 --- a/util/addons +++ b/util/addons @@ -106,9 +106,12 @@ if($argc == 3 && $argv[1] === 'install') { if($argc == 3 && $argv[1] === 'uninstall') { + $found = false; + if($plugins) { foreach($plugins as $p) { if($p[0] === $argv[2]) { + $found = true; if(! $p[1]) echo $p[0] . ' not installed.' . "\n"; elseif($p[2]['disabled']) @@ -125,6 +128,17 @@ if($argc == 3 && $argv[1] === 'uninstall') { } } + // force uninstall of addon which no longer exists + + if(! $found) { + $idx = array_search($argv[2], App::$plugins); + if ($idx !== false) + unset(App::$plugins[$idx]); + uninstall_plugin($argv[2]); + set_config("system","addon", implode(", ",App::$plugins)); + echo $argv[2] . ' uninstalled.' . "\n"; + } + killme(); } -- cgit v1.2.3 From 83c18f4d4a5f4f767e2d9073a8962c0dc9fc6fb8 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 6 May 2018 16:12:06 -0700 Subject: Back in the day there were good reasons for showing a permission denied photo instead of a null img. It distinguished a 403 from a 404 in an unmistakable way. What we've discovered is that nothing that is gained from this knowledge and it mostly just annoys and confuses people who can't really do anything about it except to express their annoyance/confusion. So just do a 403/404 instead. --- Zotlabs/Module/Photo.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index b3171fe75..9cafc8d07 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -144,9 +144,11 @@ class Photo extends \Zotlabs\Web\Controller { if(! in_array($resolution,[4,5,6])) $allowed = (-1); } - if($allowed === (-1)) + + if($allowed === (-1)) { $allowed = attach_can_view($r[0]['uid'],$observer_xchan,$photo); - + } + $channel = channelx_by_n($r[0]['uid']); // Now we'll see if we can access the photo @@ -166,13 +168,12 @@ class Photo extends \Zotlabs\Web\Controller { } else { if(! $allowed) { - logger('mod_photo: forbidden. ' . \App::$query_string); - $observer = \App::get_observer(); - logger('mod_photo: observer = ' . (($observer) ? $observer['xchan_addr'] : '(not authenticated)')); - $data = file_get_contents('images/nosign.png'); - $mimetype = 'image/png'; - $prvcachecontrol = true; + http_status_exit(403,'forbidden'); + } + if(! $exists) { + http_status_exit(404,'not found'); } + } } } -- cgit v1.2.3 From 620082c16b51a5b96ec52b8907d594d29be4b9ca Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 6 May 2018 16:55:07 -0700 Subject: If one has system.network_page_default set to a different sort order use that order on the 'All Channels' selection of the Collections (privacy group) widget. --- include/group.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/group.php b/include/group.php index 03ebf7ee5..8c95f6224 100644 --- a/include/group.php +++ b/include/group.php @@ -284,7 +284,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id 'text' => t('All Channels'), 'id' => 0, 'selected' => (($group_id == 0) ? 'group-selected' : ''), - 'href' => $every . (($every === 'network') ? '?f=&gid=0' : ''), + 'href' => $every . (($every === 'network') ? '?f=&gid=0' : '') . ((x($_GET,'order')) ? '&order=' . $_GET['order'] : ''), ); -- cgit v1.2.3 From 5e6f6e2c3eb9b4e0501472a7206d33c90b831c01 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 6 May 2018 18:10:43 -0700 Subject: minor change to test something --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index e493ef34b..4eed19254 100755 --- a/boot.php +++ b/boot.php @@ -2493,8 +2493,8 @@ function check_cron_broken() { * @return boolean */ function observer_prohibited($allow_account = false) { - if($allow_account) + if($allow_account) { return (((get_config('system', 'block_public')) && (! get_account_id()) && (! remote_channel())) ? true : false ); - + } return (((get_config('system', 'block_public')) && (! local_channel()) && (! remote_channel())) ? true : false ); } -- cgit v1.2.3 From a30934c563457c14606e2ec3194a3ec9713cdbba Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 6 May 2018 18:23:39 -0700 Subject: ensure that feed xchans have a name --- include/network.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/network.php b/include/network.php index 26ed24de2..b0bda1f9d 100644 --- a/include/network.php +++ b/include/network.php @@ -999,7 +999,7 @@ function discover_by_url($url, $arr = null) { return false; $network = (($arr['network']) ? $arr['network'] : 'unknown'); - $name = (($arr['name']) ? $arr['name'] : 'unknown'); + $name = (trim($arr['name']) ? trim($arr['name']) : 'unknown'); $photo = (($arr['photo']) ? $arr['photo'] : ''); $addr = (($arr['addr']) ? $arr['addr'] : ''); $guid = $url; @@ -1103,6 +1103,9 @@ function discover_by_url($url, $arr = null) { if(! $name) $name = notags($feed->get_description()); + if(! $name) + $name = 'unknown'; + $r = q("select * from xchan where xchan_hash = '%s' limit 1", dbesc($guid) ); -- cgit v1.2.3 From 257dcaaf8b56e3db52b62e5b722183aaddeb0a59 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 6 May 2018 18:25:17 -0700 Subject: minor tweak to last pull: ensure that feeds have a name besides whitespace characters --- include/network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/network.php b/include/network.php index b0bda1f9d..ceba56e06 100644 --- a/include/network.php +++ b/include/network.php @@ -1103,7 +1103,7 @@ function discover_by_url($url, $arr = null) { if(! $name) $name = notags($feed->get_description()); - if(! $name) + if(! trim($name)) $name = 'unknown'; $r = q("select * from xchan where xchan_hash = '%s' limit 1", -- cgit v1.2.3 From e646684493f5c3d49e972308aa8a5722877f26ce Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 6 May 2018 19:57:37 -0700 Subject: pdf embeds --- Zotlabs/Module/Linkinfo.php | 4 ++++ include/oembed.php | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php index 3392e4114..3f58f3e01 100644 --- a/Zotlabs/Module/Linkinfo.php +++ b/Zotlabs/Module/Linkinfo.php @@ -82,6 +82,10 @@ class Linkinfo extends \Zotlabs\Web\Controller { echo $br . '[audio]' . $url . '[/audio]' . $br; killme(); } + if(strtolower($type) === 'application/pdf' || strtolower($type) === 'application/x-pdf') { + echo $br . '[embed]' . $url . '[/embed]' . $br; + killme(); + } } } diff --git a/include/oembed.php b/include/oembed.php index e677087a2..41ab001d3 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -105,6 +105,7 @@ function oembed_action($embedurl) { // if the url is embeddable with oembed, return the bbcode link. function oembed_process($url) { + $j = oembed_fetch_url($url); logger('oembed_process: ' . print_r($j,true), LOGGER_DATA, LOG_DEBUG); if($j && $j['type'] !== 'error') @@ -132,6 +133,7 @@ function oembed_fetch_url($embedurl){ } } + $txt = null; // we should try to cache this and avoid a lookup on each render @@ -217,10 +219,19 @@ function oembed_fetch_url($embedurl){ } - $j = json_decode($txt,true); + if(strpos(strtolower($embedurl),'.pdf') !== false) { + $action = 'allow'; + $j = [ 'html' => '' . '' . t('View PDF') . '', 'width' => 500, 'height' => 720, 'type' => 'pdf' ]; + + } - if(! $j) + if(! $j) { + $j = json_decode($txt,true); + } + + if(! $j) { $j = []; + } if($action === 'filter') { if($j['html']) { @@ -317,6 +328,11 @@ function oembed_format_object($j){ //$ret = "".$j['title'].""; }; break; + case 'pdf': { + $ret = $j['html']; + break; + } + case "rich": { // not so safe.. $ret.= $jhtml; -- cgit v1.2.3 From 464025361403747c2d9519382d2ab0df2147a6a6 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 6 May 2018 20:30:49 -0700 Subject: autocomplete after 2 chars instead of 3; this was changed some months back to work around implementation quirks in the custom cache driver that is now disabled. --- view/js/autocomplete.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 97bb62fef..2a2d1454a 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -188,7 +188,7 @@ function string2bb(element) { // Autocomplete contacts contacts = { - match: /(^|\s)(@\!*)([^ \n]{3,})$/, + match: /(^|\s)(@\!*)([^ \n]{2,})$/, index: 3, cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels, spinelement=false); }, @@ -198,7 +198,7 @@ function string2bb(element) { // Autocomplete forums forums = { - match: /(^|\s)(\!\!*)([^ \n]{3,})$/, + match: /(^|\s)(\!\!*)([^ \n]{2,})$/, index: 3, cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'f', extra_channels, spinelement=false); }, @@ -209,7 +209,7 @@ function string2bb(element) { // Autocomplete hashtags tags = { - match: /(^|\s)(\#)([^ \n]{3,})$/, + match: /(^|\s)(\#)([^ \n]{2,})$/, index: 3, cache: true, search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.toLowerCase().indexOf(term.toLowerCase()) === 0 ? entry : null; })); }); }, @@ -253,7 +253,7 @@ function string2bb(element) { // Autocomplete contacts contacts = { - match: /(^@)([^\n]{3,})$/, + match: /(^@)([^\n]{2,})$/, index: 2, cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'x', [], spinelement='#nav-search-spinner'); }, @@ -263,7 +263,7 @@ function string2bb(element) { // Autocomplete forums forums = { - match: /(^\!)([^\n]{3,})$/, + match: /(^\!)([^\n]{2,})$/, index: 2, cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'f', [], spinelement='#nav-search-spinner'); }, @@ -273,7 +273,7 @@ function string2bb(element) { // Autocomplete hashtags tags = { - match: /(^\#)([^ \n]{3,})$/, + match: /(^\#)([^ \n]{2,})$/, index: 2, cache: true, search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.toLowerCase().indexOf(term.toLowerCase()) === 0 ? entry : null; })); }); }, @@ -306,7 +306,7 @@ function string2bb(element) { // Autocomplete contacts contacts = { - match: /(^)([^\n]{3,})$/, + match: /(^)([^\n]{2,})$/, index: 2, cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, typ,[], spinelement=false); }, @@ -344,7 +344,7 @@ function string2bb(element) { // Autocomplete contacts names = { - match: /(^)([^\n]{3,})$/, + match: /(^)([^\n]{2,})$/, index: 2, cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, typ,[], spinelement=false); }, -- cgit v1.2.3 From 1f8b4b14a465193ba0dd061dd55a170e63aeb9ea Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 6 May 2018 20:35:57 -0700 Subject: remove the old autocomplete cache mechanism --- view/js/autocomplete.js | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 2a2d1454a..b61af23f8 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -7,21 +7,6 @@ function contact_search(term, callback, backend_url, type, extra_channels, spine if(spinelement) { $(spinelement).show(); } - // Check if there is a cached result that contains the same information we would get with a full server-side search -// var bt = backend_url+type; -// if(!(bt in contact_search.cache)) contact_search.cache[bt] = {}; - -// var lterm = term.toLowerCase(); // Ignore case -// for(var t in contact_search.cache[bt]) { -// if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results -// $(spinelement).hide(); - // Filter old results locally -// var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one -// matching.unshift({taggable:false, text: term, replace: term}); -// setTimeout(function() { callback(matching); } , 1); // Use "pseudo-thread" to avoid some problems -// return; -// } -// } var postdata = { start:0, @@ -38,12 +23,7 @@ function contact_search(term, callback, backend_url, type, extra_channels, spine url: backend_url, data: postdata, dataType: 'json', - success: function(data){ - // Cache results if we got them all (more information would not improve results) - // data.count represents the maximum number of items -// if(data.items.length -1 < data.count) { -// contact_search.cache[bt][lterm] = data.items; -// } + success: function(data) { var items = data.items.slice(0); items.unshift({taggable:false, text: term, replace: term}); callback(items); -- cgit v1.2.3 From aab16123b5188e69b31893263f7074f9e9c7f210 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 7 May 2018 17:31:53 -0700 Subject: Simplify first channel creation even further by using a site-configurable default permissions role and removing one more conceptual roadblock for first time registrants. This default role only applies to the first channel an account creates and can be changed from the settings page once they've started to explore. This functionality was always present but optional and not well exposed. Now it is part of the standard workflow and exposed in the admin settings. --- Zotlabs/Module/Admin/Site.php | 10 ++++++++++ Zotlabs/Module/New_channel.php | 25 ++++++++++++++++++------- Zotlabs/Module/Register.php | 4 ++-- view/tpl/admin_site.tpl | 1 + view/tpl/new_channel.tpl | 2 ++ 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index 656770ad9..5c35e4a9d 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -77,6 +77,8 @@ class Site { $thumbnail_security = ((x($_POST,'thumbnail_security')) ? intval($_POST['thumbnail_security']) : 0); $force_queue = ((intval($_POST['force_queue']) > 0) ? intval($_POST['force_queue']) : 3000); + $permissions_role = escape_tags(trim($_POST['permissions_role'])); + $techlevel = null; if(array_key_exists('techlevel', $_POST)) $techlevel = intval($_POST['techlevel']); @@ -102,6 +104,7 @@ class Site { set_config('system', 'from_email_name' , $from_email_name); set_config('system', 'imagick_convert_path' , $imagick_path); set_config('system', 'thumbnail_security' , $thumbnail_security); + set_config('system', 'default_permissions_role', $permissions_role); set_config('system', 'techlevel_lock', $techlevel_lock); @@ -286,6 +289,12 @@ class Site { '5' => t('Wizard - I probably know more than you do') ]; + $perm_roles = \Zotlabs\Access\PermissionRoles::roles(); + $default_role = get_config('system','default_permissions_role','social'); + + $role = array('permissions_role' , t('Default permission role for new accounts'), $default_role, t('This role will be used for the first channel created after registration.'),$perm_roles); + + $homelogin = get_config('system','login_on_homepage'); $enable_context_help = get_config('system','enable_context_help'); @@ -321,6 +330,7 @@ class Site { '$minimum_age' => array('minimum_age', t("Minimum age"), (x(get_config('system','minimum_age'))?get_config('system','minimum_age'):13), t("Minimum age (in years) for who may register on this site.")), '$access_policy' => array('access_policy', t("Which best describes the types of account offered by this hub?"), get_config('system','access_policy'), "This is displayed on the public server site list.", $access_choices), '$register_text' => array('register_text', t("Register text"), htmlspecialchars(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), + '$role' => $role, '$frontpage' => array('frontpage', t("Site homepage to show visitors (default: login box)"), get_config('system','frontpage'), t("example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file.")), '$mirror_frontpage' => array('mirror_frontpage', t("Preserve site homepage URL"), get_config('system','mirror_frontpage'), t('Present the site homepage in a frame at the original location instead of redirecting')), '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php index d9becbc22..df7da2fe8 100644 --- a/Zotlabs/Module/New_channel.php +++ b/Zotlabs/Module/New_channel.php @@ -124,7 +124,7 @@ class New_channel extends \Zotlabs\Web\Controller { intval($aid) ); if($r && (! intval($r[0]['total']))) { - $default_role = get_config('system','default_permissions_role'); + $default_role = get_config('system','default_permissions_role','social'); } $limit = account_service_class_fetch(get_account_id(),'total_identities'); @@ -136,21 +136,32 @@ class New_channel extends \Zotlabs\Web\Controller { $channel_usage_message = ''; } } - + + $name_help = (($default_role) + ? t('Your real name is recommended.') + : t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"') + ); + + $nick_help = t('This will be used to create a unique network address (like an email address).'); + + if(! get_config('system','unicode_usernames')) { + $nick_help .= ' ' . t('Allowed characters are a-z 0-9, - and _'); + } + $privacy_role = ((x($_REQUEST,'permissions_role')) ? $_REQUEST['permissions_role'] : "" ); $perm_roles = \Zotlabs\Access\PermissionRoles::roles(); if((get_account_techlevel() < 4) && $privacy_role !== 'custom') unset($perm_roles[t('Other')]); - $name = array('name', t('Name or caption'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"'), "*"); + $name = array('name', t('Channel name'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), $name_help, "*"); $nickhub = '@' . \App::get_hostname(); - $nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), sprintf( t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'), $nickhub), "*"); - $role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel role with your privacy requirements.') . ' ' . t('Read more about roles') . '',$perm_roles); + $nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), $nick_help, "*"); + $role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role compatible with your usage needs and privacy requirements.') . '
    ' . '' . t('Read more about channel permission roles') . '',$perm_roles); $o = replace_macros(get_markup_template('new_channel.tpl'), array( - '$title' => t('Create Channel'), - '$desc' => t('A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things. Channels can make connections with other channels to share information with each other.') . ' ' . t('The type of channel you create affects the basic privacy settings, the permissions that are granted to connections/friends, and also the channel\'s visibility across the network.'), + '$title' => t('Create a Channel'), + '$desc' => t('A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things.') , '$label_import' => t('or import an existing channel from another location.'), '$name' => $name, '$role' => $role, diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 5356669e9..6bdffd034 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -251,10 +251,10 @@ class Register extends \Zotlabs\Web\Controller { $password = array('password', t('Choose a password'), ''); $password2 = array('password2', t('Please re-enter your password'), ''); $invite_code = array('invite_code', t('Please enter your invitation code'), ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "")); - $name = array('name', t('Name or caption'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"')); + $name = array('name', t('Your Name'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Real names are preferred.')); $nickhub = '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl')); $nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), sprintf( t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'), $nickhub)); - $role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel role with your privacy requirements.') . ' ' . t('Read more about roles') . '',$perm_roles); + $role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role for your usage needs and privacy requirements.') . ' ' . t('Read more about channel permission roles') . '',$perm_roles); $tos = array('tos', $label_tos, '', '', array(t('no'),t('yes'))); diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 7e99b2c86..ed85bd6b2 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -68,6 +68,7 @@

    {{$registration}}

    {{include file="field_input.tpl" field=$register_text}} + {{include file="field_select_grouped.tpl" field=$role}} {{include file="field_select.tpl" field=$register_policy}} {{include file="field_checkbox.tpl" field=$invite_only}} {{include file="field_input.tpl" field=$minimum_age}} diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index f415e4e2c..a89208228 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -3,6 +3,7 @@

    {{$title}}

    + {{if ! $default_role}}
    {{$desc}}
    @@ -11,6 +12,7 @@ {{$channel_usage_message}}
    {{/if}} + {{/if}}
    {{if $default_role}} -- cgit v1.2.3 From eb85d381fdb447d23e568dfecbde24a860879952 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 7 May 2018 18:46:42 -0700 Subject: Add supported protocols to siteinfo (not siteinfo.json) --- Zotlabs/Module/Siteinfo.php | 6 ++++++ view/tpl/siteinfo.tpl | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php index 92ee78cc6..25276815d 100644 --- a/Zotlabs/Module/Siteinfo.php +++ b/Zotlabs/Module/Siteinfo.php @@ -12,6 +12,9 @@ class Siteinfo extends \Zotlabs\Web\Controller { } function get() { + + $federated = []; + call_hooks('federated_transports',$federated); $siteinfo = replace_macros(get_markup_template('siteinfo.tpl'), [ @@ -27,6 +30,9 @@ class Siteinfo extends \Zotlabs\Web\Controller { '$prj_name' => t('This site is powered by $Projectname'), '$prj_transport' => t('Federated and decentralised networking and identity services provided by Zot'), '$transport_link' => 'https://zotlabs.com', + + '$additional_text' => t('Additional federated transport protocols:'), + '$additional_fed' => implode(',',$federated), '$prj_version' => ((get_config('system','hidden_version_siteinfo')) ? '' : sprintf( t('Version %s'), \Zotlabs\Lib\System::get_project_version())), '$prj_linktxt' => t('Project homepage'), '$prj_srctxt' => t('Developer homepage'), diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index a5b99fd83..4d9c53656 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -38,4 +38,8 @@

    {{$prj_transport}} ({{$transport_link}})
    +{{if $additional_fed}} +
    {{$additional_text}} {{$additional_fed}}
    +{{/if}} +
    -- cgit v1.2.3 From 0c43a9bb5dae1ab6c1646c690f0e9b765e88832e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 7 May 2018 19:33:58 -0700 Subject: yet another postgres/"group by" issue --- Zotlabs/Module/Search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 43464ad8b..3a552bb22 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -175,7 +175,7 @@ class Search extends \Zotlabs\Web\Controller { OR ( item.uid = %d )) OR item.owner_xchan = '%s' ) $item_normal $sql_extra - group by mid order by created desc $pager_sql ", + group by mid, created order by created desc $pager_sql ", intval(local_channel()), dbesc($sys['xchan_hash']) ); @@ -188,7 +188,7 @@ class Search extends \Zotlabs\Web\Controller { $pub_sql ) OR owner_xchan = '%s') $item_normal $sql_extra - group by mid order by created desc $pager_sql", + group by mid, created order by created desc $pager_sql", dbesc($sys['xchan_hash']) ); } -- cgit v1.2.3 From 611e22d67641b0c82486c60d0daa59cc8e0d6b9a Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 7 May 2018 22:07:44 -0700 Subject: turn down logging from DAV basicauth until needed --- Zotlabs/Storage/BasicAuth.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php index d8af03703..a5c01fbb7 100644 --- a/Zotlabs/Storage/BasicAuth.php +++ b/Zotlabs/Storage/BasicAuth.php @@ -253,11 +253,11 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic { * @return void */ public function log() { - logger('channel_name ' . $this->channel_name, LOGGER_DATA); - logger('channel_id ' . $this->channel_id, LOGGER_DATA); - logger('channel_hash ' . $this->channel_hash, LOGGER_DATA); - logger('observer ' . $this->observer, LOGGER_DATA); - logger('owner_id ' . $this->owner_id, LOGGER_DATA); - logger('owner_nick ' . $this->owner_nick, LOGGER_DATA); +// logger('channel_name ' . $this->channel_name, LOGGER_DATA); +// logger('channel_id ' . $this->channel_id, LOGGER_DATA); +// logger('channel_hash ' . $this->channel_hash, LOGGER_DATA); +// logger('observer ' . $this->observer, LOGGER_DATA); +// logger('owner_id ' . $this->owner_id, LOGGER_DATA); +// logger('owner_nick ' . $this->owner_nick, LOGGER_DATA); } } -- cgit v1.2.3 From 3c8de7b59d010f8273370c720aafde80067f77d7 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 7 May 2018 23:57:17 -0700 Subject: use imagemagick first stage thumbnail for cover photos, if configured --- Zotlabs/Module/Cover_photo.php | 37 +++++++++++++++++++++++++++++++++---- include/photos.php | 7 ++++--- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index 76e80156c..d0780c4de 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -84,10 +84,39 @@ class Cover_photo extends \Zotlabs\Web\Controller { ); if($r) { - - $base_image = $r[0]; - $base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); - + + $max_thumb = intval(get_config('system','max_thumbnail',1600)); + $iscaled = false; + if(intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) { + $imagick_path = get_config('system','imagick_convert_path'); + if($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) { + $fname = dbunescbin($r[0]['content']); + $tmp_name = $fname . '-001'; + $newsize = photo_calculate_scale(array_merge(getimagesize($fname),['max' => $max_thumb])); + $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -thumbnail ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); + // logger('imagick thumbnail command: ' . $cmd); + for($x = 0; $x < 4; $x ++) { + exec($cmd); + if(file_exists($tmp_name)) { + break; + } + } + if(file_exists($tmp_name)) { + $base_image = $r[0]; + $gis = getimagesize($tmp_name); + $base_image['width'] = $gis[0]; + $base_image['height'] = $gis[1]; + $base_image['content'] = @file_get_contents($tmp_name); + $iscaled = true; + @unlink($tmp_name); + } + } + } + if(! $iscaled) { + $base_image = $r[0]; + $base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); + } + $im = photo_factory($base_image['content'], $base_image['mimetype']); if($im->is_valid()) { diff --git a/include/photos.php b/include/photos.php index 495043bbf..2d2c9cc13 100644 --- a/include/photos.php +++ b/include/photos.php @@ -84,10 +84,11 @@ function photo_upload($channel, $observer, $args) { // logger('imagick thumbnail command: ' . $cmd); for($x = 0; $x < 4; $x ++) { exec($cmd); - if(! file_exists($tmp_name)) { - logger('imagick scale failed. Retrying.'); - continue; + if(file_exists($tmp_name)) { + break; } + logger('imagick scale failed. Retrying.'); + continue; } if(! file_exists($tmp_name)) { logger('imagick scale failed. Abort.'); -- cgit v1.2.3 From fbd26e8d9d5482961d5b0d0f2f10a38b2ea8009c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 8 May 2018 16:50:16 -0700 Subject: changes made during testing imagick scaling for cover photo thumbnail --- Zotlabs/Module/Cover_photo.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index d0780c4de..9adfa2209 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -90,6 +90,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { if(intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) { $imagick_path = get_config('system','imagick_convert_path'); if($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) { + $fname = dbunescbin($r[0]['content']); $tmp_name = $fname . '-001'; $newsize = photo_calculate_scale(array_merge(getimagesize($fname),['max' => $max_thumb])); @@ -104,6 +105,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { if(file_exists($tmp_name)) { $base_image = $r[0]; $gis = getimagesize($tmp_name); +logger('gis: ' . print_r($gis,true)); $base_image['width'] = $gis[0]; $base_image['height'] = $gis[1]; $base_image['content'] = @file_get_contents($tmp_name); @@ -148,10 +150,10 @@ class Cover_photo extends \Zotlabs\Web\Controller { intval(local_channel()) ); - $orig_srcx = ( $r[0]['width'] / $scaled_width ) * $srcX; - $orig_srcy = ( $r[0]['height'] / $scaled_height ) * $srcY; - $orig_srcw = ( $srcW / $scaled_width ) * $r[0]['width']; - $orig_srch = ( $srcH / $scaled_height ) * $r[0]['height']; + $orig_srcx = ( $base_image['width'] / $scaled_width ) * $srcX; + $orig_srcy = ( $base_image['height'] / $scaled_height ) * $srcY; + $orig_srcw = ( $srcW / $scaled_width ) * $base_image['width']; + $orig_srch = ( $srcH / $scaled_height ) * $base_image['height']; $im->cropImageRect(1200,435,$orig_srcx, $orig_srcy, $orig_srcw, $orig_srch); -- cgit v1.2.3 From 0545baaf56efa6353b728b46e25e64f1a058bb5f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 8 May 2018 20:12:49 -0700 Subject: initial backend support for channel page item search --- Zotlabs/Module/Channel.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 953f87f11..2ed40047b 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -178,6 +178,21 @@ class Channel extends \Zotlabs\Web\Controller { $simple_update = (($update) ? " AND item_unseen = 1 " : ''); + + $search = EMPTY_STR; + if(x($_GET,'search')) { + $search = escape_tags($_GET['search']); + if(strpos($search,'#') === 0) { + $sql_extra2 .= term_query('item',substr($search,1),TERM_HASHTAG,TERM_COMMUNITYTAG); + } + else { + $sql_extra2 .= sprintf(" AND item.body like '%s' ", + dbesc(protect_sprintf('%' . $search . '%')) + ); + } + } + + head_add_link([ 'rel' => 'alternate', 'type' => 'application/json+oembed', @@ -233,6 +248,7 @@ class Channel extends \Zotlabs\Web\Controller { $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); } + $itemspage = get_pconfig(local_channel(),'system','itemspage'); \App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start'])); @@ -251,7 +267,7 @@ class Channel extends \Zotlabs\Web\Controller { else { $r = q("SELECT item.parent AS item_id FROM item left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids ) - WHERE true and item.uid = %d AND item.item_thread_top = 1 $item_normal + WHERE true and item.uid = %d $item_normal AND (abook.abook_blocked = 0 or abook.abook_flags is null) AND item.item_wall = 1 $sql_extra $sql_extra2 @@ -323,7 +339,7 @@ class Channel extends \Zotlabs\Web\Controller { '$fh' => '0', '$static' => $static, '$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1), - '$search' => '', + '$search' => $search, '$xchan' => '', '$order' => '', '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), -- cgit v1.2.3 From cab22f228ac3dd78af3e2d695f9cbdc8f32a8f56 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 8 May 2018 23:01:24 -0700 Subject: hide dotfiles by default in /cloud - the web interface (they are still accessible but hidden). Change this behaviour with pconfig system.show_dot_files --- Zotlabs/Storage/Directory.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index 7068ee15a..b30d45b0e 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -719,6 +719,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo ); foreach ($r as $rr) { + if((strpos($rr['filename'],'.') === 0) && (! get_pconfig($channel_id,'system','show_dot_files'))) + continue; // @FIXME I don't think we use revisions currently in attach structures. // In case we see any in the wild provide a unique filename. This -- cgit v1.2.3 From 2bd7d30a5b3b1b12c2caeb6ecbc8fe9af23f3e1c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 9 May 2018 01:54:18 -0700 Subject: show/hide dot files only in mod_cloud. For DAV let the OS decide --- Zotlabs/Storage/Directory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index b30d45b0e..f46e2e666 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -719,7 +719,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo ); foreach ($r as $rr) { - if((strpos($rr['filename'],'.') === 0) && (! get_pconfig($channel_id,'system','show_dot_files'))) + if(\App::$module === 'cloud' && (strpos($rr['filename'],'.') === 0) && (! get_pconfig($channel_id,'system','show_dot_files')) ) continue; // @FIXME I don't think we use revisions currently in attach structures. -- cgit v1.2.3 From 30d0f9888c049f487769f34d2cce51560bc5925e Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Fri, 4 May 2018 21:46:08 +0200 Subject: Fix composer.json for recent composer. The old composer.json is not valid anymore. Make it work with current composer binaries again. --- composer.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index f89fb15b2..79b60771b 100644 --- a/composer.json +++ b/composer.json @@ -40,13 +40,12 @@ "smarty/smarty": "~3.1" }, "require-dev" : { - "php" : ">=7.0", - "phpunit/phpunit" : "~6.4.4", + "phpunit/phpunit" : "@stable", "behat/behat" : "@stable", "behat/mink-extension": "@stable", "behat/mink-goutte-driver": "@stable", - "php-mock/php-mock-phpunit": "^2.0", - "phpunit/dbunit": "^3.0" + "php-mock/php-mock-phpunit": "@stable", + "phpunit/dbunit": "@stable" }, "autoload" : { "psr-4" : { -- cgit v1.2.3 From dafe0afa65171f55146f49f3d45fb4c126073be9 Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Fri, 4 May 2018 22:44:22 +0200 Subject: :arrow_up: Update libraries. Updating smarty/smarty (v3.1.31 => v3.1.32) Updating sabre/vobject (4.1.5 => 4.1.6) --- composer.lock | 270 +- vendor/composer/installed.json | 24 +- vendor/sabre/vobject/CHANGELOG.md | 9 +- vendor/sabre/vobject/lib/ITip/Broker.php | 9 +- vendor/sabre/vobject/lib/Parser/MimeDir.php | 17 +- vendor/sabre/vobject/lib/Property.php | 24 +- vendor/sabre/vobject/lib/Property/Text.php | 45 +- vendor/sabre/vobject/lib/Version.php | 2 +- vendor/smarty/smarty/COMPOSER_RELEASE_NOTES.txt | 2 + vendor/smarty/smarty/INHERITANCE_RELEASE_NOTES.txt | 18 +- vendor/smarty/smarty/NEW_FEATURES.txt | 57 +- vendor/smarty/smarty/README | 68 +- vendor/smarty/smarty/README.md | 27 +- vendor/smarty/smarty/SMARTY_2_BC_NOTES.txt | 48 +- vendor/smarty/smarty/SMARTY_3.0_BC_NOTES.txt | 10 +- vendor/smarty/smarty/SMARTY_3.1_NOTES.txt | 18 +- vendor/smarty/smarty/change_log.txt | 499 ++- vendor/smarty/smarty/composer.json | 39 + .../smarty/demo/plugins/cacheresource.pdo.php | 2 +- vendor/smarty/smarty/error_reporting.ini | 1 + vendor/smarty/smarty/libs/Autoloader.php | 6 +- vendor/smarty/smarty/libs/Smarty.class.php | 737 ++-- vendor/smarty/smarty/libs/SmartyBC.class.php | 23 +- vendor/smarty/smarty/libs/bootstrap.php | 4 +- .../smarty/libs/plugins/block.textformat.php | 31 +- .../smarty/libs/plugins/function.counter.php | 6 +- .../smarty/smarty/libs/plugins/function.cycle.php | 22 +- .../smarty/smarty/libs/plugins/function.fetch.php | 48 +- .../libs/plugins/function.html_checkboxes.php | 75 +- .../smarty/libs/plugins/function.html_image.php | 37 +- .../smarty/libs/plugins/function.html_options.php | 67 +- .../smarty/libs/plugins/function.html_radios.php | 65 +- .../libs/plugins/function.html_select_date.php | 65 +- .../libs/plugins/function.html_select_time.php | 51 +- .../smarty/libs/plugins/function.html_table.php | 32 +- .../smarty/smarty/libs/plugins/function.mailto.php | 22 +- .../smarty/smarty/libs/plugins/function.math.php | 12 +- .../smarty/libs/plugins/modifier.capitalize.php | 29 +- .../smarty/libs/plugins/modifier.date_format.php | 38 +- .../libs/plugins/modifier.debug_print_var.php | 8 +- .../smarty/smarty/libs/plugins/modifier.escape.php | 60 +- .../smarty/libs/plugins/modifier.mb_wordwrap.php | 75 + .../smarty/libs/plugins/modifier.regex_replace.php | 4 +- .../smarty/libs/plugins/modifier.replace.php | 14 +- .../smarty/libs/plugins/modifier.spacify.php | 4 +- .../smarty/libs/plugins/modifier.truncate.php | 6 +- .../smarty/libs/plugins/modifiercompiler.cat.php | 10 +- .../plugins/modifiercompiler.count_characters.php | 6 +- .../plugins/modifiercompiler.count_paragraphs.php | 4 +- .../plugins/modifiercompiler.count_sentences.php | 2 +- .../libs/plugins/modifiercompiler.count_words.php | 4 +- .../libs/plugins/modifiercompiler.default.php | 4 +- .../libs/plugins/modifiercompiler.escape.php | 26 +- .../libs/plugins/modifiercompiler.from_charset.php | 4 +- .../libs/plugins/modifiercompiler.indent.php | 4 +- .../smarty/libs/plugins/modifiercompiler.lower.php | 4 +- .../libs/plugins/modifiercompiler.noprint.php | 4 +- .../plugins/modifiercompiler.string_format.php | 4 +- .../smarty/libs/plugins/modifiercompiler.strip.php | 8 +- .../libs/plugins/modifiercompiler.strip_tags.php | 6 +- .../libs/plugins/modifiercompiler.to_charset.php | 4 +- .../libs/plugins/modifiercompiler.unescape.php | 6 +- .../smarty/libs/plugins/modifiercompiler.upper.php | 4 +- .../libs/plugins/modifiercompiler.wordwrap.php | 26 +- .../libs/plugins/outputfilter.trimwhitespace.php | 2 +- .../libs/plugins/shared.escape_special_chars.php | 2 +- .../smarty/libs/plugins/shared.make_timestamp.php | 6 +- .../smarty/libs/plugins/shared.mb_str_replace.php | 14 +- .../smarty/libs/plugins/shared.mb_unicode.php | 10 +- .../smarty/libs/plugins/shared.mb_wordwrap.php | 75 - .../plugins/variablefilter.htmlspecialchars.php | 6 +- .../sysplugins/smarty_cacheresource_custom.php | 5 +- .../smarty_cacheresource_keyvaluestore.php | 11 +- .../smarty/smarty/libs/sysplugins/smarty_data.php | 4 +- .../libs/sysplugins/smarty_internal_block.php | 4 +- .../smarty_internal_cacheresource_file.php | 31 +- .../sysplugins/smarty_internal_compile_append.php | 1 + .../sysplugins/smarty_internal_compile_assign.php | 6 +- .../sysplugins/smarty_internal_compile_block.php | 56 +- .../smarty_internal_compile_block_child.php | 40 +- .../smarty_internal_compile_block_parent.php | 56 +- .../sysplugins/smarty_internal_compile_break.php | 35 +- .../sysplugins/smarty_internal_compile_call.php | 4 +- .../sysplugins/smarty_internal_compile_capture.php | 6 +- .../sysplugins/smarty_internal_compile_child.php | 77 + .../smarty_internal_compile_continue.php | 27 +- .../sysplugins/smarty_internal_compile_eval.php | 5 +- .../sysplugins/smarty_internal_compile_extends.php | 29 +- .../sysplugins/smarty_internal_compile_for.php | 14 +- .../sysplugins/smarty_internal_compile_foreach.php | 45 +- .../smarty_internal_compile_function.php | 49 +- .../libs/sysplugins/smarty_internal_compile_if.php | 34 +- .../sysplugins/smarty_internal_compile_include.php | 69 +- .../smarty_internal_compile_include_php.php | 13 +- .../sysplugins/smarty_internal_compile_insert.php | 23 +- .../sysplugins/smarty_internal_compile_ldelim.php | 5 +- .../smarty_internal_compile_make_nocache.php | 12 +- .../sysplugins/smarty_internal_compile_parent.php | 32 + ...marty_internal_compile_private_block_plugin.php | 19 +- ...rty_internal_compile_private_foreachsection.php | 11 +- ...ty_internal_compile_private_function_plugin.php | 6 +- .../smarty_internal_compile_private_modifier.php | 29 +- ...ty_internal_compile_private_object_function.php | 12 +- .../smarty_internal_compile_private_php.php | 40 +- ...y_internal_compile_private_print_expression.php | 41 +- ...y_internal_compile_private_registered_block.php | 2 +- ...nternal_compile_private_registered_function.php | 30 +- .../sysplugins/smarty_internal_compile_rdelim.php | 10 +- .../sysplugins/smarty_internal_compile_section.php | 74 +- .../smarty_internal_compile_shared_inheritance.php | 26 +- .../sysplugins/smarty_internal_compile_while.php | 10 +- .../sysplugins/smarty_internal_compilebase.php | 17 +- .../smarty_internal_config_file_compiler.php | 25 +- .../sysplugins/smarty_internal_configfilelexer.php | 287 +- .../smarty_internal_configfileparser.php | 797 ++-- .../libs/sysplugins/smarty_internal_data.php | 7 +- .../libs/sysplugins/smarty_internal_debug.php | 31 +- .../sysplugins/smarty_internal_errorhandler.php | 112 + .../smarty_internal_extension_handler.php | 127 +- .../smarty_internal_method_addautoloadfilters.php | 2 +- .../sysplugins/smarty_internal_method_append.php | 4 +- .../smarty_internal_method_appendbyref.php | 2 +- .../smarty_internal_method_assignbyref.php | 2 +- .../smarty_internal_method_assignglobal.php | 2 +- .../smarty_internal_method_clearallcache.php | 3 +- .../smarty_internal_method_clearcache.php | 3 +- ...marty_internal_method_clearcompiledtemplate.php | 42 +- .../smarty_internal_method_compilealltemplates.php | 30 +- .../smarty_internal_method_configload.php | 7 +- .../smarty_internal_method_getautoloadfilters.php | 4 +- .../smarty_internal_method_getglobal.php | 4 +- .../sysplugins/smarty_internal_method_gettags.php | 5 +- .../smarty_internal_method_gettemplatevars.php | 9 +- .../sysplugins/smarty_internal_method_literals.php | 98 + .../smarty_internal_method_loadfilter.php | 4 +- .../smarty_internal_method_loadplugin.php | 2 +- .../smarty_internal_method_mustcompile.php | 2 +- ...nternal_method_registerdefaultconfighandler.php | 2 +- ...ernal_method_registerdefaulttemplatehandler.php | 4 +- .../smarty_internal_method_registerfilter.php | 4 +- .../smarty_internal_method_registerplugin.php | 4 +- .../smarty_internal_method_setautoloadfilters.php | 3 +- .../smarty_internal_method_unloadfilter.php | 3 +- .../smarty_internal_method_unregisterfilter.php | 1 + .../sysplugins/smarty_internal_nocache_insert.php | 9 +- .../libs/sysplugins/smarty_internal_parsetree.php | 4 +- .../sysplugins/smarty_internal_parsetree_code.php | 2 +- .../sysplugins/smarty_internal_parsetree_dq.php | 4 +- .../sysplugins/smarty_internal_parsetree_tag.php | 2 +- .../smarty_internal_parsetree_template.php | 12 +- .../smarty_internal_resource_extends.php | 5 +- .../sysplugins/smarty_internal_resource_file.php | 20 +- .../sysplugins/smarty_internal_resource_php.php | 59 +- .../sysplugins/smarty_internal_resource_stream.php | 1 + .../sysplugins/smarty_internal_resource_string.php | 3 + .../smarty_internal_runtime_cachemodify.php | 3 + .../smarty_internal_runtime_cacheresourcefile.php | 56 +- .../sysplugins/smarty_internal_runtime_capture.php | 26 +- .../smarty_internal_runtime_codeframe.php | 69 +- .../smarty_internal_runtime_filterhandler.php | 4 +- .../sysplugins/smarty_internal_runtime_foreach.php | 66 +- .../smarty_internal_runtime_getincludepath.php | 21 +- .../smarty_internal_runtime_inheritance.php | 69 +- .../smarty_internal_runtime_tplfunction.php | 6 +- .../smarty_internal_runtime_updatecache.php | 132 +- .../smarty_internal_runtime_updatescope.php | 2 +- .../smarty_internal_runtime_writefile.php | 24 +- .../smarty_internal_smartytemplatecompiler.php | 8 +- .../libs/sysplugins/smarty_internal_template.php | 85 +- .../sysplugins/smarty_internal_templatebase.php | 46 +- .../smarty_internal_templatecompilerbase.php | 1346 ++++--- .../sysplugins/smarty_internal_templatelexer.php | 723 ++-- .../sysplugins/smarty_internal_templateparser.php | 4022 ++++++++++++-------- .../sysplugins/smarty_internal_testinstall.php | 417 +- .../smarty/libs/sysplugins/smarty_resource.php | 198 +- .../libs/sysplugins/smarty_resource_custom.php | 4 +- .../libs/sysplugins/smarty_resource_recompiled.php | 5 +- .../libs/sysplugins/smarty_resource_uncompiled.php | 2 +- .../smarty/libs/sysplugins/smarty_security.php | 115 +- .../libs/sysplugins/smarty_template_cached.php | 9 +- .../libs/sysplugins/smarty_template_compiled.php | 143 +- .../sysplugins/smarty_template_resource_base.php | 13 +- .../libs/sysplugins/smarty_template_source.php | 12 +- .../libs/sysplugins/smarty_undefined_variable.php | 12 +- .../libs/sysplugins/smartycompilerexception.php | 3 + .../smarty/libs/sysplugins/smartyexception.php | 3 + 186 files changed, 7392 insertions(+), 6000 deletions(-) create mode 100644 vendor/smarty/smarty/composer.json create mode 100644 vendor/smarty/smarty/error_reporting.ini create mode 100644 vendor/smarty/smarty/libs/plugins/modifier.mb_wordwrap.php delete mode 100644 vendor/smarty/smarty/libs/plugins/shared.mb_wordwrap.php create mode 100644 vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_child.php create mode 100644 vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_parent.php create mode 100644 vendor/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php create mode 100644 vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_literals.php diff --git a/composer.lock b/composer.lock index 4a80d7d90..6f1af0fd7 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "516114a0fbd804e5234ebeacbac30376", + "content-hash": "ca5770d3c97cc1d0375413eeb61758ab", "packages": [ { "name": "bshaffer/oauth2-server-php", @@ -640,16 +640,16 @@ }, { "name": "sabre/vobject", - "version": "4.1.5", + "version": "4.1.6", "source": { "type": "git", "url": "https://github.com/sabre-io/vobject.git", - "reference": "0928660e92d46d2d24336a6db320636aa3a75414" + "reference": "122cacbdea2c6133ac04db86ec05854beef75adf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/vobject/zipball/0928660e92d46d2d24336a6db320636aa3a75414", - "reference": "0928660e92d46d2d24336a6db320636aa3a75414", + "url": "https://api.github.com/repos/sabre-io/vobject/zipball/122cacbdea2c6133ac04db86ec05854beef75adf", + "reference": "122cacbdea2c6133ac04db86ec05854beef75adf", "shasum": "" }, "require": { @@ -733,7 +733,7 @@ "xCal", "xCard" ], - "time": "2018-03-08T21:06:39+00:00" + "time": "2018-04-20T07:22:50+00:00" }, { "name": "sabre/xml", @@ -863,16 +863,16 @@ }, { "name": "smarty/smarty", - "version": "v3.1.31", + "version": "v3.1.32", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "c7d42e4a327c402897dd587871434888fde1e7a9" + "reference": "ac9d4b587e5bf53381e21881820a9830765cb459" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/c7d42e4a327c402897dd587871434888fde1e7a9", - "reference": "c7d42e4a327c402897dd587871434888fde1e7a9", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/ac9d4b587e5bf53381e21881820a9830765cb459", + "reference": "ac9d4b587e5bf53381e21881820a9830765cb459", "shasum": "" }, "require": { @@ -912,7 +912,7 @@ "keywords": [ "templating" ], - "time": "2016-12-14T21:57:25+00:00" + "time": "2018-04-24T14:53:33+00:00" } ], "packages-dev": [ @@ -1118,27 +1118,27 @@ }, { "name": "behat/mink-browserkit-driver", - "version": "v1.3.2", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/minkphp/MinkBrowserKitDriver.git", - "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb" + "reference": "1b9a7ce903cfdaaec5fb32bfdbb26118343662eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/10e67fb4a295efcd62ea0bf16025a85ea19534fb", - "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb", + "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/1b9a7ce903cfdaaec5fb32bfdbb26118343662eb", + "reference": "1b9a7ce903cfdaaec5fb32bfdbb26118343662eb", "shasum": "" }, "require": { "behat/mink": "^1.7.1@dev", "php": ">=5.3.6", - "symfony/browser-kit": "~2.3|~3.0", - "symfony/dom-crawler": "~2.3|~3.0" + "symfony/browser-kit": "~2.3|~3.0|~4.0", + "symfony/dom-crawler": "~2.3|~3.0|~4.0" }, "require-dev": { - "silex/silex": "~1.2", - "symfony/phpunit-bridge": "~2.7|~3.0" + "mink/driver-testsuite": "dev-master", + "symfony/http-kernel": "~2.3|~3.0|~4.0" }, "type": "mink-driver", "extra": { @@ -1170,7 +1170,7 @@ "browser", "testing" ], - "time": "2016-03-05T08:59:47+00:00" + "time": "2018-05-02T09:25:31+00:00" }, { "name": "behat/mink-extension", @@ -1472,16 +1472,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.3.0", + "version": "6.3.3", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699" + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699", - "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", "shasum": "" }, "require": { @@ -1491,7 +1491,7 @@ }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.0 || ^5.0", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", "psr/log": "^1.0" }, "suggest": { @@ -1500,7 +1500,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.2-dev" + "dev-master": "6.3-dev" } }, "autoload": { @@ -1533,7 +1533,7 @@ "rest", "web service" ], - "time": "2017-06-22T18:50:49+00:00" + "time": "2018-04-22T15:46:56+00:00" }, { "name": "guzzlehttp/promises", @@ -1914,25 +1914,28 @@ }, { "name": "php-mock/php-mock-phpunit", - "version": "2.0.1", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/php-mock/php-mock-phpunit.git", - "reference": "b42fc41ecb7538564067527f6c30b8854f149d32" + "reference": "ff1cc1d4e7478ce74221e05742588619bee84f69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-mock/php-mock-phpunit/zipball/b42fc41ecb7538564067527f6c30b8854f149d32", - "reference": "b42fc41ecb7538564067527f6c30b8854f149d32", + "url": "https://api.github.com/repos/php-mock/php-mock-phpunit/zipball/ff1cc1d4e7478ce74221e05742588619bee84f69", + "reference": "ff1cc1d4e7478ce74221e05742588619bee84f69", "shasum": "" }, "require": { "php": ">=7", "php-mock/php-mock-integration": "^2", - "phpunit/phpunit": "^6 <6.5" + "phpunit/phpunit": "^6 || ^7" }, "type": "library", "autoload": { + "files": [ + "autoload.php" + ], "psr-4": { "phpmock\\phpunit\\": "classes/" } @@ -1961,7 +1964,7 @@ "test", "test double" ], - "time": "2017-12-02T09:49:02+00:00" + "time": "2018-04-06T13:54:43+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -2111,23 +2114,23 @@ }, { "name": "phpspec/prophecy", - "version": "1.7.5", + "version": "1.7.6", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401" + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401", - "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", - "sebastian/comparator": "^1.1|^2.0", + "sebastian/comparator": "^1.1|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { @@ -2170,7 +2173,7 @@ "spy", "stub" ], - "time": "2018-02-19T10:16:54+00:00" + "time": "2018-04-18T13:57:24+00:00" }, { "name": "phpunit/dbunit", @@ -2226,16 +2229,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "5.3.0", + "version": "5.3.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" + "reference": "c89677919c5dd6d3b3852f230a663118762218ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", - "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac", + "reference": "c89677919c5dd6d3b3852f230a663118762218ac", "shasum": "" }, "require": { @@ -2285,7 +2288,7 @@ "testing", "xunit" ], - "time": "2017-12-06T09:29:45+00:00" + "time": "2018-04-06T15:36:58+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2475,16 +2478,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.4.4", + "version": "6.5.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932" + "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/562f7dc75d46510a4ed5d16189ae57fbe45a9932", - "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4f21a3c6b97c42952fd5c2837bb354ec0199b97b", + "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b", "shasum": "" }, "require": { @@ -2498,12 +2501,12 @@ "phar-io/version": "^1.0", "php": "^7.0", "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^5.2.2", - "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-code-coverage": "^5.3", + "phpunit/php-file-iterator": "^1.4.3", "phpunit/php-text-template": "^1.2.1", "phpunit/php-timer": "^1.0.9", - "phpunit/phpunit-mock-objects": "^4.0.3", - "sebastian/comparator": "^2.0.2", + "phpunit/phpunit-mock-objects": "^5.0.5", + "sebastian/comparator": "^2.1", "sebastian/diff": "^2.0", "sebastian/environment": "^3.1", "sebastian/exporter": "^3.1", @@ -2529,7 +2532,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.4.x-dev" + "dev-master": "6.5.x-dev" } }, "autoload": { @@ -2555,33 +2558,33 @@ "testing", "xunit" ], - "time": "2017-11-08T11:26:09+00:00" + "time": "2018-04-10T11:38:34+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "4.0.4", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "2f789b59ab89669015ad984afa350c4ec577ade0" + "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0", - "reference": "2f789b59ab89669015ad984afa350c4ec577ade0", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/33fd41a76e746b8fa96d00b49a23dadfa8334cdf", + "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.5", "php": "^7.0", "phpunit/php-text-template": "^1.2.1", - "sebastian/exporter": "^3.0" + "sebastian/exporter": "^3.1" }, "conflict": { "phpunit/phpunit": "<6.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^6.5" }, "suggest": { "ext-soap": "*" @@ -2589,7 +2592,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.0.x-dev" } }, "autoload": { @@ -2604,7 +2607,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -2614,7 +2617,7 @@ "mock", "xunit" ], - "time": "2017-08-03T14:08:16+00:00" + "time": "2018-01-06T05:45:45+00:00" }, { "name": "psr/container", @@ -3276,16 +3279,16 @@ }, { "name": "symfony/browser-kit", - "version": "v3.4.6", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "490f27762705c8489bd042fe3e9377a191dba9b4" + "reference": "840bb6f0d5b3701fd768b68adf7193c2d0f98f79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/490f27762705c8489bd042fe3e9377a191dba9b4", - "reference": "490f27762705c8489bd042fe3e9377a191dba9b4", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/840bb6f0d5b3701fd768b68adf7193c2d0f98f79", + "reference": "840bb6f0d5b3701fd768b68adf7193c2d0f98f79", "shasum": "" }, "require": { @@ -3329,11 +3332,11 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-03-19T22:32:39+00:00" }, { "name": "symfony/class-loader", - "version": "v3.4.6", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", @@ -3389,16 +3392,16 @@ }, { "name": "symfony/config", - "version": "v3.4.6", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "05e10567b529476a006b00746c5f538f1636810e" + "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/05e10567b529476a006b00746c5f538f1636810e", - "reference": "05e10567b529476a006b00746c5f538f1636810e", + "url": "https://api.github.com/repos/symfony/config/zipball/7c2a9d44f4433863e9bca682e7f03609234657f9", + "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9", "shasum": "" }, "require": { @@ -3448,20 +3451,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-02-14T10:03:57+00:00" + "time": "2018-03-19T22:32:39+00:00" }, { "name": "symfony/console", - "version": "v3.4.6", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "067339e9b8ec30d5f19f5950208893ff026b94f7" + "reference": "5b1fdfa8eb93464bcc36c34da39cedffef822cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/067339e9b8ec30d5f19f5950208893ff026b94f7", - "reference": "067339e9b8ec30d5f19f5950208893ff026b94f7", + "url": "https://api.github.com/repos/symfony/console/zipball/5b1fdfa8eb93464bcc36c34da39cedffef822cdf", + "reference": "5b1fdfa8eb93464bcc36c34da39cedffef822cdf", "shasum": "" }, "require": { @@ -3482,7 +3485,7 @@ "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -3517,20 +3520,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-02-26T15:46:28+00:00" + "time": "2018-04-30T01:22:56+00:00" }, { "name": "symfony/css-selector", - "version": "v3.4.6", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "544655f1fc078a9cd839fdda2b7b1e64627c826a" + "reference": "519a80d7c1d95c6cc0b67f686d15fe27c6910de0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/544655f1fc078a9cd839fdda2b7b1e64627c826a", - "reference": "544655f1fc078a9cd839fdda2b7b1e64627c826a", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/519a80d7c1d95c6cc0b67f686d15fe27c6910de0", + "reference": "519a80d7c1d95c6cc0b67f686d15fe27c6910de0", "shasum": "" }, "require": { @@ -3570,20 +3573,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-02-03T14:55:07+00:00" + "time": "2018-03-19T22:32:39+00:00" }, { "name": "symfony/debug", - "version": "v3.4.6", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "9b1071f86e79e1999b3d3675d2e0e7684268b9bc" + "reference": "1b95888cfd996484527cb41e8952d9a5eaf7454f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/9b1071f86e79e1999b3d3675d2e0e7684268b9bc", - "reference": "9b1071f86e79e1999b3d3675d2e0e7684268b9bc", + "url": "https://api.github.com/repos/symfony/debug/zipball/1b95888cfd996484527cb41e8952d9a5eaf7454f", + "reference": "1b95888cfd996484527cb41e8952d9a5eaf7454f", "shasum": "" }, "require": { @@ -3626,20 +3629,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-02-28T21:49:22+00:00" + "time": "2018-04-30T16:53:52+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.4.6", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "12e901abc1cb0d637a0e5abe9923471361d96b07" + "reference": "54ff9d78b56429f9a1ac12e60bfb6d169c0468e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/12e901abc1cb0d637a0e5abe9923471361d96b07", - "reference": "12e901abc1cb0d637a0e5abe9923471361d96b07", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/54ff9d78b56429f9a1ac12e60bfb6d169c0468e3", + "reference": "54ff9d78b56429f9a1ac12e60bfb6d169c0468e3", "shasum": "" }, "require": { @@ -3697,20 +3700,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-03-04T03:54:53+00:00" + "time": "2018-04-29T14:04:08+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.4.6", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "2bb5d3101cc01f4fe580e536daf4f1959bc2d24d" + "reference": "1a4cffeb059226ff6bee9f48acb388faf674afff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2bb5d3101cc01f4fe580e536daf4f1959bc2d24d", - "reference": "2bb5d3101cc01f4fe580e536daf4f1959bc2d24d", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1a4cffeb059226ff6bee9f48acb388faf674afff", + "reference": "1a4cffeb059226ff6bee9f48acb388faf674afff", "shasum": "" }, "require": { @@ -3753,20 +3756,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2018-02-22T10:48:49+00:00" + "time": "2018-03-19T22:32:39+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.6", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "58990682ac3fdc1f563b7e705452921372aad11d" + "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/58990682ac3fdc1f563b7e705452921372aad11d", - "reference": "58990682ac3fdc1f563b7e705452921372aad11d", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8", + "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8", "shasum": "" }, "require": { @@ -3816,11 +3819,11 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-02-14T10:03:57+00:00" + "time": "2018-04-06T07:35:25+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.6", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -3869,16 +3872,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" + "reference": "3296adf6a6454a050679cde90f95350ad604b171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", "shasum": "" }, "require": { @@ -3890,7 +3893,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -3924,20 +3927,20 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/translation", - "version": "v3.4.6", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "80e19eaf12cbb546ac40384e5c55c36306823e57" + "reference": "d4af50f46cd8171fd5c1cdebdb9a8bbcd8078c6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/80e19eaf12cbb546ac40384e5c55c36306823e57", - "reference": "80e19eaf12cbb546ac40384e5c55c36306823e57", + "url": "https://api.github.com/repos/symfony/translation/zipball/d4af50f46cd8171fd5c1cdebdb9a8bbcd8078c6c", + "reference": "d4af50f46cd8171fd5c1cdebdb9a8bbcd8078c6c", "shasum": "" }, "require": { @@ -3958,7 +3961,7 @@ "symfony/yaml": "~3.4|~4.0" }, "suggest": { - "psr/log": "To use logging capability in translator", + "psr/log-implementation": "To use logging capability in translator", "symfony/config": "", "symfony/yaml": "" }, @@ -3992,20 +3995,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-02-22T06:28:18+00:00" + "time": "2018-04-30T01:22:56+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.6", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "6af42631dcf89e9c616242c900d6c52bd53bd1bb" + "reference": "033cfa61ef06ee0847e056e530201842b6e926c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/6af42631dcf89e9c616242c900d6c52bd53bd1bb", - "reference": "6af42631dcf89e9c616242c900d6c52bd53bd1bb", + "url": "https://api.github.com/repos/symfony/yaml/zipball/033cfa61ef06ee0847e056e530201842b6e926c3", + "reference": "033cfa61ef06ee0847e056e530201842b6e926c3", "shasum": "" }, "require": { @@ -4050,7 +4053,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-02-16T09:50:28+00:00" + "time": "2018-04-08T08:21:29+00:00" }, { "name": "theseer/tokenizer", @@ -4094,16 +4097,16 @@ }, { "name": "webmozart/assert", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" + "reference": "0df1908962e7a3071564e857d86874dad1ef204a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", + "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", + "reference": "0df1908962e7a3071564e857d86874dad1ef204a", "shasum": "" }, "require": { @@ -4140,15 +4143,18 @@ "check", "validate" ], - "time": "2016-11-23T20:04:58+00:00" + "time": "2018-01-29T19:49:41+00:00" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { + "phpunit/phpunit": 0, "behat/behat": 0, "behat/mink-extension": 0, - "behat/mink-goutte-driver": 0 + "behat/mink-goutte-driver": 0, + "php-mock/php-mock-phpunit": 0, + "phpunit/dbunit": 0 }, "prefer-stable": false, "prefer-lowest": false, @@ -4160,7 +4166,5 @@ "ext-xml": "*", "ext-openssl": "*" }, - "platform-dev": { - "php": ">=5.6 || >=7.0" - } + "platform-dev": [] } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 6ce7bf350..ea47f731d 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -657,17 +657,17 @@ }, { "name": "sabre/vobject", - "version": "4.1.5", - "version_normalized": "4.1.5.0", + "version": "4.1.6", + "version_normalized": "4.1.6.0", "source": { "type": "git", "url": "https://github.com/sabre-io/vobject.git", - "reference": "0928660e92d46d2d24336a6db320636aa3a75414" + "reference": "122cacbdea2c6133ac04db86ec05854beef75adf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/vobject/zipball/0928660e92d46d2d24336a6db320636aa3a75414", - "reference": "0928660e92d46d2d24336a6db320636aa3a75414", + "url": "https://api.github.com/repos/sabre-io/vobject/zipball/122cacbdea2c6133ac04db86ec05854beef75adf", + "reference": "122cacbdea2c6133ac04db86ec05854beef75adf", "shasum": "" }, "require": { @@ -682,7 +682,7 @@ "suggest": { "hoa/bench": "If you would like to run the benchmark scripts" }, - "time": "2018-03-08T21:06:39+00:00", + "time": "2018-04-20T07:22:50+00:00", "bin": [ "bin/vobject", "bin/generate_vcards" @@ -886,23 +886,23 @@ }, { "name": "smarty/smarty", - "version": "v3.1.31", - "version_normalized": "3.1.31.0", + "version": "v3.1.32", + "version_normalized": "3.1.32.0", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "c7d42e4a327c402897dd587871434888fde1e7a9" + "reference": "ac9d4b587e5bf53381e21881820a9830765cb459" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/c7d42e4a327c402897dd587871434888fde1e7a9", - "reference": "c7d42e4a327c402897dd587871434888fde1e7a9", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/ac9d4b587e5bf53381e21881820a9830765cb459", + "reference": "ac9d4b587e5bf53381e21881820a9830765cb459", "shasum": "" }, "require": { "php": ">=5.2" }, - "time": "2016-12-14T21:57:25+00:00", + "time": "2018-04-24T14:53:33+00:00", "type": "library", "extra": { "branch-alias": { diff --git a/vendor/sabre/vobject/CHANGELOG.md b/vendor/sabre/vobject/CHANGELOG.md index 269b3dbff..6cfec988e 100644 --- a/vendor/sabre/vobject/CHANGELOG.md +++ b/vendor/sabre/vobject/CHANGELOG.md @@ -1,10 +1,17 @@ ChangeLog ========= +4.1.6 (2018-04-20) +------------------ + +* #406, #407, #408, #409: Another round of performance improvements in serialization of properties (@gharlan, @staabm) +* #410: Fixes in iTip for handling `BYDAY=SA,SO` (@gharlan) +* #381: Fixes in iTip handling of `SCHEDULE-FORCE-SEND` (@alecpl) + 4.1.5 (2018-03-08) ------------------ -* Serialization: Performance boost for long properties (@gharlan) +* #404: Serialization: Performance boost for long properties (@gharlan) 4.1.4 (2017-12-22) ------------------ diff --git a/vendor/sabre/vobject/lib/ITip/Broker.php b/vendor/sabre/vobject/lib/ITip/Broker.php index b9a30611b..b954cdc8d 100644 --- a/vendor/sabre/vobject/lib/ITip/Broker.php +++ b/vendor/sabre/vobject/lib/ITip/Broker.php @@ -897,6 +897,9 @@ class Broker { if ($key === 'INTERVAL' && $val == 1) { continue; } + if (is_array($val)) { + $val = implode(',', $val); + } $rrule[] = "$key=$val"; } } @@ -936,9 +939,9 @@ class Broker { if (isset($attendees[$attendee->getNormalizedValue()])) { $attendees[$attendee->getNormalizedValue()]['instances'][$recurId] = [ - 'id' => $recurId, - 'partstat' => $partStat, - 'force-send' => $forceSend, + 'id' => $recurId, + 'partstat' => $partStat, + 'forceSend' => $forceSend, ]; } else { $attendees[$attendee->getNormalizedValue()] = [ diff --git a/vendor/sabre/vobject/lib/Parser/MimeDir.php b/vendor/sabre/vobject/lib/Parser/MimeDir.php index 78e5bf385..742641236 100644 --- a/vendor/sabre/vobject/lib/Parser/MimeDir.php +++ b/vendor/sabre/vobject/lib/Parser/MimeDir.php @@ -283,22 +283,22 @@ class MimeDir extends Parser { */ protected function readLine() { - if (!is_null($this->lineBuffer)) { + if (!\is_null($this->lineBuffer)) { $rawLine = $this->lineBuffer; $this->lineBuffer = null; } else { do { - $eof = feof($this->input); + $eof = \feof($this->input); - $rawLine = fgets($this->input); + $rawLine = \fgets($this->input); - if ($eof || (feof($this->input) && $rawLine === false)) { + if ($eof || (\feof($this->input) && $rawLine === false)) { throw new EofException('End of document reached prematurely'); } if ($rawLine === false) { throw new ParseException('Error reading from input stream'); } - $rawLine = rtrim($rawLine, "\r\n"); + $rawLine = \rtrim($rawLine, "\r\n"); } while ($rawLine === ''); // Skipping empty lines $this->lineIndex++; } @@ -309,14 +309,15 @@ class MimeDir extends Parser { // Looking ahead for folded lines. while (true) { - $nextLine = rtrim(fgets($this->input), "\r\n"); + $nextLine = \rtrim(\fgets($this->input), "\r\n"); $this->lineIndex++; if (!$nextLine) { break; } if ($nextLine[0] === "\t" || $nextLine[0] === " ") { - $line .= substr($nextLine, 1); - $rawLine .= "\n " . substr($nextLine, 1); + $curLine = \substr($nextLine, 1); + $line .= $curLine; + $rawLine .= "\n " . $curLine; } else { $this->lineBuffer = $nextLine; break; diff --git a/vendor/sabre/vobject/lib/Property.php b/vendor/sabre/vobject/lib/Property.php index 96855f1f7..3d1775fa2 100644 --- a/vendor/sabre/vobject/lib/Property.php +++ b/vendor/sabre/vobject/lib/Property.php @@ -246,20 +246,18 @@ abstract class Property extends Node { $str .= ':' . $this->getRawMimeDirValue(); - $out = ''; - while (strlen($str) > 0) { - if (strlen($str) > 75) { - $part = mb_strcut($str, 0, 75, 'utf-8'); - $out .= $part . "\r\n"; - $str = ' ' . substr($str, strlen($part)); - } else { - $out .= $str . "\r\n"; - $str = ''; - break; - } - } + $str = \preg_replace( + '/( + (?:^.)? # 1 additional byte in first line because of missing single space (see next line) + .{1,74} # max 75 bytes per line (1 byte is used for a single space added after every CRLF) + (?![\x80-\xbf]) # prevent splitting multibyte characters + )/x', + "$1\r\n ", + $str + ); - return $out; + // remove single space after last CRLF + return \substr($str, 0, -1); } diff --git a/vendor/sabre/vobject/lib/Property/Text.php b/vendor/sabre/vobject/lib/Property/Text.php index bb7ab34ee..47a86ccc9 100644 --- a/vendor/sabre/vobject/lib/Property/Text.php +++ b/vendor/sabre/vobject/lib/Property/Text.php @@ -213,16 +213,16 @@ class Text extends Property { $val = $this->getParts(); if (isset($this->minimumPropertyValues[$this->name])) { - $val = array_pad($val, $this->minimumPropertyValues[$this->name], ''); + $val = \array_pad($val, $this->minimumPropertyValues[$this->name], ''); } // Imploding multiple parts into a single value, and splitting the // values with ;. - if (count($val) > 1) { + if (\count($val) > 1) { foreach ($val as $k => $v) { - $val[$k] = str_replace(';', '\;', $v); + $val[$k] = \str_replace(';', '\;', $v); } - $val = implode(';', $val); + $val = \implode(';', $val); } else { $val = $val[0]; } @@ -242,7 +242,7 @@ class Text extends Property { // If the resulting value contains a \n, we must encode it as // quoted-printable. - if (strpos($val, "\n") !== false) { + if (\strpos($val, "\n") !== false) { $str .= ';ENCODING=QUOTED-PRINTABLE:'; $lastLine = $str; @@ -252,40 +252,39 @@ class Text extends Property { // encode newlines for us. Specifically, the \r\n sequence must in // vcards be encoded as =0D=OA and we must insert soft-newlines // every 75 bytes. - for ($ii = 0;$ii < strlen($val);$ii++) { - $ord = ord($val[$ii]); + for ($ii = 0;$ii < \strlen($val);$ii++) { + $ord = \ord($val[$ii]); // These characters are encoded as themselves. if ($ord >= 32 && $ord <= 126) { $lastLine .= $val[$ii]; } else { - $lastLine .= '=' . strtoupper(bin2hex($val[$ii])); + $lastLine .= '=' . \strtoupper(\bin2hex($val[$ii])); } - if (strlen($lastLine) >= 75) { + if (\strlen($lastLine) >= 75) { // Soft line break $out .= $lastLine . "=\r\n "; $lastLine = null; } } - if (!is_null($lastLine)) $out .= $lastLine . "\r\n"; + if (!\is_null($lastLine)) $out .= $lastLine . "\r\n"; return $out; } else { $str .= ':' . $val; - $out = ''; - while (strlen($str) > 0) { - if (strlen($str) > 75) { - $part = mb_strcut($str, 0, 75, 'utf-8'); - $out .= $part . "\r\n"; - $str = ' ' . substr($str, strlen($part)); - } else { - $out .= $str . "\r\n"; - $str = ''; - break; - } - } - return $out; + $str = \preg_replace( + '/( + (?:^.)? # 1 additional byte in first line because of missing single space (see next line) + .{1,74} # max 75 bytes per line (1 byte is used for a single space added after every CRLF) + (?![\x80-\xbf]) # prevent splitting multibyte characters + )/x', + "$1\r\n ", + $str + ); + + // remove single space after last CRLF + return \substr($str, 0, -1); } diff --git a/vendor/sabre/vobject/lib/Version.php b/vendor/sabre/vobject/lib/Version.php index 67e8a4037..074b06c4b 100644 --- a/vendor/sabre/vobject/lib/Version.php +++ b/vendor/sabre/vobject/lib/Version.php @@ -14,6 +14,6 @@ class Version { /** * Full version number. */ - const VERSION = '4.1.5'; + const VERSION = '4.1.6'; } diff --git a/vendor/smarty/smarty/COMPOSER_RELEASE_NOTES.txt b/vendor/smarty/smarty/COMPOSER_RELEASE_NOTES.txt index c943d9f2e..0644719c9 100644 --- a/vendor/smarty/smarty/COMPOSER_RELEASE_NOTES.txt +++ b/vendor/smarty/smarty/COMPOSER_RELEASE_NOTES.txt @@ -27,3 +27,5 @@ To retrieve the development and documentation folders add "smarty/smarty-dev": "~3.1@dev" } +If you are using (include) the composer generated autoloader.php which is located +in the /vendor folder it is no longer needed to require the Smarty.class.php file. \ No newline at end of file diff --git a/vendor/smarty/smarty/INHERITANCE_RELEASE_NOTES.txt b/vendor/smarty/smarty/INHERITANCE_RELEASE_NOTES.txt index c415c4ccd..67936a81a 100644 --- a/vendor/smarty/smarty/INHERITANCE_RELEASE_NOTES.txt +++ b/vendor/smarty/smarty/INHERITANCE_RELEASE_NOTES.txt @@ -1,4 +1,11 @@ -3.1.31-dev +3.1.3" +New tags for inheritance parent and chilD +{parent} == {$smarty.block.parent} +{child} == {$smarty.block.child} +Both tags support the assign attribute like +{child assign=foo} + +3.1.31 New tags for inheritance parent and child {block_parent} == {$smarty.block.parent} {block_child} == {$smarty.block.child} @@ -7,7 +14,6 @@ Since 3.1.28 you can mix inheritance by extends resource with the {extends} tag. A template called by extends resource can extend a subtemplate or chain buy the {extends} tag. Since 3.1.31 this feature can be turned off by setting the new Smarty property Smarty::$extends_recursion to false. - 3.1.28 Starting with version 3.1.28 template inheritance is no longer a compile time process. All {block} tag parent/child relations are resolved at run time. @@ -63,7 +69,7 @@ the compiled code of {include} subtemplates gets also merged in compiled inherit Merging the code into a single compile template has some drawbacks. 1. You could not use variable file names in {include} Smarty would use the {include} of compilation time. 2. You could not use individual compile_id in {include} -3. Seperate caching of subtemplate was not possible +3. Separate caching of subtemplate was not possible 4. Any change of the template directory structure between calls was not necessarily seen. Starting with 3.1.15 some of the above conditions got checked and resulted in an exception. It turned out @@ -75,13 +81,11 @@ With this setting all {include} subtemplate will be merge into the compiled inhe could be rejected by exception. -If $smarty->inheritance_merge_compiled_includes = false; {include} subtemplate will not be merged. -You must now manually merge all {include} subtemplate which do contain {block} tags. This is done by setting the "inline" option. +If $smarty->inheritance_merge_compiled_includes = false; {include} subtemplate will not be merged.You must now manually merge all {include} subtemplate which do contain {block} tags. This is done by setting the "inline" option. {include file='foo.bar' inline} 1. In case of a variable file name like {include file=$foo inline} you must use the variable in a compile_id $smarty->compile_id = $foo; -2. If you use individual compile_id in {include file='foo.tpl' compile_id=$bar inline} it must be used in the - global compile_id as well $smarty->compile_id = $bar; +2. If you use individual compile_id in {include file='foo.tpl' compile_id=$bar inline} it must be used in the global compile_id as well $smarty->compile_id = $bar; 3. If call templates with different template_dir configurations and a parent could same named child template from different folders you must make the folder name part of the compile_id. diff --git a/vendor/smarty/smarty/NEW_FEATURES.txt b/vendor/smarty/smarty/NEW_FEATURES.txt index adbc1099b..7632b07ea 100644 --- a/vendor/smarty/smarty/NEW_FEATURES.txt +++ b/vendor/smarty/smarty/NEW_FEATURES.txt @@ -2,6 +2,53 @@ This file contains a brief description of new features which have been added to Smarty 3.1 +Smarty 3.1.32 New tags for inheritance parent and child + ========================================= + {parent} == {$smarty.block.parent} + {child} == {$smarty.block.child} + Both tags support the assign attribute like + {child assign=foo} + + Deprecate functions Smarty::muteExpectedErrors() and Smarty::unmuteExpectedErrors() + =================================================================================== + These functions to start a special error handler are no longer needed as Smarty does + no longer use error suppression like @filemtime(). + For backward compatibility the functions still can be called. + + Using literals containing Smarty's left and right delimiter + =========================================================== + New Methods + $smarty->setLiterals(array $literals) + $smarty->addLiterals(array $literals) + to define literals containing Smarty delimiter. This can avoid the need for extreme usage + of {literal} {/literal} tags. + A) Treat '{{' and '}}' as literal + If Smarty::$auto_literal is enabled + {{ foo }} + will be treated now as literal. (This does apply for any number of delimiter repeatations). + However {{foo}} is not an literal but will be interpreted as a recursive Smarty tag. + If you use + $smarty->setLiteral(array('{{','}}')); + {{foo}} is now a literal as well. + NOTE: In the last example nested Smarty tags starting with '{{' or ending with '}}' will not + work any longer, but this should be very very raw occouring restriction. + B) Example 2 + Assume your delimiter are '<-' , '->' and '<--' , '-->' shall be literals + $smarty->setLiteral(array('<--','-->')); + + + The capture buffers can now be accessed as array + ================================================ + {capture name='foo'} + bah + {\capture} + {capture name='buh'} + blar + {\capture} + {foreach $smarty.capture as $name => $buffer} + .... + {/foreach} + Smarty 3.1.31 New tags for inheritance parent and child ========================================= @@ -45,8 +92,7 @@ Smarty 3.1.30 {/foreach} The {foreach} loop is rendered while processing the compiled template, but $current is a nocache - variable. Normally the {if $current==$item.id} would fail as the $item variable is unkown in the - cached template. {make_nocache $item} does make the current $item value known in thee cached template. + variable. Normally the {if $current==$item.id} would fail as the $item variable is unknown in the cached template. {make_nocache $item} does make the current $item value known in thee cached template. {make_nocache} is ignored when caching is disabled or the variable does exists as nocache variable. @@ -81,8 +127,7 @@ Smarty 3.1.30 Supported scope are parent, tpl_root, smarty, global and root. A scope used together with the {include} tag will cause that with some exceptions any variable assignment within that sub-template will update/assign the variable in other scopes according - to the above rules. It does include also variables assigned by plugins, tags supporting the assign=foo - attribute and direct assignments in {if} and {while} like {if $foo=$bar}. + to the above rules. It does include also variables assigned by plugins, tags supporting the assign=foo attribute and direct assignments in {if} and {while} like {if $foo=$bar}. Excluded are the key and value variables of {foreach}, {for} loop variables , variables passed by attributes in {include} and direct increments/decrements like {$foo++}, {$foo--} @@ -132,8 +177,8 @@ Smarty 3.1.28 as the corresponding Smarty methods to get the content of another template. Example: $template->display(); Does display template of template object - $template->display('foo.tpl'); Does display template 'foo.bar' - + $template->display('foo.tpl'); Does display template 'foo.bar' + File: resource ============== Multiple template_dir entries can now be selected by a comma separated list of indices. diff --git a/vendor/smarty/smarty/README b/vendor/smarty/smarty/README index 08b397c3f..9a71519bd 100644 --- a/vendor/smarty/smarty/README +++ b/vendor/smarty/smarty/README @@ -176,7 +176,7 @@ backward compatible with Smarty 2, except for the following items: There are many things that are new to Smarty 3. Here are the notable items: - + LEXER/PARSER ============ @@ -197,8 +197,8 @@ is still supported for BC. Examples: {$x+$y} will output the sum of x and y. {$foo = strlen($bar)} function in assignment -{assign var=foo value= $x+$y} in attributes -{$foo = myfunct( ($x+$y)*3 )} as function parameter +{assign var=foo value= $x+$y} in attributes +{$foo = myfunct( ($x+$y)*3 )} as function parameter {$foo[$x+3]} as array index Smarty tags can be used as values within other tags. @@ -239,18 +239,18 @@ Examples: The original "dot" notation stays, and with improvements. Examples: -{$foo.a.b.c} => $foo['a']['b']['c'] +{$foo.a.b.c} => $foo['a']['b']['c'] {$foo.a.$b.c} => $foo['a'][$b]['c'] with variable index {$foo.a.{$b+4}.c} => $foo['a'][$b+4]['c'] with expression as index {$foo.a.{$b.c}} => $foo['a'][$b['c']] with nested index -note that { and } are used to address ambiguties when nesting the dot syntax. +note that { and } are used to address ambiguties when nesting the dot syntax. Variable names themselves can be variable and contain expressions. Examples: $foo normal variable -$foo_{$bar} variable name containing other variable -$foo_{$x+$y} variable name containing expressions +$foo_{$bar} variable name containing other variable +$foo_{$x+$y} variable name containing expressions $foo_{$bar}_buh_{$blar} variable name with multiple segments {$foo_{$x}} will output the variable $foo_1 if $x has a value of 1. @@ -260,12 +260,12 @@ Example: {$object->method1($x)->method2($y)} {for} tag added for looping (replacement for {section} tag): {for $x=0, $y=count($foo); $x<$y; $x++} .... {/for} Any number of statements can be used separated by comma as the first -inital expression at {for}. +initial expression at {for}. {for $x = $start to $end step $step} ... {/for}is in the SVN now . You can use also {for $x = $start to $end} ... {/for} -In this case the step value will be automaticall 1 or -1 depending on the start and end values. +In this case the step value will be automatically 1 or -1 depending on the start and end values. Instead of $start and $end you can use any valid expression. Inside the loop the following special vars can be accessed: $x@iteration = number of iteration @@ -290,7 +290,7 @@ $var@last true on last iteration The Smarty 2 {foreach} tag syntax is still supported. -NOTE: {$bar[foo]} still indicates a variable inside of a {section} named foo. +NOTE: {$bar[foo]} still indicates a variable inside of a {section} named foo. If you want to access an array element with index foo, you must use quotes such as {$bar['foo']}, or use the dot syntax {$bar.foo}. @@ -377,12 +377,12 @@ $smarty->display('string:This is my template, {$foo}!'); // php VARIABLE SCOPE / VARIABLE STORAGE ================================= -In Smarty 2, all assigned variables were stored within the Smarty object. -Therefore, all variables assigned in PHP were accessible by all subsequent +In Smarty 2, all assigned variables were stored within the Smarty object. +Therefore, all variables assigned in PHP were accessible by all subsequent fetch and display template calls. -In Smarty 3, we have the choice to assign variables to the main Smarty object, -to user-created data objects, and to user-created template objects. +In Smarty 3, we have the choice to assign variables to the main Smarty object, +to user-created data objects, and to user-created template objects. These objects can be chained. The object at the end of a chain can access all variables belonging to that template and all variables within the parent objects. The Smarty object can only be the root of a chain, but a chain can be isolated @@ -396,7 +396,7 @@ global variables. A Smarty data object can be created as follows: $data = $smarty->createData(); // create root data object $data->assign('foo','bar'); // assign variables as usual -$data->config_load('my.conf'); // load config file +$data->config_load('my.conf'); // load config file $data= $smarty->createData($smarty); // create data object having a parent link to the Smarty object @@ -414,7 +414,7 @@ The first parameter can be a template name, a smarty object or a data object. Examples: $tpl = $smarty->createTemplate('mytpl.tpl'); // create template object not linked to any parent $tpl->assign('foo','bar'); // directly assign variables -$tpl->config_load('my.conf'); // load config file +$tpl->config_load('my.conf'); // load config file $tpl = $smarty->createTemplate('mytpl.tpl',$smarty); // create template having a parent link to the Smarty object $tpl = $smarty->createTemplate('mytpl.tpl',$data); // create template having a parent link to the $data object @@ -424,31 +424,31 @@ If the $parent parameter is not specified in these method calls, the template ob is will link back to the Smarty object as it's parent. If a template is called by an {include...} tag from another template, the -subtemplate links back to the calling template as it's parent. +subtemplate links back to the calling template as it's parent. All variables assigned locally or from a parent template are accessible. If the template creates or modifies a variable by using the {assign var=foo...} or {$foo=...} tags, these new values are only known locally (local scope). When the template exits, none of the new variables or modifications can be seen in the -parent template(s). This is same behavior as in Smarty 2. +parent template(s). This is same behavior as in Smarty 2. With Smarty 3, we can assign variables with a scope attribute which allows the availablility of these new variables or modifications globally (ie in the parent templates.) -Possible scopes are local, parent, root and global. +Possible scopes are local, parent, root and global. Examples: {assign var=foo value='bar'} // no scope is specified, the default 'local' {$foo='bar'} // same, local scope {assign var=foo value='bar' scope='local'} // same, local scope -{assign var=foo value='bar' scope='parent'} // Values will be available to the parent object +{assign var=foo value='bar' scope='parent'} // Values will be available to the parent object {$foo='bar' scope='parent'} // (normally the calling template) -{assign var=foo value='bar' scope='root'} // Values will be exported up to the root object, so they can +{assign var=foo value='bar' scope='root'} // Values will be exported up to the root object, so they can {$foo='bar' scope='root'} // be seen from all templates using the same root. -{assign var=foo value='bar' scope='global'} // Values will be exported to global variable storage, +{assign var=foo value='bar' scope='global'} // Values will be exported to global variable storage, {$foo='bar' scope='global'} // they are available to any and all templates. @@ -460,8 +460,8 @@ included template. PLUGINS ======= -Smarty 3 plugins follow the same coding rules as in Smarty 2. -The main difference is that the template object is now passed in place of the smarty object. +Smarty 3 plugins follow the same coding rules as in Smarty 2. +The main difference is that the template object is now passed in place of the smarty object. The smarty object can be still be accessed through $template->smarty. smarty_plugintype_name (array $params, Smarty_Internal_Template $template) @@ -473,7 +473,7 @@ TEMPLATE INHERITANCE: ===================== With template inheritance you can define blocks, which are areas that can be -overriden by child templates, so your templates could look like this: +overridden by child templates, so your templates could look like this: parent.tpl: @@ -491,14 +491,14 @@ parent.tpl: child.tpl: -{extends file='parent.tpl'} +{extends file='parent.tpl'} {block name='title'} Child title {/block} grandchild.tpl: -{extends file='child.tpl'} -{block name='title'}Home - {$smarty.block.parent}{/block} +{extends file='child.tpl'} +{block name='title'}Home - {$smarty.block.parent}{/block} {block name='page-title'}My home{/block} {block name='content'} {foreach $images as $img} @@ -508,10 +508,10 @@ grandchild.tpl: We redefined all the blocks here, however in the title block we used {$smarty.block.parent}, which tells Smarty to insert the default content from the parent template in its place. -The content block was overriden to display the image files, and page-title has also be -overriden to display a completely different title. +The content block was overridden to display the image files, and page-title has also be +overridden to display a completely different title. -If we render grandchild.tpl we will get this: +If we render grandchild.tpl we will get this: Home - Child title @@ -529,8 +529,8 @@ If we render grandchild.tpl we will get this: NOTE: In the child templates everything outside the {extends} or {block} tag sections is ignored. -The inheritance tree can be as big as you want (meaning you can extend a file that -extends another one that extends another one and so on..), but be aware that all files +The inheritance tree can be as big as you want (meaning you can extend a file that +extends another one that extends another one and so on..), but be aware that all files have to be checked for modifications at runtime so the more inheritance the more overhead you add. Instead of defining the parent/child relationships with the {extends} tag in the child template you @@ -538,7 +538,7 @@ can use the resource as follow: $smarty->display('extends:parent.tpl|child.tpl|grandchild.tpl'); -Child {block} tags may optionally have a append or prepend attribute. In this case the parent block content +Child {block} tags may optionally have a append or prepend attribute. In this case the parent block content is appended or prepended to the child block content. {block name='title' append} My title {/block} diff --git a/vendor/smarty/smarty/README.md b/vendor/smarty/smarty/README.md index 5783eb3e0..24baae4c2 100644 --- a/vendor/smarty/smarty/README.md +++ b/vendor/smarty/smarty/README.md @@ -1,5 +1,12 @@ -#Smarty 3 template engine -##Distribution repository +# Smarty 3 template engine +[smarty.net](https://www.smarty.net/) + +## Documentation + +For documentation see +[www.smarty.net/docs/en/](https://www.smarty.net/docs/en/) + +## Distribution repository > Smarty 3.1.28 introduces run time template inheritance @@ -10,7 +17,7 @@ Smarty versions 3.1.11 or later are now on github and can be installed with Comp The "smarty/smarty" package will start at libs/.... subfolder. -To get the latest stable version of Smarty 3.1 use +To get the latest stable version of Smarty 3.1 use: ```json "require": { @@ -20,7 +27,7 @@ To get the latest stable version of Smarty 3.1 use in your composer.json file. -To get the trunk version use +To get the trunk version use: ```json "require": { @@ -28,7 +35,7 @@ To get the trunk version use } ``` -For a specific version use something like +For a specific version use something like: ```json "require": { @@ -36,7 +43,7 @@ For a specific version use something like } ``` -PHPUnit test can be installed by corresponding composer entries like +PHPUnit test can be installed by corresponding composer entries like: ```json "require": { @@ -44,7 +51,7 @@ PHPUnit test can be installed by corresponding composer entries like } ``` -Similar applies for the lexer/parser generator +Similar applies for the lexer/parser generator. ```json "require": { @@ -52,7 +59,7 @@ Similar applies for the lexer/parser generator } ``` -Or you could use +Or you could use: ```json "require": { @@ -60,6 +67,6 @@ Or you could use } ``` -Which is a wrapper to install all 3 packages +Which is a wrapper to install all 3 packages. -Composer can also be used for Smarty2 versions 2.6.24 to 2.6.28 +Composer can also be used for Smarty2 versions 2.6.24 to 2.6.30. diff --git a/vendor/smarty/smarty/SMARTY_2_BC_NOTES.txt b/vendor/smarty/smarty/SMARTY_2_BC_NOTES.txt index 79a2cb1b6..fd36bd33b 100644 --- a/vendor/smarty/smarty/SMARTY_2_BC_NOTES.txt +++ b/vendor/smarty/smarty/SMARTY_2_BC_NOTES.txt @@ -2,8 +2,8 @@ == Syntax == -Smarty 3 API has a new syntax. Much of the Smarty 2 syntax is supported -by a wrapper but deprecated. See the README that comes with Smarty 3 for more +Smarty 3 API has a new syntax. Much of the Smarty 2 syntax is supported +by a wrapper but deprecated. See the README that comes with Smarty 3 for more information. The {$array|@mod} syntax has always been a bit confusing, where an "@" is required @@ -32,9 +32,9 @@ Makes Javascript/CSS easier to work with, eliminating the need for {literal}. This can be disabled by setting $smarty->auto_literal = false; == Unquoted Strings == -Smarty 2 was a bit more forgiving (and ambiguous) when it comes to unquoted strings -in parameters. Smarty3 is more restrictive. You can still pass strings without quotes -so long as they contain no special characters. (anything outside of A-Za-z0-9_) +Smarty 2 was a bit more forgiving (and ambiguous) when it comes to unquoted strings +in parameters. Smarty3 is more restrictive. You can still pass strings without quotes +so long as they contain no special characters. (anything outside of A-Za-z0-9_) For example filename strings must be quoted @@ -42,16 +42,16 @@ For example filename strings must be quoted == Extending the Smarty class == -Smarty 3 makes use of the __construct method for initialization. If you are extending -the Smarty class, its constructor is not called implicitly if the your child class defines -its own constructor. In order to run Smarty's constructor, a call to parent::__construct() -within your child constructor is required. +Smarty 3 makes use of the __construct method for initialization. If you are extending +the Smarty class, its constructor is not called implicitly if the your child class defines +its own constructor. In order to run Smarty's constructor, a call to parent::__construct() +within your child constructor is required. class MySmarty extends Smarty { function __construct() { parent::__construct(); - + // your initialization code goes here } @@ -59,36 +59,36 @@ class MySmarty extends Smarty { == Autoloader == -Smarty 3 does register its own autoloader with spl_autoload_register. If your code has -an existing __autoload function then this function must be explicitly registered on -the __autoload stack. See http://us3.php.net/manual/en/function.spl-autoload-register.php +Smarty 3 does register its own autoloader with spl_autoload_register. If your code has +an existing __autoload function then this function must be explicitly registered on +the __autoload stack. See http://us3.php.net/manual/en/function.spl-autoload-register.php for further details. == Plugin Filenames == -Smarty 3 optionally supports the PHP spl_autoloader. The autoloader requires filenames -to be lower case. Because of this, Smarty plugin file names must also be lowercase. +Smarty 3 optionally supports the PHP spl_autoloader. The autoloader requires filenames +to be lower case. Because of this, Smarty plugin file names must also be lowercase. In Smarty 2, mixed case file names did work. == Scope of Special Smarty Variables == -In Smarty 2 the special Smarty variables $smarty.section... and $smarty.foreach... -had global scope. If you had loops with the same name in subtemplates you could accidentally +In Smarty 2 the special Smarty variables $smarty.section... and $smarty.foreach... +had global scope. If you had loops with the same name in subtemplates you could accidentally overwrite values of parent template. -In Smarty 3 these special Smarty variable have only local scope in the template which -is defining the loop. If you need their value in a subtemplate you have to pass them +In Smarty 3 these special Smarty variable have only local scope in the template which +is defining the loop. If you need their value in a subtemplate you have to pass them as parameter. {include file='path/foo.tpl' index=$smarty.section.foo.index} == SMARTY_RESOURCE_CHAR_SET == -Smarty 3 sets the constant SMARTY_RESOURCE_CHAR_SET to utf-8 as default template charset. -This is now used also on modifiers like escape as default charset. If your templates use -other charsets make sure that you define the constant accordingly. Otherwise you may not +Smarty 3 sets the constant SMARTY_RESOURCE_CHAR_SET to utf-8 as default template charset. +This is now used also on modifiers like escape as default charset. If your templates use +other charsets make sure that you define the constant accordingly. Otherwise you may not get any output. == newline at {if} tags == -A \n was added to the compiled code of the {if},{else},{elseif},{/if} tags to get output of newlines as expected by the template source. +A \n was added to the compiled code of the {if},{else},{elseif},{/if} tags to get output of newlines as expected by the template source. If one of the {if} tags is at the line end you will now get a newline in the HTML output. == trigger_error() == @@ -96,7 +96,7 @@ The API function trigger_error() has been removed because it did just map to PHP However it's still included in the Smarty2 API wrapper. == Smarty constants == -The constants +The constants SMARTY_PHP_PASSTHRU SMARTY_PHP_QUOTE SMARTY_PHP_REMOVE diff --git a/vendor/smarty/smarty/SMARTY_3.0_BC_NOTES.txt b/vendor/smarty/smarty/SMARTY_3.0_BC_NOTES.txt index fd8b540c2..24bdec61a 100644 --- a/vendor/smarty/smarty/SMARTY_3.0_BC_NOTES.txt +++ b/vendor/smarty/smarty/SMARTY_3.0_BC_NOTES.txt @@ -1,14 +1,14 @@ == Smarty2 backward compatibility == -All Smarty2 specific API functions and deprecated functionallity has been moved +All Smarty2 specific API functions and deprecated functionality has been moved to the SmartyBC class. == {php} Tag == -The {php} tag is no longer available in the standard Smarty calls. -The use of {php} tags is deprecated and only available in the SmartyBC class. +The {php} tag is no longer available in the standard Smarty calls. +The use of {php} tags is deprecated and only available in the SmartyBC class. == {include_php} Tag == -The {include_php} tag is no longer available in the standard Smarty calls. -The use of {include_php} tags is deprecated and only available in the SmartyBC class. +The {include_php} tag is no longer available in the standard Smarty calls. +The use of {include_php} tags is deprecated and only available in the SmartyBC class. == php template resource == The support of the php template resource is removed. diff --git a/vendor/smarty/smarty/SMARTY_3.1_NOTES.txt b/vendor/smarty/smarty/SMARTY_3.1_NOTES.txt index 57709f0d7..d7c23ccc4 100644 --- a/vendor/smarty/smarty/SMARTY_3.1_NOTES.txt +++ b/vendor/smarty/smarty/SMARTY_3.1_NOTES.txt @@ -50,7 +50,7 @@ The escape modifier now knows the $double_encode option, which will prevent entities from being encoded again. The capitalize modifier now know the $lc_rest option, which makes sure -all letters following a captial letter are lower-cased. +all letters following a capital letter are lower-cased. The count_sentences modifier now accepts (.?!) as legitimate endings of a sentence - previously only (.) was @@ -62,7 +62,7 @@ entity. default_template_handler_func -The invocation of $smarty->$default_template_handler_func had to be +The invocation of $smarty->$default_template_handler_func had to be altered. Instead of a Smarty_Internal_Template, the fifth argument is now provided with the Smarty instance. New footprint: @@ -71,14 +71,14 @@ now provided with the Smarty instance. New footprint: * Default Template Handler * * called when Smarty's file: resource is unable to load a requested file - * + * * @param string $type resource type (e.g. "file", "string", "eval", "resource") * @param string $name resource name (e.g. "foo/bar.tpl") * @param string &$content template's content * @param integer &$modified template's modification time * @param Smarty $smarty Smarty instance - * @return string|boolean path to file or boolean true if $content and $modified - * have been filled, boolean false if no default template + * @return string|boolean path to file or boolean true if $content and $modified + * have been filled, boolean false if no default template * could be loaded */ function default_template_handler_func($type, $name, &$content, &$modified, Smarty $smarty) { @@ -126,7 +126,7 @@ run on variable output. SYNTAX: {setfilter filter1|filter2|filter3....} Smarty3 will lookup up matching filters in the following search order: -1. varibale filter plugin in plugins_dir. +1. variable filter plugin in plugins_dir. 2. a valid modifier. A modifier specification will also accept additional parameter like filter2:'foo' 3. a PHP function @@ -186,8 +186,8 @@ Note that old-fashioned registration of $cache_handler is not possible anymore. As the functionality had not been ported to Smarty 3.0.x properly, it has been dropped from 3.1 completely. -Locking facilities have been implemented to avoid concurrent cache -generation. Enable cache locking by setting +Locking facilities have been implemented to avoid concurrent cache +generation. Enable cache locking by setting $smarty->cache_locking = true; Relative Paths in Templates (File-Resource) @@ -258,7 +258,7 @@ default_config_handler_func() has been introduced. default_plugin_handler_func() -An optional default_plugin_handler_func() can be defined which gets called +An optional default_plugin_handler_func() can be defined which gets called by the compiler on tags which can't be resolved internally or by plugins. The default_plugin_handler() can map tags to plugins on the fly. diff --git a/vendor/smarty/smarty/change_log.txt b/vendor/smarty/smarty/change_log.txt index 1d42b0a76..5765a1718 100644 --- a/vendor/smarty/smarty/change_log.txt +++ b/vendor/smarty/smarty/change_log.txt @@ -1,4 +1,145 @@ -===== 3.1.31 ===== (14.12.2016) +===== 3.1.32 ===== (24.04.2018) +24.04.2018 + - bugfix possible Security Vulnerability in Smarty_Security class. + +26.03.2018 + - bugfix plugins may not be loaded if {function} or {block} tags are executed in nocache mode + https://github.com/smarty-php/smarty/issues/371 + +26.03.2018 + - new feature {parent} = {$smarty.block.parent} {child} = {$smarty.block.child} + +23.03.2018 + - bugfix preg_replace could fail on large content resulting in a blank page https://github.com/smarty-php/smarty/issues/417 + +21.03.2018 + - bugfix {$smarty.section...} used outside {section}{/section} showed incorrect values if {section}{/section} was called inside + another loop https://github.com/smarty-php/smarty/issues/422 + - bugfix short form of {section} attributes did not work https://github.com/smarty-php/smarty/issues/428 + +17.03.2018 + - improvement Smarty::compileAllTemplates() exit with a non-zero status code if max errors is reached https://github.com/smarty-php/smarty/pull/402 + +16.03.2018 + - bugfix extends resource did not work with user defined left/right delimiter https://github.com/smarty-php/smarty/issues/419 + +22.11.2017 + - bugfix {break} and {continue} could fail if {foreach}{/foreach} did contain other + looping tags like {for}, {section} and {while} https://github.com/smarty-php/smarty/issues/323 + +20.11.2017 + - bugfix rework of newline spacing between tag code and template text. + now again identical with Smarty2 (forum topic 26878) + - replacement of " by ' + +05.11.2017 + - lexer/parser optimization + - code cleanup and optimizations + - bugfix {$smarty.section.name.loop} used together with {$smarty.section.name.total} could produce + wrong results (forum topic 27041) + +26.10.2017 + - bugfix Smarty version was not filled in header comment of compiled and cached files + - optimization replace internal Smarty::$ds property by DIRECTORY_SEPARATOR + - deprecate functions Smarty::muteExpectedErrors() and Smarty::unmuteExpectedErrors() + as Smarty does no longer use error suppression like @filemtime(). + for backward compatibility code is moved from Smarty class to an external class and still can be + called. + - correction of PHPDoc blocks + - minor code cleanup + +21.10.2017 + - bugfix custom delimiters could fail since modification of version 3.1.32-dev-23 + https://github.com/smarty-php/smarty/issues/394 + +18.10.2017 + - bugfix fix implementation of unclosed block tag in double quoted string of 12.10.2017 + https://github.com/smarty-php/smarty/issues/396 https://github.com/smarty-php/smarty/issues/397 + https://github.com/smarty-php/smarty/issues/391 https://github.com/smarty-php/smarty/issues/392 + +12.10.2017 + - bugfix $smarty.block.child and $smarty.block.parent could not be used like any + $smarty special variable https://github.com/smarty-php/smarty/issues/393 + - unclosed block tag in double quoted string must throw compiler exception. + https://github.com/smarty-php/smarty/issues/391 https://github.com/smarty-php/smarty/issues/392 + +07.10.2017 + - bugfix modification of 9.8.2017 did fail on some recursive + tag nesting. https://github.com/smarty-php/smarty/issues/389 + +26.8.2017 + - bugfix chained modifier failed when last modifier parameter is a signed value + https://github.com/smarty-php/smarty/issues/327 + - bugfix templates filepath with multibyte characters did not work + https://github.com/smarty-php/smarty/issues/385 + - bugfix {make_nocache} did display code if the template did not contain other nocache code + https://github.com/smarty-php/smarty/issues/369 + +09.8.2017 + - improvement repeated delimiter like {{ and }} will be treated as literal + https://groups.google.com/forum/#!topic/smarty-developers/h9r82Bx4KZw + +05.8.2017 + - bugfix wordwrap modifier could fail if used in nocache code. + converted plugin file shared.mb_wordwrap.php into modifier.mb_wordwrap.php + - cleanup of _getSmartyObj() + +31.7.2017 + - Call clearstatcache() after mkdir() failure https://github.com/smarty-php/smarty/pull/379 + +30.7.2017 + - rewrite mkdir() bugfix to retry automatically see https://github.com/smarty-php/smarty/pull/377 + https://github.com/smarty-php/smarty/pull/379 + +21.7.2017 + - security possible PHP code injection on custom resources at display() or fetch() + calls if the resource does not sanitize the template name + - bugfix fix 'mkdir(): File exists' error on create directory from parallel + processes https://github.com/smarty-php/smarty/pull/377 + - bugfix solve preg_match() hhvm parameter problem https://github.com/smarty-php/smarty/pull/372 + +27.5.2017 + - bugfix change compiled code for registered function and modifiers to called as callable to allow closures + https://github.com/smarty-php/smarty/pull/368, https://github.com/smarty-php/smarty/issues/273 + - bugfix https://github.com/smarty-php/smarty/pull/368 did break the default plugin handler + - improvement replace phpversion() by PHP_VERSION constant. + https://github.com/smarty-php/smarty/pull/363 + +21.5.2017 + - performance store flag for already required shared plugin functions in static variable or + Smarty's $_cache to improve performance when plugins are often called + https://github.com/smarty-php/smarty/commit/51e0d5cd405d764a4ea257d1bac1fb1205f74528#commitcomment-22280086 + - bugfix remove special treatment of classes implementing ArrayAccess in {foreach} + https://github.com/smarty-php/smarty/issues/332 + - bugfix remove deleted files by clear_cache() and clear_compiled_template() from + ACP cache if present, add some is_file() checks to avoid possible warnings on filemtime() + caused by above functions. + https://github.com/smarty-php/smarty/issues/341 + - bugfix version 3.1.31 did fail under PHP 5.2 + https://github.com/smarty-php/smarty/issues/365 + +19.5.2017 + - change properties $accessMap and $obsoleteProperties from private to protected + https://github.com/smarty-php/smarty/issues/351 + - new feature The named capture buffers can now be accessed also as array + See NEWS_FEATURES.txt https://github.com/smarty-php/smarty/issues/366 + - improvement check if ini_get() and ini_set() not disabled + https://github.com/smarty-php/smarty/pull/362 + +24.4.2017 + - fix spelling https://github.com/smarty-php/smarty/commit/e3eda8a5f5653d8abb960eb1bc47e3eca679b1b4#commitcomment-21803095 + +17.4.2017 + - correct generated code on empty() and isset() call, observe change PHP behaviour since PHP 5.5 + https://github.com/smarty-php/smarty/issues/347 + +14.4.2017 + - merge pull requests https://github.com/smarty-php/smarty/pull/349, https://github.com/smarty-php/smarty/pull/322 and https://github.com/smarty-php/smarty/pull/337 to fix spelling and annotation + +13.4.2017 + - bugfix array_merge() parameter should be checked https://github.com/smarty-php/smarty/issues/350 + +===== 3.1.31 ===== (14.12.2016) 23.11.2016 - move template object cache into static variables @@ -36,7 +177,7 @@ 19.10.2016 - bugfix {make_nocache $var} did fail when variable value did contain '\' https://github.com/smarty-php/smarty/issues/305 - bugfix {make_nocache $var} remove spaces from variable value https://github.com/smarty-php/smarty/issues/304 - + 12.10.2016 - bugfix {include} with template names including variable or constants could fail after bugfix from 28.09.2016 https://github.com/smarty-php/smarty/issues/302 @@ -95,7 +236,7 @@ 01.09.2016 - performance require_once should be called only once for shared plugins https://github.com/smarty-php/smarty/issues/280 - + 26.08.2016 - bugfix change of 23.08.2016 failed on linux when use_include_path = true @@ -118,47 +259,47 @@ - bugfix update of 04.08.2016 was incomplete 05.08.2016 - - bugfix compiling of templates failed when the Smarty delimiter did contain '/' https://github.com/smarty-php/smarty/issues/264 + - bugfix compiling of templates failed when the Smarty delimiter did contain '/' https://github.com/smarty-php/smarty/issues/264 - updated error checking at template and config default handler - + 04.08.2016 - improvement move template function source parameter into extension - + 26.07.2016 - optimization unneeded loading of compiled resource - + 24.07.2016 - regression this->addPluginsDir('/abs/path/to/dir') adding absolute path without trailing '/' did fail https://github.com/smarty-php/smarty/issues/260 - + 23.07.2016 - bugfix setTemplateDir('/') and setTemplateDir('') did create wrong absolute filepath https://github.com/smarty-php/smarty/issues/245 - optimization of filepath normalization - improvement remove double function declaration in plugin shared.escape_special_cars.php https://github.com/smarty-php/smarty/issues/229 - + 19.07.2016 - bugfix multiple {include} with relative filepath within {block}{/block} could fail https://github.com/smarty-php/smarty/issues/246 - bugfix {math} shell injection vulnerability patch provided by Tim Weber - + 18.07.2016 - bugfix {foreach} if key variable and item@key attribute have been used both the key variable was not updated https://github.com/smarty-php/smarty/issues/254 - bugfix modifier on plugins like {plugin|modifier ... } did fail when the plugin does return an array https://github.com/smarty-php/smarty/issues/228 - bugfix avoid opcache_invalidate to result in ErrorException when opcache.restrict_api is not empty https://github.com/smarty-php/smarty/pull/244 - bugfix multiple {include} with relative filepath within {block}{/block} could fail https://github.com/smarty-php/smarty/issues/246 - + 14.07.2016 - bugfix wrong parameter on compileAllTemplates() and compileAllConfig() https://github.com/smarty-php/smarty/issues/231 - + 13.07.2016 - bugfix PHP 7 compatibility on registered compiler plugins https://github.com/smarty-php/smarty/issues/241 - update testInstall() https://github.com/smarty-php/smarty/issues/248https://github.com/smarty-php/smarty/issues/248 - bugfix enable debugging could fail when template objects did already exists https://github.com/smarty-php/smarty/issues/237 - bugfix template function data should be merged when loading subtemplate https://github.com/smarty-php/smarty/issues/240 - bugfix wrong parameter on compileAllTemplates() https://github.com/smarty-php/smarty/issues/231 - + 12.07.2016 - bugfix {foreach} item variable must be created also on empty from array https://github.com/smarty-php/smarty/issues/238 and https://github.com/smarty-php/smarty/issues/239 - bugfix enableSecurity() must init cache flags https://github.com/smarty-php/smarty/issues/247 - + 27.05.2016 - bugfix/improvement of compileAlltemplates() follow symlinks in template folder (PHP >= 5.3.1) https://github.com/smarty-php/smarty/issues/224 clear internal cache and expension handler for each template to avoid possible conflicts https://github.com/smarty-php/smarty/issues/231 @@ -201,26 +342,26 @@ 11.03.2016 - optimization of capture and security handling - improvement $smarty->clearCompiledTemplate() should return on recompiled or uncompiled resources - + 10.03.2016 - optimization of resource processing - + 09.03.2016 - improvement rework of 'scope' attribute handling see see NEW_FEATURES.txt https://github.com/smarty-php/smarty/issues/194 https://github.com/smarty-php/smarty/issues/186 https://github.com/smarty-php/smarty/issues/179 - bugfix correct Autoloader update of 2.3.2014 https://github.com/smarty-php/smarty/issues/199 - + 04.03.2016 - bugfix change from 01.03.2016 will cause $smarty->isCached(..) failure if called multiple time for same template (forum topic 25935) - + 02.03.2016 - revert autoloader optimizations because of unexplainable warning when using plugins https://github.com/smarty-php/smarty/issues/199 - + 01.03.2016 - bugfix template objects must be cached on $smarty->fetch('foo.tpl) calls incase the template is fetched multiple times (forum topic 25909) - + 25.02.2016 - bugfix wrong _realpath with 4 or more parent-directories https://github.com/smarty-php/smarty/issues/190 - optimization of _realpath @@ -229,10 +370,10 @@ 20.02.2016 - bugfix {strip} must keep space between hmtl tags. Broken by changes of 10.2.2016 https://github.com/smarty-php/smarty/issues/184 - new feature/bugfix {foreach}{section} add 'properties' attribute to force compilation of loop properties - see NEW_FEATURES.txt https://github.com/smarty-php/smarty/issues/189 - + see NEW_FEATURES.txt https://github.com/smarty-php/smarty/issues/189 + 19.02.2016 - - revert output buffer flushing on display, echo content again because possible problems when PHP files had + - revert output buffer flushing on display, echo content again because possible problems when PHP files had characters (newline} after ?> at file end https://github.com/smarty-php/smarty/issues/187 14.02.2016 @@ -243,33 +384,33 @@ - optimization make compiler tag object cache static for higher compilation speed 11.02.2016 - - improvement added KnockoutJS comments to trimwhitespace outputfilter https://github.com/smarty-php/smarty/issues/82 + - improvement added KnockoutJS comments to trimwhitespace outputfilter https://github.com/smarty-php/smarty/issues/82 https://github.com/smarty-php/smarty/pull/181 - + 10.02.2016 - bugfix {strip} must keep space on output creating smarty tags within html tags https://github.com/smarty-php/smarty/issues/177 - bugfix wrong precedence on special if conditions like '$foo is ... by $bar' could cause wrong code https://github.com/smarty-php/smarty/issues/178 - improvement because of ambiguities the inline constant support has been removed from the $foo.bar syntax https://github.com/smarty-php/smarty/issues/149 - - bugfix other {strip} error with output tags between hmtl https://github.com/smarty-php/smarty/issues/180 + - bugfix other {strip} error with output tags between hmtl https://github.com/smarty-php/smarty/issues/180 09.02.2016 - move some code from parser into compiler - reformat all code for unique style - update/bugfix scope attribute handling reworked. Read the newfeatures.txt file - + 05.02.2016 - improvement internal compiler changes - + 01.02.2016 - bugfix {foreach} compilation failed when $smarty->merge_compiled_includes = true and pre-filters are used. 29.01.2016 - bugfix implement replacement code for _tag_stack property https://github.com/smarty-php/smarty/issues/151 - + 28.01.2016 - bugfix allow windows network filepath or wrapper (forum topic 25876) https://github.com/smarty-php/smarty/issues/170 - bugfix if fetch('foo.tpl') is called on a template object the $parent parameter should default to the calling template object https://github.com/smarty-php/smarty/issues/152 - + 27.01.2016 - revert bugfix compiling {section} did create warning - bugfix {$smarty.section.customer.loop} did throw compiler error https://github.com/smarty-php/smarty/issues/161 @@ -279,7 +420,7 @@ - bugfix {extends} with relative file path did not work https://github.com/smarty-php/smarty/issues/154 https://github.com/smarty-php/smarty/issues/158 - bugfix {capture} data could not been seen in other templates with {$smarty.capture.name} https://github.com/smarty-php/smarty/issues/153 - + 26.01.2016 - improvement observe Smarty::$_CHARSET in debugging console https://github.com/smarty-php/smarty/issues/169 - bugfix compiling {section} did create warning @@ -289,28 +430,28 @@ - update scope handling - optimize block plugin compiler - improvement runtime checks if registered block plugins are callable - + 01.01.2016 - remove Smarty::$resource_cache_mode property - + 31.12.2015 - optimization of {assign}, {if} and {while} compiled code - + 30.12.2015 - bugfix plugin names starting with "php" did not compile https://github.com/smarty-php/smarty/issues/147 29.12.2015 - bugfix Smarty::error_reporting was not observed when display() or fetch() was called on template objects https://github.com/smarty-php/smarty/issues/145 - + 28.12.2015 - optimization of {foreach} code size and processing - + 27.12.2015 - improve inheritance code - update external methods - code fixes - PHPdoc updates - + 25.12.2015 - compile {block} tag code and its processing into classes - optimization replace hhvm extension by inline code @@ -324,45 +465,45 @@ - optimization move internal method decodeProperties back into template object - optimization move subtemplate processing back into template object - new feature Caching does now observe the template_dir setting and will create separate cache files if required - + 22.12.2015 - change $xxx_dir properties from private to protected in case Smarty class gets extended - code optimizations - + 21.12.2015 - bugfix a filepath starting with '/' or '\' on windows should normalize to the root dir of current working drive https://github.com/smarty-php/smarty/issues/134 - optimization of filepath normalization - bugfix {strip} must remove all blanks between html tags https://github.com/smarty-php/smarty/issues/136 - + ===== 3.1.29 ===== (21.12.2015) 21.12.2015 - optimization improve speed of filetime checks on extends and extendsall resource - + 20.12.2015 - bugfix failure when the default resource type was set to 'extendsall' https://github.com/smarty-php/smarty/issues/123 - update compilation of Smarty special variables - bugfix add addition check for OS type on normalization of file path https://github.com/smarty-php/smarty/issues/134 - bugfix the source uid of the extendsall resource must contain $template_dir settings https://github.com/smarty-php/smarty/issues/123 - + 19.12.2015 - bugfix using $smarty.capture.foo in expressions could fail https://github.com/smarty-php/smarty/pull/138 - bugfix broken PHP 5.2 compatibility https://github.com/smarty-php/smarty/issues/139 - remove no longer used code - improvement make sure that compiled and cache templates never can contain a trailing '?>? - + 18.12.2015 - bugfix regression when modifier parameter was followed by math https://github.com/smarty-php/smarty/issues/132 - + 17.12.2015 - bugfix {$smarty.capture.nameFail} did lowercase capture name https://github.com/smarty-php/smarty/issues/135 - bugfix using {block append/prepend} on same block in multiple levels of inheritance templates could fail (forum topic 25827) - bugfix text content consisting of just a single '0' like in {if true}0{/if} was suppressed (forum topic 25834) - + 16.12.2015 - bugfix {foreach} did fail if from atrribute is a Generator class https://github.com/smarty-php/smarty/issues/128 - bugfix direct access $smarty->template_dir = 'foo'; should call Smarty::setTemplateDir() https://github.com/smarty-php/smarty/issues/121 - + 15.12.2015 - bugfix {$smarty.cookies.foo} did return the $_COOKIE array not the 'foo' value https://github.com/smarty-php/smarty/issues/122 - bugfix a call to clearAllCache() and other should clear all internal template object caches (forum topic 25828) @@ -370,25 +511,25 @@ 14.12.2015 - bugfix {$smarty.config.foo} broken in 3.1.28 https://github.com/smarty-php/smarty/issues/120 - bugfix multiple calls of {section} with same name droped E_NOTICE error https://github.com/smarty-php/smarty/issues/118 - + ===== 3.1.28 ===== (13.12.2015) 13.12.2015 - bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819) - bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811) - bugfix Debug Console could display incorrect data when using subtemplates - + 09.12.2015 - bugfix Smarty did fail under PHP 7.0.0 with use_include_path = true; - + 09.12.2015 - bugfix {strip} should exclude some html tags from stripping, related to fix for https://github.com/smarty-php/smarty/issues/111 - + 08.12.2015 - bugfix internal template function data got stored in wrong compiled file https://github.com/smarty-php/smarty/issues/114 - + 05.12.2015 -bugfix {strip} should insert a single space https://github.com/smarty-php/smarty/issues/111 - + 25.11.2015 -bugfix a left delimter like '[%' did fail on [%$var_[%$variable%]%] (forum topic 25798) @@ -397,7 +538,7 @@ 01.11.2015 - update config file processing - + 31.10.2015 - bugfix add missing $trusted_dir property to SmartyBC class (forum topic 25751) @@ -421,7 +562,7 @@ 18.09.2015 - bugfix {if $foo instanceof $bar} failed to compile if 2nd value is a variable https://github.com/smarty-php/smarty/issues/92 - + 17.09.2015 - bugfix {foreach} first attribute was not correctly reset since commit 05a8fa2 of 02.08.2015 https://github.com/smarty-php/smarty/issues/90 @@ -435,7 +576,7 @@ - move code of {call} processing back into Smarty_Internal_Template class - improvement invalidate OPCACHE for cleared compiled and cached template files (forum topic 25557) - bugfix unintended multiple debug windows (forum topic 25699) - + 30.08.2015 - size optimization move some runtime functions into extension - optimize inline template processing @@ -584,10 +725,10 @@ 01.06.2015 - bugfix including template variables broken since 3.1.22 https://github.com/smarty-php/smarty/issues/47 - + 27.05.2015 - bugfix {include} with variable file name must not create by default individual cache file (since 3.1.22) https://github.com/smarty-php/smarty/issues/43 - + 24.05.2015 - bugfix if condition string 'neq' broken due to a typo https://github.com/smarty-php/smarty/issues/42 @@ -595,11 +736,11 @@ 23.05.2015 - improvement on php_handling to allow very large PHP sections, better error handling - improvement allow extreme large comment sections (forum 25538) - + 21.05.2015 - bugfix broken PHP 5.2 compatibility when compiling 1 did compile into wrong code https://github.com/smarty-php/smarty/issues/41 - + 19.05.2015 - bugfix compiler did overwrite existing variable value when setting the nocache attribute https://github.com/smarty-php/smarty/issues/39 - bugfix output filter trimwhitespace could run into the pcre.backtrack_limit on large output (code.google issue 220) @@ -607,14 +748,14 @@ 18.05.2015 - improvement introduce shortcuts in lexer/parser rules for most frequent terms for higher - compilation speed + compilation speed 16.05.2015 - bugfix {php}{/php} did work just for single lines https://github.com/smarty-php/smarty/issues/33 - improvement remove not needed ?> handling from parser to new compiler module 05.05.2015 - bugfix code could be messed up when {tags} are used in multiple attributes https://github.com/smarty-php/smarty/issues/23 - + 04.05.2015 - bugfix Smarty_Resource::parseResourceName incompatible with Google AppEngine (https://github.com/smarty-php/smarty/issues/22) - improvement use is_file() checks to avoid errors suppressed by @ which could still cause problems (https://github.com/smarty-php/smarty/issues/24) @@ -664,13 +805,13 @@ 28.04.2015 - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508) - - 23.04.2015 + + 23.04.2015 - bugfix a nocache template variable used as parameter at {insert} was by mistake cached - + 20.04.2015 - bugfix at a template function containing nocache code a parmeter could overwrite a template variable of same name - + 27.03.2015 - bugfix Smarty_Security->allow_constants=false; did also disable true, false and null (change of 16.03.2015) - improvement added a whitelist for trusted constants to security Smarty_Security::$trusted_constants (forum topic 25471) @@ -678,39 +819,39 @@ 20.03.2015 - bugfix make sure that function properties get saved only in compiled files containing the fuction definition {forum topic 25452} - bugfix correct update of global variable values on exit of template functions. (reported under Smarty Developers) - + 16.03.2015 - bugfix problems with {function}{/function} and {call} tags in different subtemplate cache files {forum topic 25452} - bugfix Smarty_Security->allow_constants=false; did not disallow direct usage of defined constants like {SMARTY_DIR} {forum topic 25457} - bugfix {block}{/block} tags did not work inside double quoted strings https://github.com/smarty-php/smarty/issues/18 - - + + 15.03.2015 - bugfix $smarty->compile_check must be restored before rendering of a just updated cache file {forum 25452} - + 14.03.2015 - bugfix {nocache} {/nocache} tags corrupted code when used within a nocache section caused by a nocache template variable. - + - bugfix template functions defined with {function} in an included subtemplate could not be called in nocache mode with {call... nocache} if the subtemplate had it's own cache file {forum 25452} - + 10.03.2015 - bugfix {include ... nocache} whith variable file or compile_id attribute was not executed in nocache mode. - + 12.02.2015 - bugfix multiple Smarty::fetch() of same template when $smarty->merge_compiled_includes = true; could cause function already defined error - + 11.02.2015 - bugfix recursive {includes} did create E_NOTICE message when $smarty->merge_compiled_includes = true; (github issue #16) - + 22.01.2015 - new feature security can now control access to static methods and properties see also NEW_FEATURES.txt 21.01.2015 - bugfix clearCompiledTemplates(), clearAll() and clear() could try to delete whole drive at wrong path permissions because realpath() fail (forum 25397) - - bugfix 'self::' and 'parent::' was interpreted in template syntax as static class - + - bugfix 'self::' and 'parent::' was interpreted in template syntax as static class + 04.01.2015 - push last weeks changes to github @@ -721,10 +862,10 @@ - optimization restructure config file processing 31.12.2014 - - bugfix use function_exists('mb_get_info') for setting Smarty::$_MBSTRING. + - bugfix use function_exists('mb_get_info') for setting Smarty::$_MBSTRING. Function mb_split could be overloaded depending on php.ini mbstring.func_overload - - + + 29.12.2014 - new feature security can now limit the template nesting level by property $max_template_nesting see also NEW_FEATURES.txt (forum 25370) @@ -738,14 +879,14 @@ 13.12.2014 - improvement optimization of lexer and parser resulting in a up to 30% higher compiling speed - + 11.12.2014 - bugfix resolve parser ambiguity between constant print tag {CONST} and other smarty tags after change of 09.12.2014 - + 09.12.2014 - bugfix variables $null, $true and $false did not work after the change of 12.11.2014 (forum 25342) - bugfix call of template function by a variable name did not work after latest changes (forum 25342) - + 23.11.2014 - bugfix a plugin with attached modifier could fail if the tag was immediately followed by another Smarty tag (since 3.1.21) (forum 25326) @@ -763,12 +904,12 @@ 04.11.2014 - new feature $smarty->debugging = true; => overwrite existing Debug Console window (old behaviour) $smarty->debugging = 2; => individual Debug Console window by template name - + 03.11.2014 - bugfix Debug Console did not show included subtemplates since 3.1.17 (forum 25301) - bugfix Modifier debug_print_var did not limit recursion or prevent recursive object display at Debug Console (ATTENTION: parameter order has changed to be able to specify maximum recursion) - - bugfix Debug consol did not include subtemplate information with $smarty->merge_compiled_includes = true + - bugfix Debug consol did not include subtemplate information with $smarty->merge_compiled_includes = true - improvement The template variables are no longer displayed as objects on the Debug Console - improvement $smarty->createData($parent = null, $name = null) new optional name parameter for display at Debug Console - addition of some hooks for future extension of Debug Console @@ -785,7 +926,7 @@ 26.10.2014 - bugfix E_NOTICE message was created during compilation when ASP tags '<%' or '%>' are in template source text - bugfix merge_compiled_includes option failed when caching enables and same subtemplate was included cached and not cached - + ===== 3.1.21 ===== (18.10.2014) 18.10.2014 - composer moved to github @@ -812,143 +953,143 @@ ===== 3.1.20 ===== (09.10.2014) 08.10.2014 - bugfix security mode of "'; - } elseif ($encode == 'javascript_charcode') { + } elseif ($encode === 'javascript_charcode') { $string = '' . $text . ''; for ($x = 0, $y = strlen($string); $x < $y; $x ++) { @@ -123,7 +123,7 @@ function smarty_function_mailto($params) implode(',', $ord) . "))" . "}\n" . "\n"; return $_ret; - } elseif ($encode == 'hex') { + } elseif ($encode === 'hex') { preg_match('!^(.*)(\?.*)$!', $address, $match); if (!empty($match[ 2 ])) { trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING); diff --git a/vendor/smarty/smarty/libs/plugins/function.math.php b/vendor/smarty/smarty/libs/plugins/function.math.php index fc5db335c..396ad085e 100644 --- a/vendor/smarty/smarty/libs/plugins/function.math.php +++ b/vendor/smarty/smarty/libs/plugins/function.math.php @@ -9,8 +9,8 @@ /** * Smarty {math} function plugin - * Type: function
    - * Name: math
    + * Type: function + * Name: math * Purpose: handle math computations in template * * @link http://www.smarty.net/manual/en/language.function.math.php {math} @@ -38,7 +38,7 @@ function smarty_function_math($params, $template) $equation = $params[ 'equation' ]; // make sure parenthesis are balanced - if (substr_count($equation, "(") != substr_count($equation, ")")) { + if (substr_count($equation, '(') !== substr_count($equation, ')')) { trigger_error("math: unbalanced parenthesis", E_USER_WARNING); return; @@ -59,9 +59,9 @@ function smarty_function_math($params, $template) } foreach ($params as $key => $val) { - if ($key != "equation" && $key != "format" && $key != "assign") { + if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') { // make sure value is not empty - if (strlen($val) == 0) { + if (strlen($val) === 0) { trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING); return; @@ -86,7 +86,7 @@ function smarty_function_math($params, $template) } foreach ($params as $key => $val) { - if ($key != "equation" && $key != "format" && $key != "assign") { + if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') { $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation); } } diff --git a/vendor/smarty/smarty/libs/plugins/modifier.capitalize.php b/vendor/smarty/smarty/libs/plugins/modifier.capitalize.php index 6513a0495..e354977b0 100644 --- a/vendor/smarty/smarty/libs/plugins/modifier.capitalize.php +++ b/vendor/smarty/smarty/libs/plugins/modifier.capitalize.php @@ -8,8 +8,8 @@ /** * Smarty capitalize modifier plugin - * Type: modifier
    - * Name: capitalize
    + * Type: modifier + * Name: capitalize * Purpose: capitalize words in the string * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }} * @@ -72,7 +72,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals return $upper_string; } -/* +/* * * Bug: create_function() use exhausts memory when used in long loops * Fix: use declared functions for callbacks instead of using create_function() @@ -80,21 +80,38 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals * * @author Kyle Renfrow */ +/** + * @param $matches + * + * @return string + */ function smarty_mod_cap_mbconvert_cb($matches) { return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET); } - +/** + * @param $matches + * + * @return string + */ function smarty_mod_cap_mbconvert2_cb($matches) { return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET); } - +/** + * @param $matches + * + * @return string + */ function smarty_mod_cap_ucfirst_cb($matches) { return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ])); } - +/** + * @param $matches + * + * @return string + */ function smarty_mod_cap_ucfirst2_cb($matches) { return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ])); diff --git a/vendor/smarty/smarty/libs/plugins/modifier.date_format.php b/vendor/smarty/smarty/libs/plugins/modifier.date_format.php index bfe363c08..b45b2d4b8 100644 --- a/vendor/smarty/smarty/libs/plugins/modifier.date_format.php +++ b/vendor/smarty/smarty/libs/plugins/modifier.date_format.php @@ -8,10 +8,10 @@ /** * Smarty date_format modifier plugin - * Type: modifier
    - * Name: date_format
    - * Purpose: format datestamps via strftime
    - * Input:
    + * Type: modifier + * Name: date_format + * Purpose: format datestamps via strftime + * Input: * - string: input date string * - format: strftime format for output * - default_date: default date if $string is empty @@ -35,20 +35,36 @@ function smarty_modifier_date_format($string, $format = null, $default_date = '' /** * require_once the {@link shared.make_timestamp.php} plugin */ - if (!is_callable('smarty_make_timestamp')) { - require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'); + static $is_loaded = false; + if (!$is_loaded) { + if (!is_callable('smarty_make_timestamp')) { + require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'); + } + $is_loaded = true; } - if ($string != '' && $string != '0000-00-00' && $string != '0000-00-00 00:00:00') { + if ($string !== '' && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') { $timestamp = smarty_make_timestamp($string); - } elseif ($default_date != '') { + } elseif ($default_date !== '') { $timestamp = smarty_make_timestamp($default_date); } else { return; } - if ($formatter == 'strftime' || ($formatter == 'auto' && strpos($format, '%') !== false)) { + if ($formatter === 'strftime' || ($formatter === 'auto' && strpos($format, '%') !== false)) { if (Smarty::$_IS_WINDOWS) { - $_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T'); - $_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S'); + $_win_from = array('%D', + '%h', + '%n', + '%r', + '%R', + '%t', + '%T'); + $_win_to = array('%m/%d/%y', + '%b', + "\n", + '%I:%M:%S %p', + '%H:%M', + "\t", + '%H:%M:%S'); if (strpos($format, '%e') !== false) { $_win_from[] = '%e'; $_win_to[] = sprintf('%\' 2d', date('j', $timestamp)); diff --git a/vendor/smarty/smarty/libs/plugins/modifier.debug_print_var.php b/vendor/smarty/smarty/libs/plugins/modifier.debug_print_var.php index 34f85dcd5..2bd112154 100644 --- a/vendor/smarty/smarty/libs/plugins/modifier.debug_print_var.php +++ b/vendor/smarty/smarty/libs/plugins/modifier.debug_print_var.php @@ -8,8 +8,8 @@ /** * Smarty debug_print_var modifier plugin - * Type: modifier
    - * Name: debug_print_var
    + * Type: modifier + * Name: debug_print_var * Purpose: formats variable contents for display in the console * * @author Monte Ohrt @@ -28,7 +28,7 @@ function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = switch (gettype($var)) { case 'array' : $results = 'Array (' . count($var) . ')'; - if ($depth == $max) { + if ($depth === $max) { break; } foreach ($var as $curr_key => $curr_val) { @@ -46,7 +46,7 @@ function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = $results .= ' called recursive'; break; } - if ($depth == $max) { + if ($depth === $max) { break; } $objects[] = $var; diff --git a/vendor/smarty/smarty/libs/plugins/modifier.escape.php b/vendor/smarty/smarty/libs/plugins/modifier.escape.php index 9c247b933..1ae87a7aa 100644 --- a/vendor/smarty/smarty/libs/plugins/modifier.escape.php +++ b/vendor/smarty/smarty/libs/plugins/modifier.escape.php @@ -8,8 +8,8 @@ /** * Smarty escape modifier plugin - * Type: modifier
    - * Name: escape
    + * Type: modifier + * Name: escape * Purpose: escape string for output * * @link http://www.smarty.net/docs/en/language.modifier.escape @@ -25,6 +25,8 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true) { static $_double_encode = null; + static $is_loaded_1 = false; + static $is_loaded_2 = false; if ($_double_encode === null) { $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>='); } @@ -46,7 +48,9 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ // php <5.2.3 - prevent double encoding $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); $string = htmlspecialchars($string, ENT_QUOTES, $char_set); - $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); + $string = str_replace(array('%%%SMARTY_START%%%', + '%%%SMARTY_END%%%'), array('&', + ';'), $string); return $string; } @@ -67,7 +71,9 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); $string = htmlspecialchars($string, ENT_QUOTES, $char_set); $string = - str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); + str_replace(array('%%%SMARTY_START%%%', + '%%%SMARTY_END%%%'), array('&', + ';'), $string); return $string; } @@ -86,7 +92,9 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ } else { $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); $string = htmlentities($string, ENT_QUOTES, $char_set); - $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); + $string = str_replace(array('%%%SMARTY_START%%%', + '%%%SMARTY_END%%%'), array('&', + ';'), $string); return $string; } @@ -116,8 +124,11 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ case 'hexentity': $return = ''; if (Smarty::$_MBSTRING) { - if (!is_callable('smarty_mb_to_unicode')) { - require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php'); + if (!$is_loaded_1) { + if (!is_callable('smarty_mb_to_unicode')) { + require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php'); + } + $is_loaded_1 = true; } $return = ''; foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) { @@ -137,8 +148,11 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ case 'decentity': $return = ''; if (Smarty::$_MBSTRING) { - if (!is_callable('smarty_mb_to_unicode')) { - require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php'); + if (!$is_loaded_1) { + if (!is_callable('smarty_mb_to_unicode')) { + require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php'); + } + $is_loaded_1 = true; } $return = ''; foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) { @@ -157,25 +171,39 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ case 'javascript': // escape quotes and backslashes, newlines, etc. - return strtr($string, array('\\' => '\\\\', "'" => "\\'", '"' => '\\"', "\r" => '\\r', "\n" => '\\n', + return strtr($string, array('\\' => '\\\\', + "'" => "\\'", + '"' => '\\"', + "\r" => '\\r', + "\n" => '\\n', ' '<\/')); case 'mail': if (Smarty::$_MBSTRING) { - if (!is_callable('smarty_mb_str_replace')) { - require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php'); + if (!$is_loaded_2) { + if (!is_callable('smarty_mb_str_replace')) { + require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php'); + } + $is_loaded_2 = true; } - return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string); + return smarty_mb_str_replace(array('@', + '.'), array(' [AT] ', + ' [DOT] '), $string); } // no MBString fallback - return str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string); + return str_replace(array('@', + '.'), array(' [AT] ', + ' [DOT] '), $string); case 'nonstd': // escape non-standard chars, such as ms document quotes $return = ''; if (Smarty::$_MBSTRING) { - if (!is_callable('smarty_mb_to_unicode')) { - require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php'); + if (!$is_loaded_1) { + if (!is_callable('smarty_mb_to_unicode')) { + require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php'); + } + $is_loaded_1 = true; } foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) { if ($unicode >= 126) { diff --git a/vendor/smarty/smarty/libs/plugins/modifier.mb_wordwrap.php b/vendor/smarty/smarty/libs/plugins/modifier.mb_wordwrap.php new file mode 100644 index 000000000..93c6241ec --- /dev/null +++ b/vendor/smarty/smarty/libs/plugins/modifier.mb_wordwrap.php @@ -0,0 +1,75 @@ + $width) { + if ($cut) { + $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, + $_token, + -1, + PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE); + } + } + + foreach ($_tokens as $token) { + $_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token); + $token_length = mb_strlen($token, Smarty::$_CHARSET); + $length += $token_length; + + if ($length > $width) { + // remove space before inserted break + if ($_previous) { + $t = mb_substr($t, 0, -1, Smarty::$_CHARSET); + } + + if (!$_space) { + // add the break before the token + if (!empty($t)) { + $t .= $break; + } + $length = $token_length; + } + } else if ($token === "\n") { + // hard break must reset counters + $length = 0; + } + $_previous = $_space; + // add the token + $t .= $token; + } + } + + return $t; +} diff --git a/vendor/smarty/smarty/libs/plugins/modifier.regex_replace.php b/vendor/smarty/smarty/libs/plugins/modifier.regex_replace.php index 85f41fdda..479aba875 100644 --- a/vendor/smarty/smarty/libs/plugins/modifier.regex_replace.php +++ b/vendor/smarty/smarty/libs/plugins/modifier.regex_replace.php @@ -8,8 +8,8 @@ /** * Smarty regex_replace modifier plugin - * Type: modifier
    - * Name: regex_replace
    + * Type: modifier + * Name: regex_replace * Purpose: regular expression search/replace * * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php diff --git a/vendor/smarty/smarty/libs/plugins/modifier.replace.php b/vendor/smarty/smarty/libs/plugins/modifier.replace.php index 9dca259d5..a1b043b64 100644 --- a/vendor/smarty/smarty/libs/plugins/modifier.replace.php +++ b/vendor/smarty/smarty/libs/plugins/modifier.replace.php @@ -8,8 +8,8 @@ /** * Smarty replace modifier plugin - * Type: modifier
    - * Name: replace
    + * Type: modifier + * Name: replace * Purpose: simple search/replace * * @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual) @@ -24,11 +24,15 @@ */ function smarty_modifier_replace($string, $search, $replace) { + static $is_loaded = false; if (Smarty::$_MBSTRING) { - if (!is_callable('smarty_mb_str_replace')) { - require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php'); + if (!$is_loaded) { + if (!is_callable('smarty_mb_str_replace')) { + require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php'); + } + $is_loaded = true; } - return smarty_mb_str_replace($search, $replace, $string); + return smarty_mb_str_replace($search, $replace, $string); } return str_replace($search, $replace, $string); diff --git a/vendor/smarty/smarty/libs/plugins/modifier.spacify.php b/vendor/smarty/smarty/libs/plugins/modifier.spacify.php index e5c41ad8b..1e29fd553 100644 --- a/vendor/smarty/smarty/libs/plugins/modifier.spacify.php +++ b/vendor/smarty/smarty/libs/plugins/modifier.spacify.php @@ -8,8 +8,8 @@ /** * Smarty spacify modifier plugin - * Type: modifier
    - * Name: spacify
    + * Type: modifier + * Name: spacify * Purpose: add spaces between characters in a string * * @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual) diff --git a/vendor/smarty/smarty/libs/plugins/modifier.truncate.php b/vendor/smarty/smarty/libs/plugins/modifier.truncate.php index 6fe844259..bb9df92d7 100644 --- a/vendor/smarty/smarty/libs/plugins/modifier.truncate.php +++ b/vendor/smarty/smarty/libs/plugins/modifier.truncate.php @@ -8,8 +8,8 @@ /** * Smarty truncate modifier plugin - * Type: modifier
    - * Name: truncate
    + * Type: modifier + * Name: truncate * Purpose: Truncate a string to a certain length if necessary, * optionally splitting in the middle of a word, and * appending the $etc string or inserting $etc into the middle. @@ -27,7 +27,7 @@ */ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false) { - if ($length == 0) { + if ($length === 0) { return ''; } diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.cat.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.cat.php index db9d81fbf..919b03c39 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.cat.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.cat.php @@ -8,11 +8,11 @@ /** * Smarty cat modifier plugin - * Type: modifier
    - * Name: cat
    - * Date: Feb 24, 2003
    - * Purpose: catenate a value to a variable
    - * Input: string to catenate
    + * Type: modifier + * Name: cat + * Date: Feb 24, 2003 + * Purpose: catenate a value to a variable + * Input: string to catenate * Example: {$var|cat:"foo"} * * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_characters.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_characters.php index 0a3ce257b..8116aa327 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_characters.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_characters.php @@ -8,8 +8,8 @@ /** * Smarty count_characters modifier plugin - * Type: modifier
    - * Name: count_characteres
    + * Type: modifier + * Name: count_characters * Purpose: count the number of characters in a text * * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual) @@ -21,7 +21,7 @@ */ function smarty_modifiercompiler_count_characters($params) { - if (!isset($params[ 1 ]) || $params[ 1 ] != 'true') { + if (!isset($params[ 1 ]) || $params[ 1 ] !== 'true') { return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)'; } if (Smarty::$_MBSTRING) { diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_paragraphs.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_paragraphs.php index f7f447763..1917d290a 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_paragraphs.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_paragraphs.php @@ -8,8 +8,8 @@ /** * Smarty count_paragraphs modifier plugin - * Type: modifier
    - * Name: count_paragraphs
    + * Type: modifier + * Name: count_paragraphs * Purpose: count the number of paragraphs in a text * * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_sentences.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_sentences.php index 20032925e..a782d8e0b 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_sentences.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_sentences.php @@ -8,7 +8,7 @@ /** * Smarty count_sentences modifier plugin - * Type: modifier
    + * Type: modifier * Name: count_sentences * Purpose: count the number of sentences in a text * diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_words.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_words.php index f20a197cd..dc8500c75 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_words.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_words.php @@ -8,8 +8,8 @@ /** * Smarty count_words modifier plugin - * Type: modifier
    - * Name: count_words
    + * Type: modifier + * Name: count_words * Purpose: count the number of words in a text * * @link http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual) diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.default.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.default.php index 2c4c00a37..9fe5d4da2 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.default.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.default.php @@ -8,8 +8,8 @@ /** * Smarty default modifier plugin - * Type: modifier
    - * Name: default
    + * Type: modifier + * Name: default * Purpose: designate default value for empty variables * * @link http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual) diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.escape.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.escape.php index 11565c2d9..6a6e01637 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.escape.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.escape.php @@ -5,27 +5,27 @@ * @package Smarty * @subpackage PluginsModifierCompiler */ - /** * Smarty escape modifier plugin - * Type: modifier
    - * Name: escape
    + * Type: modifier + * Name: escape * Purpose: escape string for output * * @link http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual) * @author Rodney Rehm * - * @param array $params parameters - * @param $compiler + * @param array $params parameters + * @param Smarty_Internal_TemplateCompilerBase $compiler * * @return string with compiled code + * @throws \SmartyException */ -function smarty_modifiercompiler_escape($params, $compiler) +function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompilerBase $compiler) { static $_double_encode = null; - if (!is_callable('smarty_literal_compiler_param')) { - require_once(SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'); - } + static $is_loaded = false; + $compiler->template->_checkPlugins(array(array('function' => 'smarty_literal_compiler_param', + 'file' => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'))); if ($_double_encode === null) { $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>='); } @@ -100,14 +100,14 @@ function smarty_modifiercompiler_escape($params, $compiler) // could not optimize |escape call, so fallback to regular plugin if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) { - $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'file' ] = + $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'file' ] = SMARTY_PLUGINS_DIR . 'modifier.escape.php'; - $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'function' ] = + $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'function' ] = 'smarty_modifier_escape'; } else { - $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'file' ] = + $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'file' ] = SMARTY_PLUGINS_DIR . 'modifier.escape.php'; - $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'function' ] = + $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'function' ] = 'smarty_modifier_escape'; } diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.from_charset.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.from_charset.php index e25a95749..b5732db42 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.from_charset.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.from_charset.php @@ -8,8 +8,8 @@ /** * Smarty from_charset modifier plugin - * Type: modifier
    - * Name: from_charset
    + * Type: modifier + * Name: from_charset * Purpose: convert character encoding from $charset to internal encoding * * @author Rodney Rehm diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.indent.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.indent.php index 851f18448..fede8aa74 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.indent.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.indent.php @@ -8,8 +8,8 @@ /** * Smarty indent modifier plugin - * Type: modifier
    - * Name: indent
    + * Type: modifier + * Name: indent * Purpose: indent lines of text * * @link http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual) diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.lower.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.lower.php index a335eff7f..8c6c26a89 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.lower.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.lower.php @@ -8,8 +8,8 @@ /** * Smarty lower modifier plugin - * Type: modifier
    - * Name: lower
    + * Type: modifier + * Name: lower * Purpose: convert string to lowercase * * @link http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual) diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.noprint.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.noprint.php index 4906908b4..455cfe14b 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.noprint.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.noprint.php @@ -8,8 +8,8 @@ /** * Smarty noprint modifier plugin - * Type: modifier
    - * Name: noprint
    + * Type: modifier + * Name: noprint * Purpose: return an empty string * * @author Uwe Tews diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.string_format.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.string_format.php index bcf9883db..8d3bfa4e2 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.string_format.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.string_format.php @@ -8,8 +8,8 @@ /** * Smarty string_format modifier plugin - * Type: modifier
    - * Name: string_format
    + * Type: modifier + * Name: string_format * Purpose: format strings via sprintf * * @link http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual) diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip.php index 8173eed8f..3b7ade5ed 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip.php @@ -8,11 +8,11 @@ /** * Smarty strip modifier plugin - * Type: modifier
    - * Name: strip
    + * Type: modifier + * Name: strip * Purpose: Replace all repeated spaces, newlines, tabs - * with a single space or supplied replacement string.
    - * Example: {$var|strip} {$var|strip:" "}
    + * with a single space or supplied replacement string. + * Example: {$var|strip} {$var|strip:" "} * Date: September 25th, 2002 * * @link http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual) diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip_tags.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip_tags.php index e56bf9315..5ddca7a94 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip_tags.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip_tags.php @@ -8,8 +8,8 @@ /** * Smarty strip_tags modifier plugin - * Type: modifier
    - * Name: strip_tags
    + * Type: modifier + * Name: strip_tags * Purpose: strip html tags from text * * @link http://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual) @@ -21,7 +21,7 @@ */ function smarty_modifiercompiler_strip_tags($params) { - if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') == 'true') { + if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') { return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})"; } else { return 'strip_tags(' . $params[ 0 ] . ')'; diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.to_charset.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.to_charset.php index fea8d8273..889005712 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.to_charset.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.to_charset.php @@ -8,8 +8,8 @@ /** * Smarty to_charset modifier plugin - * Type: modifier
    - * Name: to_charset
    + * Type: modifier + * Name: to_charset * Purpose: convert character encoding from internal encoding to $charset * * @author Rodney Rehm diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.unescape.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.unescape.php index a3409bc73..5a94e0727 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.unescape.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.unescape.php @@ -8,8 +8,8 @@ /** * Smarty unescape modifier plugin - * Type: modifier
    - * Name: unescape
    + * Type: modifier + * Name: unescape * Purpose: unescape html entities * * @author Rodney Rehm @@ -26,7 +26,7 @@ function smarty_modifiercompiler_unescape($params) if (!isset($params[ 2 ])) { $params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\''; } else { - $params[ 2 ] = "'" . $params[ 2 ] . "'"; + $params[ 2 ] = "'{$params[ 2 ]}'"; } switch (trim($params[ 1 ], '"\'')) { diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.upper.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.upper.php index a083c4f7e..d0d5cc7c3 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.upper.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.upper.php @@ -8,8 +8,8 @@ /** * Smarty upper modifier plugin - * Type: modifier
    - * Name: lower
    + * Type: modifier + * Name: lower * Purpose: convert string to uppercase * * @link http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual) diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.wordwrap.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.wordwrap.php index 91849738e..94a0cf602 100644 --- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.wordwrap.php +++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.wordwrap.php @@ -5,22 +5,22 @@ * @package Smarty * @subpackage PluginsModifierCompiler */ - /** * Smarty wordwrap modifier plugin - * Type: modifier
    - * Name: wordwrap
    + * Type: modifier + * Name: wordwrap * Purpose: wrap a string of text at a given length * * @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual) * @author Uwe Tews * - * @param array $params parameters - * @param $compiler + * @param array $params parameters + * @param \Smarty_Internal_TemplateCompilerBase $compiler * * @return string with compiled code + * @throws \SmartyException */ -function smarty_modifiercompiler_wordwrap($params, $compiler) +function smarty_modifiercompiler_wordwrap($params, Smarty_Internal_TemplateCompilerBase $compiler) { if (!isset($params[ 1 ])) { $params[ 1 ] = 80; @@ -33,19 +33,7 @@ function smarty_modifiercompiler_wordwrap($params, $compiler) } $function = 'wordwrap'; if (Smarty::$_MBSTRING) { - if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) { - $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ 'wordwrap' ][ 'modifier' ][ 'file' ] = - SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php'; - $compiler->template->required_plugins[ 'nocache' ][ 'wordwrap' ][ 'modifier' ][ 'function' ] = - 'smarty_mb_wordwrap'; - } else { - $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ 'wordwrap' ][ 'modifier' ][ 'file' ] = - SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php'; - $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ 'wordwrap' ][ 'modifier' ][ 'function' ] = - 'smarty_mb_wordwrap'; - } - $function = 'smarty_mb_wordwrap'; + $function = $compiler->getPlugin('mb_wordwrap','modifier'); } - return $function . '(' . $params[ 0 ] . ',' . $params[ 1 ] . ',' . $params[ 2 ] . ',' . $params[ 3 ] . ')'; } diff --git a/vendor/smarty/smarty/libs/plugins/outputfilter.trimwhitespace.php b/vendor/smarty/smarty/libs/plugins/outputfilter.trimwhitespace.php index 1a67123a4..70a66d3da 100644 --- a/vendor/smarty/smarty/libs/plugins/outputfilter.trimwhitespace.php +++ b/vendor/smarty/smarty/libs/plugins/outputfilter.trimwhitespace.php @@ -24,7 +24,7 @@ function smarty_outputfilter_trimwhitespace($source) $_offset = 0; // Unify Line-Breaks to \n - $source = preg_replace("/\015\012|\015|\012/", "\n", $source); + $source = preg_replace('/\015\012|\015|\012/', "\n", $source); // capture Internet Explorer and KnockoutJS Conditional Comments if (preg_match_all('##is', $source, $matches, diff --git a/vendor/smarty/smarty/libs/plugins/shared.escape_special_chars.php b/vendor/smarty/smarty/libs/plugins/shared.escape_special_chars.php index b68fe4b9d..1d4c7284b 100644 --- a/vendor/smarty/smarty/libs/plugins/shared.escape_special_chars.php +++ b/vendor/smarty/smarty/libs/plugins/shared.escape_special_chars.php @@ -8,7 +8,7 @@ /** * escape_special_chars common function - * Function: smarty_function_escape_special_chars
    + * Function: smarty_function_escape_special_chars * Purpose: used by other smarty functions to escape * special chars except for already escaped ones * diff --git a/vendor/smarty/smarty/libs/plugins/shared.make_timestamp.php b/vendor/smarty/smarty/libs/plugins/shared.make_timestamp.php index 67f862441..eb064607d 100644 --- a/vendor/smarty/smarty/libs/plugins/shared.make_timestamp.php +++ b/vendor/smarty/smarty/libs/plugins/shared.make_timestamp.php @@ -7,7 +7,7 @@ */ /** - * Function: smarty_make_timestamp
    + * Function: smarty_make_timestamp * Purpose: used by other smarty functions to make a timestamp from a string. * * @author Monte Ohrt @@ -25,7 +25,7 @@ function smarty_make_timestamp($string) (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface) ) { return (int) $string->format('U'); // PHP 5.2 BC - } elseif (strlen($string) == 14 && ctype_digit($string)) { + } elseif (strlen($string) === 14 && ctype_digit($string)) { // it is mysql timestamp format of YYYYMMDDHHMMSS? return mktime(substr($string, 8, 2), substr($string, 10, 2), substr($string, 12, 2), substr($string, 4, 2), substr($string, 6, 2), substr($string, 0, 4)); @@ -35,7 +35,7 @@ function smarty_make_timestamp($string) } else { // strtotime should handle it $time = strtotime($string); - if ($time == - 1 || $time === false) { + if ($time === - 1 || $time === false) { // strtotime() was not able to parse $string, use "now": return time(); } diff --git a/vendor/smarty/smarty/libs/plugins/shared.mb_str_replace.php b/vendor/smarty/smarty/libs/plugins/shared.mb_str_replace.php index 0c3ffe258..300702933 100644 --- a/vendor/smarty/smarty/libs/plugins/shared.mb_str_replace.php +++ b/vendor/smarty/smarty/libs/plugins/shared.mb_str_replace.php @@ -6,14 +6,13 @@ * @subpackage PluginsShared */ if (!function_exists('smarty_mb_str_replace')) { - /** * Multibyte string replace * - * @param string $search the string to be searched - * @param string $replace the replacement string - * @param string $subject the source string - * @param int &$count number of matches found + * @param string|string[] $search the string to be searched + * @param string|string[] $replace the replacement string + * @param string $subject the source string + * @param int &$count number of matches found * * @return string replaced string * @author Rodney Rehm @@ -29,7 +28,7 @@ if (!function_exists('smarty_mb_str_replace')) { $string = smarty_mb_str_replace($search, $replace, $string, $c); $count += $c; } - } elseif (is_array($search)) { + } else if (is_array($search)) { if (!is_array($replace)) { foreach ($search as &$string) { $subject = smarty_mb_str_replace($string, $replace, $subject, $c); @@ -37,7 +36,7 @@ if (!function_exists('smarty_mb_str_replace')) { } } else { $n = max(count($search), count($replace)); - while ($n --) { + while ($n--) { $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c); $count += $c; next($search); @@ -49,7 +48,6 @@ if (!function_exists('smarty_mb_str_replace')) { $count = count($parts) - 1; $subject = implode($replace, $parts); } - return $subject; } } diff --git a/vendor/smarty/smarty/libs/plugins/shared.mb_unicode.php b/vendor/smarty/smarty/libs/plugins/shared.mb_unicode.php index 0f790b56a..7450148a4 100644 --- a/vendor/smarty/smarty/libs/plugins/shared.mb_unicode.php +++ b/vendor/smarty/smarty/libs/plugins/shared.mb_unicode.php @@ -20,12 +20,12 @@ function smarty_mb_to_unicode($string, $encoding = null) { if ($encoding) { - $expanded = mb_convert_encoding($string, "UTF-32BE", $encoding); + $expanded = mb_convert_encoding($string, 'UTF-32BE', $encoding); } else { - $expanded = mb_convert_encoding($string, "UTF-32BE"); + $expanded = mb_convert_encoding($string, 'UTF-32BE'); } - return unpack("N*", $expanded); + return unpack('N*', $expanded); } /** @@ -46,8 +46,8 @@ function smarty_mb_from_unicode($unicode, $encoding = null) $encoding = mb_internal_encoding(); } foreach ((array) $unicode as $utf32be) { - $character = pack("N*", $utf32be); - $t .= mb_convert_encoding($character, $encoding, "UTF-32BE"); + $character = pack('N*', $utf32be); + $t .= mb_convert_encoding($character, $encoding, 'UTF-32BE'); } return $t; diff --git a/vendor/smarty/smarty/libs/plugins/shared.mb_wordwrap.php b/vendor/smarty/smarty/libs/plugins/shared.mb_wordwrap.php deleted file mode 100644 index 21632a1c0..000000000 --- a/vendor/smarty/smarty/libs/plugins/shared.mb_wordwrap.php +++ /dev/null @@ -1,75 +0,0 @@ - $width) { - if ($cut) { - $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, - 1, - PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE); - } - } - - foreach ($_tokens as $token) { - $_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token); - $token_length = mb_strlen($token, Smarty::$_CHARSET); - $length += $token_length; - - if ($length > $width) { - // remove space before inserted break - if ($_previous) { - $t = mb_substr($t, 0, - 1, Smarty::$_CHARSET); - } - - if (!$_space) { - // add the break before the token - if (!empty($t)) { - $t .= $break; - } - $length = $token_length; - } - } elseif ($token == "\n") { - // hard break must reset counters - $_previous = 0; - $length = 0; - } - $_previous = $_space; - // add the token - $t .= $token; - } - } - - return $t; - } -} diff --git a/vendor/smarty/smarty/libs/plugins/variablefilter.htmlspecialchars.php b/vendor/smarty/smarty/libs/plugins/variablefilter.htmlspecialchars.php index aecd1e7e7..3c85295db 100644 --- a/vendor/smarty/smarty/libs/plugins/variablefilter.htmlspecialchars.php +++ b/vendor/smarty/smarty/libs/plugins/variablefilter.htmlspecialchars.php @@ -5,15 +5,15 @@ * @package Smarty * @subpackage PluginsFilter */ - /** * Smarty htmlspecialchars variablefilter plugin * - * @param string $source input string + * @param string $source input string + * @param \Smarty_Internal_Template $template * * @return string filtered output */ -function smarty_variablefilter_htmlspecialchars($source) +function smarty_variablefilter_htmlspecialchars($source, Smarty_Internal_Template $template) { return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET); } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_custom.php b/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_custom.php index 8f1290e49..7a5920f43 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_custom.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_custom.php @@ -138,7 +138,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource $_smarty_tpl->compile_id, $content, $timestamp); } if (isset($content)) { - eval("?>" . $content); + eval('?>' . $content); $cached->content = null; return true; } @@ -204,7 +204,8 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource * @param string $compile_id compile id * @param integer $exp_time expiration time (number of seconds, not timestamp) * - * @return integer number of cache files deleted + * @return int number of cache files deleted + * @throws \SmartyException */ public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php index bab1b5c09..ff065a278 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php @@ -104,7 +104,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource } } if (isset($content)) { - eval("?>" . $content); + eval('?>' . $content); return true; } @@ -180,7 +180,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource * @param string $compile_id compile id * @param integer $exp_time expiration time [being ignored] * - * @return integer number of cache files deleted [always -1] + * @return int number of cache files deleted [always -1] + * @throws \SmartyException * @uses buildCachedFilepath() to generate the CacheID * @uses invalidate() to mark CacheIDs parent chain as outdated * @uses delete() to remove CacheID from cache @@ -272,8 +273,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource */ protected function addMetaTimestamp(&$content) { - $mt = explode(" ", microtime()); - $ts = pack("NN", $mt[ 1 ], (int) ($mt[ 0 ] * 100000000)); + $mt = explode(' ', microtime()); + $ts = pack('NN', $mt[ 1 ], (int) ($mt[ 0 ] * 100000000)); $content = $ts . $content; } @@ -370,7 +371,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource /** * Translate a CacheID into the list of applicable InvalidationKeys. - * Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... ) + * Splits 'some|chain|into|an|array' into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... ) * * @param string $cid CacheID to translate * @param string $resource_name template name diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_data.php b/vendor/smarty/smarty/libs/sysplugins/smarty_data.php index b9f5de9a5..743b117bf 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_data.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_data.php @@ -61,8 +61,8 @@ class Smarty_Data extends Smarty_Internal_Data foreach ($_parent as $_key => $_val) { $this->tpl_vars[ $_key ] = new Smarty_Variable($_val); } - } elseif ($_parent != null) { - throw new SmartyException("Wrong type for template variables"); + } elseif ($_parent !== null) { + throw new SmartyException('Wrong type for template variables'); } } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_block.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_block.php index a33ad1b11..780319f11 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_block.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_block.php @@ -38,7 +38,7 @@ class Smarty_Internal_Block public $prepend = false; /** - * Block calls {$smarty.block.child} + * Block calls $smarty.block.child * * @var bool */ @@ -67,7 +67,7 @@ class Smarty_Internal_Block /** * Smarty_Internal_Block constructor. - * - if outer level {block} of child template ($state == 1) save it as child root block + * - if outer level {block} of child template ($state === 1) save it as child root block * - otherwise process inheritance and render * * @param string $name block name diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php index 7df4ddffb..f6ef09306 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php @@ -7,7 +7,6 @@ * @author Uwe Tews * @author Rodney Rehm */ - /** * This class does contain all necessary methods for the HTML cache on file system * Implements the file system as resource for the HTML cache Version ussing nocache inserts. @@ -29,11 +28,14 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource { $source = &$_template->source; $smarty = &$_template->smarty; - $_compile_dir_sep = $smarty->use_sub_dirs ? $smarty->ds : '^'; + $_compile_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^'; $_filepath = sha1($source->uid . $smarty->_joined_template_dir); $cached->filepath = $smarty->getCacheDir(); if (isset($_template->cache_id)) { - $cached->filepath .= preg_replace(array('![^\w|]+!', '![|]+!'), array('_', $_compile_dir_sep), + $cached->filepath .= preg_replace(array('![^\w|]+!', + '![|]+!'), + array('_', + $_compile_dir_sep), $_template->cache_id) . $_compile_dir_sep; } if (isset($_template->compile_id)) { @@ -41,8 +43,10 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource } // if use_sub_dirs, break file into directories if ($smarty->use_sub_dirs) { - $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . $smarty->ds . $_filepath[ 2 ] . $_filepath[ 3 ] . $smarty->ds . - $_filepath[ 4 ] . $_filepath[ 5 ] . $smarty->ds; + $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DIRECTORY_SEPARATOR . $_filepath[ 2 ] . + $_filepath[ 3 ] . + DIRECTORY_SEPARATOR . + $_filepath[ 4 ] . $_filepath[ 5 ] . DIRECTORY_SEPARATOR; } $cached->filepath .= $_filepath; $basename = $source->handler->getBasename($source); @@ -83,12 +87,13 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource * * @return boolean true or false if the cached content does not exist */ - public function process(Smarty_Internal_Template $_smarty_tpl, Smarty_Template_Cached $cached = null, + public function process(Smarty_Internal_Template $_smarty_tpl, + Smarty_Template_Cached $cached = null, $update = false) { $_smarty_tpl->cached->valid = false; if ($update && defined('HHVM_VERSION')) { - eval("?>" . file_get_contents($_smarty_tpl->cached->filepath)); + eval('?>' . file_get_contents($_smarty_tpl->cached->filepath)); return true; } else { return @include $_smarty_tpl->cached->filepath; @@ -101,16 +106,20 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource * @param Smarty_Internal_Template $_template template object * @param string $content content to cache * - * @return boolean success + * @return bool success + * @throws \SmartyException */ public function writeCachedContent(Smarty_Internal_Template $_template, $content) { - if ($_template->smarty->ext->_writeFile->writeFile($_template->cached->filepath, $content, + if ($_template->smarty->ext->_writeFile->writeFile($_template->cached->filepath, + $content, $_template->smarty) === true ) { - if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) { + if (function_exists('opcache_invalidate') && + (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api'))) < 1 + ) { opcache_invalidate($_template->cached->filepath, true); - } elseif (function_exists('apc_compile_file')) { + } else if (function_exists('apc_compile_file')) { apc_compile_file($_template->cached->filepath); } $cached = $_template->cached; diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_append.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_append.php index 8539d6b2a..b3689e918 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_append.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_append.php @@ -24,6 +24,7 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign * @param array $parameter array with compilation parameter * * @return string compiled code + * @throws \SmartyCompilerException */ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_assign.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_assign.php index 3bd33847b..cb2ea4257 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_assign.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_assign.php @@ -71,7 +71,7 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase $_scope = $compiler->convertScope($_attr, $this->valid_scopes); } // optional parameter - $_params = ""; + $_params = ''; if ($_nocache || $_scope) { $_params .= ' ,' . var_export($_nocache, true); } @@ -85,9 +85,9 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase $output .= "settype(\$_tmp_array, 'array');\n"; $output .= "}\n"; $output .= "\$_tmp_array{$parameter['smarty_internal_index']} = {$_attr['value']};\n"; - $output .= "\$_smarty_tpl->_assignInScope({$_var}, \$_tmp_array{$_params});\n?>"; + $output .= "\$_smarty_tpl->_assignInScope({$_var}, \$_tmp_array{$_params});?>"; } else { - $output = "_assignInScope({$_var}, {$_attr['value']}{$_params});\n?>"; + $output = "_assignInScope({$_var}, {$_attr['value']}{$_params});?>"; } return $output; } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php index 5098d62fe..88d6f37e9 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php @@ -22,7 +22,6 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher * @see Smarty_Internal_CompileBase */ public $required_attributes = array('name'); - /** * Attribute definition: Overwrites base class. * @@ -30,7 +29,6 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher * @see Smarty_Internal_CompileBase */ public $shorttag_order = array('name'); - /** * Attribute definition: Overwrites base class. * @@ -38,7 +36,6 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher * @see Smarty_Internal_CompileBase */ public $option_flags = array('hide', 'nocache'); - /** * Attribute definition: Overwrites base class. * @@ -47,13 +44,6 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher */ public $optional_attributes = array('assign'); - /** - * Saved compiler object - * - * @var Smarty_Internal_TemplateCompilerBase - */ - public $compiler = null; - /** * Compiles code for the {block} tag * @@ -61,14 +51,13 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object * @param array $parameter array with compilation parameter * - * @return bool true */ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) { if (!isset($compiler->_cache[ 'blockNesting' ])) { $compiler->_cache[ 'blockNesting' ] = 0; } - if ($compiler->_cache[ 'blockNesting' ] == 0) { + if ($compiler->_cache[ 'blockNesting' ] === 0) { // make sure that inheritance gets initialized in template code $this->registerInit($compiler); $this->option_flags = array('hide', 'nocache', 'append', 'prepend'); @@ -77,30 +66,24 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher } // check and get attributes $_attr = $this->getAttributes($compiler, $args); - $compiler->_cache[ 'blockNesting' ] ++; + ++$compiler->_cache[ 'blockNesting' ]; $_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true)); $compiler->_cache[ 'blockName' ][ $compiler->_cache[ 'blockNesting' ] ] = $_attr[ 'name' ]; $compiler->_cache[ 'blockClass' ][ $compiler->_cache[ 'blockNesting' ] ] = $_className; $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ] = array(); $compiler->_cache[ 'blockParams' ][ 1 ][ 'subBlocks' ][ trim($_attr[ 'name' ], '"\'') ][] = $_className; - $this->openTag($compiler, 'block', array($_attr, $compiler->nocache, $compiler->parser->current_buffer, - $compiler->template->compiled->has_nocache_code, - $compiler->template->caching)); - // must whole block be nocache ? - if ($compiler->tag_nocache) { - $i = 0; - } + $this->openTag($compiler, + 'block', + array($_attr, $compiler->nocache, $compiler->parser->current_buffer, + $compiler->template->compiled->has_nocache_code, + $compiler->template->caching)); + $compiler->saveRequiredPlugins(true); $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; - // $compiler->suppressNocacheProcessing = true; - if ($_attr[ 'nocache' ] === true) { - //$compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->taglineno); - } $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template(); $compiler->template->compiled->has_nocache_code = false; $compiler->suppressNocacheProcessing = true; } } - /** * Smarty Internal Plugin Compile BlockClose Class * @@ -126,7 +109,7 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_ $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null; unset($_attr[ 'assign' ], $_attr[ 'name' ]); foreach ($_attr as $name => $stat) { - if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat != 'false')) { + if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat !== 'false')) { $_block[ $name ] = 'true'; } } @@ -144,7 +127,8 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_ $output .= "public \${$property} = " . var_export($value,true) .";\n"; } $output .= "public function callBlock(Smarty_Internal_Template \$_smarty_tpl) {\n"; - //$output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n"; + $output .= $compiler->compileRequiredPlugins(); + $compiler->restoreRequiredPlugins(); if ($compiler->template->compiled->has_nocache_code) { $output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n"; } @@ -167,32 +151,22 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_ $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output)); - $compiler->blockOrFunctionCode .= $f = $compiler->parser->current_buffer->to_smarty_php($compiler->parser); + $compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser); $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template(); - // nocache plugins must be copied - if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) { - foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) { - foreach ($tmp as $type => $data) { - $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] = - $data; - } - } - } - // restore old status $compiler->template->compiled->has_nocache_code = $_has_nocache_code; $compiler->tag_nocache = $compiler->nocache; $compiler->nocache = $_nocache; $compiler->parser->current_buffer = $_buffer; $output = "_cache[ 'blockNesting' ] == 1) { + if ($compiler->_cache[ 'blockNesting' ] === 1) { $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n"; } else { $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n"; } $output .= "?>\n"; - $compiler->_cache[ 'blockNesting' ] --; - if ($compiler->_cache[ 'blockNesting' ] == 0) { + --$compiler->_cache[ 'blockNesting' ]; + if ($compiler->_cache[ 'blockNesting' ] === 0) { unset($compiler->_cache[ 'blockNesting' ]); } $compiler->has_code = true; diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_child.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_child.php index bb070ebe3..1708f6482 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_child.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_child.php @@ -9,46 +9,16 @@ */ /** - * Smarty Internal Plugin Compile Block Parent Class + * Smarty Internal Plugin Compile Block Child Class * * @author Uwe Tews */ -class Smarty_Internal_Compile_Block_Child extends Smarty_Internal_CompileBase +class Smarty_Internal_Compile_Block_Child extends Smarty_Internal_Compile_Child { /** - * Attribute definition: Overwrites base class. + * Tag name * - * @var array - * @see Smarty_Internal_CompileBase + * @var string */ - public $option_flags = array(); - - /** - * Saved compiler object - * - * @var Smarty_Internal_TemplateCompilerBase - */ - public $compiler = null; - - /** - * Compiles code for the {block_parent} tag - * - * @param array $args array with attributes from parser - * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param array $parameter array with compilation parameter - * - * @return bool true - */ - public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) - { - if (!isset($compiler->_cache[ 'blockNesting' ])) { - $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ', - $compiler->parser->lex->taglineno); - } - $compiler->has_code = true; - $compiler->suppressNocacheProcessing = true; - $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true'; - $output = "inheritance->callChild(\$_smarty_tpl, \$this);\n?>\n"; - return $output; - } + public $tag = 'block_child'; } \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_parent.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_parent.php index 0ec1e8485..4f094ad61 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_parent.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_parent.php @@ -13,61 +13,19 @@ * * @author Uwe Tews */ -class Smarty_Internal_Compile_Block_Parent extends Smarty_Internal_Compile_Shared_Inheritance +class Smarty_Internal_Compile_Block_Parent extends Smarty_Internal_Compile_Child { - - /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ - public $optional_attributes = array('name'); - - /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ - public $shorttag_order = array('name'); - /** - * Attribute definition: Overwrites base class. + * Tag name * - * @var array - * @see Smarty_Internal_CompileBase + * @var string */ - public $option_flags = array(); + public $tag = 'block_parent'; /** - * Saved compiler object - * - * @var Smarty_Internal_TemplateCompilerBase - */ - public $compiler = null; - - /** - * Compiles code for the {block_parent} tag - * - * @param array $args array with attributes from parser - * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param array $parameter array with compilation parameter + * Block type * - * @return bool true + * @var string */ - public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) - { - // check and get attributes - $_attr = $this->getAttributes($compiler, $args); - if (!isset($compiler->_cache[ 'blockNesting' ])) { - $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ', - $compiler->parser->lex->taglineno); - } - $compiler->suppressNocacheProcessing = true; - $compiler->has_code = true; - $output = "inheritance->callParent(\$_smarty_tpl, \$this" . - (isset($_attr[ 'name' ]) ? ", {$_attr[ 'name' ]}" : '') . ");\n?>\n"; - return $output; - } + public $blockType = 'Parent'; } \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_break.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_break.php index 50157382a..09c25d238 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_break.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_break.php @@ -32,25 +32,35 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase */ public $shorttag_order = array('levels'); + /** + * Tag name may be overloaded by Smarty_Internal_Compile_Continue + * + * @var string + */ + public $tag = 'break'; + /** * Compiles code for the {break} tag * - * @param array $args array with attributes from parser - * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param array $parameter array with compilation parameter + * @param array $args array with attributes from parser + * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object * * @return string compiled code + * @throws \SmartyCompilerException */ - public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) + public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) { list($levels, $foreachLevels) = $this->checkLevels($args, $compiler); - $output = " 0 && $this->tag === 'continue') { + $foreachLevels--; + } + if ($foreachLevels > 0) { /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */ $foreachCompiler = $compiler->getTagCompiler('foreach'); $output .= $foreachCompiler->compileRestore($foreachLevels); } - $output .= "break {$levels};?>"; + $output .= "{$this->tag} {$levels};?>"; return $output; } @@ -59,12 +69,11 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase * * @param array $args array with attributes from parser * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param string $tag tag name * * @return array * @throws \SmartyCompilerException */ - public function checkLevels($args, Smarty_Internal_TemplateCompilerBase $compiler, $tag = 'break') + public function checkLevels($args, Smarty_Internal_TemplateCompilerBase $compiler) { static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true); // check and get attributes @@ -86,7 +95,7 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase $stack_count = count($compiler->_tag_stack) - 1; $foreachLevels = 0; $lastTag = ''; - while ($level_count >= 0 && $stack_count >= 0) { + while ($level_count > 0 && $stack_count >= 0) { if (isset($_is_loopy[ $compiler->_tag_stack[ $stack_count ][ 0 ] ])) { $lastTag = $compiler->_tag_stack[ $stack_count ][ 0 ]; if ($level_count === 0) { @@ -99,10 +108,10 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase } $stack_count --; } - if ($level_count != 0) { - $compiler->trigger_template_error("cannot {$tag} {$levels} level(s)", null, true); + if ($level_count !== 0) { + $compiler->trigger_template_error("cannot {$this->tag} {$levels} level(s)", null, true); } - if ($lastTag === 'foreach' && $tag === 'break') { + if ($lastTag === 'foreach' && $this->tag === 'break' && $foreachLevels > 0) { $foreachLevels --; } return array($levels, $foreachLevels); diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_call.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_call.php index 739df5eca..eb444d357 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_call.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_call.php @@ -57,7 +57,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase // output will be stored in a smarty variable instead of being displayed $_assign = $_attr[ 'assign' ]; } - //$_name = trim($_attr['name'], "'\""); + //$_name = trim($_attr['name'], "''"); $_name = $_attr[ 'name' ]; unset($_attr[ 'name' ], $_attr[ 'assign' ], $_attr[ 'nocache' ]); // set flag (compiled code of {function} must be included in cache file @@ -74,7 +74,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase $_paramsArray[] = "'$_key'=>$_value"; } } - $_params = 'array(' . implode(",", $_paramsArray) . ')'; + $_params = 'array(' . implode(',', $_paramsArray) . ')'; //$compiler->suppressNocacheProcessing = true; // was there an assign attribute if (isset($_assign)) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_capture.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_capture.php index 34fc55f9d..564b1f63e 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_capture.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_capture.php @@ -45,11 +45,11 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase public static function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter = null) { $tag = trim($parameter[ 0 ], '"\''); - $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false; + $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : null; if (!$name) { - $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true); + //$compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true); } - return "\$_smarty_tpl->smarty->ext->_capture->getBuffer(\$_smarty_tpl, '{$name}')"; + return '$_smarty_tpl->smarty->ext->_capture->getBuffer($_smarty_tpl'.(isset($name)?", '{$name}')":')'); } /** diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_child.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_child.php new file mode 100644 index 000000000..8c7bbdf05 --- /dev/null +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_child.php @@ -0,0 +1,77 @@ + + */ +class Smarty_Internal_Compile_Child extends Smarty_Internal_CompileBase +{ + /** + * Attribute definition: Overwrites base class. + * + * @var array + * @see Smarty_Internal_CompileBase + */ + public $optional_attributes = array('assign'); + + /** + * Tag name + * + * @var string + */ + public $tag = 'child'; + + /** + * Block type + * + * @var string + */ + public $blockType = 'Child'; + + /** + * Compiles code for the {child} tag + * + * @param array $args array with attributes from parser + * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object + * @param array $parameter array with compilation parameter + * + * @return string compiled code + * @throws \SmartyCompilerException + */ + public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) + { + // check and get attributes + $_attr = $this->getAttributes($compiler, $args); + $tag = isset($parameter[0]) ? "'{$parameter[0]}'" : "'{{$this->tag}}'"; + if (!isset($compiler->_cache[ 'blockNesting' ])) { + $compiler->trigger_template_error("{$tag} used outside {block} tags ", + $compiler->parser->lex->taglineno); + } + $compiler->has_code = true; + $compiler->suppressNocacheProcessing = true; + if ($this->blockType === 'Child') { + $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true'; + } + $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null; + $output = "inheritance->call' . $this->blockType . '($_smarty_tpl, $this' . + ($this->blockType === 'Child' ? '' : ", {$tag}"). ");\n"; + if (isset($_assign)) { + $output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n"; + } + $output .="?>\n"; + return $output; + } +} \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_continue.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_continue.php index 7492c7df2..19e5d4bee 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_continue.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_continue.php @@ -16,27 +16,10 @@ */ class Smarty_Internal_Compile_Continue extends Smarty_Internal_Compile_Break { - /** - * Compiles code for the {continue} tag - * - * @param array $args array with attributes from parser - * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param array $parameter array with compilation parameter - * - * @return string compiled code - * @throws \SmartyCompilerException - */ - public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) - { - list($levels, $foreachLevels) = $this->checkLevels($args, $compiler, 'continue'); - $output = " 1) { - /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */ - $foreachCompiler = $compiler->getTagCompiler('foreach'); - $output .= $foreachCompiler->compileRestore($foreachLevels - 1); - } - $output .= "continue {$levels};?>"; - return $output; - } + * Tag name + * + * @var string + */ + public $tag = 'continue'; } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_eval.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_eval.php index 97a3c29c5..550f194e0 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_eval.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_eval.php @@ -58,13 +58,12 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase } // create template object - $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'." . $_attr[ 'var' ] . - ", \$_smarty_tpl->smarty, \$_smarty_tpl);"; + $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'.{$_attr[ 'var' ]}, \$_smarty_tpl->smarty, \$_smarty_tpl);"; //was there an assign attribute? if (isset($_assign)) { $_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());"; } else { - $_output .= "echo \$_template->fetch();"; + $_output .= 'echo $_template->fetch();'; } return ""; diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_extends.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_extends.php index 83cb80500..37bf8dd3f 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_extends.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_extends.php @@ -64,18 +64,18 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inh // add code to initialize inheritance $this->registerInit($compiler, true); $file = trim($_attr[ 'file' ], '\'"'); - if (strlen($file) > 8 && substr($file, 0, 8) == 'extends:') { + if (strlen($file) > 8 && substr($file, 0, 8) === 'extends:') { // generate code for each template $files = array_reverse(explode('|', substr($file, 8))); $i = 0; foreach ($files as $file) { - if ($file[ 0 ] == '"') { + if ($file[ 0 ] === '"') { $file = trim($file, '".'); } else { $file = "'{$file}'"; } $i ++; - if ($i == count($files) && isset($_attr[ 'extends_resource' ])) { + if ($i === count($files) && isset($_attr[ 'extends_resource' ])) { $this->compileEndChild($compiler); } $this->compileInclude($compiler, $file); @@ -95,21 +95,24 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inh * * @param \Smarty_Internal_TemplateCompilerBase $compiler * @param null|string $template optional inheritance parent template + * + * @throws \SmartyCompilerException + * @throws \SmartyException */ private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler, $template = null) { $inlineUids = ''; if (isset($template) && $compiler->smarty->merge_compiled_includes) { $code = $compiler->compileTag('include', array($template, array('scope' => 'parent'))); - if (preg_match("/([,][\s]*['][a-z0-9]+['][,][\s]*[']content.*['])[)]/", $code, $match)) { + if (preg_match('/([,][\s]*[\'][a-z0-9]+[\'][,][\s]*[\']content.*[\'])[)]/', $code, $match)) { $inlineUids = $match[ 1 ]; } } $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser, - "inheritance->endChild(\$_smarty_tpl" . + 'inheritance->endChild($_smarty_tpl' . (isset($template) ? - ', ' . $template . $inlineUids : - '') . ");\n?>\n"); + ", {$template}{$inlineUids}" : + '') . ");\n?>"); } /** @@ -117,6 +120,9 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inh * * @param \Smarty_Internal_TemplateCompilerBase $compiler * @param string $template subtemplate name + * + * @throws \SmartyCompilerException + * @throws \SmartyException */ private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $template) { @@ -129,16 +135,17 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inh /** * Create source code for {extends} from source components array * - * @param []\Smarty_Internal_Template_Source $components + * @param \Smarty_Internal_Template $template * * @return string */ - public static function extendsSourceArrayCode($components) + public static function extendsSourceArrayCode(Smarty_Internal_Template $template) { $resources = array(); - foreach ($components as $source) { + foreach ($template->source->components as $source) { $resources[] = $source->resource; } - return '{extends file=\'extends:' . join('|', $resources) . '\' extends_resource=true}'; + return $template->smarty->left_delimiter . 'extends file=\'extends:' . join('|', $resources) . + '\' extends_resource=true' . $template->smarty->right_delimiter; } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php index e5e7c61c3..79848e521 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php @@ -35,7 +35,7 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase public function compile($args, $compiler, $parameter) { $compiler->loopNesting ++; - if ($parameter == 0) { + if ($parameter === 0) { $this->required_attributes = array('start', 'to'); $this->optional_attributes = array('max', 'step'); } else { @@ -47,7 +47,7 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase $_attr = $this->getAttributes($compiler, $args); $output = "tpl_vars[$var]->total > 0) {\n"; $output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n"; - $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration == 1;"; - $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration == \$_smarty_tpl->tpl_vars[$var]->total;"; + $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration === 1;"; + $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration === \$_smarty_tpl->tpl_vars[$var]->total;"; } - $output .= "?>"; + $output .= '?>'; $this->openTag($compiler, 'for', array('for', $compiler->nocache)); // maybe nocache because of nocache variables @@ -161,10 +161,10 @@ class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse')); $output = "\n"; + $output .= "?>"; return $output; } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php index 5ddd42d8a..471e92c3e 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php @@ -78,14 +78,14 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo /** * Compiles code for the {foreach} tag * - * @param array $args array with attributes from parser - * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param array $parameter array with compilation parameter + * @param array $args array with attributes from parser + * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object * * @return string compiled code * @throws \SmartyCompilerException + * @throws \SmartyException */ - public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) + public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) { $compiler->loopNesting ++; // init @@ -118,7 +118,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo $fromName = $compiler->getVariableName($_attr[ 'from' ]); if ($fromName) { foreach (array('item', 'key') as $a) { - if (isset($attributes[ $a ]) && $attributes[ $a ] == $fromName) { + if (isset($attributes[ $a ]) && $attributes[ $a ] === $fromName) { $compiler->trigger_template_error("'{$a}' and 'from' may not have same variable name '{$fromName}'", null, true); } @@ -137,7 +137,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo if (!empty($this->matchResults[ 'named' ])) { $namedAttr = $this->matchResults[ 'named' ]; } - if (isset($_attr[ 'properties' ]) && preg_match_all("/['](.*?)[']/", $_attr[ 'properties' ], $match)) { + if (isset($_attr[ 'properties' ]) && preg_match_all('/[\'](.*?)[\']/', $_attr[ 'properties' ], $match)) { foreach ($match[ 1 ] as $prop) { if (in_array($prop, $this->itemProperties)) { $itemAttr[ $prop ] = true; @@ -229,7 +229,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo $output .= "{$itemVar}->first = !{$itemVar}->index;\n"; } if (isset($itemAttr[ 'last' ])) { - $output .= "{$itemVar}->last = {$itemVar}->iteration == {$itemVar}->total;\n"; + $output .= "{$itemVar}->last = {$itemVar}->iteration === {$itemVar}->total;\n"; } if (isset($foreachVar)) { if (isset($namedAttr[ 'iteration' ])) { @@ -242,13 +242,13 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo $output .= "{$foreachVar}->value['first'] = !{$foreachVar}->value['index'];\n"; } if (isset($namedAttr[ 'last' ])) { - $output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] == {$foreachVar}->value['total'];\n"; + $output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] === {$foreachVar}->value['total'];\n"; } } if (!empty($itemAttr)) { $output .= "{$local}saved = {$itemVar};\n"; } - $output .= "?>"; + $output .= '?>'; return $output; } @@ -262,7 +262,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo */ public function compileRestore($levels) { - return "\$_smarty_tpl->smarty->ext->_foreach->restore(\$_smarty_tpl, {$levels});\n"; + return "\$_smarty_tpl->smarty->ext->_foreach->restore(\$_smarty_tpl, {$levels});"; } } @@ -277,13 +277,12 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase /** * Compiles code for the {foreachelse} tag * - * @param array $args array with attributes from parser - * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param array $parameter array with compilation parameter + * @param array $args array with attributes from parser + * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object * * @return string compiled code */ - public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) + public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) { // check and get attributes $_attr = $this->getAttributes($compiler, $args); @@ -291,10 +290,10 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase list($openTag, $nocache, $local, $itemVar, $restore) = $this->closeTag($compiler, array('foreach')); $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $local, $itemVar, 0)); $output = "\n"; + $output .= "}\n} else {\n?>"; return $output; } } @@ -310,13 +309,13 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase /** * Compiles code for the {/foreach} tag * - * @param array $args array with attributes from parser - * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param array $parameter array with compilation parameter + * @param array $args array with attributes from parser + * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object * * @return string compiled code - */ - public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) + * @throws \SmartyCompilerException + */ + public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) { $compiler->loopNesting --; // must endblock be nocache? @@ -328,7 +327,7 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase $this->closeTag($compiler, array('foreach', 'foreachelse')); $output = " 0) { @@ -338,7 +337,7 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */ $foreachCompiler = $compiler->getTagCompiler('foreach'); $output .= $foreachCompiler->compileRestore(1); - $output .= "?>\n"; + $output .= "?>"; return $output; } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php index b7cd9e1c0..909b767c8 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php @@ -44,14 +44,13 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase /** * Compiles code for the {function} tag * - * @param array $args array with attributes from parser - * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param array $parameter array with compilation parameter + * @param array $args array with attributes from parser + * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object * * @return bool true * @throws \SmartyCompilerException */ - public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) + public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) { // check and get attributes $_attr = $this->getAttributes($compiler, $args); @@ -60,7 +59,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase $compiler->trigger_template_error('nocache option not allowed', null, true); } unset($_attr[ 'nocache' ]); - $_name = trim($_attr[ 'name' ], "'\""); + $_name = trim($_attr[ 'name' ], '\'"'); $compiler->parent_compiler->tpl_function[ $_name ] = array(); $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code, $compiler->template->caching); @@ -68,6 +67,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase // Init temporary context $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template(); $compiler->template->compiled->has_nocache_code = false; + $compiler->saveRequiredPlugins(true); return true; } } @@ -91,18 +91,17 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase /** * Compiles code for the {/function} tag * - * @param array $args array with attributes from parser - * @param object|\Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param array $parameter array with compilation parameter + * @param array $args array with attributes from parser + * @param object|\Smarty_Internal_TemplateCompilerBase $compiler compiler object * * @return bool true */ - public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) + public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) { $this->compiler = $compiler; $saved_data = $this->closeTag($compiler, array('function')); $_attr = $saved_data[ 0 ]; - $_name = trim($_attr[ 'name' ], "'\""); + $_name = trim($_attr[ 'name' ], '\'"'); $compiler->parent_compiler->tpl_function[ $_name ][ 'compiled_filepath' ] = $compiler->parent_compiler->template->compiled->filepath; $compiler->parent_compiler->tpl_function[ $_name ][ 'uid' ] = $compiler->template->source->uid; @@ -118,7 +117,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase } } if (!empty($_paramsArray)) { - $_params = 'array(' . implode(",", $_paramsArray) . ')'; + $_params = 'array(' . implode(',', $_paramsArray) . ')'; $_paramsCode = "\$params = array_merge($_params, \$params);\n"; } else { $_paramsCode = ''; @@ -134,15 +133,16 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase $output = "compileRequiredPlugins(); $output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n"; $output .= $_paramsCode; - $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}"; + $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}\n"; $output .= "\$params = var_export(\$params, true);\n"; $output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/smarty->ext->_tplFunction->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value, \\\$_smarty_tpl->isRenderingCache);\n}\n?>"; - $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n\";?>"; + $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";?>"; $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output)); @@ -166,9 +166,11 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase $output = " \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}?>"; + $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}\n"; + $output .= $compiler->compileCheckPlugins(array_merge($compiler->required_plugins[ 'compiled' ], $compiler->required_plugins[ 'nocache' ])); + $output .= "?>\n"; $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output)); @@ -180,19 +182,10 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase new Smarty_Internal_ParseTree_Tag($compiler->parser, $output)); $compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser); - // nocache plugins must be copied - if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) { - foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) { - foreach ($tmp as $type => $data) { - $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] = - $data; - } - } - } - // restore old buffer - + // restore old buffer $compiler->parser->current_buffer = $saved_data[ 1 ]; // restore old status + $compiler->restoreRequiredPlugins(); $compiler->template->compiled->has_nocache_code = $saved_data[ 2 ]; $compiler->template->caching = $saved_data[ 3 ]; return true; @@ -200,7 +193,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase /** * Remove nocache code - * + * * @param $match * * @return string diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php index 14db55d4f..82436c266 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php @@ -34,8 +34,8 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase // must whole block be nocache ? $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; - if (!array_key_exists("if condition", $parameter)) { - $compiler->trigger_template_error("missing if condition", null, true); + if (!isset($parameter['if condition'])) { + $compiler->trigger_template_error('missing if condition', null, true); } if (is_array($parameter[ 'if condition' ])) { @@ -49,9 +49,9 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase $compiler->setNocacheInVariable($var); } $prefixVar = $compiler->getNewPrefixVariable(); - $_output = "\n"; + $_output = "\n"; $assignAttr = array(); - $assignAttr[][ 'value' ] = "{$prefixVar}"; + $assignAttr[][ 'value' ] = $prefixVar; $assignCompiler = new Smarty_Internal_Compile_Assign(); if (is_array($parameter[ 'if condition' ][ 'var' ])) { $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ]; @@ -80,18 +80,17 @@ class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase /** * Compiles code for the {else} tag * - * @param array $args array with attributes from parser - * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param array $parameter array with compilation parameter + * @param array $args array with attributes from parser + * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object * * @return string compiled code - */ - public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) + */ + public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) { list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif')); $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache)); - return ""; + return ''; } } @@ -120,8 +119,8 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif')); - if (!array_key_exists("if condition", $parameter)) { - $compiler->trigger_template_error("missing elseif condition", null, true); + if (!isset($parameter['if condition'])) { + $compiler->trigger_template_error('missing elseif condition', null, true); } $assignCode = ''; @@ -138,10 +137,10 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase $compiler->setNocacheInVariable($var); } $prefixVar = $compiler->getNewPrefixVariable(); - $assignCode = "\n"; + $assignCode = "\n"; $assignCompiler = new Smarty_Internal_Compile_Assign(); $assignAttr = array(); - $assignAttr[][ 'value' ] = "{$prefixVar}"; + $assignAttr[][ 'value' ] = $prefixVar; if (is_array($parameter[ 'if condition' ][ 'var' ])) { $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ]; $assignCode .= $assignCompiler->compile($assignAttr, $compiler, @@ -188,13 +187,12 @@ class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase /** * Compiles code for the {/if} tag * - * @param array $args array with attributes from parser - * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param array $parameter array with compilation parameter + * @param array $args array with attributes from parser + * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object * * @return string compiled code */ - public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) + public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) { // must endblock be nocache? if ($compiler->nocache) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php index a81b0c740..70f22546c 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php @@ -7,7 +7,6 @@ * @subpackage Compiler * @author Uwe Tews */ - /** * Smarty Internal Plugin Compile Include Class * @@ -20,7 +19,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase * caching mode to create nocache code but no cache file */ const CACHING_NOCACHE_CODE = 9999; - /** * Attribute definition: Overwrites base class. * @@ -28,7 +26,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase */ public $required_attributes = array('file'); - /** * Attribute definition: Overwrites base class. * @@ -36,7 +33,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase */ public $shorttag_order = array('file'); - /** * Attribute definition: Overwrites base class. * @@ -44,7 +40,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase */ public $option_flags = array('nocache', 'inline', 'caching'); - /** * Attribute definition: Overwrites base class. * @@ -52,7 +47,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase */ public $optional_attributes = array('_any'); - /** * Valid scope names * @@ -65,19 +59,19 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase /** * Compiles code for the {include} tag * - * @param array $args array with attributes from parser - * @param Smarty_Internal_SmartyTemplateCompiler $compiler compiler object - * @param array $parameter array with compilation parameter + * @param array $args array with attributes from parser + * @param Smarty_Internal_SmartyTemplateCompiler $compiler compiler object * - * @throws SmartyCompilerException - * @return string compiled code + * @return string + * @throws \Exception + * @throws \SmartyCompilerException + * @throws \SmartyException */ - public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler, $parameter) + public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler) { $uid = $t_hash = null; // check and get attributes $_attr = $this->getAttributes($compiler, $args); - $fullResourceName = $source_resource = $_attr[ 'file' ]; $variable_template = false; $cache_tpl = false; @@ -90,11 +84,11 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase $variable_template = true; } if (!$variable_template) { - if ($type != 'string') { + if ($type !== 'string') { $fullResourceName = "{$type}:{$name}"; $compiled = $compiler->parent_compiler->template->compiled; if (isset($compiled->includes[ $fullResourceName ])) { - $compiled->includes[ $fullResourceName ] ++; + $compiled->includes[ $fullResourceName ]++; $cache_tpl = true; } else { if ("{$compiler->template->source->type}:{$compiler->template->source->name}" == @@ -116,10 +110,8 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase } else { $variable_template = true; } - // scope setup $_scope = $compiler->convertScope($_attr, $this->valid_scopes); - // set flag to cache subtemplate object when called within loop or template name is variable. if ($cache_tpl || $variable_template || $compiler->loopNesting > 0) { $_cache_tpl = 'true'; @@ -128,18 +120,14 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase } // assume caching is off $_caching = Smarty::CACHING_OFF; - $call_nocache = $compiler->tag_nocache || $compiler->nocache; - // caching was on and {include} is not in nocache mode if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) { $_caching = self::CACHING_NOCACHE_CODE; } - // flag if included template code should be merged into caller $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr[ 'inline' ] === true) && !$compiler->template->source->handler->recompiled; - if ($merge_compiled_includes) { // variable template name ? if ($variable_template) { @@ -150,7 +138,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase $merge_compiled_includes = false; } } - /* * if the {include} tag provides individual parameter for caching or compile_id * the subtemplate must not be included into the common cache file and is treated like @@ -158,7 +145,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase * */ if ($_attr[ 'nocache' ] !== true && $_attr[ 'caching' ]) { - $_caching = $_new_caching = (int) $_attr[ 'caching' ]; + $_caching = $_new_caching = (int)$_attr[ 'caching' ]; $call_nocache = true; } else { $_new_caching = Smarty::CACHING_LIFETIME_CURRENT; @@ -182,7 +169,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase } else { $_compile_id = '$_smarty_tpl->compile_id'; } - // if subtemplate will be called in nocache mode do not merge if ($compiler->template->caching && $call_nocache) { $merge_compiled_includes = false; @@ -200,7 +186,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase $_assign = $_attr[ 'assign' ]; } } - $has_compiled_template = false; if ($merge_compiled_includes) { $c_id = isset($_attr[ 'compile_id' ]) ? $_attr[ 'compile_id' ] : $compiler->template->compile_id; @@ -232,17 +217,17 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase $_vars = 'array(' . join(',', $_pairs) . ')'; } $update_compile_id = $compiler->template->caching && !$compiler->tag_nocache && !$compiler->nocache && - $_compile_id != '$_smarty_tpl->compile_id'; + $_compile_id !== '$_smarty_tpl->compile_id'; if ($has_compiled_template && !$call_nocache) { $_output = "makeNocacheCode("\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n"); } - if (!empty($_attr) && $_caching == 9999 && $compiler->template->caching) { + if (!empty($_attr) && $_caching === 9999 && $compiler->template->caching) { $_vars_nc = "foreach ($_vars as \$ik => \$iv) {\n"; $_vars_nc .= "\$_smarty_tpl->tpl_vars[\$ik] = new Smarty_Variable(\$iv);\n"; $_vars_nc .= "}\n"; - $_output .= substr($compiler->processNocacheCode('\n", true), 6, - 3); + $_output .= substr($compiler->processNocacheCode('\n", true), 6, -3); } if (isset($_assign)) { $_output .= "ob_start();\n"; @@ -254,11 +239,9 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase if ($update_compile_id) { $_output .= $compiler->makeNocacheCode("\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n"); } - $_output .= "?>\n"; - + $_output .= "?>"; return $_output; } - if ($call_nocache) { $compiler->tag_nocache = true; } @@ -277,7 +260,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase if ($update_compile_id) { $_output .= "\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n"; } - $_output .= "?>\n"; + $_output .= "?>"; return $_output; } @@ -289,9 +272,12 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase * @param string $t_hash * * @return bool + * @throws \Exception + * @throws \SmartyException */ public function compileInlineTemplate(Smarty_Internal_SmartyTemplateCompiler $compiler, - Smarty_Internal_Template $tpl, $t_hash) + Smarty_Internal_Template $tpl, + $t_hash) { $uid = $tpl->source->type . $tpl->source->uid; if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) { @@ -309,29 +295,30 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase $tpl->mustCompile = true; $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'nocache_hash' ] = $tpl->compiled->nocache_hash; - if ($compiler->template->source->type == 'file') { - $sourceInfo = $compiler->template->source->filepath; + if ($tpl->source->type === 'file') { + $sourceInfo = $tpl->source->filepath; } else { - $basename = $compiler->template->source->handler->getBasename($compiler->template->source); - $sourceInfo = $compiler->template->source->type . ':' . - ($basename ? $basename : $compiler->template->source->name); + $basename = $tpl->source->handler->getBasename($tpl->source); + $sourceInfo = $tpl->source->type . ':' . + ($basename ? $basename : $tpl->source->name); } // get compiled code $compiled_code = "compiled->unifunc} (\$_smarty_tpl) {\n"; + $compiled_code .= "function {$tpl->compiled->unifunc} (Smarty_Internal_Template \$_smarty_tpl) {\n"; $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler); $compiled_code .= "\n"; $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode); $compiled_code .= ""; + $compiled_code .= '?>'; unset($tpl->compiler); if ($tpl->compiled->has_nocache_code) { // replace nocache_hash $compiled_code = - str_replace("{$tpl->compiled->nocache_hash}", $compiler->template->compiled->nocache_hash, + str_replace("{$tpl->compiled->nocache_hash}", + $compiler->template->compiled->nocache_hash, $compiled_code); $compiler->template->compiled->has_nocache_code = true; } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include_php.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include_php.php index 77586da8b..e0aca93b3 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include_php.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include_php.php @@ -7,7 +7,6 @@ * @subpackage Compiler * @author Uwe Tews */ - /** * Smarty Internal Plugin Compile Insert Class * @@ -57,7 +56,6 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase } // check and get attributes $_attr = $this->getAttributes($compiler, $args); - /** @var Smarty_Internal_Template $_smarty_tpl * used in evaluated code */ @@ -74,8 +72,8 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase $_dir = $compiler->smarty->trusted_dir; } if (!empty($_dir)) { - foreach ((array) $_dir as $_script_dir) { - $_path = $compiler->smarty->_realpath($_script_dir . $compiler->smarty->ds . $_file, true); + foreach ((array)$_dir as $_script_dir) { + $_path = $compiler->smarty->_realpath($_script_dir . DIRECTORY_SEPARATOR . $_file, true); if (file_exists($_path)) { $_filepath = $_path; break; @@ -83,25 +81,22 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase } } } - if ($_filepath == false) { + if ($_filepath === false) { $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", null, true); } - if (isset($compiler->smarty->security_policy)) { $compiler->smarty->security_policy->isTrustedPHPDir($_filepath); } - if (isset($_attr[ 'assign' ])) { // output will be stored in a smarty variable instead of being displayed $_assign = $_attr[ 'assign' ]; } $_once = '_once'; if (isset($_attr[ 'once' ])) { - if ($_attr[ 'once' ] == 'false') { + if ($_attr[ 'once' ] === 'false') { $_once = ''; } } - if (isset($_assign)) { return "assign({$_assign},ob_get_clean());\n?>"; } else { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php index 02ef67c3a..e71abdce3 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php @@ -1,5 +1,4 @@ getAttributes($compiler, $args); - //Does tag create output - $compiler->has_output = isset($_attr[ 'assign' ]) ? false : true; - $nocacheParam = $compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache); if (!$nocacheParam) { // do not compile as nocache code @@ -66,7 +61,6 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase $_smarty_tpl = $compiler->template; $_name = null; $_script = null; - $_output = 'template->tpl_vars[ $var ])) { $compiler->template->tpl_vars[ $var ]->nocache = true; } else { @@ -96,8 +90,8 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase $_dir = $compiler->smarty instanceof SmartyBC ? $compiler->smarty->trusted_dir : null; } if (!empty($_dir)) { - foreach ((array) $_dir as $_script_dir) { - $_script_dir = rtrim($_script_dir, '/\\') . $compiler->smarty->ds; + foreach ((array)$_dir as $_script_dir) { + $_script_dir = rtrim($_script_dir, '/\\') . DIRECTORY_SEPARATOR; if (file_exists($_script_dir . $_script)) { $_filepath = $_script_dir . $_script; break; @@ -105,7 +99,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase } } } - if ($_filepath == false) { + if ($_filepath === false) { $compiler->trigger_template_error("{insert} missing script file '{$_script}'", null, true); } // code for script file loading @@ -113,7 +107,8 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase require_once $_filepath; if (!is_callable($_function)) { $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", - null, true); + null, + true); } } else { $_filepath = 'null'; @@ -122,7 +117,8 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase if (!is_callable($_function)) { // try plugin if (!$_function = $compiler->getPlugin($_name, 'insert')) { - $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", null, + $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", + null, true); } } @@ -149,7 +145,6 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>"; } } - return $_output; } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php index 7251dcd6c..c22e1a637 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php @@ -16,7 +16,7 @@ */ class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase { - /** + /** * Compiles code for the {ldelim} tag * This tag does output the left delimiter * @@ -32,9 +32,6 @@ class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase if ($_attr[ 'nocache' ] === true) { $compiler->trigger_template_error('nocache option not allowed', null, true); } - // this tag does not return compiled code - $compiler->has_code = true; - return $compiler->smarty->left_delimiter; } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_make_nocache.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_make_nocache.php index 720dd68b3..f793ecbbf 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_make_nocache.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_make_nocache.php @@ -41,20 +41,18 @@ class Smarty_Internal_Compile_Make_Nocache extends Smarty_Internal_CompileBase /** * Compiles code for the {make_nocache} tag * - * @param array $args array with attributes from parser - * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object - * @param array $parameter array with compilation parameter + * @param array $args array with attributes from parser + * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object * * @return string compiled code - * @throws \SmartyCompilerException - */ - public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) + */ + public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) { // check and get attributes $_attr = $this->getAttributes($compiler, $args); if ($compiler->template->caching) { $output = "smarty->ext->_make_nocache->save(\$_smarty_tpl, {$_attr[ 'var' ]});\n?>\n"; - $compiler->has_code = true; + $compiler->template->compiled->has_nocache_code = true; $compiler->suppressNocacheProcessing = true; return $output; } else { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_parent.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_parent.php new file mode 100644 index 000000000..052479aef --- /dev/null +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_parent.php @@ -0,0 +1,32 @@ + + */ +class Smarty_Internal_Compile_Parent extends Smarty_Internal_Compile_Child +{ + + /** + * Tag name + * + * @var string + */ + public $tag = 'parent'; + + /** + * Block type + * + * @var string + */ + public $blockType = 'Parent'; +} \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php index 617564276..6c3f05aaa 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php @@ -41,17 +41,19 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi * @param string $function PHP function name * * @return string compiled code + * @throws \SmartyCompilerException + * @throws \SmartyException */ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function = null) { - if (!isset($tag[ 5 ]) || substr($tag, - 5) != 'close') { + if (!isset($tag[ 5 ]) || substr($tag, - 5) !== 'close') { // opening tag of block plugin // check and get attributes $_attr = $this->getAttributes($compiler, $args); $this->nesting ++; unset($_attr[ 'nocache' ]); list($callback, $_paramsArray, $callable) = $this->setup($compiler, $_attr, $tag, $function); - $_params = 'array(' . implode(",", $_paramsArray) . ')'; + $_params = 'array(' . implode(',', $_paramsArray) . ')'; // compile code $output = "smarty->_cache['_tag_stack'][] = array('{$tag}', {$_params});\n"; - $output .= "\$_block_repeat=true;\necho {$callback}({$_params}, null, \$_smarty_tpl, \$_block_repeat);\nwhile (\$_block_repeat) {\nob_start();\n?>"; + $output .= "\$_block_repeat=true;\necho {$callback}({$_params}, null, \$_smarty_tpl, \$_block_repeat);\nwhile (\$_block_repeat) {\nob_start();?>"; $this->openTag($compiler, $tag, array($_params, $compiler->nocache, $callback)); // maybe nocache because of nocache variables or nocache plugin $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; @@ -74,8 +76,6 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi } // closing tag of block plugin, restore nocache list($_params, $compiler->nocache, $callback) = $this->closeTag($compiler, substr($tag, 0, - 5)); - //Does tag create output - $compiler->has_output = isset($_params[ 'assign' ]) ? false : true; // compile code if (!isset($parameter[ 'modifier_list' ])) { $mod_pre = $mod_post = $mod_content = ''; @@ -88,13 +88,10 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi array('modifierlist' => $parameter[ 'modifier_list' ], 'value' => 'ob_get_clean()')) . ";\n"; } - $output = "smarty->_cache['_tag_stack']);"; - $output .= "?>"; + $output = "smarty->_cache[\'_tag_stack\']);?>'; } - return $output . "\n"; + return $output; } /** diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php index bf569be3a..5161da645 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php @@ -76,6 +76,8 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com * * @param array $attributes * @param \Smarty_Internal_TemplateCompilerBase $compiler + * + * @throws \SmartyException */ public function scanForProperties($attributes, Smarty_Internal_TemplateCompilerBase $compiler) { @@ -110,8 +112,9 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com public function buildPropertyPreg($named, $attributes) { if ($named) { - $this->resultOffsets[ 'named' ] = $this->startOffset + 3; - $this->propertyPreg .= "([\$]smarty[.]{$this->tagName}[.]{$attributes['name']}[.]("; + $this->resultOffsets[ 'named' ] = $this->startOffset + 4; + $this->propertyPreg .= "(([\$]smarty[.]{$this->tagName}[.]" . ($this->tagName === 'section' ? "|[\[]\s*" : '') + . "){$attributes['name']}[.]("; $properties = $this->nameProperties; } else { $this->resultOffsets[ 'item' ] = $this->startOffset + 3; @@ -161,6 +164,8 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com * Find matches in all parent template source * * @param \Smarty_Internal_TemplateCompilerBase $compiler + * + * @throws \SmartyException */ public function matchParentTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler) { @@ -171,7 +176,7 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com if ($compiler !== $nextCompiler) { // get template source $_content = $nextCompiler->template->source->getContent(); - if ($_content != '') { + if ($_content !== '') { // run pre filter if required if ((isset($nextCompiler->smarty->autoload_filters[ 'pre' ]) || isset($nextCompiler->smarty->registered_filters[ 'pre' ])) diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php index 26529bb68..9e9c65f59 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php @@ -42,6 +42,8 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co * @param string $function PHP function name * * @return string compiled code + * @throws \SmartyCompilerException + * @throws \SmartyException */ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function) { @@ -58,7 +60,7 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co $_paramsArray[] = "'$_key'=>$_value"; } } - $_params = 'array(' . implode(",", $_paramsArray) . ')'; + $_params = 'array(' . implode(',', $_paramsArray) . ')'; // compile code $output = "{$function}({$_params},\$_smarty_tpl)"; if (!empty($parameter[ 'modifierlist' ])) { @@ -66,8 +68,6 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co array('modifierlist' => $parameter[ 'modifierlist' ], 'value' => $output)); } - //Does tag create output - $compiler->has_output = true; $output = "\n"; return $output; } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php index 2ee88db48..e83b7a243 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php @@ -26,6 +26,7 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa * * @return string compiled code * @throws \SmartyCompilerException + * @throws \SmartyException */ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) { @@ -34,6 +35,7 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa $output = $parameter[ 'value' ]; // loop over list of modifiers foreach ($parameter[ 'modifierlist' ] as $single_modifier) { + /* @var string $modifier */ $modifier = $single_modifier[ 0 ]; $single_modifier[ 0 ] = $output; $params = implode(',', $single_modifier); @@ -48,20 +50,13 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa case 1: // registered modifier if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ])) { - $function = - $compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ]; - if (!is_array($function)) { - $output = "{$function}({$params})"; - } else { - if (is_object($function[ 0 ])) { - $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . - $modifier . '\'][0][0]->' . $function[ 1 ] . '(' . $params . ')'; - } else { - $output = $function[ 0 ] . '::' . $function[ 1 ] . '(' . $params . ')'; - } + if (is_callable($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ])) { + $output = + sprintf('call_user_func_array($_smarty_tpl->registered_plugins[ \'%s\' ][ %s ][ 0 ], array( %s ))', + Smarty::PLUGIN_MODIFIER, var_export($modifier, true), $params); + $compiler->known_modifier_type[ $modifier ] = $type; + break 2; } - $compiler->known_modifier_type[ $modifier ] = $type; - break 2; } break; case 2: @@ -135,8 +130,8 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa } } } - if (isset($compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ]) || - isset($compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ]) + if (isset($compiler->required_plugins[ 'nocache' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ]) || + isset($compiler->required_plugins[ 'compiled' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ]) ) { // was a plugin $compiler->known_modifier_type[ $modifier ] = 4; @@ -148,10 +143,10 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa } } if (!isset($compiler->known_modifier_type[ $modifier ])) { - $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", null, true); + $compiler->trigger_template_error("unknown modifier '{$modifier}'", null, true); } } return $output; } -} +} \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php index 7f78a421e..8d6c7e397 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php @@ -34,14 +34,13 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co * @param string $method name of method to call * * @return string compiled code + * @throws \SmartyCompilerException + * @throws \SmartyException */ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $method) { // check and get attributes $_attr = $this->getAttributes($compiler, $args); - //Does tag create output - $compiler->has_output = isset($_attr[ 'assign' ]) ? false : true; - unset($_attr[ 'nocache' ]); $_assign = null; if (isset($_attr[ 'assign' ])) { @@ -60,10 +59,10 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co $_paramsArray[] = "'$_key'=>$_value"; } } - $_params = 'array(' . implode(",", $_paramsArray) . ')'; + $_params = 'array(' . implode(',', $_paramsArray) . ')'; $output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)"; } else { - $_params = implode(",", $_attr); + $_params = implode(',', $_attr); $output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})"; } } else { @@ -74,9 +73,6 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter[ 'modifierlist' ], 'value' => $output)); } - //Does tag create output - $compiler->has_output = isset($_attr[ 'assign' ]) ? false : true; - if (empty($_assign)) { return "\n"; } else { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_php.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_php.php index 8bff8499f..1d100f0d2 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_php.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_php.php @@ -40,38 +40,34 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase // check and get attributes $_attr = $this->getAttributes($compiler, $args); $compiler->has_code = false; - if ($_attr[ 'type' ] == 'xml') { + if ($_attr[ 'type' ] === 'xml') { $compiler->tag_nocache = true; $output = addcslashes($_attr[ 'code' ], "'\\"); $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, - $compiler->processNocacheCode("", + $compiler->processNocacheCode("", true))); return ''; } - if ($_attr[ 'type' ] != 'tag') { - if ($compiler->php_handling == Smarty::PHP_REMOVE) { + if ($_attr[ 'type' ] !== 'tag') { + if ($compiler->php_handling === Smarty::PHP_REMOVE) { return ''; - } elseif ($compiler->php_handling == Smarty::PHP_QUOTE) { + } elseif ($compiler->php_handling === Smarty::PHP_QUOTE) { $output = preg_replace_callback('#(<\?(?:php|=)?)|(<%)|()|(\?>)|(%>)|(<\/script>)#i', array($this, 'quote'), $_attr[ 'code' ]); $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Text($output)); return ''; - } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr[ 'type' ] == 'unmatched') { + } elseif ($compiler->php_handling === Smarty::PHP_PASSTHRU || $_attr[ 'type' ] === 'unmatched') { $compiler->tag_nocache = true; $output = addcslashes($_attr[ 'code' ], "'\\"); $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, - $compiler->processNocacheCode("", + $compiler->processNocacheCode("", true))); return ''; - } elseif ($compiler->php_handling == Smarty::PHP_ALLOW) { + } elseif ($compiler->php_handling === Smarty::PHP_ALLOW) { if (!($compiler->smarty instanceof SmartyBC)) { $compiler->trigger_template_error('$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it', null, true); @@ -91,10 +87,10 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase $rdel = preg_quote($compiler->smarty->right_delimiter, '#'); preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr[ 'code' ], $match); if (!empty($match[ 2 ])) { - if ('nocache' == trim($match[ 2 ])) { + if ('nocache' === trim($match[ 2 ])) { $compiler->tag_nocache = true; } else { - $compiler->trigger_template_error("illegal value of option flag \"{$match[2]}\"", null, true); + $compiler->trigger_template_error("illegal value of option flag '{$match[2]}'", null, true); } } return preg_replace(array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"), @@ -107,9 +103,11 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase * * This code has been moved from lexer here fo easier debugging and maintenance * - * @param $lex + * @param Smarty_Internal_Templatelexer $lex + * + * @throws \SmartyCompilerException */ - public function parsePhp($lex) + public function parsePhp(Smarty_Internal_Templatelexer $lex) { $lex->token = Smarty_Internal_Templateparser::TP_PHP; $close = 0; @@ -142,16 +140,16 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase return; } $closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}"; - if ($lex->value == $closeTag) { + if ($lex->value === $closeTag) { $lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'"); } $lex->phpType = 'tag'; } - if ($lex->phpType == 'unmatched') { + if ($lex->phpType === 'unmatched') { return; } - if (($lex->phpType == 'php' || $lex->phpType == 'asp') && - ($lex->compiler->php_handling == Smarty::PHP_PASSTHRU || $lex->compiler->php_handling == Smarty::PHP_QUOTE) + if (($lex->phpType === 'php' || $lex->phpType === 'asp') && + ($lex->compiler->php_handling === Smarty::PHP_PASSTHRU || $lex->compiler->php_handling === Smarty::PHP_QUOTE) ) { return; } @@ -171,7 +169,7 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase $body = false; } else { $start = $pos + strlen($value); - $phpCommentStart = $value == '/*'; + $phpCommentStart = $value === '/*'; if ($phpCommentStart) { $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start); if ($phpCommentEnd) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php index 811996bcc..2dde69488 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php @@ -67,7 +67,7 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array); for ($i = 0, $count = count($mod_array[ 0 ]); $i < $count; $i ++) { - if ($mod_array[ 0 ][ $i ] != ':') { + if ($mod_array[ 0 ][ $i ] !== ':') { $modifierlist[ $key ][] = $mod_array[ 0 ][ $i ]; } } @@ -100,18 +100,18 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C if (isset($compiler->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ])) { foreach ((array) $compiler->template->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ] as $name) { - $result = $this->compile_output_filter($compiler, $name, $output); + $result = $this->compile_variable_filter($compiler, $name, $output); if ($result !== false) { $output = $result; } else { // not found, throw exception - throw new SmartyException("Unable to load filter '{$name}'"); + throw new SmartyException("Unable to load variable filter '{$name}'"); } } } foreach ($compiler->variable_filters as $filter) { - if (count($filter) == 1 && - ($result = $this->compile_output_filter($compiler, $filter[ 0 ], $output)) !== false + if (count($filter) === 1 && + ($result = $this->compile_variable_filter($compiler, $filter[ 0 ], $output)) !== false ) { $output = $result; } else { @@ -120,9 +120,7 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C } } } - - $compiler->has_output = true; - $output = ""; + $output = "\n"; } return $output; @@ -134,29 +132,16 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C * @param string $output embedded output * * @return string + * @throws \SmartyException */ - private function compile_output_filter(Smarty_Internal_TemplateCompilerBase $compiler, $name, $output) + private function compile_variable_filter(Smarty_Internal_TemplateCompilerBase $compiler, $name, $output) { - $plugin_name = "smarty_variablefilter_{$name}"; - $path = $compiler->smarty->loadPlugin($plugin_name); - if ($path) { - /** - if ($compiler->template->caching) { - $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $name ][ Smarty::FILTER_VARIABLE ][ 'file' ] = - $path; - $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $name ][ Smarty::FILTER_VARIABLE ][ 'function' ] = - $plugin_name; - } else { - $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $name ][ Smarty::FILTER_VARIABLE ][ 'file' ] = - $path; - $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $name ][ Smarty::FILTER_VARIABLE ][ 'function' ] = - $plugin_name; - } - * */ - return "{$plugin_name}({$output},\$_smarty_tpl)"; - } else { + $function= $compiler->getPlugin($name, 'variablefilter'); + if ($function) { + return "{$function}({$output},\$_smarty_tpl)"; + } else { // not found return false; - } + } } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php index 987bc96f3..bd88f1bf1 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php @@ -61,7 +61,7 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C if (is_int($_key)) { $_paramsArray[] = "$_key=>$_value"; } elseif ($compiler->template->caching && in_array($_key, $tag_info[ 2 ])) { - $_value = str_replace("'", "^#^", $_value); + $_value = str_replace('\'', "^#^", $_value); $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^"; } else { $_paramsArray[] = "'$_key'=>$_value"; diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php index 7a4cbb7f7..467f9a49a 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php @@ -33,6 +33,8 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna * @param string $tag name of function * * @return string compiled code + * @throws \SmartyCompilerException + * @throws \SmartyException */ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag) { @@ -41,10 +43,12 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna unset($_attr[ 'nocache' ]); if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) { $tag_info = $compiler->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ]; + $is_registered = true; } else { - $tag_info = $compiler->default_handler_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ]; + $tag_info = $compiler->default_handler_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ]; + $is_registered = false; } - // not cachable? + // not cacheable? $compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[ 1 ]; // convert attributes into parameter array string $_paramsArray = array(); @@ -52,31 +56,31 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna if (is_int($_key)) { $_paramsArray[] = "$_key=>$_value"; } elseif ($compiler->template->caching && in_array($_key, $tag_info[ 2 ])) { - $_value = str_replace("'", "^#^", $_value); + $_value = str_replace('\'', "^#^", $_value); $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^"; } else { $_paramsArray[] = "'$_key'=>$_value"; } } - $_params = 'array(' . implode(",", $_paramsArray) . ')'; - $function = $tag_info[ 0 ]; + $_params = 'array(' . implode(',', $_paramsArray) . ')'; // compile code - if (!is_array($function)) { - $output = "{$function}({$_params},\$_smarty_tpl)"; - } elseif (is_object($function[ 0 ])) { + if ($is_registered) { $output = - "\$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl)"; + "call_user_func_array( \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0], array( {$_params},\$_smarty_tpl ) )"; } else { - $output = "{$function[0]}::{$function[1]}({$_params},\$_smarty_tpl)"; + $function = $tag_info[ 0 ]; + if (!is_array($function)) { + $output = "{$function}({$_params},\$_smarty_tpl)"; + } else { + $output = "{$function[0]}::{$function[1]}({$_params},\$_smarty_tpl)"; + } } if (!empty($parameter[ 'modifierlist' ])) { $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter[ 'modifierlist' ], 'value' => $output)); } - //Does tag create output - $compiler->has_output = true; $output = "\n"; return $output; } -} +} \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php index 2e6b43c17..e3d034da1 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php @@ -14,7 +14,7 @@ * @package Smarty * @subpackage Compiler */ -class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase +class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_Compile_Ldelim { /** * Compiles code for the {rdelim} tag @@ -28,13 +28,7 @@ class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase */ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) { - $_attr = $this->getAttributes($compiler, $args); - if ($_attr[ 'nocache' ] === true) { - $compiler->trigger_template_error('nocache option not allowed', null, true); - } - // this tag does not return compiled code - $compiler->has_code = true; - + parent::compile($args,$compiler); return $compiler->smarty->right_delimiter; } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php index c3701fc63..6e80e0fde 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php @@ -84,6 +84,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo * * @return string compiled code * @throws \SmartyCompilerException + * @throws \SmartyException */ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler) { @@ -103,8 +104,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo // maybe nocache because of nocache variables $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; - $initLocal = - array('saved' => "isset(\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']) ? \$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}'] : false",); + $initLocal = array(); $initNamedProperty = array(); $initFor = array(); $incFor = array(); @@ -140,12 +140,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo $v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))"; $t = 1; } - if (isset($namedAttr[ 'loop' ])) { - $initNamedProperty[ 'loop' ] = "'loop' => {$v}"; - if ($t == 1) { - $v = "{$sectionVar}->value['loop']"; - } - } elseif ($t == 1) { + if ($t === 1) { $initLocal[ 'loop' ] = $v; $v = "{$local}loop"; } @@ -162,11 +157,11 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo case 'step': if (is_numeric($attr_value)) { $v = (int) $attr_value; - $v = ($v == 0) ? 1 : $v; + $v = ($v === 0) ? 1 : $v; $t = 0; break; } - $initLocal[ 'step' ] = "((int)@$attr_value) == 0 ? 1 : (int)@$attr_value"; + $initLocal[ 'step' ] = "((int)@$attr_value) === 0 ? 1 : (int)@$attr_value"; $v = "{$local}step"; $t = 2; break; @@ -182,7 +177,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo $t = 3; break; } - if ($t == 3 && $compiler->getId($attr_value)) { + if ($t === 3 && $compiler->getId($attr_value)) { $t = 1; } $propValue[ $attr_name ] = $v; @@ -198,8 +193,8 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo $incFor[ 'iteration' ] = "{$propValue['iteration']}++"; $initFor[ 'iteration' ] = "{$propValue['iteration']} = 1"; - if ($propType[ 'step' ] == 0) { - if ($propValue[ 'step' ] == 1) { + if ($propType[ 'step' ] === 0) { + if ($propValue[ 'step' ] === 1) { $incFor[ 'index' ] = "{$sectionVar}->value['index']++"; } elseif ($propValue[ 'step' ] > 1) { $incFor[ 'index' ] = "{$sectionVar}->value['index'] += {$propValue['step']}"; @@ -213,7 +208,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo if (!isset($propValue[ 'max' ])) { $propValue[ 'max' ] = $propValue[ 'loop' ]; $propType[ 'max' ] = $propType[ 'loop' ]; - } elseif ($propType[ 'max' ] != 0) { + } elseif ($propType[ 'max' ] !== 0) { $propValue[ 'max' ] = "{$propValue['max']} < 0 ? {$propValue['loop']} : {$propValue['max']}"; $propType[ 'max' ] = 1; } else { @@ -226,11 +221,11 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo if (!isset($propValue[ 'start' ])) { $start_code = array(1 => "{$propValue['step']} > 0 ? ", 2 => '0', 3 => ' : ', 4 => $propValue[ 'loop' ], 5 => ' - 1'); - if ($propType[ 'loop' ] == 0) { + if ($propType[ 'loop' ] === 0) { $start_code[ 5 ] = ''; $start_code[ 4 ] = $propValue[ 'loop' ] - 1; } - if ($propType[ 'step' ] == 0) { + if ($propType[ 'step' ] === 0) { if ($propValue[ 'step' ] > 0) { $start_code = array(1 => '0'); $propType[ 'start' ] = 0; @@ -248,9 +243,9 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo 5 => ' : ', 6 => '-1', 7 => ', ', 8 => "{$propValue['start']} + {$propValue['loop']}", 10 => ')', 11 => ' : ', 12 => 'min(', 13 => $propValue[ 'start' ], 14 => ', ', 15 => "{$propValue['step']} > 0 ? ", 16 => $propValue[ 'loop' ], 17 => ' : ', - 18 => $propType[ 'loop' ] == 0 ? $propValue[ 'loop' ] - 1 : "{$propValue['loop']} - 1", + 18 => $propType[ 'loop' ] === 0 ? $propValue[ 'loop' ] - 1 : "{$propValue['loop']} - 1", 19 => ')'); - if ($propType[ 'step' ] == 0) { + if ($propType[ 'step' ] === 0) { $start_code[ 3 ] = $start_code[ 5 ] = $start_code[ 15 ] = $start_code[ 17 ] = ''; if ($propValue[ 'step' ] > 0) { $start_code[ 6 ] = $start_code[ 18 ] = ''; @@ -258,8 +253,8 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo $start_code[ 4 ] = $start_code[ 16 ] = ''; } } - if ($propType[ 'start' ] == 0) { - if ($propType[ 'loop' ] == 0) { + if ($propType[ 'start' ] === 0) { + if ($propType[ 'loop' ] === 0) { $start_code[ 8 ] = $propValue[ 'start' ] + $propValue[ 'loop' ]; } $propType[ 'start' ] = $propType[ 'step' ] + $propType[ 'loop' ]; @@ -268,7 +263,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo for ($i = 11; $i <= 19; $i ++) { $start_code[ $i ] = ''; } - if ($propType[ 'start' ] == 0) { + if ($propType[ 'start' ] === 0) { $start_code = array(max($propValue[ 'step' ] > 0 ? 0 : - 1, $propValue[ 'start' ] + $propValue[ 'loop' ])); } @@ -276,7 +271,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo for ($i = 1; $i <= 11; $i ++) { $start_code[ $i ] = ''; } - if ($propType[ 'start' ] == 0) { + if ($propType[ 'start' ] === 0) { $start_code = array(min($propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] : $propValue[ 'loop' ] - 1, $propValue[ 'start' ])); @@ -285,7 +280,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo } $propValue[ 'start' ] = join('', $start_code); } - if ($propType[ 'start' ] != 0) { + if ($propType[ 'start' ] !== 0) { $initLocal[ 'start' ] = $propValue[ 'start' ]; $propValue[ 'start' ] = "{$local}start"; } @@ -298,7 +293,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo } else { $propType[ 'total' ] = $propType[ 'start' ] + $propType[ 'loop' ] + $propType[ 'step' ] + $propType[ 'max' ]; - if ($propType[ 'total' ] == 0) { + if ($propType[ 'total' ] === 0) { $propValue[ 'total' ] = min(ceil(($propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] - $propValue[ 'start' ] : (int) $propValue[ 'start' ] + 1) / abs($propValue[ 'step' ])), $propValue[ 'max' ]); @@ -310,17 +305,17 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo if (!isset($propValue[ 'max' ])) { $total_code[ 1 ] = $total_code[ 17 ] = ''; } - if ($propType[ 'loop' ] + $propType[ 'start' ] == 0) { + if ($propType[ 'loop' ] + $propType[ 'start' ] === 0) { $total_code[ 5 ] = $propValue[ 'loop' ] - $propValue[ 'start' ]; $total_code[ 6 ] = $total_code[ 7 ] = ''; } - if ($propType[ 'start' ] == 0) { + if ($propType[ 'start' ] === 0) { $total_code[ 9 ] = (int) $propValue[ 'start' ] + 1; $total_code[ 10 ] = ''; } - if ($propType[ 'step' ] == 0) { + if ($propType[ 'step' ] === 0) { $total_code[ 13 ] = $total_code[ 15 ] = ''; - if ($propValue[ 'step' ] == 1 || $propValue[ 'step' ] == - 1) { + if ($propValue[ 'step' ] === 1 || $propValue[ 'step' ] === - 1) { $total_code[ 2 ] = $total_code[ 12 ] = $total_code[ 14 ] = $total_code[ 16 ] = ''; } elseif ($propValue[ 'step' ] < 0) { $total_code[ 14 ] = - $propValue[ 'step' ]; @@ -337,7 +332,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo } if (isset($namedAttr[ 'loop' ])) { - $initNamedProperty[ 'loop' ] = "'loop' => {$propValue['total']}"; + $initNamedProperty[ 'loop' ] = "'loop' => {$propValue['loop']}"; } if (isset($namedAttr[ 'total' ])) { $initNamedProperty[ 'total' ] = "'total' => {$propValue['total']}"; @@ -357,9 +352,9 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo $_vars = 'array(' . join(', ', $initNamedProperty) . ')'; $output .= "{$sectionVar} = new Smarty_Variable({$_vars});\n"; - $cond_code = "{$propValue['total']} != 0"; - if ($propType[ 'total' ] == 0) { - if ($propValue[ 'total' ] == 0) { + $cond_code = "{$propValue['total']} !== 0"; + if ($propType[ 'total' ] === 0) { + if ($propValue[ 'total' ] === 0) { $cond_code = 'false'; } else { $cond_code = 'true'; @@ -368,7 +363,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo if ($propType[ 'show' ] > 0) { $output .= "{$local}show = {$propValue['show']} ? {$cond_code} : false;\n"; $output .= "if ({$local}show) {\n"; - } elseif ($propValue[ 'show' ] == 'true') { + } elseif ($propValue[ 'show' ] === 'true') { $output .= "if ({$cond_code}) {\n"; } else { $output .= "if (false) {\n"; @@ -387,12 +382,12 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo $output .= "{$sectionVar}->value['index_next'] = {$propValue['index']} + {$propValue['step']};\n"; } if (isset($namedAttr[ 'first' ])) { - $output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} == 1);\n"; + $output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} === 1);\n"; } if (isset($namedAttr[ 'last' ])) { - $output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} == {$propValue['total']});\n"; + $output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} === {$propValue['total']});\n"; } - $output .= "?>"; + $output .= '?>'; return $output; } @@ -454,15 +449,12 @@ class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase $this->closeTag($compiler, array('section', 'sectionelse')); $output = ""; + $output .= '?>'; return $output; } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php index c95576596..a32173cd6 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php @@ -17,30 +17,32 @@ class Smarty_Internal_Compile_Shared_Inheritance extends Smarty_Internal_CompileBase { /** - * Register post compile callback to compile inheritance initialization code + * Compile inheritance initialization code as prefix * * @param \Smarty_Internal_TemplateCompilerBase $compiler * @param bool|false $initChildSequence if true force child template */ - public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false) + static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false) { - if ($initChildSequence || !isset($compiler->_cache[ 'inheritanceInit' ])) { - $compiler->registerPostCompileCallback(array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'), - array($initChildSequence), 'inheritanceInit', $initChildSequence); - - $compiler->_cache[ 'inheritanceInit' ] = true; - } + $compiler->prefixCompiledCode .= "_loadInheritance();\n\$_smarty_tpl->inheritance->init(\$_smarty_tpl, " . + var_export($initChildSequence, true) . ");\n?>\n"; } /** - * Compile inheritance initialization code as prefix + * Register post compile callback to compile inheritance initialization code * * @param \Smarty_Internal_TemplateCompilerBase $compiler * @param bool|false $initChildSequence if true force child template */ - static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false) + public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false) { - $compiler->prefixCompiledCode .= "_loadInheritance();\n\$_smarty_tpl->inheritance->init(\$_smarty_tpl, " . - var_export($initChildSequence, true) . ");\n?>\n"; + if ($initChildSequence || !isset($compiler->_cache['inheritanceInit'])) { + $compiler->registerPostCompileCallback(array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'), + array($initChildSequence), + 'inheritanceInit', + $initChildSequence); + + $compiler->_cache['inheritanceInit'] = true; + } } } \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_while.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_while.php index 6025798c5..328d6551d 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_while.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_while.php @@ -33,8 +33,8 @@ class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase $_attr = $this->getAttributes($compiler, $args); $this->openTag($compiler, 'while', $compiler->nocache); - if (!array_key_exists("if condition", $parameter)) { - $compiler->trigger_template_error("missing while condition", null, true); + if (!array_key_exists('if condition', $parameter)) { + $compiler->trigger_template_error('missing while condition', null, true); } // maybe nocache because of nocache variables @@ -52,15 +52,15 @@ class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase $prefixVar = $compiler->getNewPrefixVariable(); $assignCompiler = new Smarty_Internal_Compile_Assign(); $assignAttr = array(); - $assignAttr[][ 'value' ] = "{$prefixVar}"; + $assignAttr[][ 'value' ] = $prefixVar; if (is_array($parameter[ 'if condition' ][ 'var' ])) { $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ]; - $_output = ""; + $_output = ""; $_output .= $assignCompiler->compile($assignAttr, $compiler, array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])); } else { $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ]; - $_output = ""; + $_output = ""; $_output .= $assignCompiler->compile($assignAttr, $compiler, array()); } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compilebase.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compilebase.php index 08aab6f4e..656672b98 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compilebase.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compilebase.php @@ -45,15 +45,15 @@ abstract class Smarty_Internal_CompileBase public $option_flags = array('nocache'); /** - * Mapping array for boolqn option value - * + * Mapping array for boolean option value + * * @var array */ public $optionMap = array(1 => true, 0 => false, 'true' => true, 'false' => false); /** * Mapping array with attributes as key - * + * * @var array */ public $mapCache = array(); @@ -117,11 +117,11 @@ abstract class Smarty_Internal_CompileBase // check if all required attributes present foreach ($this->required_attributes as $attr) { if (!isset($_indexed_attr[ $attr ])) { - $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", null, true); + $compiler->trigger_template_error("missing '{$attr}' attribute", null, true); } } // check for not allowed attributes - if ($this->optional_attributes != array('_any')) { + if ($this->optional_attributes !== array('_any')) { if (!isset($this->mapCache[ 'all' ])) { $this->mapCache[ 'all' ] = array_fill_keys(array_merge($this->required_attributes, $this->optional_attributes, @@ -129,7 +129,7 @@ abstract class Smarty_Internal_CompileBase } foreach ($_indexed_attr as $key => $dummy) { if (!isset($this->mapCache[ 'all' ][ $key ]) && $key !== 0) { - $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", null, true); + $compiler->trigger_template_error("unexpected '{$key}' attribute", null, true); } } } @@ -183,13 +183,12 @@ abstract class Smarty_Internal_CompileBase } } // wrong nesting of tags - $compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag . - "{$compiler->smarty->right_delimiter} tag"); + $compiler->trigger_template_error("unclosed '{$compiler->smarty->left_delimiter}{$_openTag}{$compiler->smarty->right_delimiter}' tag"); return; } // wrong nesting of tags - $compiler->trigger_template_error("unexpected closing tag", null, true); + $compiler->trigger_template_error('unexpected closing tag', null, true); return; } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php index b1ef958cd..ada38869d 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php @@ -97,33 +97,38 @@ class Smarty_Internal_Config_File_Compiler * @param Smarty_Internal_Template $template * * @return bool true if compiling succeeded, false if it failed + * @throws \SmartyException */ public function compileTemplate(Smarty_Internal_Template $template) { $this->template = $template; $this->template->compiled->file_dependency[ $this->template->source->uid ] = - array($this->template->source->filepath, $this->template->source->getTimeStamp(), + array($this->template->source->filepath, + $this->template->source->getTimeStamp(), $this->template->source->type); if ($this->smarty->debugging) { - if (!isset( $this->smarty->_debug)) { - $this->smarty->_debug = new Smarty_Internal_Debug(); + if (!isset($this->smarty->_debug)) { + $this->smarty->_debug = new Smarty_Internal_Debug(); } $this->smarty->_debug->start_compile($this->template); } // init the lexer/parser to compile the config file - /* @var Smarty_Internal_ConfigFileLexer $this->lex */ - $this->lex = new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $template->source->getContent()) . "\n", - $this); - /* @var Smarty_Internal_ConfigFileParser $this->parser */ + /* @var Smarty_Internal_ConfigFileLexer $this ->lex */ + $this->lex = new $this->lexer_class(str_replace(array("\r\n", + "\r"), "\n", $template->source->getContent()) . "\n", + $this); + /* @var Smarty_Internal_ConfigFileParser $this ->parser */ $this->parser = new $this->parser_class($this->lex, $this); - if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) { + if (function_exists('mb_internal_encoding') + && function_exists('ini_get') + && ((int) ini_get('mbstring.func_overload')) & 2 + ) { $mbEncoding = mb_internal_encoding(); mb_internal_encoding('ASCII'); } else { $mbEncoding = null; } - if ($this->smarty->_parserdebug) { $this->parser->PrintTrace(); } @@ -147,7 +152,7 @@ class Smarty_Internal_Config_File_Compiler $template_header = "template->source->filepath . "\" */ ?>\n"; + $template_header .= " compiled from '{$this->template->source->filepath}' */ ?>\n"; $code = 'smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' . var_export($this->config_data, true) . '); ?>'; diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfilelexer.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfilelexer.php index 7869ef384..454c9f828 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfilelexer.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfilelexer.php @@ -21,90 +21,72 @@ */ class Smarty_Internal_Configfilelexer { + const START = 1; + const VALUE = 2; + const NAKED_STRING_VALUE = 3; + const COMMENT = 4; + const SECTION = 5; + const TRIPPLE = 6; /** * Source * * @var string */ public $data; - /** * Source length * * @var int */ public $dataLength = null; - /** * byte counter * * @var int */ public $counter; - /** * token number * * @var int */ public $token; - /** * token value * * @var string */ public $value; - /** * current line * * @var int */ public $line; - /** * state number * * @var int */ public $state = 1; - /** * Smarty object * * @var Smarty */ public $smarty = null; - - /** - * compiler object - * - * @var Smarty_Internal_Config_File_Compiler - */ - private $compiler = null; - - /** - * copy of config_booleanize - * - * @var bool - */ - private $configBooleanize = false; - /** * trace file * * @var resource */ public $yyTraceFILE; - /** * trace prompt * * @var string */ public $yyTracePrompt; - /** * state names * @@ -112,31 +94,38 @@ class Smarty_Internal_Configfilelexer */ public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE'); - + /** + * token names + * + * @var array + */ + public $smarty_token_names = array( // Text for parser error messages + ); + /** + * compiler object + * + * @var Smarty_Internal_Config_File_Compiler + */ + private $compiler = null; + /** + * copy of config_booleanize + * + * @var bool + */ + private $configBooleanize = false; /** * storage for assembled token patterns * * @var string */ private $yy_global_pattern1 = null; - private $yy_global_pattern2 = null; - private $yy_global_pattern3 = null; - private $yy_global_pattern4 = null; - private $yy_global_pattern5 = null; - private $yy_global_pattern6 = null; - - /** - * token names - * - * @var array - */ - public $smarty_token_names = array( // Text for parser error messages - ); + private $_yy_state = 1; + private $_yy_stack = array(); /** * constructor @@ -158,16 +147,17 @@ class Smarty_Internal_Configfilelexer $this->configBooleanize = $this->smarty->config_booleanize; } + public function replace($input) + { + return $input; + } // end function + public function PrintTrace() { $this->yyTraceFILE = fopen('php://output', 'w'); $this->yyTracePrompt = '
    '; } - private $_yy_state = 1; - - private $_yy_stack = array(); - public function yylex() { return $this->{'yylex' . $this->_yy_state}(); @@ -176,14 +166,18 @@ class Smarty_Internal_Configfilelexer public function yypushstate($state) { if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, + fprintf($this->yyTraceFILE, + "%sState push %s\n", + $this->yyTracePrompt, isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state); } array_push($this->_yy_stack, $this->_yy_state); $this->_yy_state = $state; if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, + fprintf($this->yyTraceFILE, + "%snew State %s\n", + $this->yyTracePrompt, isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state); } @@ -192,13 +186,17 @@ class Smarty_Internal_Configfilelexer public function yypopstate() { if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, + fprintf($this->yyTraceFILE, + "%sState pop %s\n", + $this->yyTracePrompt, isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state); } $this->_yy_state = array_pop($this->_yy_stack); if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, + fprintf($this->yyTraceFILE, + "%snew State %s\n", + $this->yyTracePrompt, isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state); } @@ -208,7 +206,9 @@ class Smarty_Internal_Configfilelexer { $this->_yy_state = $state; if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, + fprintf($this->yyTraceFILE, + "%sState set %s\n", + $this->yyTracePrompt, isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state); } @@ -218,7 +218,7 @@ class Smarty_Internal_Configfilelexer { if (!isset($this->yy_global_pattern1)) { $this->yy_global_pattern1 = - "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS"; + $this->replace("/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -226,17 +226,18 @@ class Smarty_Internal_Configfilelexer if ($this->counter >= $this->dataLength) { return false; // end of input } - do { - if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) { + if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, 0, $this->counter)) { if (!isset($yymatches[ 0 ][ 1 ])) { $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . ' an empty string. Input "' . - substr($this->data, $this->counter, 5) . '... state START'); + throw new Exception('Error: lexing failed because a rule matched' . + ' an empty string. Input "' . substr($this->data, + $this->counter, + 5) . '... state START'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -247,11 +248,11 @@ class Smarty_Internal_Configfilelexer $this->line += substr_count($this->value, "\n"); // accept this token return true; - } elseif ($r === true) { + } else if ($r === true) { // we have changed state // process this token in the new state return $this->yylex(); - } elseif ($r === false) { + } else if ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); if ($this->counter >= $this->dataLength) { @@ -261,63 +262,53 @@ class Smarty_Internal_Configfilelexer continue; } } else { - throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]); + throw new Exception('Unexpected input at line' . $this->line . + ': ' . $this->data[ $this->counter ]); } break; - } - while (true); - } // end function - - const START = 1; + } while (true); + } function yy_r1_1() { - $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART; $this->yypushstate(self::COMMENT); } function yy_r1_2() { - $this->token = Smarty_Internal_Configfileparser::TPC_OPENB; $this->yypushstate(self::SECTION); } function yy_r1_3() { - $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB; } function yy_r1_4() { - $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL; $this->yypushstate(self::VALUE); - } + } // end function function yy_r1_5() { - return false; } function yy_r1_6() { - $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; } function yy_r1_7() { - $this->token = Smarty_Internal_Configfileparser::TPC_ID; } function yy_r1_8() { - $this->token = Smarty_Internal_Configfileparser::TPC_OTHER; } @@ -325,7 +316,7 @@ class Smarty_Internal_Configfilelexer { if (!isset($this->yy_global_pattern2)) { $this->yy_global_pattern2 = - "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS"; + $this->replace("/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -333,17 +324,18 @@ class Smarty_Internal_Configfilelexer if ($this->counter >= $this->dataLength) { return false; // end of input } - do { - if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) { + if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, 0, $this->counter)) { if (!isset($yymatches[ 0 ][ 1 ])) { $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . ' an empty string. Input "' . - substr($this->data, $this->counter, 5) . '... state VALUE'); + throw new Exception('Error: lexing failed because a rule matched' . + ' an empty string. Input "' . substr($this->data, + $this->counter, + 5) . '... state VALUE'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -354,11 +346,11 @@ class Smarty_Internal_Configfilelexer $this->line += substr_count($this->value, "\n"); // accept this token return true; - } elseif ($r === true) { + } else if ($r === true) { // we have changed state // process this token in the new state return $this->yylex(); - } elseif ($r === false) { + } else if ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); if ($this->counter >= $this->dataLength) { @@ -368,62 +360,52 @@ class Smarty_Internal_Configfilelexer continue; } } else { - throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]); + throw new Exception('Unexpected input at line' . $this->line . + ': ' . $this->data[ $this->counter ]); } break; - } - while (true); - } // end function - - const VALUE = 2; + } while (true); + } function yy_r2_1() { - return false; } function yy_r2_2() { - $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT; $this->yypopstate(); } function yy_r2_3() { - $this->token = Smarty_Internal_Configfileparser::TPC_INT; $this->yypopstate(); } function yy_r2_4() { - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES; $this->yypushstate(self::TRIPPLE); } function yy_r2_5() { - $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING; $this->yypopstate(); } function yy_r2_6() { - $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING; $this->yypopstate(); - } + } // end function function yy_r2_7() { - if (!$this->configBooleanize || - !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) - ) { + !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no'))) { $this->yypopstate(); $this->yypushstate(self::NAKED_STRING_VALUE); return true; //reprocess in new state @@ -435,23 +417,21 @@ class Smarty_Internal_Configfilelexer function yy_r2_8() { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; $this->yypopstate(); } function yy_r2_9() { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; - $this->value = ""; + $this->value = ''; $this->yypopstate(); - } + } // end function public function yylex3() { if (!isset($this->yy_global_pattern3)) { - $this->yy_global_pattern3 = "/\G([^\n]+?(?=[ \t\r]*\n))/isS"; + $this->yy_global_pattern3 = $this->replace("/\G([^\n]+?(?=[ \t\r]*\n))/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -459,17 +439,18 @@ class Smarty_Internal_Configfilelexer if ($this->counter >= $this->dataLength) { return false; // end of input } - do { - if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) { + if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, 0, $this->counter)) { if (!isset($yymatches[ 0 ][ 1 ])) { $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . ' an empty string. Input "' . - substr($this->data, $this->counter, 5) . '... state NAKED_STRING_VALUE'); + throw new Exception('Error: lexing failed because a rule matched' . + ' an empty string. Input "' . substr($this->data, + $this->counter, + 5) . '... state NAKED_STRING_VALUE'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -480,11 +461,11 @@ class Smarty_Internal_Configfilelexer $this->line += substr_count($this->value, "\n"); // accept this token return true; - } elseif ($r === true) { + } else if ($r === true) { // we have changed state // process this token in the new state return $this->yylex(); - } elseif ($r === false) { + } else if ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); if ($this->counter >= $this->dataLength) { @@ -494,18 +475,15 @@ class Smarty_Internal_Configfilelexer continue; } } else { - throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]); + throw new Exception('Unexpected input at line' . $this->line . + ': ' . $this->data[ $this->counter ]); } break; - } - while (true); - } // end function - - const NAKED_STRING_VALUE = 3; + } while (true); + } function yy_r3_1() { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; $this->yypopstate(); } @@ -513,7 +491,7 @@ class Smarty_Internal_Configfilelexer public function yylex4() { if (!isset($this->yy_global_pattern4)) { - $this->yy_global_pattern4 = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS"; + $this->yy_global_pattern4 = $this->replace("/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -521,17 +499,18 @@ class Smarty_Internal_Configfilelexer if ($this->counter >= $this->dataLength) { return false; // end of input } - do { - if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) { + if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, 0, $this->counter)) { if (!isset($yymatches[ 0 ][ 1 ])) { $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . ' an empty string. Input "' . - substr($this->data, $this->counter, 5) . '... state COMMENT'); + throw new Exception('Error: lexing failed because a rule matched' . + ' an empty string. Input "' . substr($this->data, + $this->counter, + 5) . '... state COMMENT'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -542,11 +521,11 @@ class Smarty_Internal_Configfilelexer $this->line += substr_count($this->value, "\n"); // accept this token return true; - } elseif ($r === true) { + } else if ($r === true) { // we have changed state // process this token in the new state return $this->yylex(); - } elseif ($r === false) { + } else if ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); if ($this->counter >= $this->dataLength) { @@ -556,30 +535,25 @@ class Smarty_Internal_Configfilelexer continue; } } else { - throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]); + throw new Exception('Unexpected input at line' . $this->line . + ': ' . $this->data[ $this->counter ]); } break; - } - while (true); - } // end function - - const COMMENT = 4; + } while (true); + } function yy_r4_1() { - return false; } function yy_r4_2() { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; - } + } // end function function yy_r4_3() { - $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; $this->yypopstate(); } @@ -587,7 +561,7 @@ class Smarty_Internal_Configfilelexer public function yylex5() { if (!isset($this->yy_global_pattern5)) { - $this->yy_global_pattern5 = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS"; + $this->yy_global_pattern5 = $this->replace("/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -595,17 +569,18 @@ class Smarty_Internal_Configfilelexer if ($this->counter >= $this->dataLength) { return false; // end of input } - do { - if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) { + if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, 0, $this->counter)) { if (!isset($yymatches[ 0 ][ 1 ])) { $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . ' an empty string. Input "' . - substr($this->data, $this->counter, 5) . '... state SECTION'); + throw new Exception('Error: lexing failed because a rule matched' . + ' an empty string. Input "' . substr($this->data, + $this->counter, + 5) . '... state SECTION'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -616,11 +591,11 @@ class Smarty_Internal_Configfilelexer $this->line += substr_count($this->value, "\n"); // accept this token return true; - } elseif ($r === true) { + } else if ($r === true) { // we have changed state // process this token in the new state return $this->yylex(); - } elseif ($r === false) { + } else if ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); if ($this->counter >= $this->dataLength) { @@ -630,32 +605,28 @@ class Smarty_Internal_Configfilelexer continue; } } else { - throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]); + throw new Exception('Unexpected input at line' . $this->line . + ': ' . $this->data[ $this->counter ]); } break; - } - while (true); - } // end function - - const SECTION = 5; + } while (true); + } function yy_r5_1() { - $this->token = Smarty_Internal_Configfileparser::TPC_DOT; } function yy_r5_2() { - $this->token = Smarty_Internal_Configfileparser::TPC_SECTION; $this->yypopstate(); - } + } // end function public function yylex6() { if (!isset($this->yy_global_pattern6)) { - $this->yy_global_pattern6 = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS"; + $this->yy_global_pattern6 = $this->replace("/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -663,17 +634,18 @@ class Smarty_Internal_Configfilelexer if ($this->counter >= $this->dataLength) { return false; // end of input } - do { - if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, null, $this->counter)) { + if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, 0, $this->counter)) { if (!isset($yymatches[ 0 ][ 1 ])) { $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . ' an empty string. Input "' . - substr($this->data, $this->counter, 5) . '... state TRIPPLE'); + throw new Exception('Error: lexing failed because a rule matched' . + ' an empty string. Input "' . substr($this->data, + $this->counter, + 5) . '... state TRIPPLE'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -684,11 +656,11 @@ class Smarty_Internal_Configfilelexer $this->line += substr_count($this->value, "\n"); // accept this token return true; - } elseif ($r === true) { + } else if ($r === true) { // we have changed state // process this token in the new state return $this->yylex(); - } elseif ($r === false) { + } else if ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); if ($this->counter >= $this->dataLength) { @@ -698,18 +670,15 @@ class Smarty_Internal_Configfilelexer continue; } } else { - throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]); + throw new Exception('Unexpected input at line' . $this->line . + ': ' . $this->data[ $this->counter ]); } break; - } - while (true); - } // end function - - const TRIPPLE = 6; + } while (true); + } function yy_r6_1() { - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END; $this->yypopstate(); $this->yypushstate(self::START); @@ -717,16 +686,14 @@ class Smarty_Internal_Configfilelexer function yy_r6_2() { - $to = strlen($this->data); preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); if (isset($match[ 0 ][ 1 ])) { $to = $match[ 0 ][ 1 ]; } else { - $this->compiler->trigger_template_error("missing or misspelled literal closing tag"); + $this->compiler->trigger_template_error('missing or misspelled literal closing tag'); } $this->value = substr($this->data, $this->counter, $to - $this->counter); $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT; } - } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php index b7551a2b5..1c76f7bc8 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php @@ -1,70 +1,5 @@ string = $s->string; - $this->metadata = $s->metadata; - } else { - $this->string = (string) $s; - if ($m instanceof TPC_yyToken) { - $this->metadata = $m->metadata; - } elseif (is_array($m)) { - $this->metadata = $m; - } - } - } - - public function __toString() - { - return $this->string; - } - - public function offsetExists($offset) - { - return isset($this->metadata[ $offset ]); - } - - public function offsetGet($offset) - { - return $this->metadata[ $offset ]; - } - - public function offsetSet($offset, $value) - { - if ($offset === null) { - if (isset($value[ 0 ])) { - $x = ($value instanceof TPC_yyToken) ? $value->metadata : $value; - $this->metadata = array_merge($this->metadata, $x); - - return; - } - $offset = count($this->metadata); - } - if ($value === null) { - return; - } - if ($value instanceof TPC_yyToken) { - if ($value->metadata) { - $this->metadata[ $offset ] = $value->metadata; - } - } elseif ($value) { - $this->metadata[ $offset ] = $value; - } - } - - public function offsetUnset($offset) - { - unset($this->metadata[ $offset ]); - } -} - class TPC_yyStackEntry { public $stateno; /* The state-number */ @@ -74,8 +9,6 @@ class TPC_yyStackEntry ** is the value of the token */ } -; - #line 12 "../smarty/lexer/smarty_internal_configfileparser.y" /** @@ -91,74 +24,250 @@ class TPC_yyStackEntry class Smarty_Internal_Configfileparser { #line 25 "../smarty/lexer/smarty_internal_configfileparser.y" - + const TPC_OPENB = 1; + const TPC_SECTION = 2; + const TPC_CLOSEB = 3; + const TPC_DOT = 4; + const TPC_ID = 5; + const TPC_EQUAL = 6; + const TPC_FLOAT = 7; + const TPC_INT = 8; + const TPC_BOOL = 9; + const TPC_SINGLE_QUOTED_STRING = 10; + const TPC_DOUBLE_QUOTED_STRING = 11; + const TPC_TRIPPLE_QUOTES = 12; + const TPC_TRIPPLE_TEXT = 13; + const TPC_TRIPPLE_QUOTES_END = 14; + const TPC_NAKED_STRING = 15; + const TPC_OTHER = 16; + const TPC_NEWLINE = 17; + const TPC_COMMENTSTART = 18; + const YY_NO_ACTION = 60; + const YY_ACCEPT_ACTION = 59; + const YY_ERROR_ACTION = 58; + const YY_SZ_ACTTAB = 38; + const YY_SHIFT_USE_DFLT = -8; + const YY_SHIFT_MAX = 19; + const YY_REDUCE_USE_DFLT = -21; + const YY_REDUCE_MAX = 10; + const YYNOCODE = 29; + const YYSTACKDEPTH = 100; + const YYNSTATE = 36; + const YYNRULE = 22; + const YYERRORSYMBOL = 19; + const YYERRSYMDT = 'yy0'; + const YYFALLBACK = 0; + static public $yy_action = array( + 29, 30, 34, 33, 24, 13, 19, 25, 35, 21, + 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, + 15, 17, 23, 18, 27, 26, 4, 5, 6, 32, + 2, 11, 28, 22, 16, 9, 7, 10, + ); + static public $yy_lookahead = array( + 7, 8, 9, 10, 11, 12, 5, 27, 15, 16, + 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, + 15, 2, 17, 4, 25, 26, 6, 3, 3, 14, + 23, 1, 24, 17, 2, 25, 22, 25, + ); + static public $yy_shift_ofst = array( + -8, 1, 1, 1, -7, -3, -3, 30, -8, -8, + -8, 19, 5, 3, 15, 16, 24, 25, 32, 20, + ); + static public $yy_reduce_ofst = array( + -10, -1, -1, -1, -20, 10, 12, 8, 14, 7, + -11, + ); + static public $yyExpectedTokens = array( + array(), + array(5, 17, 18,), + array(5, 17, 18,), + array(5, 17, 18,), + array(7, 8, 9, 10, 11, 12, 15, 16,), + array(17, 18,), + array(17, 18,), + array(1,), + array(), + array(), + array(), + array(2, 4,), + array(15, 17,), + array(13, 14,), + array(14,), + array(17,), + array(3,), + array(3,), + array(2,), + array(6,), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + ); + static public $yy_default = array( + 44, 37, 41, 40, 58, 58, 58, 36, 39, 44, + 44, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 55, 54, 57, 56, 50, 45, 43, 42, 38, 46, + 47, 52, 51, 49, 48, 53, + ); + public static $yyFallback = array(); + public static $yyRuleName = array( + 'start ::= global_vars sections', + 'global_vars ::= var_list', + 'sections ::= sections section', + 'sections ::=', + 'section ::= OPENB SECTION CLOSEB newline var_list', + 'section ::= OPENB DOT SECTION CLOSEB newline var_list', + 'var_list ::= var_list newline', + 'var_list ::= var_list var', + 'var_list ::=', + 'var ::= ID EQUAL value', + 'value ::= FLOAT', + 'value ::= INT', + 'value ::= BOOL', + 'value ::= SINGLE_QUOTED_STRING', + 'value ::= DOUBLE_QUOTED_STRING', + 'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END', + 'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END', + 'value ::= NAKED_STRING', + 'value ::= OTHER', + 'newline ::= NEWLINE', + 'newline ::= COMMENTSTART NEWLINE', + 'newline ::= COMMENTSTART NAKED_STRING NEWLINE', + ); + public static $yyRuleInfo = array( + array(0 => 20, 1 => 2), + array(0 => 21, 1 => 1), + array(0 => 22, 1 => 2), + array(0 => 22, 1 => 0), + array(0 => 24, 1 => 5), + array(0 => 24, 1 => 6), + array(0 => 23, 1 => 2), + array(0 => 23, 1 => 2), + array(0 => 23, 1 => 0), + array(0 => 26, 1 => 3), + array(0 => 27, 1 => 1), + array(0 => 27, 1 => 1), + array(0 => 27, 1 => 1), + array(0 => 27, 1 => 1), + array(0 => 27, 1 => 1), + array(0 => 27, 1 => 3), + array(0 => 27, 1 => 2), + array(0 => 27, 1 => 1), + array(0 => 27, 1 => 1), + array(0 => 25, 1 => 1), + array(0 => 25, 1 => 2), + array(0 => 25, 1 => 3), + ); + public static $yyReduceMap = array( + 0 => 0, + 2 => 0, + 3 => 0, + 19 => 0, + 20 => 0, + 21 => 0, + 1 => 1, + 4 => 4, + 5 => 5, + 6 => 6, + 7 => 7, + 8 => 8, + 9 => 9, + 10 => 10, + 11 => 11, + 12 => 12, + 13 => 13, + 14 => 14, + 15 => 15, + 16 => 16, + 17 => 17, + 18 => 17, + ); + /** + * helper map + * + * @var array + */ + private static $escapes_single = array('\\' => '\\', + '\'' => '\''); /** * result status * * @var bool */ public $successful = true; - /** * return value * * @var mixed */ public $retvalue = 0; - /** * @var */ public $yymajor; - /** - * lexer object + * compiler object * - * @var Smarty_Internal_Configfilelexer + * @var Smarty_Internal_Config_File_Compiler */ - private $lex; - + public $compiler = null; /** - * internal error flag + * smarty object * - * @var bool + * @var Smarty */ - private $internalError = false; - + public $smarty = null; + public $yyTraceFILE; + public $yyTracePrompt; + public $yyidx; + public $yyerrcnt; + public $yystack = array(); + public $yyTokenName = array( + '$', 'OPENB', 'SECTION', 'CLOSEB', + 'DOT', 'ID', 'EQUAL', 'FLOAT', + 'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', + 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING', + 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error', + 'start', 'global_vars', 'sections', 'var_list', + 'section', 'newline', 'var', 'value', + ); /** - * compiler object + * lexer object * - * @var Smarty_Internal_Config_File_Compiler + * @var Smarty_Internal_Configfilelexer */ - public $compiler = null; - + private $lex; /** - * smarty object + * internal error flag * - * @var Smarty + * @var bool */ - public $smarty = null; - + private $internalError = false; /** * copy of config_overwrite property * * @var bool */ private $configOverwrite = false; - /** * copy of config_read_hidden property * * @var bool */ private $configReadHidden = false; - - /** - * helper map - * - * @var array - */ - private static $escapes_single = Array('\\' => '\\', '\'' => '\''); + private $_retvalue; /** * constructor @@ -175,22 +284,12 @@ class Smarty_Internal_Configfileparser $this->configReadHidden = $this->smarty->config_read_hidden; } - /** - * parse optional boolean keywords - * - * @param string $str - * - * @return bool - */ - private function parse_bool($str) + public static function yy_destructor($yymajor, $yypminor) { - $str = strtolower($str); - if (in_array($str, array('on', 'yes', 'true'))) { - $res = true; - } else { - $res = false; + switch ($yymajor) { + default: + break; /* If no destructor action specified: do nothing */ } - return $res; } /** @@ -205,10 +304,8 @@ class Smarty_Internal_Configfileparser private static function parse_single_quoted_string($qstr) { $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes - - $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE); - - $str = ""; + $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE); + $str = ''; foreach ($ss as $s) { if (strlen($s) === 2 && $s[ 0 ] === '\\') { if (isset(self::$escapes_single[ $s[ 1 ] ])) { @@ -218,8 +315,7 @@ class Smarty_Internal_Configfileparser $str .= $s; } return $str; - } - + } /* Index of top element in stack */ /** * parse double quoted string * @@ -231,8 +327,7 @@ class Smarty_Internal_Configfileparser { $inner_str = substr($qstr, 1, strlen($qstr) - 2); return stripcslashes($inner_str); - } - + } /* Shifts left before out of the error */ /** * parse triple quoted string * @@ -243,153 +338,12 @@ class Smarty_Internal_Configfileparser private static function parse_tripple_double_quoted_string($qstr) { return stripcslashes($qstr); - } - - /** - * set a config variable in target array - * - * @param array $var - * @param array $target_array - */ - private function set_var(Array $var, Array &$target_array) - { - $key = $var[ "key" ]; - $value = $var[ "value" ]; - - if ($this->configOverwrite || !isset($target_array[ 'vars' ][ $key ])) { - $target_array[ 'vars' ][ $key ] = $value; - } else { - settype($target_array[ 'vars' ][ $key ], 'array'); - $target_array[ 'vars' ][ $key ][] = $value; - } - } - - /** - * add config variable to global vars - * - * @param array $vars - */ - private function add_global_vars(Array $vars) - { - if (!isset($this->compiler->config_data[ 'vars' ])) { - $this->compiler->config_data[ 'vars' ] = Array(); - } - foreach ($vars as $var) { - $this->set_var($var, $this->compiler->config_data); - } - } - - /** - * add config variable to section - * - * @param string $section_name - * @param array $vars - */ - private function add_section_vars($section_name, Array $vars) - { - if (!isset($this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ])) { - $this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ] = Array(); - } - foreach ($vars as $var) { - $this->set_var($var, $this->compiler->config_data[ 'sections' ][ $section_name ]); - } - } - - const TPC_OPENB = 1; - - const TPC_SECTION = 2; - - const TPC_CLOSEB = 3; - - const TPC_DOT = 4; - - const TPC_ID = 5; - - const TPC_EQUAL = 6; - - const TPC_FLOAT = 7; - - const TPC_INT = 8; - - const TPC_BOOL = 9; - - const TPC_SINGLE_QUOTED_STRING = 10; - - const TPC_DOUBLE_QUOTED_STRING = 11; - - const TPC_TRIPPLE_QUOTES = 12; - - const TPC_TRIPPLE_TEXT = 13; - - const TPC_TRIPPLE_QUOTES_END = 14; - - const TPC_NAKED_STRING = 15; - - const TPC_OTHER = 16; - - const TPC_NEWLINE = 17; - - const TPC_COMMENTSTART = 18; - - const YY_NO_ACTION = 60; - - const YY_ACCEPT_ACTION = 59; - - const YY_ERROR_ACTION = 58; - - const YY_SZ_ACTTAB = 38; - - static public $yy_action = array(29, 30, 34, 33, 24, 13, 19, 25, 35, 21, 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, 15, - 17, 23, 18, 27, 26, 4, 5, 6, 32, 2, 11, 28, 22, 16, 9, 7, 10,); - - static public $yy_lookahead = array(7, 8, 9, 10, 11, 12, 5, 27, 15, 16, 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, 15, - 2, 17, 4, 25, 26, 6, 3, 3, 14, 23, 1, 24, 17, 2, 25, 22, 25,); - - const YY_SHIFT_USE_DFLT = - 8; - - const YY_SHIFT_MAX = 19; - - static public $yy_shift_ofst = array(- 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8, - 8, 19, 5, 3, 15, 16, 24, 25, 32, - 20,); - - const YY_REDUCE_USE_DFLT = - 21; - - const YY_REDUCE_MAX = 10; - - static public $yy_reduce_ofst = array(- 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7, - 11,); - - static public $yyExpectedTokens = array(array(), array(5, 17, 18,), array(5, 17, 18,), array(5, 17, 18,), - array(7, 8, 9, 10, 11, 12, 15, 16,), array(17, 18,), array(17, 18,), - array(1,), array(), array(), array(), array(2, 4,), array(15, 17,), - array(13, 14,), array(14,), array(17,), array(3,), array(3,), array(2,), - array(6,), array(), array(), array(), array(), array(), array(), array(), - array(), array(), array(), array(), array(), array(), array(), array(), - array(),); - - static public $yy_default = array(44, 37, 41, 40, 58, 58, 58, 36, 39, 44, 44, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 55, 54, 57, 56, 50, 45, 43, 42, 38, 46, 47, 52, 51, 49, 48, 53,); - - const YYNOCODE = 29; - - const YYSTACKDEPTH = 100; - - const YYNSTATE = 36; - - const YYNRULE = 22; - - const YYERRORSYMBOL = 19; - - const YYERRSYMDT = 'yy0'; - - const YYFALLBACK = 0; - - public static $yyFallback = array(); - + } /* The parser's stack */ public function Trace($TraceFILE, $zTracePrompt) { if (!$TraceFILE) { $zTracePrompt = 0; - } elseif (!$zTracePrompt) { + } else if (!$zTracePrompt) { $TraceFILE = 0; } $this->yyTraceFILE = $TraceFILE; @@ -402,31 +356,6 @@ class Smarty_Internal_Configfileparser $this->yyTracePrompt = '
    '; } - public $yyTraceFILE; - - public $yyTracePrompt; - - public $yyidx; /* Index of top element in stack */ - public $yyerrcnt; /* Shifts left before out of the error */ - public $yystack = array(); /* The parser's stack */ - - public $yyTokenName = array('$', 'OPENB', 'SECTION', 'CLOSEB', 'DOT', 'ID', 'EQUAL', 'FLOAT', 'INT', 'BOOL', - 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', - 'TRIPPLE_QUOTES_END', 'NAKED_STRING', 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error', - 'start', 'global_vars', 'sections', 'var_list', 'section', 'newline', 'var', 'value',); - - public static $yyRuleName = array('start ::= global_vars sections', 'global_vars ::= var_list', - 'sections ::= sections section', 'sections ::=', - 'section ::= OPENB SECTION CLOSEB newline var_list', - 'section ::= OPENB DOT SECTION CLOSEB newline var_list', - 'var_list ::= var_list newline', 'var_list ::= var_list var', 'var_list ::=', - 'var ::= ID EQUAL value', 'value ::= FLOAT', 'value ::= INT', 'value ::= BOOL', - 'value ::= SINGLE_QUOTED_STRING', 'value ::= DOUBLE_QUOTED_STRING', - 'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END', - 'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END', 'value ::= NAKED_STRING', - 'value ::= OTHER', 'newline ::= NEWLINE', 'newline ::= COMMENTSTART NEWLINE', - 'newline ::= COMMENTSTART NAKED_STRING NEWLINE',); - public function tokenName($tokenType) { if ($tokenType === 0) { @@ -435,15 +364,7 @@ class Smarty_Internal_Configfileparser if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) { return $this->yyTokenName[ $tokenType ]; } else { - return "Unknown"; - } - } - - public static function yy_destructor($yymajor, $yypminor) - { - switch ($yymajor) { - default: - break; /* If no destructor action specified: do nothing */ + return 'Unknown'; } } @@ -454,12 +375,13 @@ class Smarty_Internal_Configfileparser } $yytos = array_pop($this->yystack); if ($this->yyTraceFILE && $this->yyidx >= 0) { - fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] . "\n"); + fwrite($this->yyTraceFILE, + $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] . + "\n"); } $yymajor = $yytos->major; self::yy_destructor($yymajor, $yytos->minor); - $this->yyidx --; - + $this->yyidx--; return $yymajor; } @@ -496,7 +418,7 @@ class Smarty_Internal_Configfileparser // reduce action $done = 0; do { - if ($done ++ == 100) { + if ($done++ === 100) { $this->yyidx = $yyidx; $this->yystack = $stack; // too much recursion prevents proper detection @@ -505,8 +427,9 @@ class Smarty_Internal_Configfileparser } $yyruleno = $yyact - self::YYNSTATE; $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ]; - $nextstate = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, - self::$yyRuleInfo[ $yyruleno ][ 0 ]); + $nextstate = $this->yy_find_reduce_action( + $this->yystack[ $this->yyidx ]->stateno, + self::$yyRuleInfo[ $yyruleno ][ 0 ]); if (isset(self::$yyExpectedTokens[ $nextstate ])) { $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]); if (isset($res4[ $nextstate ][ $token ])) { @@ -517,8 +440,7 @@ class Smarty_Internal_Configfileparser } } else { if ($res4[ $nextstate ][ $token ] = - in_array($token, self::$yyExpectedTokens[ $nextstate ], true) - ) { + in_array($token, self::$yyExpectedTokens[ $nextstate ], true)) { $this->yyidx = $yyidx; $this->yystack = $stack; return array_unique($expected); @@ -527,20 +449,20 @@ class Smarty_Internal_Configfileparser } if ($nextstate < self::YYNSTATE) { // we need to shift a non-terminal - $this->yyidx ++; + $this->yyidx++; $x = new TPC_yyStackEntry; $x->stateno = $nextstate; $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ]; $this->yystack[ $this->yyidx ] = $x; continue 2; - } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) { + } else if ($nextstate === self::YYNSTATE + self::YYNRULE + 1) { $this->yyidx = $yyidx; $this->yystack = $stack; // the last token was just ignored, we can't accept // by ignoring input, this is in essence ignoring a // syntax error! return array_unique($expected); - } elseif ($nextstate === self::YY_NO_ACTION) { + } else if ($nextstate === self::YY_NO_ACTION) { $this->yyidx = $yyidx; $this->yystack = $stack; // input accepted, but not shifted (I guess) @@ -548,15 +470,12 @@ class Smarty_Internal_Configfileparser } else { $yyact = $nextstate; } - } - while (true); + } while (true); } break; - } - while (true); + } while (true); $this->yyidx = $yyidx; $this->yystack = $stack; - return array_unique($expected); } @@ -585,7 +504,7 @@ class Smarty_Internal_Configfileparser // reduce action $done = 0; do { - if ($done ++ == 100) { + if ($done++ === 100) { $this->yyidx = $yyidx; $this->yystack = $stack; // too much recursion prevents proper detection @@ -594,8 +513,9 @@ class Smarty_Internal_Configfileparser } $yyruleno = $yyact - self::YYNSTATE; $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ]; - $nextstate = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, - self::$yyRuleInfo[ $yyruleno ][ 0 ]); + $nextstate = $this->yy_find_reduce_action( + $this->yystack[ $this->yyidx ]->stateno, + self::$yyRuleInfo[ $yyruleno ][ 0 ]); if (isset($res2[ $nextstate ][ $token ])) { if ($res2[ $nextstate ][ $token ]) { $this->yyidx = $yyidx; @@ -604,9 +524,9 @@ class Smarty_Internal_Configfileparser } } else { if ($res2[ $nextstate ][ $token ] = (isset(self::$yyExpectedTokens[ $nextstate ]) && - in_array($token, self::$yyExpectedTokens[ $nextstate ], - true)) - ) { + in_array($token, + self::$yyExpectedTokens[ $nextstate ], + true))) { $this->yyidx = $yyidx; $this->yystack = $stack; return true; @@ -614,13 +534,13 @@ class Smarty_Internal_Configfileparser } if ($nextstate < self::YYNSTATE) { // we need to shift a non-terminal - $this->yyidx ++; + $this->yyidx++; $x = new TPC_yyStackEntry; $x->stateno = $nextstate; $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ]; $this->yystack[ $this->yyidx ] = $x; continue 2; - } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) { + } else if ($nextstate === self::YYNSTATE + self::YYNRULE + 1) { $this->yyidx = $yyidx; $this->yystack = $stack; if (!$token) { @@ -631,7 +551,7 @@ class Smarty_Internal_Configfileparser // by ignoring input, this is in essence ignoring a // syntax error! return false; - } elseif ($nextstate === self::YY_NO_ACTION) { + } else if ($nextstate === self::YY_NO_ACTION) { $this->yyidx = $yyidx; $this->yystack = $stack; // input accepted, but not shifted (I guess) @@ -639,22 +559,18 @@ class Smarty_Internal_Configfileparser } else { $yyact = $nextstate; } - } - while (true); + } while (true); } break; - } - while (true); + } while (true); $this->yyidx = $yyidx; $this->yystack = $stack; - return true; } public function yy_find_shift_action($iLookAhead) { $stateno = $this->yystack[ $this->yyidx ]->stateno; - /* if ($this->yyidx < 0) return self::YY_NO_ACTION; */ if (!isset(self::$yy_shift_ofst[ $stateno ])) { // no shift actions @@ -664,23 +580,22 @@ class Smarty_Internal_Configfileparser if ($i === self::YY_SHIFT_USE_DFLT) { return self::$yy_default[ $stateno ]; } - if ($iLookAhead == self::YYNOCODE) { + if ($iLookAhead === self::YYNOCODE) { return self::YY_NO_ACTION; } $i += $iLookAhead; - if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[ $i ] != $iLookAhead) { - if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) && - ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0 - ) { + if ($i < 0 || $i >= self::YY_SZ_ACTTAB || + self::$yy_lookahead[ $i ] != $iLookAhead) { + if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) + && ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0) { if ($this->yyTraceFILE) { fwrite($this->yyTraceFILE, - $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[ $iLookAhead ] . " => " . + $this->yyTracePrompt . 'FALLBACK ' . + $this->yyTokenName[ $iLookAhead ] . ' => ' . $this->yyTokenName[ $iFallback ] . "\n"); } - return $this->yy_find_shift_action($iFallback); } - return self::$yy_default[ $stateno ]; } else { return self::$yy_action[ $i ]; @@ -690,19 +605,19 @@ class Smarty_Internal_Configfileparser public function yy_find_reduce_action($stateno, $iLookAhead) { /* $stateno = $this->yystack[$this->yyidx]->stateno; */ - if (!isset(self::$yy_reduce_ofst[ $stateno ])) { return self::$yy_default[ $stateno ]; } $i = self::$yy_reduce_ofst[ $stateno ]; - if ($i == self::YY_REDUCE_USE_DFLT) { + if ($i === self::YY_REDUCE_USE_DFLT) { return self::$yy_default[ $stateno ]; } - if ($iLookAhead == self::YYNOCODE) { + if ($iLookAhead === self::YYNOCODE) { return self::YY_NO_ACTION; } $i += $iLookAhead; - if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[ $i ] != $iLookAhead) { + if ($i < 0 || $i >= self::YY_SZ_ACTTAB || + self::$yy_lookahead[ $i ] != $iLookAhead) { return self::$yy_default[ $stateno ]; } else { return self::$yy_action[ $i ]; @@ -711,9 +626,9 @@ class Smarty_Internal_Configfileparser public function yy_shift($yyNewState, $yyMajor, $yypMinor) { - $this->yyidx ++; + $this->yyidx++; if ($this->yyidx >= self::YYSTACKDEPTH) { - $this->yyidx --; + $this->yyidx--; if ($this->yyTraceFILE) { fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt); } @@ -721,10 +636,8 @@ class Smarty_Internal_Configfileparser $this->yy_pop_parser_stack(); } #line 239 "../smarty/lexer/smarty_internal_configfileparser.y" - $this->internalError = true; - $this->compiler->trigger_config_file_error("Stack overflow in configfile parser"); - + $this->compiler->trigger_config_file_error('Stack overflow in configfile parser'); return; } $yytos = new TPC_yyStackEntry; @@ -733,141 +646,132 @@ class Smarty_Internal_Configfileparser $yytos->minor = $yypMinor; $this->yystack[] = $yytos; if ($this->yyTraceFILE && $this->yyidx > 0) { - fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState); + fprintf($this->yyTraceFILE, + "%sShift %d\n", + $this->yyTracePrompt, + $yyNewState); fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt); - for ($i = 1; $i <= $this->yyidx; $i ++) { - fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[ $this->yystack[ $i ]->major ]); + for ($i = 1; $i <= $this->yyidx; $i++) { + fprintf($this->yyTraceFILE, + " %s", + $this->yyTokenName[ $this->yystack[ $i ]->major ]); } fwrite($this->yyTraceFILE, "\n"); } } - public static $yyRuleInfo = array(array(0 => 20, 1 => 2), array(0 => 21, 1 => 1), array(0 => 22, 1 => 2), - array(0 => 22, 1 => 0), array(0 => 24, 1 => 5), array(0 => 24, 1 => 6), - array(0 => 23, 1 => 2), array(0 => 23, 1 => 2), array(0 => 23, 1 => 0), - array(0 => 26, 1 => 3), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), - array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), - array(0 => 27, 1 => 3), array(0 => 27, 1 => 2), array(0 => 27, 1 => 1), - array(0 => 27, 1 => 1), array(0 => 25, 1 => 1), array(0 => 25, 1 => 2), - array(0 => 25, 1 => 3),); - - public static $yyReduceMap = array(0 => 0, 2 => 0, 3 => 0, 19 => 0, 20 => 0, 21 => 0, 1 => 1, 4 => 4, 5 => 5, - 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14, - 15 => 15, 16 => 16, 17 => 17, 18 => 17,); - - #line 245 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r0() { $this->_retvalue = null; } - #line 250 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r1() { $this->add_global_vars($this->yystack[ $this->yyidx + 0 ]->minor); $this->_retvalue = null; } - #line 264 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r4() { - $this->add_section_vars($this->yystack[ $this->yyidx + - 3 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor); + $this->add_section_vars($this->yystack[ $this->yyidx + -3 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor); $this->_retvalue = null; } - #line 269 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 245 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r5() { if ($this->configReadHidden) { - $this->add_section_vars($this->yystack[ $this->yyidx + - 3 ]->minor, + $this->add_section_vars($this->yystack[ $this->yyidx + -3 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor); } $this->_retvalue = null; } - #line 277 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 250 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r6() { - $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor; + $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor; } - #line 281 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 264 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r7() { $this->_retvalue = - array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, Array($this->yystack[ $this->yyidx + 0 ]->minor)); + array_merge($this->yystack[ $this->yyidx + -1 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor)); } - #line 285 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 269 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r8() { - $this->_retvalue = Array(); + $this->_retvalue = array(); } - #line 291 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 277 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r9() { - $this->_retvalue = Array("key" => $this->yystack[ $this->yyidx + - 2 ]->minor, - "value" => $this->yystack[ $this->yyidx + 0 ]->minor); + $this->_retvalue = array('key' => $this->yystack[ $this->yyidx + -2 ]->minor, + 'value' => $this->yystack[ $this->yyidx + 0 ]->minor); } - #line 296 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 281 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r10() { - $this->_retvalue = (float) $this->yystack[ $this->yyidx + 0 ]->minor; + $this->_retvalue = (float)$this->yystack[ $this->yyidx + 0 ]->minor; } - #line 300 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 285 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r11() { - $this->_retvalue = (int) $this->yystack[ $this->yyidx + 0 ]->minor; + $this->_retvalue = (int)$this->yystack[ $this->yyidx + 0 ]->minor; } - #line 304 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 291 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r12() { $this->_retvalue = $this->parse_bool($this->yystack[ $this->yyidx + 0 ]->minor); } - #line 308 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 296 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r13() { $this->_retvalue = self::parse_single_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor); } - #line 312 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 300 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r14() { $this->_retvalue = self::parse_double_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor); } - #line 316 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 304 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r15() { - $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[ $this->yyidx + - 1 ]->minor); + $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[ $this->yyidx + -1 ]->minor); } - #line 320 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 308 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r16() { $this->_retvalue = ''; } - #line 324 "../smarty/lexer/smarty_internal_configfileparser.y" + #line 312 "../smarty/lexer/smarty_internal_configfileparser.y" function yy_r17() { $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor; } - private $_retvalue; - + #line 316 "../smarty/lexer/smarty_internal_configfileparser.y" public function yy_reduce($yyruleno) { - if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) { - fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno, + if ($this->yyTraceFILE && $yyruleno >= 0 + && $yyruleno < count(self::$yyRuleName)) { + fprintf($this->yyTraceFILE, + "%sReduce (%d) [%s].\n", + $this->yyTracePrompt, + $yyruleno, self::$yyRuleName[ $yyruleno ]); } - $this->_retvalue = $yy_lefthand_side = null; if (isset(self::$yyReduceMap[ $yyruleno ])) { // call the action @@ -878,14 +782,14 @@ class Smarty_Internal_Configfileparser $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ]; $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ]; $this->yyidx -= $yysize; - for ($i = $yysize; $i; $i --) { + for ($i = $yysize; $i; $i--) { // pop all of the right-hand side parameters array_pop($this->yystack); } $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto); if ($yyact < self::YYNSTATE) { if (!$this->yyTraceFILE && $yysize) { - $this->yyidx ++; + $this->yyidx++; $x = new TPC_yyStackEntry; $x->stateno = $yyact; $x->major = $yygoto; @@ -894,11 +798,12 @@ class Smarty_Internal_Configfileparser } else { $this->yy_shift($yyact, $yygoto, $yy_lefthand_side); } - } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) { + } else if ($yyact === self::YYNSTATE + self::YYNRULE + 1) { $this->yy_accept(); } } + #line 320 "../smarty/lexer/smarty_internal_configfileparser.y" public function yy_parse_failed() { if ($this->yyTraceFILE) { @@ -909,10 +814,10 @@ class Smarty_Internal_Configfileparser } } + #line 324 "../smarty/lexer/smarty_internal_configfileparser.y" public function yy_syntax_error($yymajor, $TOKEN) { #line 232 "../smarty/lexer/smarty_internal_configfileparser.y" - $this->internalError = true; $this->yymajor = $yymajor; $this->compiler->trigger_config_file_error(); @@ -927,7 +832,6 @@ class Smarty_Internal_Configfileparser $this->yy_pop_parser_stack(); } #line 225 "../smarty/lexer/smarty_internal_configfileparser.y" - $this->successful = !$this->internalError; $this->internalError = false; $this->retvalue = $this->_retvalue; @@ -936,10 +840,9 @@ class Smarty_Internal_Configfileparser public function doParse($yymajor, $yytokenvalue) { $yyerrorhit = 0; /* True if yymajor has invoked an error */ - if ($this->yyidx === null || $this->yyidx < 0) { $this->yyidx = 0; - $this->yyerrcnt = - 1; + $this->yyerrcnt = -1; $x = new TPC_yyStackEntry; $x->stateno = 0; $x->major = 0; @@ -947,53 +850,61 @@ class Smarty_Internal_Configfileparser $this->yystack[] = $x; } $yyendofinput = ($yymajor == 0); - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]); + fprintf($this->yyTraceFILE, + "%sInput %s\n", + $this->yyTracePrompt, + $this->yyTokenName[ $yymajor ]); } - do { $yyact = $this->yy_find_shift_action($yymajor); - if ($yymajor < self::YYERRORSYMBOL && !$this->yy_is_expected_token($yymajor)) { + if ($yymajor < self::YYERRORSYMBOL && + !$this->yy_is_expected_token($yymajor)) { // force a syntax error $yyact = self::YY_ERROR_ACTION; } if ($yyact < self::YYNSTATE) { $this->yy_shift($yyact, $yymajor, $yytokenvalue); - $this->yyerrcnt --; + $this->yyerrcnt--; if ($yyendofinput && $this->yyidx >= 0) { $yymajor = 0; } else { $yymajor = self::YYNOCODE; } - } elseif ($yyact < self::YYNSTATE + self::YYNRULE) { + } else if ($yyact < self::YYNSTATE + self::YYNRULE) { $this->yy_reduce($yyact - self::YYNSTATE); - } elseif ($yyact == self::YY_ERROR_ACTION) { + } else if ($yyact === self::YY_ERROR_ACTION) { if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt); + fprintf($this->yyTraceFILE, + "%sSyntax Error!\n", + $this->yyTracePrompt); } if (self::YYERRORSYMBOL) { if ($this->yyerrcnt < 0) { $this->yy_syntax_error($yymajor, $yytokenvalue); } $yymx = $this->yystack[ $this->yyidx ]->major; - if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) { + if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) { if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt, + fprintf($this->yyTraceFILE, + "%sDiscard input token %s\n", + $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]); } $this->yy_destructor($yymajor, $yytokenvalue); $yymajor = self::YYNOCODE; } else { - while ($this->yyidx >= 0 && $yymx != self::YYERRORSYMBOL && - ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE) { + while ($this->yyidx >= 0 && + $yymx !== self::YYERRORSYMBOL && + ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE + ) { $this->yy_pop_parser_stack(); } if ($this->yyidx < 0 || $yymajor == 0) { $this->yy_destructor($yymajor, $yytokenvalue); $this->yy_parse_failed(); $yymajor = self::YYNOCODE; - } elseif ($yymx != self::YYERRORSYMBOL) { + } else if ($yymx !== self::YYERRORSYMBOL) { $u2 = 0; $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2); } @@ -1015,8 +926,74 @@ class Smarty_Internal_Configfileparser $this->yy_accept(); $yymajor = self::YYNOCODE; } + } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0); + } + + /** + * parse optional boolean keywords + * + * @param string $str + * + * @return bool + */ + private function parse_bool($str) + { + $str = strtolower($str); + if (in_array($str, array('on', 'yes', 'true'))) { + $res = true; + } else { + $res = false; + } + return $res; + } + + /** + * set a config variable in target array + * + * @param array $var + * @param array $target_array + */ + private function set_var(array $var, array &$target_array) + { + $key = $var[ 'key' ]; + $value = $var[ 'value' ]; + if ($this->configOverwrite || !isset($target_array[ 'vars' ][ $key ])) { + $target_array[ 'vars' ][ $key ] = $value; + } else { + settype($target_array[ 'vars' ][ $key ], 'array'); + $target_array[ 'vars' ][ $key ][] = $value; + } + } + + /** + * add config variable to global vars + * + * @param array $vars + */ + private function add_global_vars(array $vars) + { + if (!isset($this->compiler->config_data[ 'vars' ])) { + $this->compiler->config_data[ 'vars' ] = array(); + } + foreach ($vars as $var) { + $this->set_var($var, $this->compiler->config_data); + } + } + + /** + * add config variable to section + * + * @param string $section_name + * @param array $vars + */ + private function add_section_vars($section_name, array $vars) + { + if (!isset($this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ])) { + $this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ] = array(); + } + foreach ($vars as $var) { + $this->set_var($var, $this->compiler->config_data[ 'sections' ][ $section_name ]); } - while ($yymajor != self::YYNOCODE && $this->yyidx >= 0); } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_data.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_data.php index fd9c3020b..37b917b14 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_data.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_data.php @@ -19,6 +19,7 @@ * The following methods will be dynamically loaded by the extension handler when they are called. * They are located in a corresponding Smarty_Internal_Method_xxxx class * + * @method mixed _getConfigVariable(string $varName, bool $errorEnable = true) * @method mixed getConfigVariable(string $varName, bool $errorEnable = true) * @method mixed getConfigVars(string $varName = null, bool $searchParents = true) * @method mixed getGlobal(string $varName = null) @@ -28,7 +29,7 @@ * @method Smarty_Internal_Data clearConfig(string $varName = null) * @method Smarty_Internal_Data configLoad(string $config_file, mixed $sections = null, string $scope = 'local') */ -class Smarty_Internal_Data +abstract class Smarty_Internal_Data { /** * This object type (Smarty = 1, template = 2, data = 4) @@ -54,7 +55,7 @@ class Smarty_Internal_Data /** * parent template (if any) * - * @var Smarty|Smarty_Internal_Template|Smarty_Internal_Data + * @var Smarty|Smarty_Internal_Template|Smarty_Data */ public $parent = null; @@ -100,7 +101,7 @@ class Smarty_Internal_Data $this->assign($_key, $_val, $nocache); } } else { - if ($tpl_var != '') { + if ($tpl_var !== '') { if ($this->_objType === 2) { /** @var Smarty_Internal_Template $this */ $this->_assignInScope($tpl_var, $value, $nocache); diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_debug.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_debug.php index f16bd3fb1..c826a1786 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_debug.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_debug.php @@ -193,6 +193,9 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data * * @param Smarty_Internal_Template|Smarty $obj object to debug * @param bool $full + * + * @throws \Exception + * @throws \SmartyException */ public function display_debug($obj, $full = false) { @@ -210,7 +213,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data // init properties by hand as user may have edited the original Smarty class $debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ . '/../plugins' : $smarty->getPluginsDir()); $debObj->force_compile = false; - $debObj->compile_check = true; + $debObj->compile_check = Smarty::COMPILECHECK_ON; $debObj->left_delimiter = '{'; $debObj->right_delimiter = '}'; $debObj->security_policy = null; @@ -224,7 +227,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data $debObj->autoload_filters = array(); $debObj->default_modifiers = array(); $debObj->escape_html = true; - $debObj->caching = false; + $debObj->caching = Smarty::CACHING_OFF; $debObj->compile_id = null; $debObj->cache_id = null; // prepare information of assigned variables @@ -239,7 +242,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data if ($obj->_isTplObj()) { $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name); } - if ($obj->_objType == 1 || $full) { + if ($obj->_objType === 1 || $full) { $_template->assign('template_data', $this->template_data[ $this->index ]); } else { $_template->assign('template_data', null); @@ -247,7 +250,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data $_template->assign('assigned_vars', $_assigned_vars); $_template->assign('config_vars', $_config_vars); $_template->assign('execution_time', microtime(true) - $smarty->start_time); - $_template->assign('display_mode', $debugging == 2 || !$full); + $_template->assign('display_mode', $debugging === 2 || !$full); $_template->assign('offset', $this->offset * 50); echo $_template->fetch(); if (isset($full)) { @@ -281,15 +284,15 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data $tpl_vars = array(); foreach ($obj->tpl_vars as $key => $var) { foreach ($var as $varkey => $varvalue) { - if ($varkey == 'value') { + if ($varkey === 'value') { $tpl_vars[ $key ][ $varkey ] = $varvalue; } else { - if ($varkey == 'nocache') { - if ($varvalue == true) { + if ($varkey === 'nocache') { + if ($varvalue === true) { $tpl_vars[ $key ][ $varkey ] = $varvalue; } } else { - if ($varkey != 'scope' || $varvalue !== 0) { + if ($varkey !== 'scope' || $varvalue !== 0) { $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue; } } @@ -323,15 +326,15 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data foreach (Smarty::$global_tpl_vars as $key => $var) { if (!array_key_exists($key, $tpl_vars)) { foreach ($var as $varkey => $varvalue) { - if ($varkey == 'value') { + if ($varkey === 'value') { $tpl_vars[ $key ][ $varkey ] = $varvalue; } else { - if ($varkey == 'nocache') { - if ($varvalue == true) { + if ($varkey === 'nocache') { + if ($varvalue === true) { $tpl_vars[ $key ][ $varkey ] = $varvalue; } } else { - if ($varkey != 'scope' || $varvalue !== 0) { + if ($varkey !== 'scope' || $varvalue !== 0) { $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue; } } @@ -356,7 +359,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data { static $_is_stringy = array('string' => true, 'eval' => true); // calculate Uid if not already done - if ($template->source->uid == '') { + if ($template->source->uid === '') { $template->source->filepath; } $key = $template->source->uid; @@ -386,7 +389,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data public function ignore(Smarty_Internal_Template $template) { // calculate Uid if not already done - if ($template->source->uid == '') { + if ($template->source->uid === '') { $template->source->filepath; } $this->ignore_uid[ $template->source->uid ] = true; diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php new file mode 100644 index 000000000..831421833 --- /dev/null +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php @@ -0,0 +1,112 @@ + $smarty_dir, 'length' => strlen($smarty_dir),); + } + } + // walk the muted directories and test against $errfile + foreach (self::$mutedDirectories as $key => &$dir) { + if (!$dir) { + // resolve directory and length for speedy comparisons + $file = realpath($key); + if ($file === false) { + // this directory does not exist, remove and skip it + unset(self::$mutedDirectories[ $key ]); + continue; + } + $dir = array('file' => $file, 'length' => strlen($file),); + } + if (!strncmp($errfile, $dir[ 'file' ], $dir[ 'length' ])) { + $_is_muted_directory = true; + break; + } + } + // pass to next error handler if this error did not occur inside SMARTY_DIR + // or the error was within smarty but masked to be ignored + if (!$_is_muted_directory || ($errno && $errno & error_reporting())) { + if (self::$previousErrorHandler) { + return call_user_func(self::$previousErrorHandler, + $errno, + $errstr, + $errfile, + $errline, + $errcontext); + } else { + return false; + } + } + } +} \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_extension_handler.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_extension_handler.php index 340e6dee1..90d3b81ea 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_extension_handler.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_extension_handler.php @@ -27,14 +27,15 @@ * Method extensions * @property Smarty_Internal_Method_GetTemplateVars $getTemplateVars * @property Smarty_Internal_Method_Append $append - * @property Smarty_Internal_Method_AppendByRef $appendByRef - * @property Smarty_Internal_Method_AssignGlobal $assignGlobal - * @property Smarty_Internal_Method_AssignByRef $assignByRef - * @property Smarty_Internal_Method_LoadFilter $loadFilter - * @property Smarty_Internal_Method_LoadPlugin $loadPlugin - * @property Smarty_Internal_Method_RegisterFilter $registerFilter - * @property Smarty_Internal_Method_RegisterObject $registerObject - * @property Smarty_Internal_Method_RegisterPlugin $registerPlugin + * @property Smarty_Internal_Method_AppendByRef $appendByRef + * @property Smarty_Internal_Method_AssignGlobal $assignGlobal + * @property Smarty_Internal_Method_AssignByRef $assignByRef + * @property Smarty_Internal_Method_LoadFilter $loadFilter + * @property Smarty_Internal_Method_LoadPlugin $loadPlugin + * @property Smarty_Internal_Method_RegisterFilter $registerFilter + * @property Smarty_Internal_Method_RegisterObject $registerObject + * @property Smarty_Internal_Method_RegisterPlugin $registerPlugin + * @property mixed|\Smarty_Template_Cached configLoad */ class Smarty_Internal_Extension_Handler { @@ -47,9 +48,9 @@ class Smarty_Internal_Extension_Handler * * @var array */ - private $_property_info = array('AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0, - 'DebugTemplate' => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0, - 'TemplateVars' => 0,);# + private $_property_info = array('AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0, + 'DebugTemplate' => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0, + 'TemplateVars' => 0, 'Literals' => 'Literals',);# private $resolvedProperties = array(); @@ -68,38 +69,62 @@ class Smarty_Internal_Extension_Handler /* @var Smarty $data ->smarty */ $smarty = isset($data->smarty) ? $data->smarty : $data; if (!isset($smarty->ext->$name)) { - $class = 'Smarty_Internal_Method_' . $this->upperCase($name); - if (preg_match('/^(set|get)([A-Z].*)$/', $name, $match)) { - $pn = ''; - if (!isset($this->_property_info[ $prop = $match[ 2 ] ])) { - // convert camel case to underscored name - $this->resolvedProperties[ $prop ] = $pn = strtolower(join('_', - preg_split('/([A-Z][^A-Z]*)/', $prop, - - 1, PREG_SPLIT_NO_EMPTY | - PREG_SPLIT_DELIM_CAPTURE))); - $this->_property_info[ $prop ] = - property_exists($data, $pn) ? 1 : ($data->_isTplObj() && property_exists($smarty, $pn) ? 2 : 0); + if (preg_match('/^((set|get)|(.*?))([A-Z].*)$/', $name, $match)) { + $basename = $this->upperCase($match[4]); + if (!isset($smarty->ext->$basename) && isset($this->_property_info[ $basename ]) && + is_string($this->_property_info[ $basename ])) { + $class = 'Smarty_Internal_Method_' . $this->_property_info[ $basename ]; + if (class_exists($class)) { + $classObj = new $class(); + $methodes = get_class_methods($classObj); + foreach ($methodes as $method) { + $smarty->ext->$method = $classObj; + } + } } - if ($this->_property_info[ $prop ]) { - $pn = $this->resolvedProperties[ $prop ]; - if ($match[ 1 ] == 'get') { - return $this->_property_info[ $prop ] == 1 ? $data->$pn : $data->smarty->$pn; - } else { - return $this->_property_info[ $prop ] == 1 ? $data->$pn = $args[ 0 ] : - $data->smarty->$pn = $args[ 0 ]; + if (!empty($match[2]) && !isset($smarty->ext->$name)) { + $class = 'Smarty_Internal_Method_' . $this->upperCase($name); + if (!class_exists($class)) { + $objType = $data->_objType; + $propertyType = false; + if (!isset($this->resolvedProperties[ $match[0] ][ $objType ])) { + $property = isset($this->resolvedProperties['property'][ $basename ]) ? + $this->resolvedProperties['property'][ $basename ] : + $property = $this->resolvedProperties['property'][ $basename ] = strtolower(join('_', + preg_split('/([A-Z][^A-Z]*)/', + $basename, + -1, + PREG_SPLIT_NO_EMPTY | + PREG_SPLIT_DELIM_CAPTURE))); + + if ($property !== false) { + if (property_exists($data, $property)) { + $propertyType = $this->resolvedProperties[ $match[0] ][ $objType ] = 1; + } else if (property_exists($smarty, $property)) { + $propertyType = $this->resolvedProperties[ $match[0] ][ $objType ] = 2; + } else { + $this->resolvedProperties['property'][ $basename ] = $property = false; + } + } + } else { + $propertyType = $this->resolvedProperties[ $match[0] ][ $objType ]; + $property = $this->resolvedProperties['property'][ $basename ]; + } + if ($propertyType) { + $obj = $propertyType === 1 ? $data : $smarty; + if ($match[2] === 'get') { + return $obj->$property; + } else if ($match[2] === 'set') { + return $obj->$property = $args[0]; + } + } } - } elseif (!class_exists($class)) { - throw new SmartyException("property '$pn' does not exist."); } } - if (class_exists($class)) { - $callback = array($smarty->ext->$name = new $class(), $name); - } - } else { - $callback = array($smarty->ext->$name, $name); } + $callback = array($smarty->ext->$name, $name); array_unshift($args, $data); - if (isset($callback) && $callback[ 0 ]->objMap | $data->_objType) { + if (isset($callback) && $callback[0]->objMap | $data->_objType) { return call_user_func_array($callback, $args); } return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args); @@ -119,19 +144,6 @@ class Smarty_Internal_Extension_Handler return implode('_', $_name); } - /** - * set extension property - * - * @param string $property_name property name - * @param mixed $value value - * - * @throws SmartyException - */ - public function __set($property_name, $value) - { - $this->$property_name = $value; - } - /** * get extension object * @@ -143,7 +155,7 @@ class Smarty_Internal_Extension_Handler public function __get($property_name) { // object properties of runtime template extensions will start with '_' - if ($property_name[ 0 ] == '_') { + if ($property_name[0] === '_') { $class = 'Smarty_Internal_Runtime' . $this->upperCase($property_name); } else { $class = 'Smarty_Internal_Method_' . $this->upperCase($property_name); @@ -154,6 +166,19 @@ class Smarty_Internal_Extension_Handler return $this->$property_name = new $class(); } + /** + * set extension property + * + * @param string $property_name property name + * @param mixed $value value + * + * @throws SmartyException + */ + public function __set($property_name, $value) + { + $this->$property_name = $value; + } + /** * Call error handler for undefined method * diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php index 3eef8a28c..7bd75bfb5 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php @@ -11,7 +11,6 @@ */ class Smarty_Internal_Method_AddAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters { - /** * Add autoload filters * @@ -25,6 +24,7 @@ class Smarty_Internal_Method_AddAutoloadFilters extends Smarty_Internal_Method_S * the appropriate types * * @return \Smarty|\Smarty_Internal_Template + * @throws \SmartyException */ public function addAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_append.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_append.php index af6935919..a1422cf5a 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_append.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_append.php @@ -38,12 +38,12 @@ class Smarty_Internal_Method_Append if (is_array($tpl_var)) { // $tpl_var is an array, ignore $value foreach ($tpl_var as $_key => $_val) { - if ($_key != '') { + if ($_key !== '') { $this->append($data, $_key, $_val, $merge, $nocache); } } } else { - if ($tpl_var != '' && isset($value)) { + if ($tpl_var !== '' && isset($value)) { if (!isset($data->tpl_vars[ $tpl_var ])) { $tpl_var_inst = $data->ext->getTemplateVars->_getVariable($data, $tpl_var, null, true, false); if ($tpl_var_inst instanceof Smarty_Undefined_Variable) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php index 532ac9509..9185a8e83 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php @@ -27,7 +27,7 @@ class Smarty_Internal_Method_AppendByRef */ public static function appendByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $merge = false) { - if ($tpl_var != '' && isset($value)) { + if ($tpl_var !== '' && isset($value)) { if (!isset($data->tpl_vars[ $tpl_var ])) { $data->tpl_vars[ $tpl_var ] = new Smarty_Variable(); } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php index 0060bbc5f..1c513ce99 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php @@ -24,7 +24,7 @@ class Smarty_Internal_Method_AssignByRef */ public function assignByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $nocache) { - if ($tpl_var != '') { + if ($tpl_var !== '') { $data->tpl_vars[ $tpl_var ] = new Smarty_Variable(null, $nocache); $data->tpl_vars[ $tpl_var ]->value = &$value; if ($data->_isTplObj() && $data->scope) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php index 3c2b26049..0e1690418 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php @@ -30,7 +30,7 @@ class Smarty_Internal_Method_AssignGlobal */ public function assignGlobal(Smarty_Internal_Data $data, $varName, $value = null, $nocache = false) { - if ($varName != '') { + if ($varName !== '') { Smarty::$global_tpl_vars[ $varName ] = new Smarty_Variable($value, $nocache); $ptr = $data; while ($ptr->_isTplObj()) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php index 5879f9a06..9641e2baa 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php @@ -28,7 +28,8 @@ class Smarty_Internal_Method_ClearAllCache * @param integer $exp_time expiration time * @param string $type resource type * - * @return integer number of cache files deleted + * @return int number of cache files deleted + * @throws \SmartyException */ public function clearAllCache(Smarty $smarty, $exp_time = null, $type = null) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcache.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcache.php index 95649a777..6d56c13d5 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcache.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcache.php @@ -31,7 +31,8 @@ class Smarty_Internal_Method_ClearCache * @param integer $exp_time expiration time * @param string $type resource type * - * @return integer number of cache files deleted + * @return int number of cache files deleted + * @throws \SmartyException */ public function clearCache(Smarty $smarty, $template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null) diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php index a1f1a80bb..c019c59db 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php @@ -29,27 +29,27 @@ class Smarty_Internal_Method_ClearCompiledTemplate * @param string $compile_id compile id * @param integer $exp_time expiration time * - * @return integer number of template files deleted + * @return int number of template files deleted + * @throws \SmartyException */ public function clearCompiledTemplate(Smarty $smarty, $resource_name = null, $compile_id = null, $exp_time = null) { // clear template objects cache $smarty->_clearTemplateCache(); - $_compile_dir = $smarty->getCompileDir(); - if ($_compile_dir == '/') { //We should never want to delete this! + if ($_compile_dir === '/') { //We should never want to delete this! return 0; } $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null; - $_dir_sep = $smarty->use_sub_dirs ? $smarty->ds : '^'; + $_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^'; if (isset($resource_name)) { $_save_stat = $smarty->caching; - $smarty->caching = false; + $smarty->caching = Smarty::CACHING_OFF; /* @var Smarty_Internal_Template $tpl */ $tpl = $smarty->createTemplate($resource_name); $smarty->caching = $_save_stat; if (!$tpl->source->handler->uncompiled && !$tpl->source->handler->recompiled && $tpl->source->exists) { - $_resource_part_1 = basename(str_replace('^', $smarty->ds, $tpl->compiled->filepath)); + $_resource_part_1 = basename(str_replace('^', DIRECTORY_SEPARATOR, $tpl->compiled->filepath)); $_resource_part_1_length = strlen($_resource_part_1); } else { return 0; @@ -75,10 +75,10 @@ class Smarty_Internal_Method_ClearCompiledTemplate } $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST); foreach ($_compile as $_file) { - if (substr(basename($_file->getPathname()), 0, 1) == '.') { + if (substr(basename($_file->getPathname()), 0, 1) === '.') { continue; } - $_filepath = (string) $_file; + $_filepath = (string)$_file; if ($_file->isDir()) { if (!$_compile->isDot()) { // delete folder if empty @@ -93,26 +93,32 @@ class Smarty_Internal_Method_ClearCompiledTemplate if ((!isset($_compile_id) || (isset($_filepath[ $_compile_id_part_length ]) && $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length))) && (!isset($resource_name) || (isset($_filepath[ $_resource_part_1_length ]) && - substr_compare($_filepath, $_resource_part_1, - - $_resource_part_1_length, $_resource_part_1_length) == + substr_compare($_filepath, + $_resource_part_1, + -$_resource_part_1_length, + $_resource_part_1_length) === 0) || (isset($_filepath[ $_resource_part_2_length ]) && - substr_compare($_filepath, $_resource_part_2, - - $_resource_part_2_length, - $_resource_part_2_length) == 0)) + substr_compare($_filepath, + $_resource_part_2, + -$_resource_part_2_length, + $_resource_part_2_length) === 0)) ) { if (isset($exp_time)) { - if (time() - @filemtime($_filepath) >= $exp_time) { + if (is_file($_filepath) && time() - filemtime($_filepath) >= $exp_time) { $unlink = true; } } else { $unlink = true; } } - - if ($unlink && @unlink($_filepath)) { - $_count ++; - if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) { + if ($unlink && is_file($_filepath) && @unlink($_filepath)) { + $_count++; + if (function_exists('opcache_invalidate') + && (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api')) < 1) + ) { opcache_invalidate($_filepath, true); + } else if (function_exists('apc_delete_file')) { + apc_delete_file($_filepath); } } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php index 0abed2124..64912599f 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php @@ -1,5 +1,4 @@ compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors); @@ -49,7 +51,11 @@ class Smarty_Internal_Method_CompileAllTemplates * * @return int number of template files compiled */ - protected function compileAll(Smarty $smarty, $extension, $force_compile, $time_limit, $max_errors, + protected function compileAll(Smarty $smarty, + $extension, + $force_compile, + $time_limit, + $max_errors, $isConfig = false) { // switch off time limit @@ -66,20 +72,20 @@ class Smarty_Internal_Method_CompileAllTemplates $_dir_2 = new RecursiveIteratorIterator($_dir_1); foreach ($_dir_2 as $_fileinfo) { $_file = $_fileinfo->getFilename(); - if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) { + if (substr(basename($_fileinfo->getPathname()), 0, 1) === '.' || strpos($_file, '.svn') !== false) { continue; } - if (!substr_compare($_file, $extension, - strlen($extension)) == 0) { + if (!substr_compare($_file, $extension, -strlen($extension)) === 0) { continue; } - if ($_fileinfo->getPath() !== substr($_dir, 0, - 1)) { - $_file = substr($_fileinfo->getPath(), strlen($_dir)) . $smarty->ds . $_file; + if ($_fileinfo->getPath() !== substr($_dir, 0, -1)) { + $_file = substr($_fileinfo->getPath(), strlen($_dir)) . DIRECTORY_SEPARATOR . $_file; } echo "\n
    ", $_dir, '---', $_file; flush(); $_start_time = microtime(true); $_smarty = clone $smarty; - // + // $_smarty->_cache = array(); $_smarty->ext = new Smarty_Internal_Extension_Handler(); $_smarty->ext->objType = $_smarty->_objType; @@ -92,7 +98,7 @@ class Smarty_Internal_Method_CompileAllTemplates $isConfig ? Smarty_Template_Config::load($_tpl) : Smarty_Template_Source::load($_tpl); if ($_tpl->mustCompile()) { $_tpl->compileTemplateSource(); - $_count ++; + $_count++; echo ' compiled in ', microtime(true) - $_start_time, ' seconds'; flush(); } else { @@ -102,14 +108,14 @@ class Smarty_Internal_Method_CompileAllTemplates } catch (Exception $e) { echo "\n
    ------>Error: ", $e->getMessage(), "

    \n"; - $_error_count ++; + $_error_count++; } // free memory unset($_tpl); $_smarty->_clearTemplateCache(); - if ($max_errors !== null && $_error_count == $max_errors) { + if ($max_errors !== null && $_error_count === $max_errors) { echo "\n

    too many errors\n"; - exit(); + exit(1); } } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_configload.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_configload.php index 6113eaf98..eb8672fe9 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_configload.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_configload.php @@ -30,7 +30,7 @@ class Smarty_Internal_Method_ConfigLoad * section or null * * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template - * @throws \SmartyException + * @throws \Exception */ public function configLoad(Smarty_Internal_Data $data, $config_file, $sections = null) { @@ -52,7 +52,7 @@ class Smarty_Internal_Method_ConfigLoad * shall be loaded * * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template - * @throws \SmartyException + * @throws \Exception */ public function _loadConfigFile(Smarty_Internal_Data $data, $config_file, $sections = null, $scope = 0) { @@ -83,7 +83,7 @@ class Smarty_Internal_Method_ConfigLoad $this->_assignConfigVars($tpl->parent->config_vars, $tpl, $new_config_vars); $tagScope = $tpl->source->scope; if ($tagScope >= 0) { - if ($tagScope == Smarty::SCOPE_LOCAL) { + if ($tagScope === Smarty::SCOPE_LOCAL) { $this->_updateVarStack($tpl, $new_config_vars); $tagScope = 0; if (!$tpl->scope) { @@ -94,6 +94,7 @@ class Smarty_Internal_Method_ConfigLoad $mergedScope = $tagScope | $tpl->scope; if ($mergedScope) { // update scopes + /* @var \Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $ptr */ foreach ($tpl->smarty->ext->_updateScope->_getAffectedScopes($tpl->parent, $mergedScope) as $ptr) { $this->_assignConfigVars($ptr->config_vars, $tpl, $new_config_vars); if ($tagScope && $ptr->_isTplObj() && isset($tpl->_cache[ 'varStack' ])) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php index d945a01e3..b957b60d2 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php @@ -11,7 +11,6 @@ */ class Smarty_Internal_Method_GetAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters { - /** * Get autoload filters * @@ -22,8 +21,9 @@ class Smarty_Internal_Method_GetAutoloadFilters extends Smarty_Internal_Method_S * for. Defaults to all autoload * filters * - * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type + * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type * was specified + * @throws \SmartyException */ public function getAutoloadFilters(Smarty_Internal_TemplateBase $obj, $type = null) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getglobal.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getglobal.php index 7a8a9bc71..0f00da53c 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getglobal.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getglobal.php @@ -24,9 +24,9 @@ class Smarty_Internal_Method_GetGlobal * @api Smarty::getGlobal() * * @param \Smarty_Internal_Data $data - * @param string $varName variable name or null + * @param string $varName variable name or null * - * @return string variable value or or array of variables + * @return string|array variable value or or array of variables */ public function getGlobal(Smarty_Internal_Data $data, $varName = null) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettags.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettags.php index 5718b69e9..afaa4b913 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettags.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettags.php @@ -28,6 +28,7 @@ class Smarty_Internal_Method_GetTags * @param null|string|Smarty_Internal_Template $template * * @return array of tag/attributes + * @throws \Exception * @throws \SmartyException */ public function getTags(Smarty_Internal_TemplateBase $obj, $template = null) @@ -52,11 +53,11 @@ class Smarty_Internal_Method_GetTags $tpl->_cache[ 'used_tags' ] = array(); $tpl->smarty->merge_compiled_includes = false; $tpl->smarty->disableSecurity(); - $tpl->caching = false; + $tpl->caching = Smarty::CACHING_OFF; $tpl->loadCompiler(); $tpl->compiler->compileTemplate($tpl); return $tpl->_cache[ 'used_tags' ]; } - throw new SmartyException("Missing template specification"); + throw new SmartyException('Missing template specification'); } } \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php index 1759646f3..510bab0fc 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php @@ -53,7 +53,7 @@ class Smarty_Internal_Method_GetTemplateVars } } // not found, try at parent - if ($searchParents) { + if ($searchParents && isset($_ptr->parent)) { $_ptr = $_ptr->parent; } else { $_ptr = null; @@ -93,7 +93,7 @@ class Smarty_Internal_Method_GetTemplateVars return $_ptr->tpl_vars[ $varName ]; } // not found, try at parent - if ($searchParents) { + if ($searchParents && isset($_ptr->parent)) { $_ptr = $_ptr->parent; } else { $_ptr = null; @@ -103,14 +103,11 @@ class Smarty_Internal_Method_GetTemplateVars // found it, return it return Smarty::$global_tpl_vars[ $varName ]; } - /* @var \Smarty $smarty */ - $smarty = isset($data->smarty) ? $data->smarty : $data; - if ($smarty->error_unassigned && $errorEnable) { + if ($errorEnable && $data->_getSmartyObj()->error_unassigned) { // force a notice $x = $$varName; } return new Smarty_Undefined_Variable; } - } \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_literals.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_literals.php new file mode 100644 index 000000000..08e1a473b --- /dev/null +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_literals.php @@ -0,0 +1,98 @@ +_getSmartyObj(); + return (array)$smarty->literals; + } + + /** + * Add literals + * + * @api Smarty::addLiterals() + * + * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj + * @param array|string $literals literal or list of literals + * to add + * + * @return \Smarty|\Smarty_Internal_Template + * @throws \SmartyException + */ + public function addLiterals(Smarty_Internal_TemplateBase $obj, $literals = null) + { + if (isset($literals)) { + $this->set($obj->_getSmartyObj(), (array)$literals); + } + return $obj; + } + + /** + * Set literals + * + * @api Smarty::setLiterals() + * + * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj + * @param array|string $literals literal or list of literals + * to set + * + * @return \Smarty|\Smarty_Internal_Template + * @throws \SmartyException + */ + public function setLiterals(Smarty_Internal_TemplateBase $obj, $literals = null) + { + $smarty = $obj->_getSmartyObj(); + $smarty->literals = array(); + if (!empty($literals)) { + $this->set($smarty, (array)$literals); + } + return $obj; + } + + /** + * common setter for literals for easier handling of duplicates the + * Smarty::$literals array gets filled with identical key values + * + * @param \Smarty $smarty + * @param array $literals + * + * @throws \SmartyException + */ + private function set(Smarty $smarty, $literals) + { + $literals = array_combine($literals, $literals); + $error = isset($literals[ $smarty->left_delimiter ]) ? array($smarty->left_delimiter) : array(); + $error = isset($literals[ $smarty->right_delimiter ]) ? $error[] = $smarty->right_delimiter : $error; + if (!empty($error)) { + throw new SmartyException('User defined literal(s) "' . $error . + '" may not be identical with left or right delimiter'); + } + $smarty->literals = array_merge((array)$smarty->literals, (array)$literals); + } +} \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php index d092d876e..239fd6dd3 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php @@ -58,7 +58,7 @@ class Smarty_Internal_Method_LoadFilter return true; } } - throw new SmartyException("{$type}filter \"{$name}\" not found or callable"); + throw new SmartyException("{$type}filter '{$name}' not found or callable"); } /** @@ -71,7 +71,7 @@ class Smarty_Internal_Method_LoadFilter public function _checkFilterType($type) { if (!isset($this->filterTypes[ $type ])) { - throw new SmartyException("Illegal filter type \"{$type}\""); + throw new SmartyException("Illegal filter type '{$type}'"); } } } \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php index 50f3bfc2c..2454d9c9c 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php @@ -76,7 +76,7 @@ class Smarty_Internal_Method_LoadPlugin } } $_file_names = array($_plugin_filename); - if ($_lower_filename != $_plugin_filename) { + if ($_lower_filename !== $_plugin_filename) { $_file_names[] = $_lower_filename; } $_p_dirs = $smarty->getPluginsDir(); diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php index 0950ba9cf..62c16f626 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php @@ -41,7 +41,7 @@ class Smarty_Internal_Method_MustCompile if ($_template->mustCompile === null) { $_template->mustCompile = (!$_template->source->handler->uncompiled && ($_template->smarty->force_compile || $_template->source->handler->recompiled || - !$_template->compiled->exists || ($_template->smarty->compile_check && + !$_template->compiled->exists || ($_template->compile_check && $_template->compiled->getTimeStamp() < $_template->source->getTimeStamp()))); } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php index 43088a1d4..c8c5ae73f 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php @@ -35,7 +35,7 @@ class Smarty_Internal_Method_RegisterDefaultConfigHandler if (is_callable($callback)) { $smarty->default_config_handler_func = $callback; } else { - throw new SmartyException("Default config handler not callable"); + throw new SmartyException('Default config handler not callable'); } return $obj; } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php index 569ea1062..4c5d396ed 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php @@ -35,7 +35,7 @@ class Smarty_Internal_Method_RegisterDefaultTemplateHandler if (is_callable($callback)) { $smarty->default_template_handler_func = $callback; } else { - throw new SmartyException("Default template handler not callable"); + throw new SmartyException('Default template handler not callable'); } return $obj; } @@ -62,7 +62,7 @@ class Smarty_Internal_Method_RegisterDefaultTemplateHandler if ($source->exists) { $source->timestamp = filemtime($_return); } else { - throw new SmartyException("Default handler: Unable to load " . + throw new SmartyException('Default handler: Unable to load ' . ($source->isConfig ? 'config' : 'template') . " default file '{$_return}' for '{$source->type}:{$source->name}'"); } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php index ea8f75a85..77e41f37c 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php @@ -46,7 +46,7 @@ class Smarty_Internal_Method_RegisterFilter $this->_checkFilterType($type); $name = isset($name) ? $name : $this->_getFilterName($callback); if (!is_callable($callback)) { - throw new SmartyException("{$type}filter \"{$name}\" not callable"); + throw new SmartyException("{$type}filter '{$name}' not callable"); } $smarty->registered_filters[ $type ][ $name ] = $callback; return $obj; @@ -82,7 +82,7 @@ class Smarty_Internal_Method_RegisterFilter public function _checkFilterType($type) { if (!isset($this->filterTypes[ $type ])) { - throw new SmartyException("Illegal filter type \"{$type}\""); + throw new SmartyException("Illegal filter type '{$type}'"); } } } \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php index 91f065920..64bf0ef15 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php @@ -40,9 +40,9 @@ class Smarty_Internal_Method_RegisterPlugin { $smarty = $obj->_getSmartyObj(); if (isset($smarty->registered_plugins[ $type ][ $name ])) { - throw new SmartyException("Plugin tag \"{$name}\" already registered"); + throw new SmartyException("Plugin tag '{$name}' already registered"); } elseif (!is_callable($callback)) { - throw new SmartyException("Plugin \"{$name}\" not callable"); + throw new SmartyException("Plugin '{$name}' not callable"); } else { $smarty->registered_plugins[ $type ][ $name ] = array($callback, (bool) $cacheable, (array) $cache_attr); } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php index df5ca6405..29653b08e 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php @@ -38,6 +38,7 @@ class Smarty_Internal_Method_SetAutoloadFilters * the appropriate types * * @return \Smarty|\Smarty_Internal_Template + * @throws \SmartyException */ public function setAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null) { @@ -64,7 +65,7 @@ class Smarty_Internal_Method_SetAutoloadFilters public function _checkFilterType($type) { if (!isset($this->filterTypes[ $type ])) { - throw new SmartyException("Illegal filter type \"{$type}\""); + throw new SmartyException("Illegal filter type '{$type}'"); } } } \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php index 9aa1d229b..1a5fdf19b 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php @@ -22,7 +22,8 @@ class Smarty_Internal_Method_UnloadFilter extends Smarty_Internal_Method_LoadFil * @param string $type filter type * @param string $name filter name * - * @return bool + * @return Smarty_Internal_TemplateBase + * @throws \SmartyException */ public function unloadFilter(Smarty_Internal_TemplateBase $obj, $type, $name) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php index c5b88f57d..fcc4e5d89 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php @@ -23,6 +23,7 @@ class Smarty_Internal_Method_UnregisterFilter extends Smarty_Internal_Method_Reg * @param callback|string $callback * * @return \Smarty|\Smarty_Internal_Template + * @throws \SmartyException */ public function unregisterFilter(Smarty_Internal_TemplateBase $obj, $type, $callback) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_nocache_insert.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_nocache_insert.php index 65fc143cd..2629d51f7 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_nocache_insert.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_nocache_insert.php @@ -30,7 +30,7 @@ class Smarty_Internal_Nocache_Insert public static function compile($_function, $_attr, $_template, $_script, $_assign = null) { $_output = 'assign('{$_assign}' , {$_function} (" . var_export($_attr, true) . - ",\$_smarty_tpl), true);?>"; + ',\$_smarty_tpl), true);?>'; } else { - $_output .= "echo {$_function}(" . var_export($_attr, true) . ",\$_smarty_tpl);?>"; + $_output .= "echo {$_function}(" . var_export($_attr, true) . ',$_smarty_tpl);?>'; } $_tpl = $_template; while ($_tpl->_isSubTpl()) { $_tpl = $_tpl->parent; } - return "/*%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/" . $_output . - "/*/%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/"; + return "/*%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/{$_output}/*/%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/"; } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree.php index 32c9df094..b3e202efb 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree.php @@ -1,7 +1,7 @@ data); + return sprintf('(%s)', $this->data); } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php index 8c2e0d993..a57e629c6 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php @@ -74,8 +74,8 @@ class Smarty_Internal_ParseTree_Dq extends Smarty_Internal_ParseTree { $code = ''; foreach ($this->subtrees as $subtree) { - if ($code !== "") { - $code .= "."; + if ($code !== '') { + $code .= '.'; } if ($subtree instanceof Smarty_Internal_ParseTree_Tag) { $more_php = $subtree->assign_to_var($parser); diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php index 9058aabfb..8e19ec294 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php @@ -62,7 +62,7 @@ class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree $var = $parser->compiler->getNewPrefixVariable(); $tmp = $parser->compiler->appendCode('', $this->data); $tmp = $parser->compiler->appendCode($tmp, ""); - $parser->compiler->prefix_code[] = sprintf("%s", $tmp); + $parser->compiler->prefix_code[] = sprintf('%s', $tmp); return $var; } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_template.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_template.php index f6032351e..26612d4c7 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_template.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_template.php @@ -91,14 +91,14 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) { $subtree = $this->subtrees[ $key ]->to_smarty_php($parser); while ($key + 1 < $cnt && ($this->subtrees[ $key + 1 ] instanceof Smarty_Internal_ParseTree_Text || - $this->subtrees[ $key + 1 ]->data == '')) { + $this->subtrees[ $key + 1 ]->data === '')) { $key ++; - if ($this->subtrees[ $key ]->data == '') { + if ($this->subtrees[ $key ]->data === '') { continue; } $subtree .= $this->subtrees[ $key ]->to_smarty_php($parser); } - if ($subtree == '') { + if ($subtree === '') { continue; } $code .= preg_replace('/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/', "\n", @@ -108,14 +108,14 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) { $subtree = $this->subtrees[ $key ]->to_smarty_php($parser); while ($key + 1 < $cnt && ($this->subtrees[ $key + 1 ] instanceof Smarty_Internal_ParseTree_Tag || - $this->subtrees[ $key + 1 ]->data == '')) { + $this->subtrees[ $key + 1 ]->data === '')) { $key ++; - if ($this->subtrees[ $key ]->data == '') { + if ($this->subtrees[ $key ]->data === '') { continue; } $subtree = $parser->compiler->appendCode($subtree, $this->subtrees[ $key ]->to_smarty_php($parser)); } - if ($subtree == '') { + if ($subtree === '') { continue; } $code .= $subtree; diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_extends.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_extends.php index 4f1f09ea5..23a624729 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_extends.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_extends.php @@ -42,7 +42,7 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource foreach ($components as $component) { /* @var \Smarty_Template_Source $_s */ $_s = Smarty_Template_Source::load(null, $smarty, $component); - if ($_s->type == 'php') { + if ($_s->type === 'php') { throw new SmartyException("Resource type {$_s->type} cannot be used with the extends resource type"); } $sources[ $_s->uid ] = $_s; @@ -118,6 +118,9 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource * * @return bool */ + /** + * @return bool + */ public function checkTimestamps() { return false; diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_file.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_file.php index a58771a17..9dcda7fcb 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_file.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_file.php @@ -30,32 +30,32 @@ class Smarty_Internal_Resource_File extends Smarty_Resource { $file = $source->name; // absolute file ? - if ($file[ 0 ] == '/' || $file[ 1 ] == ':') { + if ($file[ 0 ] === '/' || $file[ 1 ] === ':') { $file = $source->smarty->_realpath($file, true); return is_file($file) ? $file : false; } // go relative to a given template? - if ($file[ 0 ] == '.' && $_template && $_template->_isSubTpl() && + if ($file[ 0 ] === '.' && $_template && $_template->_isSubTpl() && preg_match('#^[.]{1,2}[\\\/]#', $file) ) { - if ($_template->parent->source->type != 'file' && $_template->parent->source->type != 'extends' && + if ($_template->parent->source->type !== 'file' && $_template->parent->source->type !== 'extends' && !isset($_template->parent->_cache[ 'allow_relative_path' ]) ) { throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'"); } // normalize path - $path = $source->smarty->_realpath(dirname($_template->parent->source->filepath) . $source->smarty->ds . $file); + $path = $source->smarty->_realpath(dirname($_template->parent->source->filepath) . DIRECTORY_SEPARATOR . $file); // files relative to a template only get one shot return is_file($path) ? $path : false; } - // normalize $source->smarty->ds - if (strpos($file, $source->smarty->ds == '/' ? '\\' : '/') !== false) { - $file = str_replace($source->smarty->ds == '/' ? '\\' : '/', $source->smarty->ds, $file); + // normalize DIRECTORY_SEPARATOR + if (strpos($file, DIRECTORY_SEPARATOR === '/' ? '\\' : '/') !== false) { + $file = str_replace(DIRECTORY_SEPARATOR === '/' ? '\\' : '/', DIRECTORY_SEPARATOR, $file); } $_directories = $source->smarty->getTemplateDir(null, $source->isConfig); // template_dir index? - if ($file[ 0 ] == '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) { + if ($file[ 0 ] === '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) { $file = $fileMatch[ 2 ]; $_indices = explode(',', $fileMatch[ 1 ]); $_index_dirs = array(); @@ -90,7 +90,7 @@ class Smarty_Internal_Resource_File extends Smarty_Resource foreach ($_directories as $_directory) { $path = $_directory . $file; if (is_file($path)) { - return (strpos($path, '.' . $source->smarty->ds) !== false) ? $source->smarty->_realpath($path) : $path; + return (strpos($path, '.' . DIRECTORY_SEPARATOR) !== false) ? $source->smarty->_realpath($path) : $path; } } if (!isset($_index_dirs)) { @@ -112,6 +112,8 @@ class Smarty_Internal_Resource_File extends Smarty_Resource * * @param Smarty_Template_Source $source source object * @param Smarty_Internal_Template $_template template object + * + * @throws \SmartyException */ public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_php.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_php.php index 52e7096b3..6f685abe4 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_php.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_php.php @@ -19,25 +19,25 @@ class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File public $uncompiled = true; /** - * container for short_open_tag directive's value before executing PHP templates + * Resource does implement populateCompiledFilepath() method * - * @var string + * @var bool */ - protected $short_open_tag; + public $hasCompiledHandler = true; /** - * Resource does implement populateCompiledFilepath() method + * container for short_open_tag directive's value before executing PHP templates * - * @var bool + * @var string */ - public $hasCompiledHandler = true; + protected $short_open_tag; /** * Create a new PHP Resource */ public function __construct() { - $this->short_open_tag = ini_get('short_open_tag'); + $this->short_open_tag = function_exists('ini_get') ? ini_get('short_open_tag') : 1; } /** @@ -56,6 +56,23 @@ class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File throw new SmartyException("Unable to read template {$source->type} '{$source->name}'"); } + /** + * populate compiled object with compiled filepath + * + * @param Smarty_Template_Compiled $compiled compiled object + * @param Smarty_Internal_Template $_template template object (is ignored) + */ + public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template) + { + $compiled->filepath = $_template->source->filepath; + $compiled->timestamp = $_template->source->timestamp; + $compiled->exists = $_template->source->exists; + $compiled->file_dependency[ $_template->source->uid ] = + array($compiled->filepath, + $compiled->timestamp, + $_template->source->type,); + } + /** * Render and output the template (without using the compiler) * @@ -68,10 +85,10 @@ class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template) { if (!$source->smarty->allow_php_templates) { - throw new SmartyException("PHP templates are disabled"); + throw new SmartyException('PHP templates are disabled'); } if (!$source->exists) { - throw new SmartyException("Unable to load template {$source->type} '{$source->name}'" . + throw new SmartyException("Unable to load template '{$source->type}:{$source->name}'" . ($_template->_isSubTpl() ? " in '{$_template->parent->template_resource}'" : '')); } @@ -79,28 +96,16 @@ class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File extract($_template->getTemplateVars()); // include PHP template with short open tags enabled - ini_set('short_open_tag', '1'); + if (function_exists('ini_set')) { + ini_set('short_open_tag', '1'); + } /** @var Smarty_Internal_Template $_smarty_template * used in included file */ $_smarty_template = $_template; include($source->filepath); - ini_set('short_open_tag', $this->short_open_tag); - } - - /** - * populate compiled object with compiled filepath - * - * @param Smarty_Template_Compiled $compiled compiled object - * @param Smarty_Internal_Template $_template template object (is ignored) - */ - public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template) - { - $compiled->filepath = $_template->source->filepath; - $compiled->timestamp = $_template->source->timestamp; - $compiled->exists = $_template->source->exists; - $compiled->file_dependency[ $_template->source->uid ] = - array($compiled->filepath, $compiled->timestamp, - $_template->source->type,); + if (function_exists('ini_set')) { + ini_set('short_open_tag', $this->short_open_tag); + } } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_stream.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_stream.php index b4248fbb5..f358db01d 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_stream.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_stream.php @@ -26,6 +26,7 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled * @param Smarty_Internal_Template $_template template object * * @return void + * @throws \SmartyException */ public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_string.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_string.php index f2610d9d6..0175d5182 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_string.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_string.php @@ -99,6 +99,9 @@ class Smarty_Internal_Resource_String extends Smarty_Resource * * @return bool */ + /** + * @return bool + */ public function checkTimestamps() { return false; diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php index a91874a9f..dfbf7115b 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php @@ -16,6 +16,9 @@ class Smarty_Internal_Runtime_CacheModify * @param \Smarty_Template_Cached $cached * @param \Smarty_Internal_Template $_template * @param string $content + * + * @throws \Exception + * @throws \SmartyException */ public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content) { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cacheresourcefile.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cacheresourcefile.php index 7b7a9f685..a9ff5789a 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cacheresourcefile.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cacheresourcefile.php @@ -1,5 +1,4 @@ use_sub_dirs ? '/' : '^'; $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0; $_dir = $smarty->getCacheDir(); - if ($_dir == '/') { //We should never want to delete this! + if ($_dir === '/') { //We should never want to delete this! return 0; } $_dir_length = strlen($_dir); @@ -43,19 +41,17 @@ class Smarty_Internal_Runtime_CacheResourceFile $_cache_id_parts_count = count($_cache_id_parts); if ($smarty->use_sub_dirs) { foreach ($_cache_id_parts as $id_part) { - $_dir .= $id_part . $smarty->ds; + $_dir .= $id_part . DIRECTORY_SEPARATOR; } } } if (isset($resource_name)) { $_save_stat = $smarty->caching; - $smarty->caching = true; + $smarty->caching = Smarty::CACHING_LIFETIME_CURRENT; $tpl = new $smarty->template_class($resource_name, $smarty); $smarty->caching = $_save_stat; - // remove from template cache $tpl->source; // have the template registered before unset() - if ($tpl->source->exists) { $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath)); } else { @@ -68,10 +64,10 @@ class Smarty_Internal_Runtime_CacheResourceFile $_cacheDirs = new RecursiveDirectoryIterator($_dir); $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST); foreach ($_cache as $_file) { - if (substr(basename($_file->getPathname()), 0, 1) == '.') { + if (substr(basename($_file->getPathname()), 0, 1) === '.') { continue; } - $_filepath = (string) $_file; + $_filepath = (string)$_file; // directory ? if ($_file->isDir()) { if (!$_cache->isDot()) { @@ -87,13 +83,13 @@ class Smarty_Internal_Runtime_CacheResourceFile $_parts_count = count($_parts); // check name if (isset($resource_name)) { - if ($_parts[ $_parts_count - 1 ] != $_resourcename_parts) { + if ($_parts[ $_parts_count - 1 ] !== $_resourcename_parts) { continue; } } // check compile id if (isset($_compile_id) && (!isset($_parts[ $_parts_count - 2 - $_compile_id_offset ]) || - $_parts[ $_parts_count - 2 - $_compile_id_offset ] != $_compile_id) + $_parts[ $_parts_count - 2 - $_compile_id_offset ] !== $_compile_id) ) { continue; } @@ -105,28 +101,34 @@ class Smarty_Internal_Runtime_CacheResourceFile if ($_parts_count < $_cache_id_parts_count) { continue; } - for ($i = 0; $i < $_cache_id_parts_count; $i ++) { - if ($_parts[ $i ] != $_cache_id_parts[ $i ]) { + for ($i = 0; $i < $_cache_id_parts_count; $i++) { + if ($_parts[ $i ] !== $_cache_id_parts[ $i ]) { continue 2; } } } - // expired ? - if (isset($exp_time)) { - if ($exp_time < 0) { - preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_file), $match); - if ($_time < (@filemtime($_file) + $match[ 1 ])) { - continue; - } - } else { - if ($_time - @filemtime($_file) < $exp_time) { - continue; + if (is_file($_filepath)) { + // expired ? + if (isset($exp_time)) { + if ($exp_time < 0) { + preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_filepath), $match); + if ($_time < (filemtime($_filepath) + $match[ 1 ])) { + continue; + } + } else { + if ($_time - filemtime($_filepath) < $exp_time) { + continue; + } } } - } - $_count += @unlink($_filepath) ? 1 : 0; - if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) { - opcache_invalidate($_filepath, true); + $_count += @unlink($_filepath) ? 1 : 0; + if (function_exists('opcache_invalidate') + && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1) + ) { + opcache_invalidate($_filepath, true); + } else if (function_exists('apc_delete_file')) { + apc_delete_file($_filepath); + } } } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_capture.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_capture.php index 69f1ce0cf..80ffa35b2 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_capture.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_capture.php @@ -64,7 +64,9 @@ class Smarty_Internal_Runtime_Capture if (!$this->isRegistered) { $this->register($_template); } - $this->captureStack[] = array($buffer, $assign, $append); + $this->captureStack[] = array($buffer, + $assign, + $append); $this->captureCount ++; ob_start(); } @@ -76,8 +78,10 @@ class Smarty_Internal_Runtime_Capture */ private function register(Smarty_Internal_Template $_template) { - $_template->startRenderCallbacks[] = array($this, 'startRender'); - $_template->endRenderCallbacks[] = array($this, 'endRender'); + $_template->startRenderCallbacks[] = array($this, + 'startRender'); + $_template->endRenderCallbacks[] = array($this, + 'endRender'); $this->startRender($_template); $this->isRegistered = true; } @@ -126,20 +130,24 @@ class Smarty_Internal_Runtime_Capture */ public function error(Smarty_Internal_Template $_template) { - throw new SmartyException("Not matching {capture}{/capture} in \"{$_template->template_resource}\""); + throw new SmartyException("Not matching {capture}{/capture} in '{$_template->template_resource}'"); } /** - * Return content of named capture buffer + * Return content of named capture buffer by key or as array * * @param \Smarty_Internal_Template $_template - * @param $name + * @param string|null $name * - * @return null + * @return string|string[]|null */ - public function getBuffer(Smarty_Internal_Template $_template, $name) + public function getBuffer(Smarty_Internal_Template $_template, $name = null) { - return isset($this->namedBuffer[ $name ]) ? $this->namedBuffer[ $name ] : null; + if (isset($name)) { + return isset($this->namedBuffer[ $name ]) ? $this->namedBuffer[ $name ] : null; + } else { + return $this->namedBuffer; + } } /** diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php index e363712a6..f792496f9 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php @@ -41,58 +41,55 @@ class Smarty_Internal_Runtime_CodeFrame $properties[ 'cache_lifetime' ] = $_template->cache_lifetime; } $output = "source->filepath . "\" */\n\n"; + $output .= "/* Smarty version {$properties[ 'version' ]}, created on " . strftime("%Y-%m-%d %H:%M:%S") . + "\n from '" . str_replace('*/','* /',$_template->source->filepath) . "' */\n\n"; $output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n"; $dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' . - ($cache ? 'true' : 'false') . ")"; + ($cache ? 'true' : 'false') . ')'; $output .= "if ({$dec}) {\n"; $output .= "function {$properties['unifunc']} (Smarty_Internal_Template \$_smarty_tpl) {\n"; if (!$cache && !empty($compiler->tpl_function)) { - $output .= "\$_smarty_tpl->smarty->ext->_tplFunction->registerTplFunctions(\$_smarty_tpl, " . - var_export($compiler->tpl_function, true) . ");\n"; + $output .= '$_smarty_tpl->smarty->ext->_tplFunction->registerTplFunctions($_smarty_tpl, '; + $output .= var_export($compiler->tpl_function, true); + $output .= ");\n"; } if ($cache && isset($_template->smarty->ext->_tplFunction)) { $output .= "\$_smarty_tpl->smarty->ext->_tplFunction->registerTplFunctions(\$_smarty_tpl, " . var_export($_template->smarty->ext->_tplFunction->getTplFunction($_template), true) . ");\n"; } - // include code for plugins - if (!$cache) { - if (!empty($_template->compiled->required_plugins[ 'compiled' ])) { - foreach ($_template->compiled->required_plugins[ 'compiled' ] as $tmp) { - foreach ($tmp as $data) { - $file = addslashes($data[ 'file' ]); - if (is_array($data[ 'function' ])) { - $output .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n"; - } else { - $output .= "if (!is_callable('{$data['function']}')) require_once '{$file}';\n"; - } - } - } - } - if ($_template->caching && !empty($_template->compiled->required_plugins[ 'nocache' ])) { - $_template->compiled->has_nocache_code = true; - $output .= "echo '/*%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/smarty; "; - foreach ($_template->compiled->required_plugins[ 'nocache' ] as $tmp) { - foreach ($tmp as $data) { - $file = addslashes($data[ 'file' ]); - if (is_array($data[ 'function' ])) { - $output .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n"); - } else { - $output .= addslashes("if (!is_callable('{$data['function']}')) require_once '{$file}';\n"); - } - } - } - $output .= "?>/*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/';\n"; - } + // include code for required plugins + if (!$cache && isset($compiler)) { + $output .= $compiler->compileRequiredPlugins(); } - $output .= "?>\n"; + $output .= "?>"; $output .= $content; $output .= ""; $output .= $functions; $output .= "[\n]?<\?php\s*/', '/\?>\s*$/'), array("\n", ''), $output); + if (preg_match('/\s*\?>[\n]?<\?php\s*/', $output)) { + $curr_split = preg_split('/\s*\?>[\n]?<\?php\s*/', + $output); + preg_match_all('/\s*\?>[\n]?<\?php\s*/', + $output, + $curr_parts); + $output = ''; + foreach ($curr_split as $idx => $curr_output) { + $output .= $curr_output; + if (isset($curr_parts[ 0 ][ $idx ])) { + $output .= "\n"; + } + } + } + if (preg_match('/\?>\s*$/', $output)) { + $curr_split = preg_split('/\?>\s*$/', + $output); + $output = ''; + foreach ($curr_split as $idx => $curr_output) { + $output .= $curr_output; + } + } + return $output; } } \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php index f6cfa7c44..9d7d2db2e 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php @@ -48,11 +48,11 @@ class Smarty_Internal_Runtime_FilterHandler // loaded class of filter plugin $callback = array($plugin_name, 'execute'); } else { - throw new SmartyException("Auto load {$type}-filter plugin method \"{$plugin_name}::execute\" not callable"); + throw new SmartyException("Auto load {$type}-filter plugin method '{$plugin_name}::execute' not callable"); } } else { // nothing found, throw exception - throw new SmartyException("Unable to auto load {$type}-filter plugin \"{$plugin_name}\""); + throw new SmartyException("Unable to auto load {$type}-filter plugin '{$plugin_name}'"); } $content = call_user_func($callback, $content, $template); } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php index 1e8655d92..8b60768bc 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php @@ -50,7 +50,8 @@ class Smarty_Internal_Runtime_Foreach $total = empty($from) ? 0 : (($needTotal || isset($properties[ 'total' ])) ? count($from) : 1); } if (isset($tpl->tpl_vars[ $item ])) { - $saveVars[ 'item' ] = array($item, $tpl->tpl_vars[ $item ]); + $saveVars[ 'item' ] = array($item, + $tpl->tpl_vars[ $item ]); } $tpl->tpl_vars[ $item ] = new Smarty_Variable(null, $tpl->isRenderingCache); if ($total === 0) { @@ -58,7 +59,8 @@ class Smarty_Internal_Runtime_Foreach } else { if ($key) { if (isset($tpl->tpl_vars[ $key ])) { - $saveVars[ 'key' ] = array($key, $tpl->tpl_vars[ $key ]); + $saveVars[ 'key' ] = array($key, + $tpl->tpl_vars[ $key ]); } $tpl->tpl_vars[ $key ] = new Smarty_Variable(null, $tpl->isRenderingCache); } @@ -69,7 +71,8 @@ class Smarty_Internal_Runtime_Foreach if ($name) { $namedVar = "__smarty_foreach_{$name}"; if (isset($tpl->tpl_vars[ $namedVar ])) { - $saveVars[ 'named' ] = array($namedVar, $tpl->tpl_vars[ $namedVar ]); + $saveVars[ 'named' ] = array($namedVar, + $tpl->tpl_vars[ $namedVar ]); } $namedProp = array(); if (isset($properties[ 'total' ])) { @@ -90,6 +93,33 @@ class Smarty_Internal_Runtime_Foreach return $from; } + /** + * + * [util function] counts an array, arrayAccess/traversable or PDOStatement object + * + * @param mixed $value + * + * @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 + * for empty elements + */ + public function count($value) + { + if ($value instanceof IteratorAggregate) { + // Note: getIterator() returns a Traversable, not an Iterator + // thus rewind() and valid() methods may not be present + return iterator_count($value->getIterator()); + } elseif ($value instanceof Iterator) { + return $value instanceof Generator ? 1 : iterator_count($value); + } elseif ($value instanceof Countable) { + return count($value); + } elseif ($value instanceof PDOStatement) { + return $value->rowCount(); + } elseif ($value instanceof Traversable) { + return iterator_count($value); + } + return count((array) $value); + } + /** * Restore saved variables * @@ -114,36 +144,8 @@ class Smarty_Internal_Runtime_Foreach $tpl->tpl_vars[ $saveVars[ 'named' ][ 0 ] ] = $saveVars[ 'named' ][ 1 ]; } } - $levels--; + $levels --; } } - /* - * - * [util function] counts an array, arrayAccess/traversable or PDOStatement object - * - * @param mixed $value - * - * @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 - * for empty elements - */ - public function count($value) - { - if ($value instanceof Countable) { - return count($value); - } elseif ($value instanceof IteratorAggregate) { - // Note: getIterator() returns a Traversable, not an Iterator - // thus rewind() and valid() methods may not be present - return iterator_count($value->getIterator()); - } elseif ($value instanceof Iterator) { - return $value instanceof Generator ? 1 : iterator_count($value); - } elseif ($value instanceof PDOStatement) { - return $value->rowCount(); - } elseif ($value instanceof Traversable) { - return iterator_count($value); - } elseif ($value instanceof ArrayAccess) { - return $value->offsetExists(0) ? 1 : 0; - } - return count((array) $value); - } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php index e12b0c57c..54b1bb3d5 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php @@ -21,49 +21,42 @@ class Smarty_Internal_Runtime_GetIncludePath * @var string */ public $_include_path = ''; - /** * include path directory cache * * @var array */ public $_include_dirs = array(); - /** * include path directory cache * * @var array */ public $_user_dirs = array(); - /** * stream cache * - * @var string[] + * @var string[][] */ public $isFile = array(); - /** * stream cache * * @var string[] */ public $isPath = array(); - /** * stream cache * * @var int[] */ public $number = array(); - /** * status cache * * @var bool */ public $_has_stream_include = null; - /** * Number for array index * @@ -81,13 +74,13 @@ class Smarty_Internal_Runtime_GetIncludePath public function isNewIncludePath(Smarty $smarty) { $_i_path = get_include_path(); - if ($this->_include_path != $_i_path) { + if ($this->_include_path !== $_i_path) { $this->_include_dirs = array(); $this->_include_path = $_i_path; - $_dirs = (array) explode(PATH_SEPARATOR, $_i_path); + $_dirs = (array)explode(PATH_SEPARATOR, $_i_path); foreach ($_dirs as $_path) { if (is_dir($_path)) { - $this->_include_dirs[] = $smarty->_realpath($_path . $smarty->ds, true); + $this->_include_dirs[] = $smarty->_realpath($_path . DIRECTORY_SEPARATOR, true); } } return true; @@ -128,7 +121,7 @@ class Smarty_Internal_Runtime_GetIncludePath } // try PHP include_path foreach ($dirs as $dir) { - $dir_n = isset($this->number[ $dir ]) ? $this->number[ $dir ] : $this->number[ $dir ] = $this->counter ++; + $dir_n = isset($this->number[ $dir ]) ? $this->number[ $dir ] : $this->number[ $dir ] = $this->counter++; if (isset($this->isFile[ $dir_n ][ $file ])) { if ($this->isFile[ $dir_n ][ $file ]) { return $this->isFile[ $dir_n ][ $file ]; @@ -143,9 +136,9 @@ class Smarty_Internal_Runtime_GetIncludePath $dir = $this->_user_dirs[ $dir_n ]; } } else { - if ($dir[ 0 ] == '/' || $dir[ 1 ] == ':') { + if ($dir[ 0 ] === '/' || $dir[ 1 ] === ':') { $dir = str_ireplace(getcwd(), '.', $dir); - if ($dir[ 0 ] == '/' || $dir[ 1 ] == ':') { + if ($dir[ 0 ] === '/' || $dir[ 1 ] === ':') { $this->_user_dirs[ $dir_n ] = false; continue; } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php index 7ec5924e6..b593b78eb 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php @@ -46,7 +46,6 @@ class Smarty_Internal_Runtime_Inheritance /** * Array of template source objects - * - key template index * * @var Smarty_Template_Source[] */ @@ -70,12 +69,12 @@ class Smarty_Internal_Runtime_Inheritance public function init(Smarty_Internal_Template $tpl, $initChild, $blockNames = array()) { // if called while executing parent template it must be a sub-template with new inheritance root - if ($initChild && $this->state == 3 && (strpos($tpl->template_resource, 'extendsall') === false)) { + if ($initChild && $this->state === 3 && (strpos($tpl->template_resource, 'extendsall') === false)) { $tpl->inheritance = new Smarty_Internal_Runtime_Inheritance(); $tpl->inheritance->init($tpl, $initChild, $blockNames); return; } - $this->tplIndex ++; + ++$this->tplIndex; $this->sources[ $this->tplIndex ] = $tpl->source; // start of child sub template(s) @@ -85,12 +84,12 @@ class Smarty_Internal_Runtime_Inheritance //grab any output of child templates ob_start(); } - $this->inheritanceLevel ++; + ++$this->inheritanceLevel; // $tpl->startRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateStart'); // $tpl->endRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateEnd'); } // if state was waiting for parent change state to parent - if ($this->state == 2) { + if ($this->state === 2) { $this->state = 3; } } @@ -100,32 +99,46 @@ class Smarty_Internal_Runtime_Inheritance * - if outer level is reached flush output buffer and switch to wait for parent template state * * @param \Smarty_Internal_Template $tpl - * @param null|string $template optinal name of inheritance parent template + * @param null|string $template optional name of inheritance parent template * @param null|string $uid uid of inline template * @param null|string $func function call name of inline template + * + * @throws \Exception + * @throws \SmartyException */ public function endChild(Smarty_Internal_Template $tpl, $template = null, $uid = null, $func = null) { - $this->inheritanceLevel --; + --$this->inheritanceLevel; if (!$this->inheritanceLevel) { ob_end_clean(); $this->state = 2; } - if (isset($template) && (($tpl->parent->_isTplObj() && $tpl->parent->source->type !== 'extends') || $tpl->smarty->extends_recursion)) { - $tpl->_subTemplateRender($template, $tpl->cache_id, $tpl->compile_id, $tpl->caching ? 9999 : 0, - $tpl->cache_lifetime, array(), 2, false, $uid, $func); + if (isset($template) && (($tpl->parent->_isTplObj() && $tpl->parent->source->type !== 'extends') || + $tpl->smarty->extends_recursion)) { + $tpl->_subTemplateRender($template, + $tpl->cache_id, + $tpl->compile_id, + $tpl->caching ? 9999 : 0, + $tpl->cache_lifetime, + array(), + 2, + false, + $uid, + $func); } } /** * Smarty_Internal_Block constructor. - * - if outer level {block} of child template ($state == 1) save it as child root block + * - if outer level {block} of child template ($state === 1) save it as child root block * - otherwise process inheritance and render * * @param \Smarty_Internal_Template $tpl * @param $className * @param string $name * @param int|null $tplIndex index of outer level {block} if nested + * + * @throws \SmartyException */ public function instanceBlock(Smarty_Internal_Template $tpl, $className, $name, $tplIndex = null) { @@ -133,7 +146,7 @@ class Smarty_Internal_Runtime_Inheritance if (isset($this->childRoot[ $name ])) { $block->child = $this->childRoot[ $name ]; } - if ($this->state == 1) { + if ($this->state === 1) { $this->childRoot[ $name ] = $block; return; } @@ -164,7 +177,7 @@ class Smarty_Internal_Runtime_Inheritance } $block->parent = $parent; if ($block->append && !$block->prepend && isset($parent)) { - $this->callParent($tpl, $block); + $this->callParent($tpl, $block, '\'{block append}\''); } if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child))) { $this->callBlock($block, $tpl); @@ -172,7 +185,7 @@ class Smarty_Internal_Runtime_Inheritance $this->process($tpl, $block->child, $block); } if ($block->prepend && isset($parent)) { - $this->callParent($tpl, $block); + $this->callParent($tpl, $block, '{block prepend}'); if ($block->append) { if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child)) @@ -187,10 +200,13 @@ class Smarty_Internal_Runtime_Inheritance } /** - * Render child on {$smarty.block.child} + * Render child on \$smarty.block.child * * @param \Smarty_Internal_Template $tpl * @param \Smarty_Internal_Block $block + * + * @return null|string block content + * @throws \SmartyException */ public function callChild(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block) { @@ -200,34 +216,27 @@ class Smarty_Internal_Runtime_Inheritance } /** - * Render parent on {$smarty.block.parent} or {block append/prepend} * + * Render parent block on \$smarty.block.parent or {block append/prepend} * * @param \Smarty_Internal_Template $tpl * @param \Smarty_Internal_Block $block + * @param string $tag * - * @param null $name - * + * @return null|string block content * @throws \SmartyException */ - public function callParent(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block, $name = null) + public function callParent(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block, $tag) { - if (isset($name)) { - $block = $block->parent; - while (isset($block)) { - if (isset($block->subBlocks[ $name ])) { - } else { - $block = $block->parent; - } - } - return; - } else if (isset($block->parent)) { + if (isset($block->parent)) { $this->callBlock($block->parent, $tpl); } else { - throw new SmartyException("inheritance: illegal {\$smarty.block.parent} or {block append/prepend} used in parent template '{$tpl->inheritance->sources[$block->tplIndex]->filepath}' block '{$block->name}'"); + throw new SmartyException("inheritance: illegal '{$tag}' used in child template '{$tpl->inheritance->sources[$block->tplIndex]->filepath}' block '{$block->name}'"); } } /** + * render block + * * @param \Smarty_Internal_Block $block * @param \Smarty_Internal_Template $tpl */ diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php index f6b36f2a5..b86563cb3 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php @@ -120,15 +120,13 @@ class Smarty_Internal_Runtime_TplFunction } // add template function code to cache file if (isset($tplPtr->cached)) { - /* @var Smarty_Template_Cached $cache */ - $cache = $tplPtr->cached; - $content = $cache->read($tplPtr); + $content = $tplPtr->cached->read($tplPtr); if ($content) { // check if we must update file dependency if (!preg_match("/'{$funcParam['uid']}'(.*?)'nocache_hash'/", $content, $match2)) { $content = preg_replace("/('file_dependency'(.*?)\()/", "\\1{$match1[0]}", $content); } - $tplPtr->smarty->ext->_updateCache->write($cache, $tplPtr, + $tplPtr->smarty->ext->_updateCache->write($tplPtr, preg_replace('/\s*\?>\s*$/', "\n", $content) . "\n" . preg_replace(array('/^\s*<\?php\s+/', '/\s*\?>\s*$/',), "\n", diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php index ceee3b718..bb3e4e138 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php @@ -21,6 +21,41 @@ class Smarty_Internal_Runtime_UpdateCache { } + /** + * Cache was invalid , so render from compiled and write to cache + * + * @param \Smarty_Template_Cached $cached + * @param \Smarty_Internal_Template $_template + * @param $no_output_filter + * + * @throws \Exception + */ + public function updateCache(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $no_output_filter) + { + ob_start(); + if (!isset($_template->compiled)) { + $_template->loadCompiled(); + } + $_template->compiled->render($_template); + if ($_template->smarty->debugging) { + $_template->smarty->_debug->start_cache($_template); + } + $this->removeNoCacheHash($cached, $_template, $no_output_filter); + $compile_check = (int)$_template->compile_check; + $_template->compile_check = Smarty::COMPILECHECK_OFF; + if ($_template->_isSubTpl()) { + $_template->compiled->unifunc = $_template->parent->compiled->unifunc; + } + if (!$_template->cached->processed) { + $_template->cached->process($_template, true); + } + $_template->compile_check = $compile_check; + $cached->getRenderedTemplateCode($_template); + if ($_template->smarty->debugging) { + $_template->smarty->_debug->end_cache($_template); + } + } + /** * Sanitize content and write it to cache resource * @@ -30,35 +65,47 @@ class Smarty_Internal_Runtime_UpdateCache * * @throws \SmartyException */ - public function removeNoCacheHash(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, + public function removeNoCacheHash(Smarty_Template_Cached $cached, + Smarty_Internal_Template $_template, $no_output_filter) { + $php_pattern = '/(<%|%>|<\?php|<\?|\?>|)/'; $content = ob_get_clean(); - unset($cached->hashes[ $_template->compiled->nocache_hash ]); - if (!empty($cached->hashes)) { - $hash_array = array(); - foreach ($cached->hashes as $hash => $foo) { - $hash_array[] = "/{$hash}/"; - } - $content = preg_replace($hash_array, $_template->compiled->nocache_hash, $content); - } + $hash_array = $cached->hashes; + $hash_array[$_template->compiled->nocache_hash] = true; + $hash_array = array_keys($hash_array); + $nocache_hash = '(' . implode('|', $hash_array) . ')'; $_template->cached->has_nocache_code = false; // get text between non-cached items $cache_split = - preg_split("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s", + preg_split("!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s", $content); // get non-cached items - preg_match_all("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s", - $content, $cache_parts); + preg_match_all("!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s", + $content, + $cache_parts); $content = ''; // loop over items, stitch back together foreach ($cache_split as $curr_idx => $curr_split) { - // escape PHP tags in template content - $content .= preg_replace('/(<%|%>|<\?php|<\?|\?>|)/', - "\n", $curr_split); + if (preg_match($php_pattern, $curr_split)) { + // escape PHP tags in template content + $php_split = preg_split($php_pattern, + $curr_split); + preg_match_all($php_pattern, + $curr_split, + $php_parts); + foreach ($php_split as $idx_php => $curr_php) { + $content .= $curr_php; + if (isset($php_parts[ 0 ][ $idx_php ])) { + $content .= "\n"; + } + } + } else { + $content .= $curr_split; + } if (isset($cache_parts[ 0 ][ $curr_idx ])) { $_template->cached->has_nocache_code = true; - $content .= $cache_parts[ 1 ][ $curr_idx ]; + $content .= $cache_parts[ 2 ][ $curr_idx ]; } } if (!$no_output_filter && !$_template->cached->has_nocache_code && @@ -68,77 +115,43 @@ class Smarty_Internal_Runtime_UpdateCache $content = $_template->smarty->ext->_filterHandler->runFilter('output', $content, $_template); } // write cache file content - $this->writeCachedContent($cached, $_template, $content); - } - - /** - * Cache was invalid , so render from compiled and write to cache - * - * @param \Smarty_Template_Cached $cached - * @param \Smarty_Internal_Template $_template - * @param $no_output_filter - * - * @throws \Exception - */ - public function updateCache(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $no_output_filter) - { - ob_start(); - if (!isset($_template->compiled)) { - $_template->loadCompiled(); - } - $_template->compiled->render($_template); - if ($_template->smarty->debugging) { - $_template->smarty->_debug->start_cache($_template); - } - $this->removeNoCacheHash($cached, $_template, $no_output_filter); - $compile_check = $_template->smarty->compile_check; - $_template->smarty->compile_check = false; - if ($_template->_isSubTpl()) { - $_template->compiled->unifunc = $_template->parent->compiled->unifunc; - } - if (!$_template->cached->processed) { - $_template->cached->process($_template, true); - } - $_template->smarty->compile_check = $compile_check; - $cached->getRenderedTemplateCode($_template); - if ($_template->smarty->debugging) { - $_template->smarty->_debug->end_cache($_template); - } + $this->writeCachedContent($_template, $content); } /** * Writes the content to cache resource * - * @param \Smarty_Template_Cached $cached * @param Smarty_Internal_Template $_template * @param string $content * * @return bool */ - public function writeCachedContent(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content) + public function writeCachedContent(Smarty_Internal_Template $_template, $content) { - if ($_template->source->handler->recompiled || !($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || - $_template->caching == Smarty::CACHING_LIFETIME_SAVED) + if ($_template->source->handler->recompiled || !$_template->caching ) { // don't write cache file return false; } + if (!isset($_template->cached)) { + $_template->loadCached(); + } $content = $_template->smarty->ext->_codeFrame->create($_template, $content, '', true); - return $this->write($cached, $_template, $content); + return $this->write($_template, $content); } /** * Write this cache object to handler * - * @param \Smarty_Template_Cached $cached * @param Smarty_Internal_Template $_template template object * @param string $content content to cache * * @return bool success */ - public function write(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content) + public function write(Smarty_Internal_Template $_template, $content) { if (!$_template->source->handler->recompiled) { + $cached = $_template->cached; if ($cached->handler->writeCachedContent($_template, $content)) { $cached->content = null; $cached->timestamp = time(); @@ -161,5 +174,4 @@ class Smarty_Internal_Runtime_UpdateCache return false; } - } \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php index 79885321b..2d62c60bb 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php @@ -82,7 +82,7 @@ class Smarty_Internal_Runtime_UpdateScope } /** - * Update varibale in other scope + * Update variable in other scope * * @param array $tpl_vars template variable array * @param \Smarty_Internal_Template $from diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php index 7c462c6ca..dc9019f49 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php @@ -6,7 +6,6 @@ * @subpackage PluginsInternal * @author Monte Ohrt */ - /** * Smarty Internal Write File Class * @@ -35,20 +34,30 @@ class Smarty_Internal_Runtime_WriteFile if ($_file_perms !== null) { $old_umask = umask(0); } - $_dirpath = dirname($_filepath); // if subdirs, create dir structure - if ($_dirpath !== '.' && !file_exists($_dirpath)) { - mkdir($_dirpath, $_dir_perms, true); + if ($_dirpath !== '.') { + $i = 0; + // loop if concurrency problem occurs + // see https://bugs.php.net/bug.php?id=35326 + while (!is_dir($_dirpath)) { + if (@mkdir($_dirpath, $_dir_perms, true)) { + break; + } + clearstatcache(); + if (++$i === 3) { + error_reporting($_error_reporting); + throw new SmartyException("unable to create directory {$_dirpath}"); + } + sleep(1); + } } - // write to tmp file, then move to overt file lock race condition - $_tmp_file = $_dirpath . $smarty->ds . str_replace(array('.', ','), '_', uniqid('wrt', true)); + $_tmp_file = $_dirpath . DIRECTORY_SEPARATOR . str_replace(array('.', ','), '_', uniqid('wrt', true)); if (!file_put_contents($_tmp_file, $_contents)) { error_reporting($_error_reporting); throw new SmartyException("unable to write file {$_tmp_file}"); } - /* * Windows' rename() fails if the destination exists, * Linux' rename() properly handles the overwrite. @@ -85,7 +94,6 @@ class Smarty_Internal_Runtime_WriteFile umask($old_umask); } error_reporting($_error_reporting); - return true; } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php index 8cd37dd56..bdf74065d 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php @@ -89,12 +89,16 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom then written to compiled files. */ // init the lexer/parser to compile the template $this->parser = - new $this->parser_class(new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $_content), $this), + new $this->parser_class(new $this->lexer_class(str_replace(array("\r\n", + "\r"), "\n", $_content), $this), $this); if ($isTemplateSource && $this->template->caching) { $this->parser->insertPhpCode("compiled->nocache_hash = '{$this->nocache_hash}';\n?>\n"); } - if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) { + if (function_exists('mb_internal_encoding') + && function_exists('ini_get') + && ((int) ini_get('mbstring.func_overload')) & 2 + ) { $mbEncoding = mb_internal_encoding(); mb_internal_encoding('ASCII'); } else { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_template.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_template.php index f950606df..21f60f991 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_template.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_template.php @@ -17,6 +17,7 @@ * @property Smarty_Template_Compiled $compiled * @property Smarty_Template_Cached $cached * @property Smarty_Internal_TemplateCompilerBase $compiler + * @property mixed|\Smarty_Template_Cached registered_plugins * * The following methods will be dynamically loaded by the extension handler when they are called. * They are located in a corresponding Smarty_Internal_Method_xxxx class @@ -110,16 +111,18 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase public static $tplObjCache = array(); /** - * Template object cache for Smarty::isCached() == true + * Template object cache for Smarty::isCached() === true * * @var Smarty_Internal_Template[] */ public static $isCacheTplObj = array(); /** - * Subtemplate Info Cache + * Sub template Info Cache + * - index name + * - value use count * - * @var string[]int[] + * @var int[] */ public static $subTplInfo = array(); @@ -148,11 +151,9 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase // Smarty parameter $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id; $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id; - $this->caching = $_caching === null ? $this->smarty->caching : $_caching; - if ($this->caching === true) { - $this->caching = Smarty::CACHING_LIFETIME_CURRENT; - } + $this->caching = (int)($_caching === null ? $this->smarty->caching : $_caching); $this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime; + $this->compile_check = (int)$smarty->compile_check; $this->parent = $_parent; // Template resource $this->template_resource = $template_resource; @@ -170,6 +171,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase * @param null|bool $display true: display, false: fetch null: sub-template * * @return string + * @throws \Exception * @throws \SmartyException */ public function render($no_output_filter = true, $display = null) @@ -187,12 +189,10 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase } // disable caching for evaluated code if ($this->source->handler->recompiled) { - $this->caching = false; + $this->caching = Smarty::CACHING_OFF; } // read from cache or render - $isCacheTpl = - $this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED; - if ($isCacheTpl) { + if ($this->caching === Smarty::CACHING_LIFETIME_CURRENT || $this->caching === Smarty::CACHING_LIFETIME_SAVED) { if (!isset($this->cached) || $this->cached->cache_id !== $this->cache_id || $this->cached->compile_id !== $this->compile_id ) { @@ -234,15 +234,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase $this->smarty->_debug->display_debug($this, true); } } - if ($this->_isSubTpl()) { - foreach ($this->compiled->required_plugins as $code => $tmp1) { - foreach ($tmp1 as $name => $tmp) { - foreach ($tmp as $type => $data) { - $this->parent->compiled->required_plugins[ $code ][ $name ][ $type ] = $data; - } - } - } - } if (!$no_output_filter && (!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled) && (isset($this->smarty->autoload_filters[ 'output' ]) || @@ -269,6 +260,8 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase * @param string $uid file dependency uid * @param string $content_func function name * + * @throws \Exception + * @throws \SmartyException */ public function _subTemplateRender($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $scope, $forceTplCache, $uid = null, $content_func = null) @@ -278,7 +271,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase $smarty = &$this->smarty; $_templateId = $smarty->_getTemplateId($template, $cache_id, $compile_id, $caching, $tpl); // recursive call ? - if (isset($tpl->templateId) ? $tpl->templateId : $tpl->_getTemplateId() != $_templateId) { + if (isset($tpl->templateId) ? $tpl->templateId : $tpl->_getTemplateId() !== $_templateId) { // already in template cache? if (isset(self::$tplObjCache[ $_templateId ])) { // copy data from cached object @@ -293,7 +286,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase } else { unset($tpl->compiled); } - if ($caching != 9999 && isset($cachedTpl->cached)) { + if ($caching !== 9999 && isset($cachedTpl->cached)) { $tpl->cached = $cachedTpl->cached; } else { unset($tpl->cached); @@ -315,7 +308,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase $tpl->source = Smarty_Template_Source::load($tpl); unset($tpl->compiled); } - if ($caching != 9999) { + if ($caching !== 9999) { unset($tpl->cached); } } @@ -343,7 +336,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase $tpl->tpl_vars[ $_key ] = new Smarty_Variable($_val, $this->isRenderingCache); } } - if ($tpl->caching == 9999) { + if ($tpl->caching === 9999) { if (!isset($tpl->compiled)) { $this->loadCompiled(true); } @@ -426,6 +419,39 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase } } + /** + * Check if plugins are callable require file otherwise + * + * @param array $plugins required plugins + * + * @throws \SmartyException + */ + public function _checkPlugins($plugins) { + static $checked = array(); + foreach($plugins as $plugin) { + $name = join('::', (array)$plugin[ 'function' ]); + if (!isset($checked[$name])) { + if (!is_callable($plugin['function'])) { + if (is_file($plugin['file'])) { + require_once $plugin['file']; + if (is_callable($plugin['function'])) { + $checked[ $name ] = true; + } + } + } else { + $checked[ $name ] = true; + } + } + if (!isset($checked[ $name ])) { + if (false !== $this->smarty->loadPlugin($name)) { + $checked[ $name ] = true; + } else { + throw new SmartyException("Plugin '{$name}' not callable"); + } + } + } + } + /** * This function is executed automatically when a compiled or cached template file is included * - Decode saved properties from compiled template and cache files @@ -451,12 +477,12 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase } $is_valid = true; if (!empty($properties[ 'file_dependency' ]) && - ((!$cache && $tpl->smarty->compile_check) || $tpl->smarty->compile_check == 1) + ((!$cache && $tpl->compile_check) || $tpl->compile_check === Smarty::COMPILECHECK_ON) ) { // check file dependencies at compiled code foreach ($properties[ 'file_dependency' ] as $_file_to_check) { - if ($_file_to_check[ 2 ] == 'file' || $_file_to_check[ 2 ] == 'php') { - if ($tpl->source->filepath == $_file_to_check[ 0 ]) { + if ($_file_to_check[ 2 ] === 'file' || $_file_to_check[ 2 ] === 'php') { + if ($tpl->source->filepath === $_file_to_check[ 0 ]) { // do not recheck current template continue; //$mtime = $tpl->source->getTimeStamp(); @@ -521,13 +547,14 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase */ public function writeCachedContent($content) { - return $this->smarty->ext->_updateCache->writeCachedContent($this->cached, $this, $content); + return $this->smarty->ext->_updateCache->writeCachedContent($this, $content); } /** * Get unique template id * * @return string + * @throws \SmartyException */ public function _getTemplateId() { @@ -540,7 +567,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase */ public function capture_error() { - throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\""); + throw new SmartyException("Not matching {capture} open/close in '{$this->template_resource}'"); } /** diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php index c026a6644..6b959404c 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php @@ -21,10 +21,12 @@ * * @method Smarty_Internal_TemplateBase addAutoloadFilters(mixed $filters, string $type = null) * @method Smarty_Internal_TemplateBase addDefaultModifier(mixed $modifiers) + * @method Smarty_Internal_TemplateBase addLiterals(mixed $literals) * @method Smarty_Internal_TemplateBase createData(Smarty_Internal_Data $parent = null, string $name = null) * @method array getAutoloadFilters(string $type = null) * @method string getDebugTemplate() * @method array getDefaultModifier() + * @method array getLiterals() * @method array getTags(mixed $template = null) * @method object getRegisteredObject(string $object_name) * @method Smarty_Internal_TemplateBase registerCacheResource(string $name, Smarty_CacheResource $resource_handler) @@ -35,14 +37,14 @@ * @method Smarty_Internal_TemplateBase registerResource(string $name, mixed $resource_handler) * @method Smarty_Internal_TemplateBase setAutoloadFilters(mixed $filters, string $type = null) * @method Smarty_Internal_TemplateBase setDebugTemplate(string $tpl_name) - * @method Smarty_Internal_TemplateBase setDefaultModifier(mixed $modifiers) + * @method Smarty_Internal_TemplateBase setDefaultModifiers(mixed $modifiers) + * @method Smarty_Internal_TemplateBase setLiterals(mixed $literals) * @method Smarty_Internal_TemplateBase unloadFilter(string $type, string $name) * @method Smarty_Internal_TemplateBase unregisterCacheResource(string $name) * @method Smarty_Internal_TemplateBase unregisterObject(string $object_name) * @method Smarty_Internal_TemplateBase unregisterPlugin(string $type, string $name) * @method Smarty_Internal_TemplateBase unregisterFilter(string $type, mixed $callback) * @method Smarty_Internal_TemplateBase unregisterResource(string $name) - * @method Smarty _getSmartyObj() */ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data { @@ -65,9 +67,16 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data /** * caching enabled * - * @var boolean + * @var int */ - public $caching = false; + public $caching = Smarty::CACHING_OFF; + + /** + * check template for modifications? + * + * @var int + */ + public $compile_check = Smarty::COMPILECHECK_ON; /** * cache lifetime in seconds @@ -115,6 +124,9 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data * @param mixed $cache_id cache id to be used with this template * @param mixed $compile_id compile id to be used with this template * @param object $parent next higher level of Smarty variables + * + * @throws \Exception + * @throws \SmartyException */ public function display($template = null, $cache_id = null, $compile_id = null, $parent = null) { @@ -133,7 +145,9 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data * @param mixed $compile_id compile id to be used with this template * @param object $parent next higher level of Smarty variables * - * @return boolean cache status + * @return bool cache status + * @throws \Exception + * @throws \SmartyException */ public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null) { @@ -173,26 +187,28 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data $saveVars = false; $template = $smarty->createTemplate($template, $cache_id, $compile_id, $parent ? $parent : $this, false); - if ($this->_objType == 1) { + if ($this->_objType === 1) { // set caching in template object $template->caching = $this->caching; } } + // make sure we have integer values + $template->caching = (int)$template->caching; // fetch template content $level = ob_get_level(); try { $_smarty_old_error_level = isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null; - if ($this->_objType == 2) { + if ($this->_objType === 2) { /* @var Smarty_Internal_Template $this */ $template->tplFunctions = $this->tplFunctions; $template->inheritance = $this->inheritance; } /* @var Smarty_Internal_Template $parent */ - if (isset($parent->_objType) && ($parent->_objType == 2) && !empty($parent->tplFunctions)) { + if (isset($parent->_objType) && ($parent->_objType === 2) && !empty($parent->tplFunctions)) { $template->tplFunctions = array_merge($parent->tplFunctions, $template->tplFunctions); } - if ($function == 2) { + if ($function === 2) { if ($template->caching) { // return cache status of template if (!isset($template->cached)) { @@ -320,11 +336,19 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data } /** - * @param boolean $caching + * @param int $compile_check + */ + public function setCompileCheck($compile_check) + { + $this->compile_check = (int)$compile_check; + } + + /** + * @param int $caching */ public function setCaching($caching) { - $this->caching = $caching; + $this->caching = (int)$caching; } /** diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php index 158d654c7..0d7284a0a 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php @@ -1,5 +1,4 @@ array(), 'nocache' => array()); + /** + * Required plugins stack + * + * @var array + */ + public $required_plugins_stack = array(); /** * current template * * @var Smarty_Internal_Template */ public $template = null; - /** * merged included sub template data * * @var array */ public $mergedSubTemplatesData = array(); - /** * merged sub template code * * @var array */ public $mergedSubTemplatesCode = array(); - /** * collected template properties during compilation * * @var array */ public $templateProperties = array(); - /** * source line offset for error messages * * @var int */ public $trace_line_offset = 0; - /** * trace uid * * @var string */ public $trace_uid = ''; - /** * trace file path * * @var string */ public $trace_filepath = ''; - /** * stack for tracing file and line of nested {block} tags * * @var array */ public $trace_stack = array(); - /** * plugins loaded by default plugin handler * * @var array */ public $default_handler_plugins = array(); - /** * saved preprocessed modifier list * * @var mixed */ public $default_modifier_list = null; - /** * force compilation of complete template as nocache * * @var boolean */ public $forceNocache = false; - /** * flag if compiled template file shall we written * * @var bool */ public $write_compiled_code = true; - /** * Template functions * * @var array */ public $tpl_function = array(); - /** * called sub functions from template function * * @var array */ public $called_functions = array(); - /** * compiled template or block function code * * @var string */ public $blockOrFunctionCode = ''; - /** * php_handling setting either from Smarty or security * * @var int */ public $php_handling = 0; - /** * flags for used modifier plugins * * @var array */ public $modifier_plugins = array(); - /** * type of already compiled modifier * * @var array */ public $known_modifier_type = array(); - /** * parent compiler object for merged subtemplates and template functions * * @var Smarty_Internal_TemplateCompilerBase */ public $parent_compiler = null; - /** * Flag true when compiling nocache section * * @var bool */ public $nocache = false; - /** * Flag true when tag is compiled as nocache * * @var bool */ public $tag_nocache = false; - /** * Compiled tag prefix code * * @var array */ public $prefix_code = array(); - + /** + * used prefix variables by current compiled tag + * + * @var array + */ + public $usedPrefixVariables = array(); /** * Prefix code stack * * @var array */ public $prefixCodeStack = array(); - /** * Tag has compiled code * * @var bool */ public $has_code = false; - /** * A variable string was compiled * @@ -240,71 +246,75 @@ abstract class Smarty_Internal_TemplateCompilerBase */ public $has_variable_string = false; - /** - * Tag creates output - * - * @var bool - */ - public $has_output = false; - /** * Stack for {setfilter} {/setfilter} * * @var array */ public $variable_filter_stack = array(); - /** * variable filters for {setfilter} {/setfilter} * * @var array */ public $variable_filters = array(); - /** * Nesting count of looping tags like {foreach}, {for}, {section}, {while} * * @var int */ public $loopNesting = 0; - /** * Strip preg pattern * * @var string */ public $stripRegEx = '![\t ]*[\r\n]+[\t ]*!'; - /** * plugin search order * * @var array */ - public $plugin_search_order = array('function', 'block', 'compiler', 'class'); - + public $plugin_search_order = array('function', + 'block', + 'compiler', + 'class'); /** * General storage area for tag compiler plugins * * @var array */ public $_cache = array(); - /** - * counter for prefix variable number + * Lexer preg pattern for left delimiter + * + * @var string + */ + private $ldelPreg = '[{]'; + /** + * Lexer preg pattern for right delimiter + * + * @var string + */ + private $rdelPreg = '[}]'; + /** + * Length of right delimiter * * @var int */ - public static $prefixVariableNumber = 0; - + private $rdelLength = 0; /** - * method to compile a Smarty template + * Length of left delimiter * - * @param mixed $_content template source - * @param bool $isTemplateSource + * @var int + */ + private $ldelLength = 0; + /** + * Lexer preg pattern for user literals * - * @return bool true if compiling succeeded, false if it failed + * @var string */ - abstract protected function doCompile($_content, $isTemplateSource = false); + private $literalPreg = ''; /** * Initialize compiler @@ -314,7 +324,10 @@ abstract class Smarty_Internal_TemplateCompilerBase public function __construct(Smarty $smarty) { $this->smarty = $smarty; - $this->nocache_hash = str_replace(array('.', ','), '_', uniqid(rand(), true)); + $this->nocache_hash = str_replace(array('.', + ','), + '_', + uniqid(rand(), true)); } /** @@ -327,15 +340,18 @@ abstract class Smarty_Internal_TemplateCompilerBase * @return bool true if compiling succeeded, false if it failed * @throws \Exception */ - public function compileTemplate(Smarty_Internal_Template $template, $nocache = null, + public function compileTemplate(Smarty_Internal_Template $template, + $nocache = null, Smarty_Internal_TemplateCompilerBase $parent_compiler = null) { // get code frame of compiled template $_compiled_code = $template->smarty->ext->_codeFrame->create($template, - $this->compileTemplateSource($template, $nocache, + $this->compileTemplateSource($template, + $nocache, $parent_compiler), $this->postFilter($this->blockOrFunctionCode) . - join('', $this->mergedSubTemplatesCode), false, + join('', $this->mergedSubTemplatesCode), + false, $this); return $_compiled_code; } @@ -350,7 +366,8 @@ abstract class Smarty_Internal_TemplateCompilerBase * @return string * @throws \Exception */ - public function compileTemplateSource(Smarty_Internal_Template $template, $nocache = null, + public function compileTemplateSource(Smarty_Internal_Template $template, + $nocache = null, Smarty_Internal_TemplateCompilerBase $parent_compiler = null) { try { @@ -377,6 +394,7 @@ abstract class Smarty_Internal_TemplateCompilerBase } else { $this->nocache_hash = $template->compiled->nocache_hash; } + $this->caching = $template->caching; // flag for nocache sections $this->nocache = $nocache; $this->tag_nocache = false; @@ -387,7 +405,8 @@ abstract class Smarty_Internal_TemplateCompilerBase // add file dependency if ($this->smarty->merge_compiled_includes || $this->template->source->handler->checkTimestamps()) { $this->parent_compiler->template->compiled->file_dependency[ $this->template->source->uid ] = - array($this->template->source->filepath, $this->template->source->getTimeStamp(), + array($this->template->source->filepath, + $this->template->source->getTimeStamp(), $this->template->source->type,); } $this->smarty->_current_file = $this->template->source->filepath; @@ -396,7 +415,7 @@ abstract class Smarty_Internal_TemplateCompilerBase // we have array of inheritance templates by extends: resource // generate corresponding source code sequence $_content = - Smarty_Internal_Compile_Extends::extendsSourceArrayCode($this->template->source->components); + Smarty_Internal_Compile_Extends::extendsSourceArrayCode($this->template); } else { // get template source $_content = $this->template->source->getContent(); @@ -453,7 +472,7 @@ abstract class Smarty_Internal_TemplateCompilerBase public function preFilter($_content) { // run pre filter if required - if ($_content != '' && + if ($_content !== '' && ((isset($this->smarty->autoload_filters[ 'pre' ]) || isset($this->smarty->registered_filters[ 'pre' ]))) ) { return $this->smarty->ext->_filterHandler->runFilter('pre', $_content, $this->template); @@ -489,521 +508,281 @@ abstract class Smarty_Internal_TemplateCompilerBase } /** - * Compile Tag + * compile variable * - * @param string $tag tag name - * @param array $args array with tag attributes - * @param array $parameter array with compilation parameter + * @param string $variable * - * @throws SmartyCompilerException - * @throws SmartyException - * @return string compiled code + * @return string */ - private function compileTag2($tag, $args, $parameter) + public function compileVariable($variable) { - $plugin_type = ''; - // $args contains the attributes parsed and compiled by the lexer/parser - // assume that tag does compile into code, but creates no HTML output - $this->has_code = true; - $this->has_output = false; - // log tag/attributes - if (isset($this->smarty->_cache[ 'get_used_tags' ])) { - $this->template->_cache[ 'used_tags' ][] = array($tag, $args); + if (!strpos($variable, '(')) { + // not a variable variable + $var = trim($variable, '\''); + $this->tag_nocache = $this->tag_nocache | + $this->template->ext->getTemplateVars->_getVariable($this->template, + $var, + null, + true, + false)->nocache; + // todo $this->template->compiled->properties['variables'][$var] = $this->tag_nocache | $this->nocache; } - // check nocache option flag - foreach ($args as $arg) { - if (!is_array($arg)) { - if ($arg === "'nocache'" || $arg === 'nocache') { - $this->tag_nocache = true; - } - } else { - foreach ($arg as $k => $v) { - if (($k === "'nocache'" || $k === 'nocache') && (trim($v, "'\" ") == 'true')) { - $this->tag_nocache = true; + return '$_smarty_tpl->tpl_vars[' . $variable . ']->value'; + } + + /** + * compile config variable + * + * @param string $variable + * + * @return string + */ + public function compileConfigVariable($variable) + { + // return '$_smarty_tpl->config_vars[' . $variable . ']'; + return '$_smarty_tpl->smarty->ext->configLoad->_getConfigVariable($_smarty_tpl, ' . $variable . ')'; + } + + /** + * compile PHP function call + * + * @param string $name + * @param array $parameter + * + * @return string + * @throws \SmartyCompilerException + */ + public function compilePHPFunctionCall($name, $parameter) + { + if (!$this->smarty->security_policy || $this->smarty->security_policy->isTrustedPhpFunction($name, $this)) { + if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0 || + strcasecmp($name, 'array') === 0 || is_callable($name) + ) { + $func_name = strtolower($name); + $par = implode(',', $parameter); + $parHasFuction = strpos($par, '(') !== false; + if ($func_name === 'isset') { + if (count($parameter) === 0) { + $this->trigger_template_error('Illegal number of parameter in "isset()"'); + } + if ($parHasFuction) { + $pa = array(); + foreach ($parameter as $p) { + $pa[] = (strpos($p, '(') === false) ? ('isset(' . $p . ')') : ('(' . $p . ' !== null )'); + } + return '(' . implode(' && ', $pa) . ')'; + } else { + $isset_par = str_replace("')->value", "',null,true,false)->value", $par); + } + return $name . '(' . $isset_par . ')'; + } else if (in_array($func_name, + array('empty', + 'reset', + 'current', + 'end', + 'prev', + 'next'))) { + if (count($parameter) !== 1) { + $this->trigger_template_error("Illegal number of parameter in '{$func_name()}'"); + } + if ($func_name === 'empty') { + if ($parHasFuction && version_compare(PHP_VERSION, '5.5.0', '<')) { + return '(' . $parameter[ 0 ] . ' === false )'; + } else { + return $func_name . '(' . + str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')'; + } + } else { + return $func_name . '(' . $parameter[ 0 ] . ')'; } + } else { + return $name . '(' . implode(',', $parameter) . ')'; } + } else { + $this->trigger_template_error("unknown function '{$name}'"); } } - // compile the smarty tag (required compile classes to compile the tag are auto loaded) - if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) { - if (isset($this->parent_compiler->tpl_function[ $tag ]) || - (isset ($this->template->smarty->ext->_tplFunction) && $this->template->smarty->ext->_tplFunction->getTplFunction($this->template, $tag) !== false)) { - // template defined by {template} tag - $args[ '_attr' ][ 'name' ] = "'" . $tag . "'"; - $_output = $this->callTagCompiler('call', $args, $parameter); - } - } - if ($_output !== false) { - if ($_output !== true) { - // did we get compiled code - if ($this->has_code) { - // Does it create output? - if ($this->has_output) { - $_output .= "\n"; + } + + /** + * This method is called from parser to process a text content section + * - remove text from inheritance child templates as they may generate output + * - strip text if strip is enabled + * + * @param string $text + * + * @return null|\Smarty_Internal_ParseTree_Text + */ + public function processText($text) + { + if ((string)$text !== '') { + $store = array(); + $_store = 0; + if ($this->parser->strip) { + if (strpos($text, '<') !== false) { + // capture html elements not to be messed with + $_offset = 0; + if (preg_match_all('#(]*>.*?]*>)|(]*>.*?]*>)|(]*>.*?]*>)#is', + $text, + $matches, + PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) { + foreach ($matches as $match) { + $store[] = $match[ 0 ][ 0 ]; + $_length = strlen($match[ 0 ][ 0 ]); + $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@'; + $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length); + $_offset += $_length - strlen($replace); + ++$_store; + } } - // return compiled code - return $_output; - } - } - // tag did not produce compiled code - return null; - } else { - // map_named attributes - if (isset($args[ '_attr' ])) { - foreach ($args[ '_attr' ] as $key => $attribute) { - if (is_array($attribute)) { - $args = array_merge($args, $attribute); + $expressions = array(// replace multiple spaces between tags by a single space + '#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s' => '\1 \2', + // remove newline between tags + '#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s' => '\1\2', + // remove multiple spaces between attributes (but not in attribute values!) + '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5', + '#>[\040\011]+$#Ss' => '> ', + '#>[\040\011]*[\n]\s*$#Ss' => '>', + $this->stripRegEx => '',); + $text = preg_replace(array_keys($expressions), array_values($expressions), $text); + $_offset = 0; + if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', + $text, + $matches, + PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) { + foreach ($matches as $match) { + $_length = strlen($match[ 0 ][ 0 ]); + $replace = $store[ $match[ 1 ][ 0 ] ]; + $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length); + $_offset += strlen($replace) - $_length; + ++$_store; + } } + } else { + $text = preg_replace($this->stripRegEx, '', $text); } } - // not an internal compiler tag - if (strlen($tag) < 6 || substr($tag, - 5) != 'close') { - // check if tag is a registered object - if (isset($this->smarty->registered_objects[ $tag ]) && isset($parameter[ 'object_method' ])) { - $method = $parameter[ 'object_method' ]; - if (!in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ]) && - (empty($this->smarty->registered_objects[ $tag ][ 1 ]) || - in_array($method, $this->smarty->registered_objects[ $tag ][ 1 ])) - ) { - return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method); - } elseif (in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])) { - return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, - $method); - } else { - // throw exception - $this->trigger_template_error('not allowed method "' . $method . '" in registered object "' . - $tag . '"', null, true); - } - } - // check if tag is registered - foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK,) as $plugin_type) - { - if (isset($this->smarty->registered_plugins[ $plugin_type ][ $tag ])) { - // if compiler function plugin call it now - if ($plugin_type == Smarty::PLUGIN_COMPILER) { - $new_args = array(); - foreach ($args as $key => $mixed) { - if (is_array($mixed)) { - $new_args = array_merge($new_args, $mixed); - } else { - $new_args[ $key ] = $mixed; - } - } - if (!$this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 1 ]) { - $this->tag_nocache = true; - } - return call_user_func_array($this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 0 ], - array($new_args, $this)); - } - // compile registered function or block function - if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) { - return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, - $tag); - } - } - } - // check plugins from plugins folder - foreach ($this->plugin_search_order as $plugin_type) { - if ($plugin_type == Smarty::PLUGIN_COMPILER && - $this->smarty->loadPlugin('smarty_compiler_' . $tag) && - (!isset($this->smarty->security_policy) || - $this->smarty->security_policy->isTrustedTag($tag, $this)) - ) { - $plugin = 'smarty_compiler_' . $tag; - if (is_callable($plugin)) { - // convert arguments format for old compiler plugins - $new_args = array(); - foreach ($args as $key => $mixed) { - if (is_array($mixed)) { - $new_args = array_merge($new_args, $mixed); - } else { - $new_args[ $key ] = $mixed; - } - } - - return $plugin($new_args, $this->smarty); - } - if (class_exists($plugin, false)) { - $plugin_object = new $plugin; - if (method_exists($plugin_object, 'compile')) { - return $plugin_object->compile($args, $this); - } - } - throw new SmartyException("Plugin \"{$tag}\" not callable"); - } else { - if ($function = $this->getPlugin($tag, $plugin_type)) { - if (!isset($this->smarty->security_policy) || - $this->smarty->security_policy->isTrustedTag($tag, $this) - ) { - return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, - $tag, $function); - } - } - } - } - if (is_callable($this->smarty->default_plugin_handler_func)) { - $found = false; - // look for already resolved tags - foreach ($this->plugin_search_order as $plugin_type) { - if (isset($this->default_handler_plugins[ $plugin_type ][ $tag ])) { - $found = true; - break; - } - } - if (!$found) { - // call default handler - foreach ($this->plugin_search_order as $plugin_type) { - if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) { - $found = true; - break; - } - } - } - if ($found) { - // if compiler function plugin call it now - if ($plugin_type == Smarty::PLUGIN_COMPILER) { - $new_args = array(); - foreach ($args as $mixed) { - $new_args = array_merge($new_args, $mixed); - } - return call_user_func_array($this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ], - array($new_args, $this)); - } else { - return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, - $tag); - } - } - } - } else { - // compile closing tag of block function - $base_tag = substr($tag, 0, - 5); - // check if closing tag is a registered object - if (isset($this->smarty->registered_objects[ $base_tag ]) && isset($parameter[ 'object_method' ])) { - $method = $parameter[ 'object_method' ]; - if (in_array($method, $this->smarty->registered_objects[ $base_tag ][ 3 ])) { - return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, - $method); - } else { - // throw exception - $this->trigger_template_error('not allowed closing tag method "' . $method . - '" in registered object "' . $base_tag . '"', null, true); - } - } - // registered block tag ? - if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ]) || - isset($this->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ]) - ) { - return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag); - } - // registered function tag ? - if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) { - return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag); - } - // block plugin? - if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) { - return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function); - } - // function plugin? - if ($function = $this->getPlugin($tag, Smarty::PLUGIN_FUNCTION)) { - if (!isset($this->smarty->security_policy) || - $this->smarty->security_policy->isTrustedTag($tag, $this) - ) { - return $this->callTagCompiler('private_function_plugin', $args, $parameter, $tag, $function); - } - } - // registered compiler plugin ? - if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ])) { - // if compiler function plugin call it now - $args = array(); - if (!$this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 1 ]) { - $this->tag_nocache = true; - } - return call_user_func_array($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 0 ], - array($args, $this)); - } - if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) { - $plugin = 'smarty_compiler_' . $tag; - if (is_callable($plugin)) { - return $plugin($args, $this->smarty); - } - if (class_exists($plugin, false)) { - $plugin_object = new $plugin; - if (method_exists($plugin_object, 'compile')) { - return $plugin_object->compile($args, $this); - } - } - throw new SmartyException("Plugin \"{$tag}\" not callable"); - } - } - $this->trigger_template_error("unknown tag \"" . $tag . "\"", null, true); + return new Smarty_Internal_ParseTree_Text($text); } + return null; } /** - * compile variable + * lazy loads internal compile plugin for tag and calls the compile method + * compile objects cached for reuse. + * class name format: Smarty_Internal_Compile_TagName + * plugin filename format: Smarty_Internal_TagName.php * - * @param string $variable + * @param string $tag tag name + * @param array $args list of tag attributes + * @param mixed $param1 optional parameter + * @param mixed $param2 optional parameter + * @param mixed $param3 optional parameter * - * @return string + * @return bool|string compiled code or false + * @throws \SmartyCompilerException */ - public function compileVariable($variable) + public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null) { - if (strpos($variable, '(') == 0) { - // not a variable variable - $var = trim($variable, '\''); - $this->tag_nocache = $this->tag_nocache | - $this->template->ext->getTemplateVars->_getVariable($this->template, $var, null, true, - false)->nocache; - // todo $this->template->compiled->properties['variables'][$var] = $this->tag_nocache | $this->nocache; - } - return '$_smarty_tpl->tpl_vars[' . $variable . ']->value'; + /* @var Smarty_Internal_CompileBase $tagCompiler */ + $tagCompiler = $this->getTagCompiler($tag); + // compile this tag + return $tagCompiler === false ? false : $tagCompiler->compile($args, $this, $param1, $param2, $param3); } /** - * compile config variable - * - * @param string $variable + * lazy loads internal compile plugin for tag compile objects cached for reuse. * - * @return string - */ - public function compileConfigVariable($variable) - { - // return '$_smarty_tpl->config_vars[' . $variable . ']'; - return '$_smarty_tpl->smarty->ext->configLoad->_getConfigVariable($_smarty_tpl, ' . $variable . ')'; - } - - /** - * compile PHP function call + * class name format: Smarty_Internal_Compile_TagName + * plugin filename format: Smarty_Internal_TagName.php * - * @param string $name - * @param array $parameter + * @param string $tag tag name * - * @return string + * @return bool|\Smarty_Internal_CompileBase tag compiler object or false if not found + * @throws \SmartyCompilerException */ - public function compilePHPFunctionCall($name, $parameter) + public function getTagCompiler($tag) { - if (!$this->smarty->security_policy || $this->smarty->security_policy->isTrustedPhpFunction($name, $this)) { - if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0 || - strcasecmp($name, 'array') === 0 || is_callable($name) + // re-use object if already exists + if (!isset(self::$_tag_objects[ $tag ])) { + // lazy load internal compiler plugin + $_tag = explode('_', $tag); + $_tag = array_map('ucfirst', $_tag); + $class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag); + if (class_exists($class_name) && + (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) ) { - $func_name = strtolower($name); - $par = implode(',', $parameter); - $parHasFuction = strpos($par, '(') !== false; - if ($func_name == 'isset') { - if (count($parameter) == 0) { - $this->trigger_template_error('Illegal number of paramer in "isset()"'); - } - if ($parHasFuction) { - $prefixVar = $this->getNewPrefixVariable(); - $this->appendPrefixCode("'); - $isset_par = $prefixVar; - } else { - $isset_par = str_replace("')->value", "',null,true,false)->value", $par); - } - return $name . "(" . $isset_par . ")"; - } elseif (in_array($func_name, array('empty', 'reset', 'current', 'end', 'prev', 'next'))) { - if (count($parameter) != 1) { - $this->trigger_template_error('Illegal number of paramer in "empty()"'); - } - if ($func_name == 'empty') { - if ($parHasFuction) { - $prefixVar = $this->getNewPrefixVariable(); - $this->appendPrefixCode("'); - - return $func_name . '(' . $prefixVar . ')'; - } else { - return $func_name . '(' . - str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')'; - } - } else { - return $func_name . '(' . $parameter[ 0 ] . ')'; - } - } else { - return $name . "(" . implode(',', $parameter) . ")"; - } + self::$_tag_objects[ $tag ] = new $class_name; } else { - $this->trigger_template_error("unknown function \"" . $name . "\""); + self::$_tag_objects[ $tag ] = false; } } + return self::$_tag_objects[ $tag ]; } /** - * This method is called from parser to process a text content section - * - remove text from inheritance child templates as they may generate output - * - strip text if strip is enabled + * Check for plugins and return function name * - * @param string $text + * @param $plugin_name + * @param string $plugin_type type of plugin * - * @return null|\Smarty_Internal_ParseTree_Text + * @return string call name of function + * @throws \SmartyException */ - public function processText($text) - { - if ((string) $text != '') { - $store = array(); - $_store = 0; - if ($this->parser->strip) { - if (strpos($text, '<') !== false) { - // capture html elements not to be messed with - $_offset = 0; - if (preg_match_all('#(]*>.*?]*>)|(]*>.*?]*>)|(]*>.*?]*>)#is', - $text, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) { - foreach ($matches as $match) { - $store[] = $match[ 0 ][ 0 ]; - $_length = strlen($match[ 0 ][ 0 ]); - $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@'; - $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length); - - $_offset += $_length - strlen($replace); - $_store ++; - } - } - $expressions = array(// replace multiple spaces between tags by a single space - '#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s' => '\1 \2', - // remove newline between tags - '#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s' => '\1\2', - // remove multiple spaces between attributes (but not in attribute values!) - '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5', - '#>[\040\011]+$#Ss' => '> ', '#>[\040\011]*[\n]\s*$#Ss' => '>', - $this->stripRegEx => '',); - - $text = preg_replace(array_keys($expressions), array_values($expressions), $text); - $_offset = 0; - if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $text, $matches, - PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) { - foreach ($matches as $match) { - $_length = strlen($match[ 0 ][ 0 ]); - $replace = $store[ $match[ 1 ][ 0 ] ]; - $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length); - - $_offset += strlen($replace) - $_length; - $_store ++; - } - } - } else { - $text = preg_replace($this->stripRegEx, '', $text); - } - } - return new Smarty_Internal_ParseTree_Text($text); - } - return null; - } - - /** - * lazy loads internal compile plugin for tag and calls the compile method - * compile objects cached for reuse. - * class name format: Smarty_Internal_Compile_TagName - * plugin filename format: Smarty_Internal_TagName.php - * - * @param string $tag tag name - * @param array $args list of tag attributes - * @param mixed $param1 optional parameter - * @param mixed $param2 optional parameter - * @param mixed $param3 optional parameter - * - * @return string|bool compiled code or false - */ - public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null) - { - $tagCompiler = $this->getTagCompiler($tag); - // compile this tag - return $tagCompiler === false ? false : $tagCompiler->compile($args, $this, $param1, $param2, $param3); - } - - /** - * lazy loads internal compile plugin for tag compile objects cached for reuse. - * - * class name format: Smarty_Internal_Compile_TagName - * plugin filename format: Smarty_Internal_TagName.php - * - * @param string $tag tag name - * - * @return Smarty_Internal_CompileBase|bool tag compiler object or false if not found - */ - public function getTagCompiler($tag) - { - // re-use object if already exists - if (!isset(self::$_tag_objects[ $tag ])) { - // lazy load internal compiler plugin - $_tag = explode('_', $tag); - $_tag = array_map('ucfirst', $_tag); - $class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag); - if (class_exists($class_name) && - (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) - ) { - self::$_tag_objects[ $tag ] = new $class_name; - } else { - self::$_tag_objects[ $tag ] = false; - } - } - return self::$_tag_objects[ $tag ]; - } - - /** - * Check for plugins and return function name - * - * @param $plugin_name - * @param string $plugin_type type of plugin - * - * @return string call name of function - */ - public function getPlugin($plugin_name, $plugin_type) + public function getPlugin($plugin_name, $plugin_type) { $function = null; - if ($this->template->caching && ($this->nocache || $this->tag_nocache)) { - if (isset($this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) { + if ($this->caching && ($this->nocache || $this->tag_nocache)) { + if (isset($this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) { $function = - $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ]; - } elseif (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) { - $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ] = - $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ]; + $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ]; + } else if (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) { + $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ] = + $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ]; $function = - $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ]; + $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ]; } } else { - if (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) { + if (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) { $function = - $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ]; - } elseif (isset($this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) { - $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ] = - $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ]; + $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ]; + } else if (isset($this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) { + $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ] = + $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ]; $function = - $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ]; + $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ]; } } if (isset($function)) { - if ($plugin_type == 'modifier') { + if ($plugin_type === 'modifier') { $this->modifier_plugins[ $plugin_name ] = true; } - return $function; } // loop through plugin dirs and find the plugin $function = 'smarty_' . $plugin_type . '_' . $plugin_name; $file = $this->smarty->loadPlugin($function, false); - if (is_string($file)) { - if ($this->template->caching && ($this->nocache || $this->tag_nocache)) { - $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'file' ] = + if ($this->caching && ($this->nocache || $this->tag_nocache)) { + $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'file' ] = $file; - $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ] = + $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ] = $function; } else { - $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'file' ] = + $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'file' ] = $file; - $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ] = + $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ] = $function; } - if ($plugin_type == 'modifier') { + if ($plugin_type === 'modifier') { $this->modifier_plugins[ $plugin_name ] = true; } - return $function; } if (is_callable($function)) { // plugin function is defined in the script return $function; } - return false; } @@ -1013,7 +792,8 @@ abstract class Smarty_Internal_TemplateCompilerBase * @param string $tag name of tag * @param string $plugin_type type of plugin * - * @return boolean true if found + * @return bool true if found + * @throws \SmartyCompilerException */ public function getPluginFromDefaultHandler($tag, $plugin_type) { @@ -1021,36 +801,41 @@ abstract class Smarty_Internal_TemplateCompilerBase $script = null; $cacheable = true; $result = call_user_func_array($this->smarty->default_plugin_handler_func, - array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable,)); + array($tag, + $plugin_type, + $this->template, + &$callback, + &$script, + &$cacheable,)); if ($result) { $this->tag_nocache = $this->tag_nocache || !$cacheable; if ($script !== null) { if (is_file($script)) { - if ($this->template->caching && ($this->nocache || $this->tag_nocache)) { - $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'file' ] = + if ($this->caching && ($this->nocache || $this->tag_nocache)) { + $this->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'file' ] = $script; - $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'function' ] = + $this->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'function' ] = $callback; } else { - $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'file' ] = + $this->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'file' ] = $script; - $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'function' ] = + $this->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'function' ] = $callback; } require_once $script; } else { - $this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found"); + $this->trigger_template_error("Default plugin handler: Returned script file '{$script}' for '{$tag}' not found"); } } if (is_callable($callback)) { - $this->default_handler_plugins[ $plugin_type ][ $tag ] = array($callback, true, array()); - + $this->default_handler_plugins[ $plugin_type ][ $tag ] = array($callback, + true, + array()); return true; } else { - $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" not callable"); + $this->trigger_template_error("Default plugin handler: Returned callback for '{$tag}' not callable"); } } - return false; } @@ -1064,9 +849,9 @@ abstract class Smarty_Internal_TemplateCompilerBase */ public function appendCode($left, $right) { - if (preg_match('/\s*\?>\s*$/', $left) && preg_match('/^\s*<\?php\s+/', $right)) { - $left = preg_replace('/\s*\?>\s*$/', "\n", $left); - $left .= preg_replace('/^\s*<\?php\s+/', '', $right); + if (preg_match('/\s*\?>\s?$/D', $left) && preg_match('/^<\?php\s+/', $right)) { + $left = preg_replace('/\s*\?>\s?$/D', "\n", $left); + $left .= preg_replace('/^<\?php\s+/', '', $right); } else { $left .= $right; } @@ -1089,19 +874,18 @@ abstract class Smarty_Internal_TemplateCompilerBase // If the template is not evaluated and we have a nocache section and or a nocache tag if ($is_code && !empty($content)) { // generate replacement code - if ((!($this->template->source->handler->recompiled) || $this->forceNocache) && $this->template->caching && + if ((!($this->template->source->handler->recompiled) || $this->forceNocache) && $this->caching && !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache) ) { $this->template->compiled->has_nocache_code = true; $_output = addcslashes($content, '\'\\'); - $_output = str_replace("^#^", "'", $_output); - $_output = "nocache_hash}%%*/" . $_output . - "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n"; + $_output = str_replace('^#^', '\'', $_output); + $_output = "nocache_hash}%%*/{$_output}/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n"; // make sure we include modifier plugins for nocache code foreach ($this->modifier_plugins as $plugin_name => $dummy) { - if (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ])) { - $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ 'modifier' ] = - $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ]; + if (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ])) { + $this->required_plugins[ 'nocache' ][ $plugin_name ][ 'modifier' ] = + $this->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ]; } } } else { @@ -1113,7 +897,6 @@ abstract class Smarty_Internal_TemplateCompilerBase $this->modifier_plugins = array(); $this->suppressNocacheProcessing = false; $this->tag_nocache = false; - return $_output; } @@ -1176,11 +959,11 @@ abstract class Smarty_Internal_TemplateCompilerBase { $_scope = 0; if (isset($_attr[ 'scope' ])) { - $_scopeName = trim($_attr[ 'scope' ], "'\""); + $_scopeName = trim($_attr[ 'scope' ], '\'"'); if (is_numeric($_scopeName) && in_array($_scopeName, $validScopes)) { $_scope = $_scopeName; - } elseif (is_string($_scopeName)) { - $_scopeName = trim($_scopeName, "'\""); + } else if (is_string($_scopeName)) { + $_scopeName = trim($_scopeName, '\'"'); $_scope = isset($validScopes[ $_scopeName ]) ? $validScopes[ $_scopeName ] : false; } else { $_scope = false; @@ -1203,7 +986,7 @@ abstract class Smarty_Internal_TemplateCompilerBase public function makeNocacheCode($code) { return "echo '/*%%SmartyNocache:{$this->nocache_hash}%%*//*/%%SmartyNocache:{$this->nocache_hash}%%*/';\n"; } @@ -1225,22 +1008,23 @@ abstract class Smarty_Internal_TemplateCompilerBase if ($tagline === true) { // get line number of Tag $line = $lex->taglineno; - } elseif (!isset($line)) { + } else if (!isset($line)) { // get template source line which has error $line = $lex->line; } else { - $line = (int) $line; + $line = (int)$line; } - - if (in_array($this->template->source->type, array('eval', 'string'))) { - $templateName = $this->template->source->type . ':' . trim(preg_replace('![\t\r\n]+!', ' ', + if (in_array($this->template->source->type, + array('eval', + 'string'))) { + $templateName = $this->template->source->type . ':' . trim(preg_replace('![\t\r\n]+!', + ' ', strlen($lex->data) > 40 ? substr($lex->data, 0, 40) . '...' : $lex->data)); } else { $templateName = $this->template->source->type . ':' . $this->template->source->filepath; } - // $line += $this->trace_line_offset; $match = preg_split("/\n/", $lex->data); $error_text = @@ -1268,6 +1052,11 @@ abstract class Smarty_Internal_TemplateCompilerBase $error_text .= ', expected one of: ' . implode(' , ', $expect); } } + if ($this->smarty->_parserdebug) { + $this->parser->errorRunDown(); + echo ob_get_clean(); + flush(); + } $e = new SmartyCompilerException($error_text); $e->line = $line; $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ])); @@ -1288,6 +1077,142 @@ abstract class Smarty_Internal_TemplateCompilerBase return preg_replace('/\s/', '', var_export($value, true)); } + /** + * enter double quoted string + * - save tag stack count + */ + public function enterDoubleQuote() + { + array_push($this->_tag_stack_count, $this->getTagStackCount()); + } + + /** + * Return tag stack count + * + * @return int + */ + public function getTagStackCount() + { + return count($this->_tag_stack); + } + + /** + * @param $lexerPreg + * + * @return mixed + */ + public function replaceDelimiter($lexerPreg) + { + return str_replace(array('SMARTYldel', 'SMARTYliteral', 'SMARTYrdel', 'SMARTYautoliteral', 'SMARTYal'), + array($this->ldelPreg, $this->literalPreg, $this->rdelPreg, + $this->smarty->getAutoLiteral() ? '{1,}' : '{9}', + $this->smarty->getAutoLiteral() ? '' : '\\s*'), + $lexerPreg); + } + + /** + * Build lexer regular expressions for left and right delimiter and user defined literals + */ + public function initDelimiterPreg() + { + $ldel = $this->smarty->getLeftDelimiter(); + $this->ldelLength = strlen($ldel); + $this->ldelPreg = ''; + foreach (str_split($ldel, 1) as $chr) { + $this->ldelPreg .= '[' . ($chr === '\\' ? '\\' : '') . $chr . ']'; + } + $rdel = $this->smarty->getRightDelimiter(); + $this->rdelLength = strlen($rdel); + $this->rdelPreg = ''; + foreach (str_split($rdel, 1) as $chr) { + $this->rdelPreg .= '[' . ($chr === '\\' ? '\\' : '') . $chr . ']'; + } + $literals = $this->smarty->getLiterals(); + if (!empty($literals)) { + foreach ($literals as $key => $literal) { + $literalPreg = ''; + foreach (str_split($literal, 1) as $chr) { + $literalPreg .= '[' . ($chr === '\\' ? '\\' : '') . $chr . ']'; + } + $literals[ $key ] = $literalPreg; + } + $this->literalPreg = '|' . implode('|', $literals); + } else { + $this->literalPreg = ''; + } + } + + /** + * leave double quoted string + * - throw exception if block in string was not closed + * + * @throws \SmartyCompilerException + */ + public function leaveDoubleQuote() + { + if (array_pop($this->_tag_stack_count) !== $this->getTagStackCount()) { + $tag = $this->getOpenBlockTag(); + $this->trigger_template_error("unclosed '{{$tag}}' in doubled quoted string", + null, + true); + } + } + + /** + * Get left delimiter preg + * + * @return string + */ + public function getLdelPreg() + { + return $this->ldelPreg; + } + + /** + * Get right delimiter preg + * + * @return string + */ + public function getRdelPreg() + { + return $this->rdelPreg; + } + + /** + * Get length of left delimiter + * + * @return int + */ + public function getLdelLength() + { + return $this->ldelLength; + } + + /** + * Get length of right delimiter + * + * @return int + */ + public function getRdelLength() + { + return $this->rdelLength; + } + + /** + * Get name of current open block tag + * + * @return string|boolean + */ + public function getOpenBlockTag() + { + $tagCount = $this->getTagStackCount(); + if ($tagCount) { + return $this->_tag_stack[ $tagCount - 1 ][ 0 ]; + } else { + return false; + } + } + /** * Check if $value contains variable elements * @@ -1321,7 +1246,7 @@ abstract class Smarty_Internal_TemplateCompilerBase */ public function getNewPrefixVariable() { - self::$prefixVariableNumber ++; + ++self::$prefixVariableNumber; return $this->getPrefixVariable(); } @@ -1362,4 +1287,345 @@ abstract class Smarty_Internal_TemplateCompilerBase return $code; } + /** + * Save current required plugins + * + * @param bool $init if true init required plugins + */ + public function saveRequiredPlugins($init=false) + { + $this->required_plugins_stack[] = $this->required_plugins; + if ($init) { + $this->required_plugins = array('compiled' => array(), 'nocache' => array()); + } + } + + /** + * Restore required plugins + */ + public function restoreRequiredPlugins() + { + $this->required_plugins = array_pop($this->required_plugins_stack); + } + + /** + * Compile code to call Smarty_Internal_Template::_checkPlugins() + * for required plugins + * + * @return string + */ + public function compileRequiredPlugins() + { + $code = $this->compileCheckPlugins($this->required_plugins[ 'compiled' ]); + if ($this->caching && !empty($this->required_plugins[ 'nocache' ])) { + $code .= $this->makeNocacheCode($this->compileCheckPlugins($this->required_plugins[ 'nocache' ])); + } + return $code; + } + + /** + * Compile code to call Smarty_Internal_Template::_checkPlugins + * - checks if plugin is callable require otherwise + * + * @param $requiredPlugins + * + * @return string + */ + public function compileCheckPlugins($requiredPlugins) + { + if (!empty($requiredPlugins)) { + $plugins = array(); + foreach ($requiredPlugins as $plugin) { + foreach ($plugin as $data) { + $plugins[] = $data; + } + } + return '$_smarty_tpl->_checkPlugins(' . $this->getVarExport($plugins) . ');' . "\n"; + } else { + return ''; + } + } + + /** + * method to compile a Smarty template + * + * @param mixed $_content template source + * @param bool $isTemplateSource + * + * @return bool true if compiling succeeded, false if it failed + */ + abstract protected function doCompile($_content, $isTemplateSource = false); + + /** + * Compile Tag + * + * @param string $tag tag name + * @param array $args array with tag attributes + * @param array $parameter array with compilation parameter + * + * @throws SmartyCompilerException + * @throws SmartyException + * @return string compiled code + */ + private function compileTag2($tag, $args, $parameter) + { + $plugin_type = ''; + // $args contains the attributes parsed and compiled by the lexer/parser + // assume that tag does compile into code, but creates no HTML output + $this->has_code = true; + // log tag/attributes + if (isset($this->smarty->_cache[ 'get_used_tags' ])) { + $this->template->_cache[ 'used_tags' ][] = array($tag, + $args); + } + // check nocache option flag + foreach ($args as $arg) { + if (!is_array($arg)) { + if ($arg === "'nocache'" || $arg === 'nocache') { + $this->tag_nocache = true; + } + } else { + foreach ($arg as $k => $v) { + if (($k === "'nocache'" || $k === 'nocache') && (trim($v, "'\" ") === 'true')) { + $this->tag_nocache = true; + } + } + } + } + // compile the smarty tag (required compile classes to compile the tag are auto loaded) + if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) { + if (isset($this->parent_compiler->tpl_function[ $tag ]) || + (isset ($this->template->smarty->ext->_tplFunction) && + $this->template->smarty->ext->_tplFunction->getTplFunction($this->template, $tag) !== false) + ) { + // template defined by {template} tag + $args[ '_attr' ][ 'name' ] = "'{$tag}'"; + $_output = $this->callTagCompiler('call', $args, $parameter); + } + } + if ($_output !== false) { + if ($_output !== true) { + // did we get compiled code + if ($this->has_code) { + // return compiled code + return $_output; + } + } + // tag did not produce compiled code + return null; + } else { + // map_named attributes + if (isset($args[ '_attr' ])) { + foreach ($args[ '_attr' ] as $key => $attribute) { + if (is_array($attribute)) { + $args = array_merge($args, $attribute); + } + } + } + // not an internal compiler tag + if (strlen($tag) < 6 || substr($tag, -5) !== 'close') { + // check if tag is a registered object + if (isset($this->smarty->registered_objects[ $tag ]) && isset($parameter[ 'object_method' ])) { + $method = $parameter[ 'object_method' ]; + if (!in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ]) && + (empty($this->smarty->registered_objects[ $tag ][ 1 ]) || + in_array($method, $this->smarty->registered_objects[ $tag ][ 1 ])) + ) { + return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method); + } else if (in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])) { + return $this->callTagCompiler('private_object_block_function', + $args, + $parameter, + $tag, + $method); + } else { + // throw exception + $this->trigger_template_error('not allowed method "' . $method . '" in registered object "' . + $tag . '"', + null, + true); + } + } + // check if tag is registered + foreach (array(Smarty::PLUGIN_COMPILER, + Smarty::PLUGIN_FUNCTION, + Smarty::PLUGIN_BLOCK,) as $plugin_type) { + if (isset($this->smarty->registered_plugins[ $plugin_type ][ $tag ])) { + // if compiler function plugin call it now + if ($plugin_type === Smarty::PLUGIN_COMPILER) { + $new_args = array(); + foreach ($args as $key => $mixed) { + if (is_array($mixed)) { + $new_args = array_merge($new_args, $mixed); + } else { + $new_args[ $key ] = $mixed; + } + } + if (!$this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 1 ]) { + $this->tag_nocache = true; + } + return call_user_func_array($this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 0 ], + array($new_args, + $this)); + } + // compile registered function or block function + if ($plugin_type === Smarty::PLUGIN_FUNCTION || $plugin_type === Smarty::PLUGIN_BLOCK) { + return $this->callTagCompiler('private_registered_' . $plugin_type, + $args, + $parameter, + $tag); + } + } + } + // check plugins from plugins folder + foreach ($this->plugin_search_order as $plugin_type) { + if ($plugin_type === Smarty::PLUGIN_COMPILER && + $this->smarty->loadPlugin('smarty_compiler_' . $tag) && + (!isset($this->smarty->security_policy) || + $this->smarty->security_policy->isTrustedTag($tag, $this)) + ) { + $plugin = 'smarty_compiler_' . $tag; + if (is_callable($plugin)) { + // convert arguments format for old compiler plugins + $new_args = array(); + foreach ($args as $key => $mixed) { + if (is_array($mixed)) { + $new_args = array_merge($new_args, $mixed); + } else { + $new_args[ $key ] = $mixed; + } + } + return $plugin($new_args, $this->smarty); + } + if (class_exists($plugin, false)) { + $plugin_object = new $plugin; + if (method_exists($plugin_object, 'compile')) { + return $plugin_object->compile($args, $this); + } + } + throw new SmartyException("Plugin '{$tag}' not callable"); + } else { + if ($function = $this->getPlugin($tag, $plugin_type)) { + if (!isset($this->smarty->security_policy) || + $this->smarty->security_policy->isTrustedTag($tag, $this) + ) { + return $this->callTagCompiler('private_' . $plugin_type . '_plugin', + $args, + $parameter, + $tag, + $function); + } + } + } + } + if (is_callable($this->smarty->default_plugin_handler_func)) { + $found = false; + // look for already resolved tags + foreach ($this->plugin_search_order as $plugin_type) { + if (isset($this->default_handler_plugins[ $plugin_type ][ $tag ])) { + $found = true; + break; + } + } + if (!$found) { + // call default handler + foreach ($this->plugin_search_order as $plugin_type) { + if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) { + $found = true; + break; + } + } + } + if ($found) { + // if compiler function plugin call it now + if ($plugin_type === Smarty::PLUGIN_COMPILER) { + $new_args = array(); + foreach ($args as $key => $mixed) { + if (is_array($mixed)) { + $new_args = array_merge($new_args, $mixed); + } else { + $new_args[ $key ] = $mixed; + } + } + return call_user_func_array($this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ], + array($new_args, + $this)); + } else { + return $this->callTagCompiler('private_registered_' . $plugin_type, + $args, + $parameter, + $tag); + } + } + } + } else { + // compile closing tag of block function + $base_tag = substr($tag, 0, -5); + // check if closing tag is a registered object + if (isset($this->smarty->registered_objects[ $base_tag ]) && isset($parameter[ 'object_method' ])) { + $method = $parameter[ 'object_method' ]; + if (in_array($method, $this->smarty->registered_objects[ $base_tag ][ 3 ])) { + return $this->callTagCompiler('private_object_block_function', + $args, + $parameter, + $tag, + $method); + } else { + // throw exception + $this->trigger_template_error('not allowed closing tag method "' . $method . + '" in registered object "' . $base_tag . '"', + null, + true); + } + } + // registered block tag ? + if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ]) || + isset($this->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ]) + ) { + return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag); + } + // registered function tag ? + if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) { + return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag); + } + // block plugin? + if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) { + return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function); + } + // function plugin? + if ($function = $this->getPlugin($tag, Smarty::PLUGIN_FUNCTION)) { + if (!isset($this->smarty->security_policy) || + $this->smarty->security_policy->isTrustedTag($tag, $this) + ) { + return $this->callTagCompiler('private_function_plugin', $args, $parameter, $tag, $function); + } + } + // registered compiler plugin ? + if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ])) { + // if compiler function plugin call it now + $args = array(); + if (!$this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 1 ]) { + $this->tag_nocache = true; + } + return call_user_func_array($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 0 ], + array($args, + $this)); + } + if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) { + $plugin = 'smarty_compiler_' . $tag; + if (is_callable($plugin)) { + return $plugin($args, $this->smarty); + } + if (class_exists($plugin, false)) { + $plugin_object = new $plugin; + if (method_exists($plugin_object, 'compile')) { + return $plugin_object->compile($args, $this); + } + } + throw new SmartyException("Plugin '{$tag}' not callable"); + } + } + $this->trigger_template_error("unknown tag '{$tag}'", null, true); + } + } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatelexer.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatelexer.php index 8e870b75c..3045a7b0c 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatelexer.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatelexer.php @@ -18,231 +18,237 @@ */ class Smarty_Internal_Templatelexer { + const TEXT = 1; + const TAG = 2; + const TAGBODY = 3; + const LITERAL = 4; + const DOUBLEQUOTEDSTRING = 5; /** * Source * * @var string */ public $data; - /** * Source length * * @var int */ public $dataLength = null; - /** * byte counter * * @var int */ public $counter; - /** * token number * * @var int */ public $token; - /** * token value * * @var string */ public $value; - /** * current line * * @var int */ public $line; - /** * tag start line * * @var */ public $taglineno; - /** * php code type * * @var string */ public $phpType = ''; - - /** - * escaped left delimiter - * - * @var string - */ - public $ldel = ''; - - /** - * escaped left delimiter length - * - * @var int - */ - public $ldel_length = 0; - - /** - * escaped right delimiter - * - * @var string - */ - public $rdel = ''; - - /** - * escaped right delimiter length - * - * @var int - */ - public $rdel_length = 0; - /** * state number * * @var int */ public $state = 1; - /** * Smarty object * * @var Smarty */ public $smarty = null; - /** * compiler object * * @var Smarty_Internal_TemplateCompilerBase */ public $compiler = null; - - /** - * literal tag nesting level - * - * @var int - */ - private $literal_cnt = 0; - - /** - * PHP start tag string - * - * @var string - */ - /** * trace file * * @var resource */ public $yyTraceFILE; - /** * trace prompt * * @var string */ public $yyTracePrompt; - /** * XML flag true while processing xml * * @var bool */ public $is_xml = false; - /** * state names * * @var array */ public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',); - /** - * storage for assembled token patterns + * token names + * + * @var array + */ + public $smarty_token_names = array( // Text for parser error messages + 'NOT' => '(!,not)', + 'OPENP' => '(', + 'CLOSEP' => ')', + 'OPENB' => '[', + 'CLOSEB' => ']', + 'PTR' => '->', + 'APTR' => '=>', + 'EQUAL' => '=', + 'NUMBER' => 'number', + 'UNIMATH' => '+" , "-', + 'MATH' => '*" , "/" , "%', + 'INCDEC' => '++" , "--', + 'SPACE' => ' ', + 'DOLLAR' => '$', + 'SEMICOLON' => ';', + 'COLON' => ':', + 'DOUBLECOLON' => '::', + 'AT' => '@', + 'HATCH' => '#', + 'QUOTE' => '"', + 'BACKTICK' => '`', + 'VERT' => '"|" modifier', + 'DOT' => '.', + 'COMMA' => '","', + 'QMARK' => '"?"', + 'ID' => 'id, name', + 'TEXT' => 'text', + 'LDELSLASH' => '{/..} closing tag', + 'LDEL' => '{...} Smarty tag', + 'COMMENT' => 'comment', + 'AS' => 'as', + 'TO' => 'to', + 'PHP' => '" '"<", "==" ... logical operator', + 'TLOGOP' => '"lt", "eq" ... logical operator; "is div by" ... if condition', + 'SCOND' => '"is even" ... if condition', + ); + /** + * literal tag nesting level + * + * @var int + */ + private $literal_cnt = 0; + /** + * preg token pattern for state TEXT * * @var string */ private $yy_global_pattern1 = null; - + /** + * preg token pattern for state TAG + * + * @var string + */ private $yy_global_pattern2 = null; - + /** + * preg token pattern for state TAGBODY + * + * @var string + */ private $yy_global_pattern3 = null; - + /** + * preg token pattern for state LITERAL + * + * @var string + */ private $yy_global_pattern4 = null; - - private $yy_global_pattern5 = null; - /** - * token names + * preg token pattern for state DOUBLEQUOTEDSTRING * - * @var array + * @var null */ - public $smarty_token_names = array( // Text for parser error messages - 'NOT' => '(!,not)', 'OPENP' => '(', 'CLOSEP' => ')', 'OPENB' => '[', - 'CLOSEB' => ']', 'PTR' => '->', 'APTR' => '=>', 'EQUAL' => '=', - 'NUMBER' => 'number', 'UNIMATH' => '+" , "-', 'MATH' => '*" , "/" , "%', - 'INCDEC' => '++" , "--', 'SPACE' => ' ', 'DOLLAR' => '$', - 'SEMICOLON' => ';', 'COLON' => ':', 'DOUBLECOLON' => '::', 'AT' => '@', - 'HATCH' => '#', 'QUOTE' => '"', 'BACKTICK' => '`', - 'VERT' => '"|" modifier', 'DOT' => '.', 'COMMA' => '","', - 'QMARK' => '"?"', 'ID' => 'id, name', 'TEXT' => 'text', - 'LDELSLASH' => '{/..} closing tag', 'LDEL' => '{...} Smarty tag', - 'COMMENT' => 'comment', 'AS' => 'as', 'TO' => 'to', - 'PHP' => '" '"<", "==" ... logical operator', - 'TLOGOP' => '"lt", "eq" ... logical operator; "is div by" ... if condition', - 'SCOND' => '"is even" ... if condition',); + private $yy_global_pattern5 = null; + private $_yy_state = 1; + private $_yy_stack = array(); /** * constructor * - * @param string $data template source + * @param string $source template source * @param Smarty_Internal_TemplateCompilerBase $compiler */ - function __construct($data, Smarty_Internal_TemplateCompilerBase $compiler) + function __construct($source, Smarty_Internal_TemplateCompilerBase $compiler) { - $this->data = $data; - $this->dataLength = strlen($data); + $this->data = $source; + $this->dataLength = strlen($this->data); $this->counter = 0; if (preg_match('/^\xEF\xBB\xBF/i', $this->data, $match)) { $this->counter += strlen($match[ 0 ]); } $this->line = 1; - $this->smarty = $compiler->smarty; + $this->smarty = $compiler->template->smarty; $this->compiler = $compiler; - $this->ldel = preg_quote($this->smarty->left_delimiter, '/'); - $this->ldel_length = strlen($this->smarty->left_delimiter); - $this->rdel = preg_quote($this->smarty->right_delimiter, '/'); - $this->rdel_length = strlen($this->smarty->right_delimiter); - $this->smarty_token_names[ 'LDEL' ] = $this->smarty->left_delimiter; - $this->smarty_token_names[ 'RDEL' ] = $this->smarty->right_delimiter; + $this->compiler->initDelimiterPreg(); + $this->smarty_token_names[ 'LDEL' ] = $this->smarty->getLeftDelimiter(); + $this->smarty_token_names[ 'RDEL' ] = $this->smarty->getRightDelimiter(); } + /** + * open lexer/parser trace file + * + */ public function PrintTrace() { $this->yyTraceFILE = fopen('php://output', 'w'); $this->yyTracePrompt = '
    '; } - /* - * Check if this tag is autoliteral + /** + * replace placeholders with runtime preg code + * + * @param string $preg + * + * @return string */ - public function isAutoLiteral() + public function replace($preg) { - return $this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ? - strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false; + return $this->compiler->replaceDelimiter($preg); } - private $_yy_state = 1; - - private $_yy_stack = array(); + /** + * check if current value is an autoliteral left delimiter + * + * @return bool + */ + public function isAutoLiteral() + { + return $this->smarty->getAutoLiteral() && isset($this->value[ $this->compiler->getLdelLength() ]) ? + strpos(" \n\t\r", $this->value[ $this->compiler->getLdelLength() ]) !== false : false; + } // end function public function yylex() { @@ -252,14 +258,18 @@ class Smarty_Internal_Templatelexer public function yypushstate($state) { if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, + fprintf($this->yyTraceFILE, + "%sState push %s\n", + $this->yyTracePrompt, isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state); } array_push($this->_yy_stack, $this->_yy_state); $this->_yy_state = $state; if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, + fprintf($this->yyTraceFILE, + "%snew State %s\n", + $this->yyTracePrompt, isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state); } @@ -268,13 +278,17 @@ class Smarty_Internal_Templatelexer public function yypopstate() { if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, + fprintf($this->yyTraceFILE, + "%sState pop %s\n", + $this->yyTracePrompt, isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state); } $this->_yy_state = array_pop($this->_yy_stack); if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, + fprintf($this->yyTraceFILE, + "%snew State %s\n", + $this->yyTracePrompt, isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state); } @@ -284,20 +298,19 @@ class Smarty_Internal_Templatelexer { $this->_yy_state = $state; if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, + fprintf($this->yyTraceFILE, + "%sState set %s\n", + $this->yyTracePrompt, isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state); } } - public function yylex1() +public function yylex1() { if (!isset($this->yy_global_pattern1)) { $this->yy_global_pattern1 = - "/\G([{][}])|\G(" . $this->ldel . "[*])|\G((" . $this->ldel . "\\s*php([ ].*?)?" . $this->rdel . ")|(" . - $this->ldel . "\\s*[\/]php" . $this->rdel . "))|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . - ")|\G(" . $this->ldel . "\\s*)|\G(\\s*" . $this->rdel . - ")|\G((<[?]((php\\s+|=)|\\s+))|(<[%])|(<[?]xml\\s+)|()|([?][>])|([%][>]))|\G([\S\s])/isS"; + $this->replace("/\G([{][}])|\G((SMARTYldel)SMARTYal[*])|\G((SMARTYldel)SMARTYalphp([ ].*?)?SMARTYrdel|(SMARTYldel)SMARTYal[\/]phpSMARTYrdel)|\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([<][?]((php\\s+|=)|\\s+)|[<][%]|[<][?]xml\\s+|[<]script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*[>]|[?][>]|[%][>])|\G((.*?)(?=((SMARTYldel)SMARTYal|[<][?]((php\\s+|=)|\\s+)|[<][%]|[<][?]xml\\s+|[<]script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*[>]|[?][>]|[%][>]SMARTYliteral))|[\s\S]+)/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -305,17 +318,18 @@ class Smarty_Internal_Templatelexer if ($this->counter >= $this->dataLength) { return false; // end of input } - do { - if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) { + if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, 0, $this->counter)) { if (!isset($yymatches[ 0 ][ 1 ])) { $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . ' an empty string. Input "' . - substr($this->data, $this->counter, 5) . '... state TEXT'); + throw new Exception('Error: lexing failed because a rule matched' . + ' an empty string. Input "' . substr($this->data, + $this->counter, + 5) . '... state TEXT'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -326,11 +340,11 @@ class Smarty_Internal_Templatelexer $this->line += substr_count($this->value, "\n"); // accept this token return true; - } elseif ($r === true) { + } else if ($r === true) { // we have changed state // process this token in the new state return $this->yylex(); - } elseif ($r === false) { + } else if ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); if ($this->counter >= $this->dataLength) { @@ -340,101 +354,77 @@ class Smarty_Internal_Templatelexer continue; } } else { - throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]); + throw new Exception('Unexpected input at line' . $this->line . + ': ' . $this->data[ $this->counter ]); } break; - } - while (true); - } // end function - - const TEXT = 1; + } while (true); + } function yy_r1_1() { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; } function yy_r1_2() { - - preg_match("/[*]{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); + preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/", + $this->data, + $match, + PREG_OFFSET_CAPTURE, + $this->counter); if (isset($match[ 0 ][ 1 ])) { $to = $match[ 0 ][ 1 ] + strlen($match[ 0 ][ 0 ]); } else { - $this->compiler->trigger_template_error("missing or misspelled comment closing tag '*{$this->smarty->right_delimiter}'"); + $this->compiler->trigger_template_error("missing or misspelled comment closing tag '{$this->smarty->getRightDelimiter()}'"); } $this->value = substr($this->data, $this->counter, $to - $this->counter); return false; } - function yy_r1_3() + function yy_r1_4() { - $this->compiler->getTagCompiler('private_php')->parsePhp($this); } - function yy_r1_7() + function yy_r1_8() { - - if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ? - strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false - ) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; - $this->yypushstate(self::LITERAL); - } + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - function yy_r1_8() + function yy_r1_10() { - - if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ? - strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false - ) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->yypushstate(self::TAG); - return true; - } + $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; + $this->yypushstate(self::LITERAL); } - function yy_r1_9() + function yy_r1_12() { + $this->token = Smarty_Internal_Templateparser::TP_LITERALEND; + $this->yypushstate(self::LITERAL); + } // end function - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + function yy_r1_14() + { + $this->yypushstate(self::TAG); + return true; } - function yy_r1_10() + function yy_r1_16() { - $this->compiler->getTagCompiler('private_php')->parsePhp($this); } function yy_r1_19() { - - $to = $this->dataLength; - preg_match("/($this->ldel)|(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|()|([?][>])|([%][>])/i", - $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); - if (isset($match[ 0 ][ 1 ])) { - $to = $match[ 0 ][ 1 ]; - } - $this->value = substr($this->data, $this->counter, $to - $this->counter); $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - public function yylex2() +public function yylex2() { if (!isset($this->yy_global_pattern2)) { $this->yy_global_pattern2 = - "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . - $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel . - "\\s*make_nocache\\s+)|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . - ")|\G(" . $this->ldel . "\\s*[\/](?:(?!block)[0-9]*[a-zA-Z_]\\w*)\\s*" . $this->rdel . ")|\G(" . - $this->ldel . "\\s*[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel . - "\\s*[\/])|\G(" . $this->ldel . "\\s*)/isS"; + $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYalmake_nocache\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -442,17 +432,18 @@ class Smarty_Internal_Templatelexer if ($this->counter >= $this->dataLength) { return false; // end of input } - do { - if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) { + if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, 0, $this->counter)) { if (!isset($yymatches[ 0 ][ 1 ])) { $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . ' an empty string. Input "' . - substr($this->data, $this->counter, 5) . '... state TAG'); + throw new Exception('Error: lexing failed because a rule matched' . + ' an empty string. Input "' . substr($this->data, + $this->counter, + 5) . '... state TAG'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -463,11 +454,11 @@ class Smarty_Internal_Templatelexer $this->line += substr_count($this->value, "\n"); // accept this token return true; - } elseif ($r === true) { + } else if ($r === true) { // we have changed state // process this token in the new state return $this->yylex(); - } elseif ($r === false) { + } else if ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); if ($this->counter >= $this->dataLength) { @@ -477,107 +468,102 @@ class Smarty_Internal_Templatelexer continue; } } else { - throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]); + throw new Exception('Unexpected input at line' . $this->line . + ': ' . $this->data[ $this->counter ]); } break; - } - while (true); - } // end function - - const TAG = 2; + } while (true); + } function yy_r2_1() { - $this->token = Smarty_Internal_Templateparser::TP_LDELIF; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } - function yy_r2_3() + function yy_r2_4() { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } - function yy_r2_4() + function yy_r2_6() { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } - function yy_r2_5() + function yy_r2_8() { - $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } - function yy_r2_6() + function yy_r2_10() { - $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } - function yy_r2_7() + function yy_r2_12() { - $this->yypopstate(); $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG; $this->taglineno = $this->line; } - function yy_r2_9() + function yy_r2_15() { + $this->yypopstate(); + $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT; + $this->taglineno = $this->line; + } + function yy_r2_18() + { $this->yypopstate(); $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG; $this->taglineno = $this->line; } - function yy_r2_10() + function yy_r2_20() { - - if ($this->_yy_stack[ count($this->_yy_stack) - 1 ] == self::TEXT) { + if ($this->_yy_stack[ count($this->_yy_stack) - 1 ] === self::TEXT) { $this->yypopstate(); $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT; $this->taglineno = $this->line; } else { - $this->value = $this->smarty->left_delimiter; + $this->value = $this->smarty->getLeftDelimiter(); $this->token = Smarty_Internal_Templateparser::TP_LDEL; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } - } + } // end function - function yy_r2_12() + function yy_r2_23() { - $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } - function yy_r2_13() + function yy_r2_25() { - $this->token = Smarty_Internal_Templateparser::TP_LDEL; $this->yybegin(self::TAGBODY); $this->taglineno = $this->line; } - public function yylex3() +public function yylex3() { if (!isset($this->yy_global_pattern3)) { - $this->yy_global_pattern3 = "/\G(\\s*" . $this->rdel . ")|\G(" . $this->ldel . - "\\s*)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+(is\\s+(not\\s+)?(odd|even|div)\\s+by)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G(([!]\\s*)|(not\\s+))|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|])|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS"; + $this->yy_global_pattern3 = + $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -585,17 +571,18 @@ class Smarty_Internal_Templatelexer if ($this->counter >= $this->dataLength) { return false; // end of input } - do { - if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) { + if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, 0, $this->counter)) { if (!isset($yymatches[ 0 ][ 1 ])) { $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . ' an empty string. Input "' . - substr($this->data, $this->counter, 5) . '... state TAGBODY'); + throw new Exception('Error: lexing failed because a rule matched' . + ' an empty string. Input "' . substr($this->data, + $this->counter, + 5) . '... state TAGBODY'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -606,11 +593,11 @@ class Smarty_Internal_Templatelexer $this->line += substr_count($this->value, "\n"); // accept this token return true; - } elseif ($r === true) { + } else if ($r === true) { // we have changed state // process this token in the new state return $this->yylex(); - } elseif ($r === false) { + } else if ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); if ($this->counter >= $this->dataLength) { @@ -620,213 +607,168 @@ class Smarty_Internal_Templatelexer continue; } } else { - throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]); + throw new Exception('Unexpected input at line' . $this->line . + ': ' . $this->data[ $this->counter ]); } break; - } - while (true); - } // end function - - const TAGBODY = 3; + } while (true); + } function yy_r3_1() { - $this->token = Smarty_Internal_Templateparser::TP_RDEL; $this->yypopstate(); } function yy_r3_2() { - - if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ? - strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false - ) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->yypushstate(self::TAG); - return true; - } + $this->yypushstate(self::TAG); + return true; } - function yy_r3_3() + function yy_r3_4() { - $this->token = Smarty_Internal_Templateparser::TP_QUOTE; $this->yypushstate(self::DOUBLEQUOTEDSTRING); - } - - function yy_r3_4() - { - - $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING; + $this->compiler->enterDoubleQuote(); } function yy_r3_5() { - - $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT; - $this->taglineno = $this->line; + $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING; } - function yy_r3_7() + function yy_r3_6() { - $this->token = Smarty_Internal_Templateparser::TP_DOLLARID; } - function yy_r3_8() + function yy_r3_7() { - $this->token = Smarty_Internal_Templateparser::TP_DOLLAR; } - function yy_r3_9() + function yy_r3_8() { - $this->token = Smarty_Internal_Templateparser::TP_ISIN; } - function yy_r3_10() + function yy_r3_9() { - $this->token = Smarty_Internal_Templateparser::TP_AS; } - function yy_r3_11() + function yy_r3_10() { - $this->token = Smarty_Internal_Templateparser::TP_TO; } - function yy_r3_12() + function yy_r3_11() { - $this->token = Smarty_Internal_Templateparser::TP_STEP; } - function yy_r3_13() + function yy_r3_12() { - $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF; } - function yy_r3_14() + function yy_r3_13() { - $this->token = Smarty_Internal_Templateparser::TP_LOGOP; } - function yy_r3_19() + function yy_r3_15() { - $this->token = Smarty_Internal_Templateparser::TP_SLOGOP; } - function yy_r3_21() + function yy_r3_17() { - $this->token = Smarty_Internal_Templateparser::TP_TLOGOP; } - function yy_r3_25() + function yy_r3_20() { - $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND; } - function yy_r3_28() + function yy_r3_23() { - $this->token = Smarty_Internal_Templateparser::TP_NOT; } - function yy_r3_31() + function yy_r3_24() { - $this->token = Smarty_Internal_Templateparser::TP_TYPECAST; } - function yy_r3_35() + function yy_r3_28() { - $this->token = Smarty_Internal_Templateparser::TP_OPENP; } - function yy_r3_36() + function yy_r3_29() { - $this->token = Smarty_Internal_Templateparser::TP_CLOSEP; } - function yy_r3_37() + function yy_r3_30() { - $this->token = Smarty_Internal_Templateparser::TP_OPENB; } - function yy_r3_38() + function yy_r3_31() { - $this->token = Smarty_Internal_Templateparser::TP_CLOSEB; } - function yy_r3_39() + function yy_r3_32() { - $this->token = Smarty_Internal_Templateparser::TP_PTR; } - function yy_r3_40() + function yy_r3_33() { - $this->token = Smarty_Internal_Templateparser::TP_APTR; } - function yy_r3_41() + function yy_r3_34() { - $this->token = Smarty_Internal_Templateparser::TP_EQUAL; } - function yy_r3_42() + function yy_r3_35() { - $this->token = Smarty_Internal_Templateparser::TP_INCDEC; } - function yy_r3_44() + function yy_r3_37() { - $this->token = Smarty_Internal_Templateparser::TP_UNIMATH; } - function yy_r3_46() + function yy_r3_39() { - $this->token = Smarty_Internal_Templateparser::TP_MATH; } - function yy_r3_48() + function yy_r3_41() { - $this->token = Smarty_Internal_Templateparser::TP_AT; } - function yy_r3_49() + function yy_r3_42() { - $this->token = Smarty_Internal_Templateparser::TP_HATCH; } - function yy_r3_50() + function yy_r3_43() { - // resolve conflicts with shorttag and right_delimiter starting with '=' - if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) == - $this->smarty->right_delimiter - ) { - preg_match("/\s+/", $this->value, $match); + if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) === + $this->smarty->getRightDelimiter()) { + preg_match('/\s+/', $this->value, $match); $this->value = $match[ 0 ]; $this->token = Smarty_Internal_Templateparser::TP_SPACE; } else { @@ -834,97 +776,82 @@ class Smarty_Internal_Templatelexer } } - function yy_r3_51() + function yy_r3_44() { - $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE; } - function yy_r3_54() + function yy_r3_47() { - $this->token = Smarty_Internal_Templateparser::TP_ID; } - function yy_r3_55() + function yy_r3_48() { - $this->token = Smarty_Internal_Templateparser::TP_INTEGER; } - function yy_r3_56() + function yy_r3_49() { - $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; $this->yypopstate(); } - function yy_r3_57() + function yy_r3_50() { - $this->token = Smarty_Internal_Templateparser::TP_VERT; } - function yy_r3_58() + function yy_r3_51() { - $this->token = Smarty_Internal_Templateparser::TP_DOT; } - function yy_r3_59() + function yy_r3_52() { - $this->token = Smarty_Internal_Templateparser::TP_COMMA; } - function yy_r3_60() + function yy_r3_53() { - $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON; } - function yy_r3_61() + function yy_r3_54() { - $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON; } - function yy_r3_62() + function yy_r3_55() { - $this->token = Smarty_Internal_Templateparser::TP_COLON; } - function yy_r3_63() + function yy_r3_56() { - $this->token = Smarty_Internal_Templateparser::TP_QMARK; } - function yy_r3_64() + function yy_r3_57() { - $this->token = Smarty_Internal_Templateparser::TP_HEX; } - function yy_r3_65() + function yy_r3_58() { - $this->token = Smarty_Internal_Templateparser::TP_SPACE; - } + } // end function - function yy_r3_66() + function yy_r3_59() { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - public function yylex4() +public function yylex4() { if (!isset($this->yy_global_pattern4)) { $this->yy_global_pattern4 = - "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" . - $this->rdel . ")|\G([\S\s])/isS"; + $this->replace("/\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((.*?)(?=(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel))/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -932,17 +859,18 @@ class Smarty_Internal_Templatelexer if ($this->counter >= $this->dataLength) { return false; // end of input } - do { - if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) { + if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, 0, $this->counter)) { if (!isset($yymatches[ 0 ][ 1 ])) { $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . ' an empty string. Input "' . - substr($this->data, $this->counter, 5) . '... state LITERAL'); + throw new Exception('Error: lexing failed because a rule matched' . + ' an empty string. Input "' . substr($this->data, + $this->counter, + 5) . '... state LITERAL'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -953,11 +881,11 @@ class Smarty_Internal_Templatelexer $this->line += substr_count($this->value, "\n"); // accept this token return true; - } elseif ($r === true) { + } else if ($r === true) { // we have changed state // process this token in the new state return $this->yylex(); - } elseif ($r === false) { + } else if ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); if ($this->counter >= $this->dataLength) { @@ -967,27 +895,23 @@ class Smarty_Internal_Templatelexer continue; } } else { - throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]); + throw new Exception('Unexpected input at line' . $this->line . + ': ' . $this->data[ $this->counter ]); } break; - } - while (true); - } // end function - - const LITERAL = 4; + } while (true); + } function yy_r4_1() { - - $this->literal_cnt ++; + $this->literal_cnt++; $this->token = Smarty_Internal_Templateparser::TP_LITERAL; } - function yy_r4_2() + function yy_r4_3() { - if ($this->literal_cnt) { - $this->literal_cnt --; + $this->literal_cnt--; $this->token = Smarty_Internal_Templateparser::TP_LITERAL; } else { $this->token = Smarty_Internal_Templateparser::TP_LITERALEND; @@ -995,30 +919,16 @@ class Smarty_Internal_Templatelexer } } - function yy_r4_3() + function yy_r4_5() { - - $to = $this->dataLength; - preg_match("/{$this->ldel}[\/]?literal{$this->rdel}/i", $this->data, $match, PREG_OFFSET_CAPTURE, - $this->counter); - if (isset($match[ 0 ][ 1 ])) { - $to = $match[ 0 ][ 1 ]; - } else { - $this->compiler->trigger_template_error("missing or misspelled literal closing tag"); - } - $this->value = substr($this->data, $this->counter, $to - $this->counter); $this->token = Smarty_Internal_Templateparser::TP_LITERAL; - } + } // end function - public function yylex5() +public function yylex5() { if (!isset($this->yy_global_pattern5)) { $this->yy_global_pattern5 = - "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" . - $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/])|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*)|\G(" . - $this->ldel . - "\\s*)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . - $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/isS"; + $this->replace("/\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=((SMARTYldel)SMARTYal|\\$|`\\$|\"SMARTYliteral)))/isS"); } if (!isset($this->dataLength)) { $this->dataLength = strlen($this->data); @@ -1026,17 +936,18 @@ class Smarty_Internal_Templatelexer if ($this->counter >= $this->dataLength) { return false; // end of input } - do { - if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) { + if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, 0, $this->counter)) { if (!isset($yymatches[ 0 ][ 1 ])) { $yymatches = preg_grep("/(.|\s)+/", $yymatches); } else { $yymatches = array_filter($yymatches); } if (empty($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . ' an empty string. Input "' . - substr($this->data, $this->counter, 5) . '... state DOUBLEQUOTEDSTRING'); + throw new Exception('Error: lexing failed because a rule matched' . + ' an empty string. Input "' . substr($this->data, + $this->counter, + 5) . '... state DOUBLEQUOTEDSTRING'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number @@ -1047,11 +958,11 @@ class Smarty_Internal_Templatelexer $this->line += substr_count($this->value, "\n"); // accept this token return true; - } elseif ($r === true) { + } else if ($r === true) { // we have changed state // process this token in the new state return $this->yylex(); - } elseif ($r === false) { + } else if ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); if ($this->counter >= $this->dataLength) { @@ -1061,109 +972,75 @@ class Smarty_Internal_Templatelexer continue; } } else { - throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]); + throw new Exception('Unexpected input at line' . $this->line . + ': ' . $this->data[ $this->counter ]); } break; - } - while (true); - } // end function - - const DOUBLEQUOTEDSTRING = 5; + } while (true); + } function yy_r5_1() { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - function yy_r5_2() + function yy_r5_3() { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - function yy_r5_3() + function yy_r5_5() { - - if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ? - strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false - ) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->yypushstate(self::TAG); - return true; - } + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - function yy_r5_4() + function yy_r5_7() { - - if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ? - strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false - ) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->yypushstate(self::TAG); - return true; - } + $this->yypushstate(self::TAG); + return true; } - function yy_r5_5() + function yy_r5_9() { - - if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ? - strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false - ) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDEL; - $this->taglineno = $this->line; - $this->yypushstate(self::TAGBODY); - } + $this->yypushstate(self::TAG); + return true; } - function yy_r5_6() + function yy_r5_11() { + $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->taglineno = $this->line; + $this->yypushstate(self::TAGBODY); + } + function yy_r5_13() + { $this->token = Smarty_Internal_Templateparser::TP_QUOTE; $this->yypopstate(); } - function yy_r5_7() + function yy_r5_14() { - $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; - $this->value = substr($this->value, 0, - 1); + $this->value = substr($this->value, 0, -1); $this->yypushstate(self::TAGBODY); $this->taglineno = $this->line; } - function yy_r5_8() + function yy_r5_15() { - $this->token = Smarty_Internal_Templateparser::TP_DOLLARID; } - function yy_r5_9() + function yy_r5_16() { - - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } - - function yy_r5_10() - { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - function yy_r5_14() + function yy_r5_17() { - - $to = $this->dataLength; - $this->value = substr($this->data, $this->counter, $to - $this->counter); $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - } \ No newline at end of file diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php index bc74fe440..d8219daed 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php @@ -1,70 +1,5 @@ string = $s->string; - $this->metadata = $s->metadata; - } else { - $this->string = (string) $s; - if ($m instanceof TP_yyToken) { - $this->metadata = $m->metadata; - } elseif (is_array($m)) { - $this->metadata = $m; - } - } - } - - public function __toString() - { - return $this->string; - } - - public function offsetExists($offset) - { - return isset($this->metadata[ $offset ]); - } - - public function offsetGet($offset) - { - return $this->metadata[ $offset ]; - } - - public function offsetSet($offset, $value) - { - if ($offset === null) { - if (isset($value[ 0 ])) { - $x = ($value instanceof TP_yyToken) ? $value->metadata : $value; - $this->metadata = array_merge($this->metadata, $x); - - return; - } - $offset = count($this->metadata); - } - if ($value === null) { - return; - } - if ($value instanceof TP_yyToken) { - if ($value->metadata) { - $this->metadata[ $offset ] = $value->metadata; - } - } elseif ($value) { - $this->metadata[ $offset ] = $value; - } - } - - public function offsetUnset($offset) - { - unset($this->metadata[ $offset ]); - } -} - class TP_yyStackEntry { public $stateno; /* The state-number */ @@ -75,7 +10,6 @@ class TP_yyStackEntry } ; - #line 11 "../smarty/lexer/smarty_internal_templateparser.y" /** @@ -89,129 +23,1629 @@ class TP_yyStackEntry class Smarty_Internal_Templateparser { #line 23 "../smarty/lexer/smarty_internal_templateparser.y" - - const Err1 = "Security error: Call to private object member not allowed"; - - const Err2 = "Security error: Call to dynamic object member not allowed"; - - const Err3 = "PHP in template not allowed. Use SmartyBC to enable it"; - + const Err1 = 'Security error: Call to private object member not allowed'; + const Err2 = 'Security error: Call to dynamic object member not allowed'; + const Err3 = 'PHP in template not allowed. Use SmartyBC to enable it'; + const TP_VERT = 1; + const TP_COLON = 2; + const TP_UNIMATH = 3; + const TP_PHP = 4; + const TP_TEXT = 5; + const TP_STRIPON = 6; + const TP_STRIPOFF = 7; + const TP_LITERALSTART = 8; + const TP_LITERALEND = 9; + const TP_LITERAL = 10; + const TP_SIMPELOUTPUT = 11; + const TP_SIMPLETAG = 12; + const TP_SMARTYBLOCKCHILDPARENT = 13; + const TP_LDEL = 14; + const TP_RDEL = 15; + const TP_DOLLARID = 16; + const TP_EQUAL = 17; + const TP_ID = 18; + const TP_PTR = 19; + const TP_LDELMAKENOCACHE = 20; + const TP_LDELIF = 21; + const TP_LDELFOR = 22; + const TP_SEMICOLON = 23; + const TP_INCDEC = 24; + const TP_TO = 25; + const TP_STEP = 26; + const TP_LDELFOREACH = 27; + const TP_SPACE = 28; + const TP_AS = 29; + const TP_APTR = 30; + const TP_LDELSETFILTER = 31; + const TP_CLOSETAG = 32; + const TP_LDELSLASH = 33; + const TP_ATTR = 34; + const TP_INTEGER = 35; + const TP_COMMA = 36; + const TP_OPENP = 37; + const TP_CLOSEP = 38; + const TP_MATH = 39; + const TP_ISIN = 40; + const TP_QMARK = 41; + const TP_NOT = 42; + const TP_TYPECAST = 43; + const TP_HEX = 44; + const TP_DOT = 45; + const TP_INSTANCEOF = 46; + const TP_SINGLEQUOTESTRING = 47; + const TP_DOUBLECOLON = 48; + const TP_NAMESPACE = 49; + const TP_AT = 50; + const TP_HATCH = 51; + const TP_OPENB = 52; + const TP_CLOSEB = 53; + const TP_DOLLAR = 54; + const TP_LOGOP = 55; + const TP_SLOGOP = 56; + const TP_TLOGOP = 57; + const TP_SINGLECOND = 58; + const TP_QUOTE = 59; + const TP_BACKTICK = 60; + const YY_NO_ACTION = 511; + const YY_ACCEPT_ACTION = 510; + const YY_ERROR_ACTION = 509; + const YY_SZ_ACTTAB = 2178; + const YY_SHIFT_USE_DFLT = -23; + const YY_SHIFT_MAX = 227; + const YY_REDUCE_USE_DFLT = -68; + const YY_REDUCE_MAX = 176; + const YYNOCODE = 108; + const YYSTACKDEPTH = 500; + const YYNSTATE = 323; + const YYNRULE = 186; + const YYERRORSYMBOL = 61; + const YYERRSYMDT = 'yy0'; + const YYFALLBACK = 0; /** * result status * * @var bool */ public $successful = true; - /** * return value * * @var mixed */ public $retvalue = 0; - /** * @var */ public $yymajor; - /** * last index of array variable * * @var mixed */ public $last_index; - /** * last variable name * * @var string */ public $last_variable; - /** * root parse tree buffer * * @var Smarty_Internal_ParseTree */ public $root_buffer; - /** * current parse tree object * * @var Smarty_Internal_ParseTree */ public $current_buffer; - /** * lexer object * * @var Smarty_Internal_Templatelexer */ public $lex; - /** * internal error flag * * @var bool */ private $internalError = false; - /** * {strip} status * * @var bool */ public $strip = false; - /** * compiler object * * @var Smarty_Internal_TemplateCompilerBase */ public $compiler = null; - /** * smarty object * * @var Smarty */ public $smarty = null; - /** * template object * * @var Smarty_Internal_Template */ public $template = null; - /** * block nesting level * * @var int */ public $block_nesting_level = 0; - /** * security object * * @var Smarty_Security */ public $security = null; - /** * template prefix array * * @var \Smarty_Internal_ParseTree[] */ public $template_prefix = array(); - /** - * security object + * template prefix array * * @var \Smarty_Internal_ParseTree[] */ public $template_postfix = array(); + static public $yy_action = array( + 43, 266, 267, 379, 115, 203, 33, 201, 274, 275, + 281, 1, 13, 124, 93, 183, 379, 217, 6, 79, + 253, 89, 379, 16, 102, 425, 304, 252, 218, 249, + 211, 129, 190, 302, 26, 213, 425, 33, 11, 39, + 42, 283, 209, 13, 223, 385, 195, 233, 77, 3, + 236, 290, 43, 385, 170, 385, 75, 17, 385, 94, + 274, 275, 281, 1, 385, 128, 385, 196, 385, 217, + 6, 79, 80, 298, 158, 210, 102, 156, 174, 133, + 218, 249, 211, 85, 208, 290, 28, 264, 101, 264, + 199, 39, 42, 283, 209, 31, 312, 182, 195, 259, + 77, 3, 43, 290, 23, 172, 239, 174, 75, 288, + 274, 275, 281, 1, 167, 127, 256, 196, 248, 217, + 6, 79, 345, 40, 20, 305, 102, 248, 345, 157, + 218, 249, 211, 83, 208, 290, 26, 8, 174, 264, + 74, 39, 42, 283, 209, 131, 312, 292, 195, 74, + 77, 3, 43, 290, 295, 99, 243, 174, 75, 345, + 274, 275, 281, 1, 15, 126, 86, 196, 248, 217, + 6, 79, 345, 322, 161, 289, 102, 87, 345, 165, + 218, 249, 211, 290, 208, 115, 26, 128, 255, 221, + 74, 39, 42, 283, 209, 93, 312, 210, 195, 162, + 77, 3, 43, 290, 254, 235, 247, 304, 75, 27, + 274, 275, 281, 1, 172, 127, 425, 177, 248, 217, + 6, 79, 77, 174, 250, 290, 102, 425, 198, 14, + 218, 249, 211, 248, 208, 34, 26, 222, 206, 139, + 74, 39, 42, 283, 209, 198, 312, 23, 195, 291, + 77, 3, 43, 290, 300, 74, 198, 438, 75, 346, + 274, 275, 281, 1, 438, 127, 176, 196, 267, 217, + 6, 79, 346, 161, 289, 290, 102, 23, 346, 238, + 218, 249, 211, 33, 178, 263, 26, 160, 289, 13, + 37, 39, 42, 283, 209, 198, 312, 212, 195, 250, + 77, 3, 43, 290, 216, 189, 155, 97, 75, 381, + 274, 275, 281, 1, 149, 127, 264, 179, 18, 217, + 6, 79, 381, 94, 97, 237, 102, 140, 381, 251, + 218, 249, 211, 4, 194, 94, 26, 264, 198, 37, + 30, 39, 42, 283, 209, 198, 312, 212, 195, 129, + 77, 3, 43, 290, 219, 172, 11, 97, 75, 378, + 274, 275, 281, 1, 101, 127, 438, 186, 210, 217, + 6, 79, 378, 438, 12, 163, 102, 220, 378, 425, + 218, 249, 211, 302, 208, 213, 26, 225, 215, 187, + 425, 39, 42, 283, 209, 234, 312, 7, 195, 212, + 77, 3, 43, 290, 134, 9, 240, 425, 75, 97, + 274, 275, 281, 1, 264, 91, 109, 76, 425, 217, + 6, 79, 253, 293, 426, 16, 102, 251, 198, 252, + 218, 249, 211, 198, 208, 426, 26, 148, 198, 135, + 132, 39, 42, 283, 209, 143, 312, 264, 195, 264, + 77, 3, 43, 290, 138, 264, 205, 24, 75, 166, + 274, 275, 281, 1, 264, 125, 276, 196, 19, 217, + 6, 79, 454, 153, 13, 454, 102, 168, 290, 454, + 218, 249, 211, 174, 208, 314, 5, 136, 210, 251, + 152, 39, 42, 283, 209, 268, 312, 213, 195, 308, + 77, 3, 43, 290, 94, 169, 111, 144, 75, 251, + 274, 275, 281, 1, 229, 128, 7, 196, 313, 217, + 6, 79, 510, 90, 175, 111, 102, 164, 289, 174, + 218, 249, 211, 101, 208, 265, 28, 32, 128, 150, + 261, 39, 42, 283, 209, 10, 312, 317, 195, 224, + 77, 21, 269, 290, 232, 230, 282, 114, 75, 307, + 214, 213, 279, 22, 84, 103, 246, 181, 92, 64, + 260, 262, 454, 77, 93, 454, 290, 257, 316, 454, + 438, 228, 311, 197, 309, 78, 304, 271, 272, 273, + 270, 121, 258, 310, 274, 275, 281, 1, 17, 280, + 110, 284, 81, 217, 6, 79, 438, 146, 94, 438, + 102, 454, 151, 438, 218, 249, 211, 307, 214, 213, + 279, 278, 84, 103, 104, 180, 92, 56, 263, 159, + 130, 152, 93, 295, 137, 257, 316, 295, 251, 88, + 311, 197, 309, 82, 304, 307, 295, 213, 303, 295, + 100, 295, 295, 193, 105, 59, 295, 295, 295, 295, + 93, 295, 295, 257, 316, 295, 295, 295, 311, 197, + 309, 307, 304, 213, 277, 295, 100, 103, 295, 181, + 92, 64, 200, 297, 295, 253, 93, 295, 16, 257, + 316, 295, 252, 295, 311, 197, 309, 295, 304, 295, + 299, 295, 295, 295, 295, 295, 274, 275, 281, 2, + 295, 301, 295, 295, 295, 217, 6, 79, 253, 295, + 295, 16, 102, 299, 204, 252, 218, 249, 211, 274, + 275, 281, 2, 295, 301, 33, 295, 154, 217, 6, + 79, 13, 295, 295, 295, 102, 295, 295, 295, 218, + 249, 211, 295, 295, 286, 25, 307, 295, 213, 295, + 295, 100, 295, 295, 193, 105, 59, 295, 295, 295, + 295, 93, 295, 295, 257, 316, 295, 287, 25, 311, + 197, 309, 307, 304, 213, 295, 454, 100, 295, 454, + 193, 118, 67, 454, 296, 253, 295, 93, 16, 295, + 257, 316, 252, 295, 295, 311, 197, 309, 295, 304, + 295, 295, 307, 295, 213, 295, 188, 100, 295, 295, + 193, 118, 67, 295, 295, 454, 295, 93, 295, 295, + 257, 316, 295, 295, 226, 311, 197, 309, 295, 304, + 295, 295, 307, 295, 213, 295, 192, 100, 295, 295, + 193, 118, 67, 295, 295, 295, 295, 93, 295, 295, + 257, 316, 295, 295, 295, 311, 197, 309, 295, 304, + 295, 295, 307, 295, 213, 295, 191, 98, 295, 295, + 193, 118, 46, 295, 108, 295, 295, 93, 295, 295, + 257, 316, 295, 295, 295, 311, 197, 309, 307, 304, + 213, 295, 295, 98, 295, 295, 193, 118, 47, 295, + 219, 295, 295, 93, 295, 295, 257, 316, 295, 295, + 295, 311, 197, 309, 307, 304, 213, 295, 295, 100, + 295, 295, 193, 118, 45, 295, 295, 295, 295, 93, + 295, 295, 257, 316, 295, 295, 295, 311, 197, 309, + 295, 304, 295, 295, 307, 295, 213, 295, 295, 100, + 295, 295, 193, 118, 70, 295, 295, 295, 295, 93, + 295, 295, 257, 316, 295, 295, 295, 311, 197, 309, + 307, 304, 213, 295, 295, 100, 295, 295, 193, 118, + 49, 295, 295, 295, 295, 93, 295, 295, 257, 316, + 295, 295, 295, 311, 197, 309, 307, 304, 213, 295, + 295, 100, 295, 295, 193, 96, 66, 295, 295, 295, + 295, 93, 295, 295, 257, 316, 295, 295, 295, 311, + 197, 309, 295, 304, 295, 295, 307, 295, 213, 295, + 295, 100, 295, 295, 193, 118, 44, 295, 295, 295, + 295, 93, 295, 295, 257, 316, 295, 295, 295, 311, + 197, 309, 307, 304, 213, 295, 295, 100, 295, 295, + 193, 118, 58, 295, 295, 295, 295, 93, 295, 295, + 257, 316, 295, 295, 295, 311, 197, 309, 307, 304, + 213, 295, 295, 100, 295, 295, 193, 118, 54, 295, + 295, 295, 295, 93, 295, 295, 257, 316, 295, 295, + 295, 311, 197, 309, 295, 304, 295, 295, 307, 295, + 213, 295, 295, 100, 295, 295, 193, 118, 71, 295, + 295, 295, 295, 93, 295, 295, 257, 316, 295, 295, + 295, 311, 197, 309, 307, 304, 213, 295, 295, 100, + 295, 295, 193, 118, 65, 295, 295, 295, 295, 93, + 295, 295, 257, 316, 295, 295, 295, 311, 197, 309, + 307, 304, 213, 295, 295, 100, 295, 295, 193, 96, + 57, 295, 295, 295, 295, 93, 295, 295, 257, 316, + 295, 295, 295, 311, 197, 309, 295, 304, 295, 295, + 307, 295, 213, 295, 295, 100, 295, 295, 185, 106, + 53, 295, 295, 295, 295, 93, 295, 295, 257, 316, + 295, 295, 295, 311, 197, 309, 307, 304, 213, 295, + 295, 100, 295, 295, 193, 118, 60, 295, 295, 295, + 295, 93, 295, 295, 257, 316, 295, 295, 295, 311, + 197, 309, 307, 304, 213, 295, 295, 100, 295, 295, + 193, 118, 73, 295, 295, 295, 295, 93, 295, 295, + 257, 316, 295, 295, 295, 311, 197, 309, 295, 304, + 295, 295, 307, 295, 213, 295, 295, 100, 295, 295, + 193, 118, 55, 295, 295, 295, 295, 93, 295, 295, + 257, 316, 295, 295, 295, 311, 197, 309, 307, 304, + 213, 295, 295, 100, 295, 295, 193, 95, 68, 295, + 295, 295, 295, 93, 295, 295, 257, 316, 295, 295, + 295, 311, 197, 309, 307, 304, 213, 295, 295, 100, + 295, 295, 193, 118, 69, 295, 295, 295, 295, 93, + 295, 295, 257, 316, 295, 295, 295, 311, 197, 309, + 295, 304, 295, 295, 307, 295, 213, 295, 295, 100, + 295, 295, 193, 118, 51, 295, 295, 295, 295, 93, + 295, 295, 257, 316, 295, 295, 295, 311, 197, 309, + 307, 304, 213, 295, 295, 100, 295, 295, 184, 118, + 52, 295, 295, 295, 295, 93, 295, 295, 257, 316, + 295, 295, 295, 311, 197, 309, 307, 304, 213, 295, + 295, 100, 295, 295, 193, 118, 47, 295, 295, 295, + 295, 93, 295, 295, 257, 316, 295, 295, 295, 311, + 197, 309, 295, 304, 295, 295, 307, 295, 213, 295, + 295, 100, 295, 295, 193, 118, 50, 295, 295, 295, + 295, 93, 295, 295, 257, 316, 295, 295, 295, 311, + 197, 309, 307, 304, 213, 295, 295, 100, 295, 295, + 193, 118, 62, 295, 295, 295, 295, 93, 295, 295, + 257, 316, 295, 295, 295, 311, 197, 309, 307, 304, + 213, 295, 295, 100, 295, 295, 193, 118, 63, 295, + 295, 295, 295, 93, 295, 295, 257, 316, 295, 295, + 295, 311, 197, 309, 295, 304, 295, 295, 307, 295, + 213, 295, 295, 100, 295, 295, 193, 118, 61, 295, + 295, 295, 295, 93, 295, 295, 257, 316, 295, 295, + 295, 311, 197, 309, 307, 304, 213, 295, 295, 100, + 295, 295, 193, 118, 48, 295, 295, 295, 295, 93, + 295, 295, 257, 316, 391, 391, 391, 311, 197, 309, + 307, 304, 213, 295, 295, 100, 295, 295, 193, 118, + 72, 295, 295, 295, 295, 93, 295, 295, 257, 316, + 295, 295, 295, 311, 197, 309, 295, 304, 295, 295, + 425, 295, 391, 391, 295, 295, 295, 295, 307, 295, + 213, 425, 198, 100, 38, 295, 193, 112, 391, 391, + 391, 391, 38, 93, 295, 295, 295, 306, 295, 295, + 295, 311, 197, 309, 295, 304, 295, 35, 307, 33, + 213, 295, 295, 100, 295, 13, 193, 120, 295, 295, + 41, 36, 198, 93, 38, 295, 295, 231, 41, 36, + 295, 311, 197, 309, 295, 304, 319, 318, 315, 245, + 295, 207, 295, 295, 319, 318, 315, 245, 295, 33, + 454, 295, 295, 454, 295, 13, 207, 454, 438, 295, + 41, 36, 295, 295, 295, 454, 295, 295, 454, 295, + 295, 14, 454, 438, 295, 295, 319, 318, 315, 245, + 295, 198, 295, 38, 438, 295, 295, 438, 307, 454, + 213, 438, 320, 100, 295, 241, 193, 122, 295, 438, + 295, 295, 438, 93, 454, 295, 438, 295, 198, 295, + 38, 311, 197, 309, 295, 304, 307, 295, 213, 41, + 36, 100, 295, 295, 193, 117, 295, 295, 295, 295, + 295, 93, 295, 295, 295, 319, 318, 315, 245, 311, + 197, 309, 207, 304, 295, 295, 41, 36, 295, 295, + 295, 454, 295, 295, 454, 295, 295, 4, 454, 438, + 295, 295, 319, 318, 315, 245, 295, 294, 295, 295, + 295, 307, 295, 213, 295, 295, 100, 295, 295, 193, + 123, 295, 295, 295, 295, 438, 93, 295, 438, 141, + 454, 295, 438, 167, 311, 197, 309, 295, 304, 264, + 295, 295, 40, 20, 305, 295, 295, 307, 295, 213, + 295, 198, 100, 38, 295, 193, 116, 174, 307, 295, + 213, 295, 93, 100, 295, 295, 193, 113, 295, 295, + 311, 197, 309, 93, 304, 295, 198, 295, 38, 295, + 295, 311, 197, 309, 295, 304, 307, 295, 213, 41, + 36, 100, 295, 295, 193, 119, 295, 295, 295, 295, + 295, 93, 295, 321, 145, 319, 318, 315, 245, 311, + 197, 309, 207, 304, 41, 36, 295, 295, 295, 295, + 295, 454, 295, 295, 454, 295, 295, 295, 454, 438, + 319, 318, 315, 245, 198, 295, 38, 295, 198, 295, + 38, 295, 198, 295, 38, 295, 295, 295, 242, 295, + 295, 295, 285, 295, 295, 438, 171, 295, 438, 295, + 454, 295, 438, 295, 295, 295, 295, 454, 295, 295, + 454, 295, 41, 36, 454, 438, 41, 36, 295, 295, + 41, 36, 198, 295, 38, 295, 295, 295, 319, 318, + 315, 245, 319, 318, 315, 245, 319, 318, 315, 245, + 295, 438, 295, 147, 438, 295, 454, 167, 438, 295, + 295, 295, 295, 264, 295, 295, 40, 20, 305, 227, + 41, 36, 295, 295, 295, 295, 295, 295, 295, 295, + 295, 174, 295, 295, 295, 295, 319, 318, 315, 245, + 198, 295, 38, 295, 198, 295, 38, 142, 198, 295, + 38, 167, 295, 295, 173, 295, 295, 264, 295, 295, + 40, 20, 305, 295, 295, 295, 107, 295, 198, 29, + 38, 295, 198, 295, 38, 174, 295, 295, 41, 36, + 295, 295, 41, 36, 295, 244, 41, 36, 295, 295, + 295, 295, 295, 295, 319, 318, 315, 245, 319, 318, + 315, 245, 319, 318, 315, 245, 41, 36, 295, 295, + 41, 36, 295, 295, 295, 295, 295, 295, 295, 295, + 295, 295, 319, 318, 315, 245, 319, 318, 315, 245, + 198, 295, 295, 295, 295, 295, 295, 295, 295, 295, + 295, 295, 295, 295, 349, 295, 295, 295, 202, 295, + 295, 295, 295, 295, 295, 295, 295, 33, 295, 295, + 295, 295, 295, 13, 295, 295, 425, 295, 295, 295, + 295, 295, 295, 295, 295, 295, 295, 425, + ); + static public $yy_lookahead = array( + 3, 9, 10, 15, 71, 17, 28, 74, 11, 12, + 13, 14, 34, 16, 81, 18, 28, 20, 21, 22, + 11, 82, 34, 14, 27, 37, 93, 18, 31, 32, + 33, 45, 35, 66, 37, 68, 48, 28, 52, 42, + 43, 44, 45, 34, 47, 15, 49, 16, 51, 52, + 53, 54, 3, 23, 77, 25, 59, 17, 28, 19, + 11, 12, 13, 14, 34, 16, 36, 18, 38, 20, + 21, 22, 105, 106, 94, 45, 27, 73, 101, 73, + 31, 32, 33, 77, 35, 54, 37, 83, 48, 83, + 65, 42, 43, 44, 45, 14, 47, 16, 49, 18, + 51, 52, 3, 54, 36, 101, 38, 101, 59, 15, + 11, 12, 13, 14, 77, 16, 35, 18, 24, 20, + 21, 22, 28, 86, 87, 88, 27, 24, 34, 73, + 31, 32, 33, 77, 35, 54, 37, 36, 101, 83, + 46, 42, 43, 44, 45, 16, 47, 70, 49, 46, + 51, 52, 3, 54, 53, 81, 53, 101, 59, 15, + 11, 12, 13, 14, 23, 16, 37, 18, 24, 20, + 21, 22, 28, 99, 97, 98, 27, 36, 34, 82, + 31, 32, 33, 54, 35, 71, 37, 16, 74, 18, + 46, 42, 43, 44, 45, 81, 47, 45, 49, 77, + 51, 52, 3, 54, 90, 53, 18, 93, 59, 30, + 11, 12, 13, 14, 101, 16, 37, 18, 24, 20, + 21, 22, 51, 101, 102, 54, 27, 48, 1, 17, + 31, 32, 33, 24, 35, 14, 37, 16, 50, 18, + 46, 42, 43, 44, 45, 1, 47, 36, 49, 38, + 51, 52, 3, 54, 60, 46, 1, 45, 59, 15, + 11, 12, 13, 14, 52, 16, 8, 18, 10, 20, + 21, 22, 28, 97, 98, 54, 27, 36, 34, 38, + 31, 32, 33, 28, 35, 95, 37, 97, 98, 34, + 2, 42, 43, 44, 45, 1, 47, 71, 49, 102, + 51, 52, 3, 54, 78, 79, 73, 81, 59, 15, + 11, 12, 13, 14, 71, 16, 83, 18, 17, 20, + 21, 22, 28, 19, 81, 24, 27, 73, 34, 96, + 31, 32, 33, 17, 35, 19, 37, 83, 1, 2, + 17, 42, 43, 44, 45, 1, 47, 71, 49, 45, + 51, 52, 3, 54, 78, 101, 52, 81, 59, 15, + 11, 12, 13, 14, 48, 16, 45, 18, 45, 20, + 21, 22, 28, 52, 14, 16, 27, 18, 34, 37, + 31, 32, 33, 66, 35, 68, 37, 45, 64, 65, + 48, 42, 43, 44, 45, 53, 47, 37, 49, 71, + 51, 52, 3, 54, 73, 37, 78, 37, 59, 81, + 11, 12, 13, 14, 83, 16, 48, 18, 48, 20, + 21, 22, 11, 106, 37, 14, 27, 96, 1, 18, + 31, 32, 33, 1, 35, 48, 37, 73, 1, 73, + 16, 42, 43, 44, 45, 73, 47, 83, 49, 83, + 51, 52, 3, 54, 73, 83, 19, 30, 59, 77, + 11, 12, 13, 14, 83, 16, 70, 18, 28, 20, + 21, 22, 11, 94, 34, 14, 27, 82, 54, 18, + 31, 32, 33, 101, 35, 53, 37, 94, 45, 96, + 94, 42, 43, 44, 45, 66, 47, 68, 49, 92, + 51, 52, 3, 54, 19, 77, 99, 94, 59, 96, + 11, 12, 13, 14, 38, 16, 37, 18, 92, 20, + 21, 22, 62, 63, 18, 99, 27, 97, 98, 101, + 31, 32, 33, 48, 35, 16, 37, 25, 16, 51, + 18, 42, 43, 44, 45, 37, 47, 18, 49, 18, + 51, 41, 9, 54, 53, 53, 15, 18, 59, 66, + 67, 68, 69, 2, 71, 72, 18, 74, 75, 76, + 18, 49, 11, 51, 81, 14, 54, 84, 85, 18, + 19, 18, 89, 90, 91, 18, 93, 4, 5, 6, + 7, 8, 18, 35, 11, 12, 13, 14, 17, 15, + 18, 35, 81, 20, 21, 22, 45, 51, 19, 48, + 27, 50, 94, 52, 31, 32, 33, 66, 67, 68, + 69, 83, 71, 72, 80, 74, 75, 76, 95, 94, + 81, 94, 81, 107, 94, 84, 85, 107, 96, 94, + 89, 90, 91, 81, 93, 66, 107, 68, 98, 107, + 71, 107, 107, 74, 75, 76, 107, 107, 107, 107, + 81, 107, 107, 84, 85, 107, 107, 107, 89, 90, + 91, 66, 93, 68, 69, 107, 71, 72, 107, 74, + 75, 76, 103, 104, 107, 11, 81, 107, 14, 84, + 85, 107, 18, 107, 89, 90, 91, 107, 93, 107, + 5, 107, 107, 107, 107, 107, 11, 12, 13, 14, + 107, 16, 107, 107, 107, 20, 21, 22, 11, 107, + 107, 14, 27, 5, 50, 18, 31, 32, 33, 11, + 12, 13, 14, 107, 16, 28, 107, 30, 20, 21, + 22, 34, 107, 107, 107, 27, 107, 107, 107, 31, + 32, 33, 107, 107, 59, 60, 66, 107, 68, 107, + 107, 71, 107, 107, 74, 75, 76, 107, 107, 107, + 107, 81, 107, 107, 84, 85, 107, 59, 60, 89, + 90, 91, 66, 93, 68, 107, 11, 71, 107, 14, + 74, 75, 76, 18, 104, 11, 107, 81, 14, 107, + 84, 85, 18, 107, 107, 89, 90, 91, 107, 93, + 107, 107, 66, 107, 68, 107, 100, 71, 107, 107, + 74, 75, 76, 107, 107, 50, 107, 81, 107, 107, + 84, 85, 107, 107, 50, 89, 90, 91, 107, 93, + 107, 107, 66, 107, 68, 107, 100, 71, 107, 107, + 74, 75, 76, 107, 107, 107, 107, 81, 107, 107, + 84, 85, 107, 107, 107, 89, 90, 91, 107, 93, + 107, 107, 66, 107, 68, 107, 100, 71, 107, 107, + 74, 75, 76, 107, 78, 107, 107, 81, 107, 107, + 84, 85, 107, 107, 107, 89, 90, 91, 66, 93, + 68, 107, 107, 71, 107, 107, 74, 75, 76, 107, + 78, 107, 107, 81, 107, 107, 84, 85, 107, 107, + 107, 89, 90, 91, 66, 93, 68, 107, 107, 71, + 107, 107, 74, 75, 76, 107, 107, 107, 107, 81, + 107, 107, 84, 85, 107, 107, 107, 89, 90, 91, + 107, 93, 107, 107, 66, 107, 68, 107, 107, 71, + 107, 107, 74, 75, 76, 107, 107, 107, 107, 81, + 107, 107, 84, 85, 107, 107, 107, 89, 90, 91, + 66, 93, 68, 107, 107, 71, 107, 107, 74, 75, + 76, 107, 107, 107, 107, 81, 107, 107, 84, 85, + 107, 107, 107, 89, 90, 91, 66, 93, 68, 107, + 107, 71, 107, 107, 74, 75, 76, 107, 107, 107, + 107, 81, 107, 107, 84, 85, 107, 107, 107, 89, + 90, 91, 107, 93, 107, 107, 66, 107, 68, 107, + 107, 71, 107, 107, 74, 75, 76, 107, 107, 107, + 107, 81, 107, 107, 84, 85, 107, 107, 107, 89, + 90, 91, 66, 93, 68, 107, 107, 71, 107, 107, + 74, 75, 76, 107, 107, 107, 107, 81, 107, 107, + 84, 85, 107, 107, 107, 89, 90, 91, 66, 93, + 68, 107, 107, 71, 107, 107, 74, 75, 76, 107, + 107, 107, 107, 81, 107, 107, 84, 85, 107, 107, + 107, 89, 90, 91, 107, 93, 107, 107, 66, 107, + 68, 107, 107, 71, 107, 107, 74, 75, 76, 107, + 107, 107, 107, 81, 107, 107, 84, 85, 107, 107, + 107, 89, 90, 91, 66, 93, 68, 107, 107, 71, + 107, 107, 74, 75, 76, 107, 107, 107, 107, 81, + 107, 107, 84, 85, 107, 107, 107, 89, 90, 91, + 66, 93, 68, 107, 107, 71, 107, 107, 74, 75, + 76, 107, 107, 107, 107, 81, 107, 107, 84, 85, + 107, 107, 107, 89, 90, 91, 107, 93, 107, 107, + 66, 107, 68, 107, 107, 71, 107, 107, 74, 75, + 76, 107, 107, 107, 107, 81, 107, 107, 84, 85, + 107, 107, 107, 89, 90, 91, 66, 93, 68, 107, + 107, 71, 107, 107, 74, 75, 76, 107, 107, 107, + 107, 81, 107, 107, 84, 85, 107, 107, 107, 89, + 90, 91, 66, 93, 68, 107, 107, 71, 107, 107, + 74, 75, 76, 107, 107, 107, 107, 81, 107, 107, + 84, 85, 107, 107, 107, 89, 90, 91, 107, 93, + 107, 107, 66, 107, 68, 107, 107, 71, 107, 107, + 74, 75, 76, 107, 107, 107, 107, 81, 107, 107, + 84, 85, 107, 107, 107, 89, 90, 91, 66, 93, + 68, 107, 107, 71, 107, 107, 74, 75, 76, 107, + 107, 107, 107, 81, 107, 107, 84, 85, 107, 107, + 107, 89, 90, 91, 66, 93, 68, 107, 107, 71, + 107, 107, 74, 75, 76, 107, 107, 107, 107, 81, + 107, 107, 84, 85, 107, 107, 107, 89, 90, 91, + 107, 93, 107, 107, 66, 107, 68, 107, 107, 71, + 107, 107, 74, 75, 76, 107, 107, 107, 107, 81, + 107, 107, 84, 85, 107, 107, 107, 89, 90, 91, + 66, 93, 68, 107, 107, 71, 107, 107, 74, 75, + 76, 107, 107, 107, 107, 81, 107, 107, 84, 85, + 107, 107, 107, 89, 90, 91, 66, 93, 68, 107, + 107, 71, 107, 107, 74, 75, 76, 107, 107, 107, + 107, 81, 107, 107, 84, 85, 107, 107, 107, 89, + 90, 91, 107, 93, 107, 107, 66, 107, 68, 107, + 107, 71, 107, 107, 74, 75, 76, 107, 107, 107, + 107, 81, 107, 107, 84, 85, 107, 107, 107, 89, + 90, 91, 66, 93, 68, 107, 107, 71, 107, 107, + 74, 75, 76, 107, 107, 107, 107, 81, 107, 107, + 84, 85, 107, 107, 107, 89, 90, 91, 66, 93, + 68, 107, 107, 71, 107, 107, 74, 75, 76, 107, + 107, 107, 107, 81, 107, 107, 84, 85, 107, 107, + 107, 89, 90, 91, 107, 93, 107, 107, 66, 107, + 68, 107, 107, 71, 107, 107, 74, 75, 76, 107, + 107, 107, 107, 81, 107, 107, 84, 85, 107, 107, + 107, 89, 90, 91, 66, 93, 68, 107, 107, 71, + 107, 107, 74, 75, 76, 107, 107, 107, 107, 81, + 107, 107, 84, 85, 1, 2, 3, 89, 90, 91, + 66, 93, 68, 107, 107, 71, 107, 107, 74, 75, + 76, 107, 107, 107, 107, 81, 107, 107, 84, 85, + 107, 107, 107, 89, 90, 91, 107, 93, 107, 107, + 37, 107, 39, 40, 107, 107, 107, 107, 66, 107, + 68, 48, 1, 71, 3, 107, 74, 75, 55, 56, + 57, 58, 3, 81, 107, 107, 107, 85, 107, 107, + 107, 89, 90, 91, 107, 93, 107, 26, 66, 28, + 68, 107, 107, 71, 107, 34, 74, 75, 107, 107, + 39, 40, 1, 81, 3, 107, 107, 85, 39, 40, + 107, 89, 90, 91, 107, 93, 55, 56, 57, 58, + 107, 2, 107, 107, 55, 56, 57, 58, 107, 28, + 11, 107, 107, 14, 107, 34, 2, 18, 19, 107, + 39, 40, 107, 107, 107, 11, 107, 107, 14, 107, + 107, 17, 18, 19, 107, 107, 55, 56, 57, 58, + 107, 1, 107, 3, 45, 107, 107, 48, 66, 50, + 68, 52, 53, 71, 107, 15, 74, 75, 107, 45, + 107, 107, 48, 81, 50, 107, 52, 107, 1, 107, + 3, 89, 90, 91, 107, 93, 66, 107, 68, 39, + 40, 71, 107, 107, 74, 75, 107, 107, 107, 107, + 107, 81, 107, 107, 107, 55, 56, 57, 58, 89, + 90, 91, 2, 93, 107, 107, 39, 40, 107, 107, + 107, 11, 107, 107, 14, 107, 107, 17, 18, 19, + 107, 107, 55, 56, 57, 58, 107, 60, 107, 107, + 107, 66, 107, 68, 107, 107, 71, 107, 107, 74, + 75, 107, 107, 107, 107, 45, 81, 107, 48, 73, + 50, 107, 52, 77, 89, 90, 91, 107, 93, 83, + 107, 107, 86, 87, 88, 107, 107, 66, 107, 68, + 107, 1, 71, 3, 107, 74, 75, 101, 66, 107, + 68, 107, 81, 71, 107, 107, 74, 75, 107, 107, + 89, 90, 91, 81, 93, 107, 1, 107, 3, 107, + 107, 89, 90, 91, 107, 93, 66, 107, 68, 39, + 40, 71, 107, 107, 74, 75, 107, 107, 107, 107, + 107, 81, 107, 53, 29, 55, 56, 57, 58, 89, + 90, 91, 2, 93, 39, 40, 107, 107, 107, 107, + 107, 11, 107, 107, 14, 107, 107, 107, 18, 19, + 55, 56, 57, 58, 1, 107, 3, 107, 1, 107, + 3, 107, 1, 107, 3, 107, 107, 107, 15, 107, + 107, 107, 15, 107, 107, 45, 15, 107, 48, 107, + 50, 107, 52, 107, 107, 107, 107, 11, 107, 107, + 14, 107, 39, 40, 18, 19, 39, 40, 107, 107, + 39, 40, 1, 107, 3, 107, 107, 107, 55, 56, + 57, 58, 55, 56, 57, 58, 55, 56, 57, 58, + 107, 45, 107, 73, 48, 107, 50, 77, 52, 107, + 107, 107, 107, 83, 107, 107, 86, 87, 88, 38, + 39, 40, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 101, 107, 107, 107, 107, 55, 56, 57, 58, + 1, 107, 3, 107, 1, 107, 3, 73, 1, 107, + 3, 77, 107, 107, 15, 107, 107, 83, 107, 107, + 86, 87, 88, 107, 107, 107, 23, 107, 1, 2, + 3, 107, 1, 107, 3, 101, 107, 107, 39, 40, + 107, 107, 39, 40, 107, 38, 39, 40, 107, 107, + 107, 107, 107, 107, 55, 56, 57, 58, 55, 56, + 57, 58, 55, 56, 57, 58, 39, 40, 107, 107, + 39, 40, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 55, 56, 57, 58, 55, 56, 57, 58, + 1, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 15, 107, 107, 107, 19, 107, + 107, 107, 107, 107, 107, 107, 107, 28, 107, 107, + 107, 107, 107, 34, 107, 107, 37, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 48, + ); + static public $yy_shift_ofst = array( + -23, 399, 399, 349, 99, 449, 449, 99, 349, 99, + 99, -3, 99, 99, 249, 99, 99, 99, 99, 299, + 99, 149, 199, 99, 99, 99, 99, 99, 99, 99, + 99, 99, 99, 299, 99, 99, 49, 49, 499, 499, + 499, 499, 499, 499, 1621, 1661, 1661, 1981, 2067, 2039, + 2047, 2043, 1747, 1850, 1720, 1941, 1937, 1875, 1933, 2071, + 2071, 2071, 2071, 2071, 2071, 2071, 2071, 2071, 2071, 2071, + 2071, 2071, 1629, 1629, 522, 695, 2129, 171, 255, 129, + 718, 707, 9, 255, 316, 255, 129, 129, 304, 337, + 583, 1780, 244, 784, 221, 344, 294, 411, 40, 411, + 485, 359, 440, -22, -22, 427, 432, 424, -22, 359, + 437, 589, 227, 227, 227, 589, 227, 227, 227, 227, + -23, -23, -23, -23, 1679, 1694, 561, 1910, 1956, 81, + 674, 212, 461, -22, -22, -22, -14, -14, -22, 360, + -22, -22, -22, -22, -14, 31, 321, -22, -22, 301, + 321, -14, -14, -14, 31, -22, -22, -22, -14, -14, + 589, 589, 227, 508, 589, 288, 227, 227, 288, 227, + 227, -23, -23, -23, -23, -23, -23, 1573, 30, -12, + 94, 144, 775, 342, 194, 103, 179, 258, 211, 141, + 152, 68, 241, 209, 323, 387, 370, 368, 188, -8, + 101, 556, 567, 563, 552, 539, 548, 574, 443, 558, + 566, 582, 581, 584, 541, 543, 512, 519, 506, 476, + 479, 488, 508, 502, 501, 531, 529, 510, + ); + static public $yy_reduce_ofst = array( + 460, 493, 551, 579, 605, 832, 806, 776, 690, 746, + 716, 1134, 1216, 1242, 1160, 1298, 1022, 1052, 1078, 1104, + 1268, 1488, 1514, 1432, 1462, 1324, 1350, 1406, 1380, 1186, + 888, 996, 970, 940, 914, 858, 1552, 1582, 1745, 1690, + 1781, 1820, 1792, 1662, 1974, 1930, 1756, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 114, -33, 6, -67, 56, 226, + 317, 233, 331, 254, 77, 4, 276, 328, 190, 122, + 429, 396, -23, 393, 74, -23, -23, 393, 176, 413, + 176, 407, 381, 366, 364, -23, -23, 243, 372, 426, + 428, 430, -23, -23, 382, 176, -23, -23, -23, -23, + -23, 324, -23, -23, 537, 537, 537, 537, 537, 549, + 542, 537, 537, 538, 538, 538, 533, 533, 538, 540, + 538, 538, 538, 538, 533, 521, 518, 538, 538, 544, + 535, 533, 533, 533, 562, 538, 538, 538, 533, 533, + 550, 550, 113, 545, 550, 197, 113, 113, 197, 113, + 113, 379, 395, -20, 97, -61, 25, + ); + static public $yyExpectedTokens = array( + array(), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 53, 54, + 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 54, 59,), + array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 54, 59,), + array(1, 3, 26, 28, 34, 39, 40, 55, 56, 57, 58,), + array(1, 3, 28, 34, 39, 40, 55, 56, 57, 58,), + array(1, 3, 28, 34, 39, 40, 55, 56, 57, 58,), + array(1, 3, 38, 39, 40, 55, 56, 57, 58,), + array(1, 2, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 15, 39, 40, 55, 56, 57, 58,), + array(1, 3, 38, 39, 40, 55, 56, 57, 58,), + array(1, 3, 23, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58, 60,), + array(1, 3, 39, 40, 53, 55, 56, 57, 58,), + array(1, 3, 15, 39, 40, 55, 56, 57, 58,), + array(1, 3, 15, 39, 40, 55, 56, 57, 58,), + array(1, 3, 15, 39, 40, 55, 56, 57, 58,), + array(1, 3, 29, 39, 40, 55, 56, 57, 58,), + array(1, 3, 15, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(1, 3, 39, 40, 55, 56, 57, 58,), + array(3, 39, 40, 55, 56, 57, 58,), + array(3, 39, 40, 55, 56, 57, 58,), + array(16, 18, 49, 51, 54,), + array(5, 11, 12, 13, 14, 16, 20, 21, 22, 27, 31, 32, 33, 59, 60,), + array(1, 15, 19, 28, 34, 37, 48,), + array(16, 18, 51, 54,), + array(1, 28, 34,), + array(16, 37, 54,), + array(5, 11, 12, 13, 14, 16, 20, 21, 22, 27, 31, 32, 33, 59, 60,), + array(11, 14, 18, 28, 30, 34,), + array(11, 14, 18, 28, 34,), + array(1, 28, 34,), + array(17, 19, 48,), + array(1, 28, 34,), + array(16, 37, 54,), + array(16, 37, 54,), + array(19, 45, 52,), + array(1, 2,), + array(4, 5, 6, 7, 8, 11, 12, 13, 14, 20, 21, 22, 27, 31, 32, 33,), + array(2, 11, 14, 17, 18, 19, 45, 48, 50, 52,), + array(1, 15, 28, 34,), + array(11, 14, 18, 50,), + array(14, 16, 18, 54,), + array(1, 15, 28, 34,), + array(1, 15, 28, 34,), + array(11, 14, 18,), + array(17, 19, 48,), + array(11, 14, 18,), + array(19, 48,), + array(16, 18,), + array(28, 34,), + array(28, 34,), + array(28, 34,), + array(1, 30,), + array(1, 53,), + array(16, 54,), + array(28, 34,), + array(16, 18,), + array(1, 19,), + array(19,), + array(1,), + array(1,), + array(1,), + array(19,), + array(1,), + array(1,), + array(1,), + array(1,), + array(), + array(), + array(), + array(), + array(2, 11, 14, 18, 19, 45, 48, 50, 52, 53,), + array(2, 11, 14, 17, 18, 19, 45, 48, 50, 52,), + array(2, 11, 14, 18, 19, 45, 48, 50, 52,), + array(2, 11, 14, 18, 19, 45, 48, 50, 52,), + array(11, 14, 18, 19, 45, 48, 50, 52,), + array(14, 16, 18, 35, 54,), + array(11, 14, 18, 50,), + array(17, 45, 52,), + array(11, 14, 18,), + array(28, 34,), + array(28, 34,), + array(28, 34,), + array(45, 52,), + array(45, 52,), + array(28, 34,), + array(14, 37,), + array(28, 34,), + array(28, 34,), + array(28, 34,), + array(28, 34,), + array(45, 52,), + array(16, 54,), + array(45, 52,), + array(28, 34,), + array(28, 34,), + array(17, 24,), + array(45, 52,), + array(45, 52,), + array(45, 52,), + array(45, 52,), + array(16, 54,), + array(28, 34,), + array(28, 34,), + array(28, 34,), + array(45, 52,), + array(45, 52,), + array(19,), + array(19,), + array(1,), + array(37,), + array(19,), + array(2,), + array(1,), + array(1,), + array(2,), + array(1,), + array(1,), + array(), + array(), + array(), + array(), + array(), + array(), + array(1, 2, 3, 37, 39, 40, 48, 55, 56, 57, 58,), + array(15, 23, 25, 28, 34, 36, 38, 45,), + array(15, 17, 28, 34, 37, 48,), + array(15, 24, 28, 34, 46,), + array(15, 24, 28, 34, 46,), + array(11, 14, 18, 50,), + array(37, 45, 48, 53,), + array(24, 46, 60,), + array(24, 46, 53,), + array(30, 37, 48,), + array(8, 10,), + array(36, 38,), + array(23, 36,), + array(45, 53,), + array(36, 38,), + array(36, 38,), + array(24, 46,), + array(17, 45,), + array(37, 48,), + array(37, 48,), + array(37, 48,), + array(18, 50,), + array(9, 10,), + array(36, 53,), + array(51,), + array(18,), + array(18,), + array(18,), + array(18,), + array(18,), + array(18,), + array(45,), + array(35,), + array(35,), + array(18,), + array(17,), + array(15,), + array(15,), + array(9,), + array(25,), + array(16,), + array(18,), + array(38,), + array(37,), + array(51,), + array(37,), + array(53,), + array(53,), + array(18,), + array(18,), + array(41,), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + ); + static public $yy_default = array( + 334, 509, 509, 494, 509, 509, 509, 473, 509, 473, + 473, 509, 509, 509, 509, 509, 509, 509, 509, 509, + 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, + 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, + 509, 509, 509, 509, 375, 375, 354, 509, 509, 509, + 509, 509, 509, 509, 509, 509, 347, 380, 509, 497, + 386, 495, 496, 471, 347, 359, 380, 472, 377, 397, + 382, 387, 401, 402, 509, 509, 413, 509, 375, 509, + 509, 375, 375, 375, 428, 375, 509, 509, 485, 366, + 323, 427, 389, 438, 509, 389, 389, 438, 428, 438, + 428, 509, 375, 375, 375, 389, 389, 509, 356, 509, + 369, 482, 400, 406, 371, 428, 396, 405, 389, 392, + 480, 332, 404, 393, 427, 427, 427, 427, 427, 509, + 440, 454, 438, 348, 364, 344, 436, 463, 365, 438, + 352, 355, 361, 357, 464, 509, 433, 362, 358, 509, + 431, 434, 435, 466, 509, 363, 350, 351, 465, 432, + 486, 460, 367, 438, 483, 475, 372, 395, 474, 370, + 422, 438, 479, 438, 479, 479, 332, 413, 409, 413, + 403, 403, 439, 413, 403, 403, 413, 330, 509, 509, + 409, 509, 509, 403, 409, 423, 413, 509, 509, 509, + 509, 509, 509, 509, 509, 509, 509, 509, 409, 509, + 411, 509, 509, 509, 509, 509, 383, 509, 509, 509, + 484, 509, 454, 418, 509, 509, 509, 415, 376, 388, + 447, 481, 446, 454, 445, 448, 453, 360, 468, 469, + 384, 459, 444, 450, 415, 490, 476, 477, 407, 368, + 478, 456, 457, 458, 416, 417, 443, 390, 391, 442, + 441, 425, 426, 437, 374, 353, 329, 331, 333, 328, + 327, 324, 325, 326, 335, 336, 341, 343, 373, 340, + 339, 337, 338, 408, 410, 506, 498, 499, 505, 461, + 455, 470, 342, 500, 503, 491, 493, 492, 501, 508, + 502, 504, 507, 462, 430, 398, 399, 421, 420, 419, + 412, 414, 418, 424, 451, 489, 394, 429, 488, 487, + 449, 452, 467, + ); + public static $yyFallback = array(); + public $yyTraceFILE; + public $yyTracePrompt; +public $yyidx; +public $yyerrcnt; +public $yystack = array(); + public $yyTokenName = array( + '$', 'VERT', 'COLON', 'UNIMATH', + 'PHP', 'TEXT', 'STRIPON', 'STRIPOFF', + 'LITERALSTART', 'LITERALEND', 'LITERAL', 'SIMPELOUTPUT', + 'SIMPLETAG', 'SMARTYBLOCKCHILDPARENT', 'LDEL', 'RDEL', + 'DOLLARID', 'EQUAL', 'ID', 'PTR', + 'LDELMAKENOCACHE', 'LDELIF', 'LDELFOR', 'SEMICOLON', + 'INCDEC', 'TO', 'STEP', 'LDELFOREACH', + 'SPACE', 'AS', 'APTR', 'LDELSETFILTER', + 'CLOSETAG', 'LDELSLASH', 'ATTR', 'INTEGER', + 'COMMA', 'OPENP', 'CLOSEP', 'MATH', + 'ISIN', 'QMARK', 'NOT', 'TYPECAST', + 'HEX', 'DOT', 'INSTANCEOF', 'SINGLEQUOTESTRING', + 'DOUBLECOLON', 'NAMESPACE', 'AT', 'HATCH', + 'OPENB', 'CLOSEB', 'DOLLAR', 'LOGOP', + 'SLOGOP', 'TLOGOP', 'SINGLECOND', 'QUOTE', + 'BACKTICK', 'error', 'start', 'template', + 'literal_e2', 'literal_e1', 'smartytag', 'tagbody', + 'tag', 'outattr', 'eqoutattr', 'varindexed', + 'output', 'attributes', 'variable', 'value', + 'expr', 'modifierlist', 'statement', 'statements', + 'foraction', 'varvar', 'modparameters', 'attribute', + 'ternary', 'array', 'tlop', 'lop', + 'scond', 'function', 'ns1', 'doublequoted_with_quotes', + 'static_class_access', 'object', 'arrayindex', 'indexdef', + 'varvarele', 'objectchain', 'objectelement', 'method', + 'params', 'modifier', 'modparameter', 'arrayelements', + 'arrayelement', 'doublequoted', 'doublequotedcontent', + ); + public static $yyRuleName = array( + 'start ::= template', + 'template ::= template PHP', + 'template ::= template TEXT', + 'template ::= template STRIPON', + 'template ::= template STRIPOFF', + 'template ::= template LITERALSTART literal_e2 LITERALEND', + 'literal_e2 ::= literal_e1 LITERALSTART literal_e1 LITERALEND', + 'literal_e2 ::= literal_e1', + 'literal_e1 ::= literal_e1 LITERAL', + 'literal_e1 ::=', + 'template ::= template smartytag', + 'template ::=', + 'smartytag ::= SIMPELOUTPUT', + 'smartytag ::= SIMPLETAG', + 'smartytag ::= SMARTYBLOCKCHILDPARENT', + 'smartytag ::= LDEL tagbody RDEL', + 'smartytag ::= tag RDEL', + 'tagbody ::= outattr', + 'tagbody ::= DOLLARID eqoutattr', + 'tagbody ::= varindexed eqoutattr', + 'eqoutattr ::= EQUAL outattr', + 'outattr ::= output attributes', + 'output ::= variable', + 'output ::= value', + 'output ::= expr', + 'tag ::= LDEL ID attributes', + 'tag ::= LDEL ID', + 'tag ::= LDEL ID modifierlist attributes', + 'tag ::= LDEL ID PTR ID attributes', + 'tag ::= LDEL ID PTR ID modifierlist attributes', + 'tag ::= LDELMAKENOCACHE DOLLARID', + 'tag ::= LDELIF expr', + 'tag ::= LDELIF expr attributes', + 'tag ::= LDELIF statement', + 'tag ::= LDELIF statement attributes', + 'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes', + 'foraction ::= EQUAL expr', + 'foraction ::= INCDEC', + 'tag ::= LDELFOR statement TO expr attributes', + 'tag ::= LDELFOR statement TO expr STEP expr attributes', + 'tag ::= LDELFOREACH SPACE expr AS varvar attributes', + 'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes', + 'tag ::= LDELFOREACH attributes', + 'tag ::= LDELSETFILTER ID modparameters', + 'tag ::= LDELSETFILTER ID modparameters modifierlist', + 'smartytag ::= CLOSETAG', + 'tag ::= LDELSLASH ID', + 'tag ::= LDELSLASH ID modifierlist', + 'tag ::= LDELSLASH ID PTR ID', + 'tag ::= LDELSLASH ID PTR ID modifierlist', + 'attributes ::= attributes attribute', + 'attributes ::= attribute', + 'attributes ::=', + 'attribute ::= SPACE ID EQUAL ID', + 'attribute ::= ATTR expr', + 'attribute ::= ATTR value', + 'attribute ::= SPACE ID', + 'attribute ::= SPACE expr', + 'attribute ::= SPACE value', + 'attribute ::= SPACE INTEGER EQUAL expr', + 'statements ::= statement', + 'statements ::= statements COMMA statement', + 'statement ::= DOLLARID EQUAL INTEGER', + 'statement ::= DOLLARID EQUAL expr', + 'statement ::= varindexed EQUAL expr', + 'statement ::= OPENP statement CLOSEP', + 'expr ::= value', + 'expr ::= ternary', + 'expr ::= DOLLARID COLON ID', + 'expr ::= expr MATH value', + 'expr ::= expr UNIMATH value', + 'expr ::= array', + 'expr ::= expr modifierlist', + 'expr ::= expr tlop value', + 'expr ::= expr lop expr', + 'expr ::= expr scond', + 'expr ::= expr ISIN array', + 'expr ::= expr ISIN value', + 'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr', + 'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr', + 'value ::= variable', + 'value ::= UNIMATH value', + 'value ::= NOT value', + 'value ::= TYPECAST value', + 'value ::= variable INCDEC', + 'value ::= HEX', + 'value ::= INTEGER', + 'value ::= INTEGER DOT INTEGER', + 'value ::= INTEGER DOT', + 'value ::= DOT INTEGER', + 'value ::= ID', + 'value ::= function', + 'value ::= OPENP expr CLOSEP', + 'value ::= variable INSTANCEOF ns1', + 'value ::= variable INSTANCEOF variable', + 'value ::= SINGLEQUOTESTRING', + 'value ::= doublequoted_with_quotes', + 'value ::= varindexed DOUBLECOLON static_class_access', + 'value ::= smartytag', + 'value ::= value modifierlist', + 'value ::= NAMESPACE', + 'value ::= ns1 DOUBLECOLON static_class_access', + 'ns1 ::= ID', + 'ns1 ::= NAMESPACE', + 'variable ::= DOLLARID', + 'variable ::= varindexed', + 'variable ::= varvar AT ID', + 'variable ::= object', + 'variable ::= HATCH ID HATCH', + 'variable ::= HATCH ID HATCH arrayindex', + 'variable ::= HATCH variable HATCH', + 'variable ::= HATCH variable HATCH arrayindex', + 'varindexed ::= DOLLARID arrayindex', + 'varindexed ::= varvar arrayindex', + 'arrayindex ::= arrayindex indexdef', + 'arrayindex ::=', + 'indexdef ::= DOT DOLLARID', + 'indexdef ::= DOT varvar', + 'indexdef ::= DOT varvar AT ID', + 'indexdef ::= DOT ID', + 'indexdef ::= DOT INTEGER', + 'indexdef ::= DOT LDEL expr RDEL', + 'indexdef ::= OPENB ID CLOSEB', + 'indexdef ::= OPENB ID DOT ID CLOSEB', + 'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB', + 'indexdef ::= OPENB INTEGER CLOSEB', + 'indexdef ::= OPENB DOLLARID CLOSEB', + 'indexdef ::= OPENB variable CLOSEB', + 'indexdef ::= OPENB value CLOSEB', + 'indexdef ::= OPENB expr CLOSEB', + 'indexdef ::= OPENB CLOSEB', + 'varvar ::= DOLLARID', + 'varvar ::= DOLLAR', + 'varvar ::= varvar varvarele', + 'varvarele ::= ID', + 'varvarele ::= SIMPELOUTPUT', + 'varvarele ::= LDEL expr RDEL', + 'object ::= varindexed objectchain', + 'objectchain ::= objectelement', + 'objectchain ::= objectchain objectelement', + 'objectelement ::= PTR ID arrayindex', + 'objectelement ::= PTR varvar arrayindex', + 'objectelement ::= PTR LDEL expr RDEL arrayindex', + 'objectelement ::= PTR ID LDEL expr RDEL arrayindex', + 'objectelement ::= PTR method', + 'function ::= ns1 OPENP params CLOSEP', + 'method ::= ID OPENP params CLOSEP', + 'method ::= DOLLARID OPENP params CLOSEP', + 'params ::= params COMMA expr', + 'params ::= expr', + 'params ::=', + 'modifierlist ::= modifierlist modifier modparameters', + 'modifierlist ::= modifier modparameters', + 'modifier ::= VERT AT ID', + 'modifier ::= VERT ID', + 'modparameters ::= modparameters modparameter', + 'modparameters ::=', + 'modparameter ::= COLON value', + 'modparameter ::= COLON array', + 'static_class_access ::= method', + 'static_class_access ::= method objectchain', + 'static_class_access ::= ID', + 'static_class_access ::= DOLLARID arrayindex', + 'static_class_access ::= DOLLARID arrayindex objectchain', + 'lop ::= LOGOP', + 'lop ::= SLOGOP', + 'tlop ::= TLOGOP', + 'scond ::= SINGLECOND', + 'array ::= OPENB arrayelements CLOSEB', + 'arrayelements ::= arrayelement', + 'arrayelements ::= arrayelements COMMA arrayelement', + 'arrayelements ::=', + 'arrayelement ::= value APTR expr', + 'arrayelement ::= ID APTR expr', + 'arrayelement ::= expr', + 'doublequoted_with_quotes ::= QUOTE QUOTE', + 'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE', + 'doublequoted ::= doublequoted doublequotedcontent', + 'doublequoted ::= doublequotedcontent', + 'doublequotedcontent ::= BACKTICK variable BACKTICK', + 'doublequotedcontent ::= BACKTICK expr BACKTICK', + 'doublequotedcontent ::= DOLLARID', + 'doublequotedcontent ::= LDEL variable RDEL', + 'doublequotedcontent ::= LDEL expr RDEL', + 'doublequotedcontent ::= smartytag', + 'doublequotedcontent ::= TEXT', + ); + public static $yyRuleInfo = array( + array(0 => 62, 1 => 1), + array(0 => 63, 1 => 2), + array(0 => 63, 1 => 2), + array(0 => 63, 1 => 2), + array(0 => 63, 1 => 2), + array(0 => 63, 1 => 4), + array(0 => 64, 1 => 4), + array(0 => 64, 1 => 1), + array(0 => 65, 1 => 2), + array(0 => 65, 1 => 0), + array(0 => 63, 1 => 2), + array(0 => 63, 1 => 0), + array(0 => 66, 1 => 1), + array(0 => 66, 1 => 1), + array(0 => 66, 1 => 1), + array(0 => 66, 1 => 3), + array(0 => 66, 1 => 2), + array(0 => 67, 1 => 1), + array(0 => 67, 1 => 2), + array(0 => 67, 1 => 2), + array(0 => 70, 1 => 2), + array(0 => 69, 1 => 2), + array(0 => 72, 1 => 1), + array(0 => 72, 1 => 1), + array(0 => 72, 1 => 1), + array(0 => 68, 1 => 3), + array(0 => 68, 1 => 2), + array(0 => 68, 1 => 4), + array(0 => 68, 1 => 5), + array(0 => 68, 1 => 6), + array(0 => 68, 1 => 2), + array(0 => 68, 1 => 2), + array(0 => 68, 1 => 3), + array(0 => 68, 1 => 2), + array(0 => 68, 1 => 3), + array(0 => 68, 1 => 8), + array(0 => 80, 1 => 2), + array(0 => 80, 1 => 1), + array(0 => 68, 1 => 5), + array(0 => 68, 1 => 7), + array(0 => 68, 1 => 6), + array(0 => 68, 1 => 8), + array(0 => 68, 1 => 2), + array(0 => 68, 1 => 3), + array(0 => 68, 1 => 4), + array(0 => 66, 1 => 1), + array(0 => 68, 1 => 2), + array(0 => 68, 1 => 3), + array(0 => 68, 1 => 4), + array(0 => 68, 1 => 5), + array(0 => 73, 1 => 2), + array(0 => 73, 1 => 1), + array(0 => 73, 1 => 0), + array(0 => 83, 1 => 4), + array(0 => 83, 1 => 2), + array(0 => 83, 1 => 2), + array(0 => 83, 1 => 2), + array(0 => 83, 1 => 2), + array(0 => 83, 1 => 2), + array(0 => 83, 1 => 4), + array(0 => 79, 1 => 1), + array(0 => 79, 1 => 3), + array(0 => 78, 1 => 3), + array(0 => 78, 1 => 3), + array(0 => 78, 1 => 3), + array(0 => 78, 1 => 3), + array(0 => 76, 1 => 1), + array(0 => 76, 1 => 1), + array(0 => 76, 1 => 3), + array(0 => 76, 1 => 3), + array(0 => 76, 1 => 3), + array(0 => 76, 1 => 1), + array(0 => 76, 1 => 2), + array(0 => 76, 1 => 3), + array(0 => 76, 1 => 3), + array(0 => 76, 1 => 2), + array(0 => 76, 1 => 3), + array(0 => 76, 1 => 3), + array(0 => 84, 1 => 7), + array(0 => 84, 1 => 7), + array(0 => 75, 1 => 1), + array(0 => 75, 1 => 2), + array(0 => 75, 1 => 2), + array(0 => 75, 1 => 2), + array(0 => 75, 1 => 2), + array(0 => 75, 1 => 1), + array(0 => 75, 1 => 1), + array(0 => 75, 1 => 3), + array(0 => 75, 1 => 2), + array(0 => 75, 1 => 2), + array(0 => 75, 1 => 1), + array(0 => 75, 1 => 1), + array(0 => 75, 1 => 3), + array(0 => 75, 1 => 3), + array(0 => 75, 1 => 3), + array(0 => 75, 1 => 1), + array(0 => 75, 1 => 1), + array(0 => 75, 1 => 3), + array(0 => 75, 1 => 1), + array(0 => 75, 1 => 2), + array(0 => 75, 1 => 1), + array(0 => 75, 1 => 3), + array(0 => 90, 1 => 1), + array(0 => 90, 1 => 1), + array(0 => 74, 1 => 1), + array(0 => 74, 1 => 1), + array(0 => 74, 1 => 3), + array(0 => 74, 1 => 1), + array(0 => 74, 1 => 3), + array(0 => 74, 1 => 4), + array(0 => 74, 1 => 3), + array(0 => 74, 1 => 4), + array(0 => 71, 1 => 2), + array(0 => 71, 1 => 2), + array(0 => 94, 1 => 2), + array(0 => 94, 1 => 0), + array(0 => 95, 1 => 2), + array(0 => 95, 1 => 2), + array(0 => 95, 1 => 4), + array(0 => 95, 1 => 2), + array(0 => 95, 1 => 2), + array(0 => 95, 1 => 4), + array(0 => 95, 1 => 3), + array(0 => 95, 1 => 5), + array(0 => 95, 1 => 3), + array(0 => 95, 1 => 3), + array(0 => 95, 1 => 3), + array(0 => 95, 1 => 3), + array(0 => 95, 1 => 3), + array(0 => 95, 1 => 3), + array(0 => 95, 1 => 2), + array(0 => 81, 1 => 1), + array(0 => 81, 1 => 1), + array(0 => 81, 1 => 2), + array(0 => 96, 1 => 1), + array(0 => 96, 1 => 1), + array(0 => 96, 1 => 3), + array(0 => 93, 1 => 2), + array(0 => 97, 1 => 1), + array(0 => 97, 1 => 2), + array(0 => 98, 1 => 3), + array(0 => 98, 1 => 3), + array(0 => 98, 1 => 5), + array(0 => 98, 1 => 6), + array(0 => 98, 1 => 2), + array(0 => 89, 1 => 4), + array(0 => 99, 1 => 4), + array(0 => 99, 1 => 4), + array(0 => 100, 1 => 3), + array(0 => 100, 1 => 1), + array(0 => 100, 1 => 0), + array(0 => 77, 1 => 3), + array(0 => 77, 1 => 2), + array(0 => 101, 1 => 3), + array(0 => 101, 1 => 2), + array(0 => 82, 1 => 2), + array(0 => 82, 1 => 0), + array(0 => 102, 1 => 2), + array(0 => 102, 1 => 2), + array(0 => 92, 1 => 1), + array(0 => 92, 1 => 2), + array(0 => 92, 1 => 1), + array(0 => 92, 1 => 2), + array(0 => 92, 1 => 3), + array(0 => 87, 1 => 1), + array(0 => 87, 1 => 1), + array(0 => 86, 1 => 1), + array(0 => 88, 1 => 1), + array(0 => 85, 1 => 3), + array(0 => 103, 1 => 1), + array(0 => 103, 1 => 3), + array(0 => 103, 1 => 0), + array(0 => 104, 1 => 3), + array(0 => 104, 1 => 3), + array(0 => 104, 1 => 1), + array(0 => 91, 1 => 2), + array(0 => 91, 1 => 3), + array(0 => 105, 1 => 2), + array(0 => 105, 1 => 1), + array(0 => 106, 1 => 3), + array(0 => 106, 1 => 3), + array(0 => 106, 1 => 1), + array(0 => 106, 1 => 3), + array(0 => 106, 1 => 3), + array(0 => 106, 1 => 1), + array(0 => 106, 1 => 1), + ); + public static $yyReduceMap = array( + 0 => 0, + 1 => 1, + 2 => 2, + 3 => 3, + 4 => 4, + 5 => 5, + 6 => 6, + 7 => 7, + 22 => 7, + 23 => 7, + 24 => 7, + 37 => 7, + 57 => 7, + 58 => 7, + 66 => 7, + 67 => 7, + 71 => 7, + 80 => 7, + 85 => 7, + 86 => 7, + 91 => 7, + 95 => 7, + 96 => 7, + 100 => 7, + 102 => 7, + 107 => 7, + 169 => 7, + 174 => 7, + 8 => 8, + 9 => 9, + 10 => 10, + 12 => 12, + 13 => 13, + 14 => 14, + 15 => 15, + 16 => 16, + 17 => 17, + 18 => 18, + 19 => 19, + 20 => 20, + 21 => 21, + 25 => 25, + 26 => 26, + 27 => 27, + 28 => 28, + 29 => 29, + 30 => 30, + 31 => 31, + 32 => 32, + 34 => 32, + 33 => 33, + 35 => 35, + 36 => 36, + 38 => 38, + 39 => 39, + 40 => 40, + 41 => 41, + 42 => 42, + 43 => 43, + 44 => 44, + 45 => 45, + 46 => 46, + 47 => 47, + 48 => 48, + 49 => 49, + 50 => 50, + 51 => 51, + 60 => 51, + 149 => 51, + 153 => 51, + 157 => 51, + 158 => 51, + 52 => 52, + 150 => 52, + 156 => 52, + 53 => 53, + 54 => 54, + 55 => 54, + 56 => 56, + 134 => 56, + 59 => 59, + 61 => 61, + 62 => 62, + 63 => 62, + 64 => 64, + 65 => 65, + 68 => 68, + 69 => 69, + 70 => 69, + 72 => 72, + 99 => 72, + 73 => 73, + 74 => 74, + 75 => 75, + 76 => 76, + 77 => 77, + 78 => 78, + 79 => 79, + 81 => 81, + 83 => 81, + 84 => 81, + 114 => 81, + 82 => 82, + 87 => 87, + 88 => 88, + 89 => 89, + 90 => 90, + 92 => 92, + 93 => 93, + 94 => 93, + 97 => 97, + 98 => 98, + 101 => 101, + 103 => 103, + 104 => 104, + 105 => 105, + 106 => 106, + 108 => 108, + 109 => 109, + 110 => 110, + 111 => 111, + 112 => 112, + 113 => 113, + 115 => 115, + 171 => 115, + 116 => 116, + 117 => 117, + 118 => 118, + 119 => 119, + 120 => 120, + 121 => 121, + 129 => 121, + 122 => 122, + 123 => 123, + 124 => 124, + 125 => 124, + 127 => 124, + 128 => 124, + 126 => 126, + 130 => 130, + 131 => 131, + 132 => 132, + 175 => 132, + 133 => 133, + 135 => 135, + 136 => 136, + 137 => 137, + 138 => 138, + 139 => 139, + 140 => 140, + 141 => 141, + 142 => 142, + 143 => 143, + 144 => 144, + 145 => 145, + 146 => 146, + 147 => 147, + 148 => 148, + 151 => 151, + 152 => 152, + 154 => 154, + 155 => 155, + 159 => 159, + 160 => 160, + 161 => 161, + 162 => 162, + 163 => 163, + 164 => 164, + 165 => 165, + 166 => 166, + 167 => 167, + 168 => 168, + 170 => 170, + 172 => 172, + 173 => 173, + 176 => 176, + 177 => 177, + 178 => 178, + 179 => 179, + 182 => 179, + 180 => 180, + 183 => 180, + 181 => 181, + 184 => 184, + 185 => 185, + ); /* Index of top element in stack */ + private $_retvalue; /* Shifts left before out of the error */ /** * constructor @@ -227,7 +1661,7 @@ class Smarty_Internal_Templateparser $this->smarty = $this->template->smarty; $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false; $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template(); - } + } /* The parser's stack */ /** * insert PHP code in current buffer @@ -239,6 +1673,20 @@ class Smarty_Internal_Templateparser $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code)); } + /** + * error rundown + * + */ + public function errorRunDown() + { + while ($this->yystack !== array()) { + $this->yy_pop_parser_stack(); + } + if (is_resource($this->yyTraceFILE)) { + fclose($this->yyTraceFILE); + } + } + /** * merge PHP code with prefix code and return parse tree tag object * @@ -257,637 +1705,11 @@ class Smarty_Internal_Templateparser return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true)); } - const TP_VERT = 1; - - const TP_COLON = 2; - - const TP_PHP = 3; - - const TP_TEXT = 4; - - const TP_STRIPON = 5; - - const TP_STRIPOFF = 6; - - const TP_LITERALSTART = 7; - - const TP_LITERALEND = 8; - - const TP_LITERAL = 9; - - const TP_RDEL = 10; - - const TP_SIMPELOUTPUT = 11; - - const TP_LDEL = 12; - - const TP_DOLLARID = 13; - - const TP_EQUAL = 14; - - const TP_SIMPLETAG = 15; - - const TP_ID = 16; - - const TP_PTR = 17; - - const TP_LDELMAKENOCACHE = 18; - - const TP_LDELIF = 19; - - const TP_LDELFOR = 20; - - const TP_SEMICOLON = 21; - - const TP_INCDEC = 22; - - const TP_TO = 23; - - const TP_STEP = 24; - - const TP_LDELFOREACH = 25; - - const TP_SPACE = 26; - - const TP_AS = 27; - - const TP_APTR = 28; - - const TP_LDELSETFILTER = 29; - - const TP_SMARTYBLOCKCHILDPARENT = 30; - - const TP_CLOSETAG = 31; - - const TP_LDELSLASH = 32; - - const TP_ATTR = 33; - - const TP_INTEGER = 34; - - const TP_COMMA = 35; - - const TP_OPENP = 36; - - const TP_CLOSEP = 37; - - const TP_MATH = 38; - - const TP_UNIMATH = 39; - - const TP_ISIN = 40; - - const TP_QMARK = 41; - - const TP_NOT = 42; - - const TP_TYPECAST = 43; - - const TP_HEX = 44; - - const TP_DOT = 45; - - const TP_INSTANCEOF = 46; - - const TP_SINGLEQUOTESTRING = 47; - - const TP_DOUBLECOLON = 48; - - const TP_NAMESPACE = 49; - - const TP_AT = 50; - - const TP_HATCH = 51; - - const TP_OPENB = 52; - - const TP_CLOSEB = 53; - - const TP_DOLLAR = 54; - - const TP_LOGOP = 55; - - const TP_SLOGOP = 56; - - const TP_TLOGOP = 57; - - const TP_SINGLECOND = 58; - - const TP_QUOTE = 59; - - const TP_BACKTICK = 60; - - const YY_NO_ACTION = 532; - - const YY_ACCEPT_ACTION = 531; - - const YY_ERROR_ACTION = 530; - - const YY_SZ_ACTTAB = 2114; - - static public $yy_action = array(268, 8, 132, 210, 245, 197, 183, 228, 7, 84, 176, 264, 275, 302, 112, 44, 36, 278, - 233, 136, 305, 221, 281, 203, 237, 26, 234, 202, 41, 104, 189, 39, 42, 256, 213, - 216, 224, 78, 207, 129, 82, 1, 316, 297, 102, 268, 8, 133, 79, 245, 80, 302, 228, - 7, 84, 330, 299, 82, 272, 112, 297, 273, 325, 233, 285, 305, 221, 214, 231, 34, 26, - 3, 101, 41, 230, 78, 39, 42, 256, 213, 35, 239, 314, 207, 300, 82, 1, 13, 297, 333, - 268, 8, 135, 79, 245, 201, 302, 228, 7, 84, 35, 85, 322, 109, 112, 29, 196, 13, - 233, 269, 305, 221, 237, 231, 249, 26, 136, 104, 41, 219, 78, 39, 42, 256, 213, - 459, 239, 267, 207, 355, 82, 1, 459, 297, 446, 268, 8, 135, 79, 245, 193, 302, 228, - 7, 84, 35, 446, 297, 28, 112, 247, 263, 13, 233, 82, 305, 221, 297, 231, 309, 26, - 185, 292, 41, 298, 78, 39, 42, 256, 213, 27, 239, 237, 207, 232, 82, 1, 104, 297, - 459, 268, 8, 135, 79, 245, 195, 459, 228, 7, 84, 446, 297, 283, 11, 112, 25, 188, - 282, 233, 236, 305, 221, 446, 204, 294, 26, 32, 318, 41, 90, 210, 39, 42, 256, 213, - 174, 239, 137, 207, 402, 82, 1, 210, 297, 9, 268, 8, 136, 79, 245, 201, 223, 228, - 7, 84, 402, 142, 235, 225, 112, 22, 227, 402, 233, 166, 305, 221, 35, 231, 27, 33, - 210, 101, 41, 13, 210, 39, 42, 256, 213, 361, 239, 302, 207, 399, 82, 1, 210, 297, - 101, 268, 8, 135, 79, 245, 201, 402, 228, 7, 84, 399, 235, 297, 109, 112, 447, 78, - 399, 233, 319, 305, 221, 402, 194, 172, 26, 279, 447, 41, 402, 307, 39, 42, 256, - 213, 182, 239, 16, 207, 296, 82, 1, 210, 297, 101, 268, 8, 131, 79, 245, 201, 357, - 228, 7, 84, 283, 11, 475, 475, 112, 282, 303, 475, 233, 24, 305, 221, 35, 231, 175, - 4, 279, 271, 41, 13, 109, 39, 42, 256, 213, 181, 239, 178, 207, 12, 82, 1, 16, 297, - 274, 268, 8, 135, 79, 245, 200, 475, 228, 7, 84, 475, 475, 283, 11, 112, 475, 189, - 282, 233, 210, 305, 221, 20, 231, 38, 26, 179, 292, 41, 148, 446, 39, 42, 256, 213, - 229, 239, 180, 207, 332, 82, 1, 446, 297, 190, 268, 8, 134, 79, 245, 201, 215, 228, - 7, 84, 168, 16, 188, 243, 112, 104, 189, 303, 233, 140, 305, 221, 325, 231, 255, - 26, 177, 214, 41, 218, 312, 39, 42, 256, 213, 277, 239, 128, 207, 101, 82, 1, 92, - 297, 2, 268, 8, 136, 79, 245, 201, 23, 228, 7, 84, 210, 108, 251, 184, 112, 297, - 304, 289, 233, 367, 305, 221, 137, 231, 315, 33, 220, 5, 41, 9, 5, 39, 42, 256, - 213, 35, 239, 189, 207, 113, 82, 311, 13, 297, 106, 446, 214, 212, 79, 116, 72, - 114, 258, 260, 261, 222, 102, 446, 214, 257, 280, 187, 308, 334, 270, 206, 242, - 152, 299, 210, 128, 83, 262, 250, 252, 253, 176, 332, 211, 329, 268, 8, 151, 143, - 245, 189, 178, 228, 7, 84, 210, 265, 332, 332, 112, 188, 21, 311, 233, 153, 305, - 221, 214, 212, 17, 122, 67, 114, 164, 141, 189, 13, 102, 149, 266, 257, 280, 183, - 332, 332, 270, 206, 242, 332, 299, 295, 44, 36, 278, 235, 311, 208, 279, 145, 169, - 214, 212, 91, 122, 67, 114, 189, 320, 332, 167, 102, 146, 139, 257, 280, 94, 171, - 159, 270, 206, 242, 332, 299, 210, 38, 311, 189, 332, 155, 209, 214, 212, 317, 122, - 53, 107, 123, 232, 332, 189, 102, 291, 400, 257, 280, 6, 217, 276, 270, 206, 242, - 311, 299, 297, 158, 313, 214, 212, 400, 122, 49, 107, 154, 117, 332, 400, 102, 30, - 446, 257, 280, 248, 332, 173, 270, 206, 242, 279, 299, 324, 446, 186, 292, 332, 95, - 279, 268, 10, 326, 170, 245, 88, 87, 228, 7, 84, 279, 138, 89, 279, 112, 86, 309, - 311, 233, 115, 305, 221, 214, 212, 254, 122, 67, 114, 105, 303, 163, 165, 102, 303, - 93, 257, 280, 303, 303, 303, 270, 206, 242, 303, 299, 303, 303, 303, 286, 19, 311, - 205, 303, 303, 303, 214, 212, 303, 116, 72, 114, 303, 43, 40, 37, 102, 303, 303, - 257, 280, 303, 303, 303, 270, 206, 242, 303, 299, 324, 327, 323, 288, 287, 303, - 303, 268, 10, 326, 331, 245, 303, 303, 228, 7, 84, 303, 303, 303, 303, 112, 303, - 303, 311, 233, 303, 305, 221, 214, 212, 303, 122, 70, 114, 303, 303, 303, 303, 102, - 303, 303, 257, 280, 303, 283, 11, 270, 206, 242, 282, 299, 303, 311, 303, 290, 19, - 303, 214, 212, 35, 122, 54, 114, 303, 303, 303, 13, 102, 162, 303, 257, 280, 183, - 303, 303, 270, 206, 242, 332, 299, 311, 44, 36, 278, 303, 214, 212, 303, 122, 68, - 114, 303, 303, 303, 303, 102, 189, 303, 257, 280, 303, 303, 303, 270, 206, 242, - 303, 299, 311, 303, 303, 303, 303, 214, 212, 303, 100, 73, 114, 303, 303, 303, 303, - 102, 303, 303, 257, 280, 303, 303, 303, 270, 206, 242, 303, 299, 311, 303, 303, - 303, 303, 214, 212, 303, 122, 77, 114, 303, 303, 303, 303, 102, 147, 303, 257, 280, - 183, 303, 303, 270, 206, 242, 332, 299, 311, 44, 36, 278, 303, 214, 212, 303, 122, - 76, 114, 303, 303, 303, 303, 102, 189, 303, 257, 280, 303, 303, 303, 270, 206, 242, - 303, 299, 311, 303, 303, 303, 303, 214, 212, 303, 99, 71, 114, 303, 303, 303, 303, - 102, 161, 303, 257, 280, 183, 303, 303, 270, 206, 242, 332, 299, 311, 44, 36, 278, - 303, 214, 212, 303, 122, 47, 114, 303, 303, 303, 303, 102, 189, 303, 257, 280, 303, - 303, 303, 270, 206, 242, 303, 299, 311, 303, 303, 303, 303, 214, 212, 303, 122, 59, - 114, 303, 303, 303, 303, 102, 150, 303, 257, 280, 183, 303, 303, 270, 206, 242, - 332, 299, 311, 44, 36, 278, 303, 214, 198, 303, 118, 55, 114, 303, 303, 303, 303, - 102, 189, 303, 257, 280, 303, 303, 303, 270, 206, 242, 303, 299, 311, 303, 303, - 303, 303, 214, 212, 303, 122, 69, 114, 303, 303, 303, 303, 102, 160, 303, 257, 280, - 183, 303, 303, 270, 206, 242, 332, 299, 311, 44, 36, 278, 303, 214, 97, 303, 81, - 48, 103, 303, 303, 303, 303, 102, 189, 303, 257, 280, 303, 303, 303, 270, 206, 242, - 303, 299, 311, 303, 303, 303, 303, 214, 212, 303, 122, 57, 114, 303, 303, 303, 303, - 102, 303, 303, 257, 280, 303, 303, 303, 270, 206, 242, 303, 299, 311, 303, 303, - 303, 303, 214, 212, 303, 122, 65, 114, 303, 303, 303, 303, 102, 303, 303, 257, 280, - 303, 303, 303, 270, 206, 242, 303, 299, 311, 303, 303, 303, 303, 214, 96, 303, 81, - 46, 103, 303, 303, 303, 303, 102, 303, 303, 257, 280, 303, 303, 303, 270, 206, 242, - 303, 299, 311, 303, 303, 303, 303, 214, 212, 303, 111, 50, 114, 303, 303, 303, 303, - 102, 303, 303, 257, 280, 303, 303, 303, 270, 206, 242, 303, 299, 311, 303, 303, - 303, 303, 214, 212, 303, 98, 61, 114, 303, 303, 303, 303, 102, 303, 303, 257, 280, - 303, 303, 303, 270, 206, 242, 303, 299, 311, 303, 303, 303, 303, 214, 199, 303, - 122, 56, 114, 303, 303, 303, 303, 102, 303, 303, 257, 280, 303, 303, 303, 270, 206, - 242, 303, 299, 311, 303, 303, 303, 303, 214, 212, 303, 122, 51, 114, 303, 303, 303, - 303, 102, 303, 303, 257, 280, 303, 303, 303, 270, 206, 242, 303, 299, 311, 303, - 303, 303, 303, 214, 212, 303, 122, 58, 114, 303, 303, 303, 303, 102, 303, 303, 257, - 280, 303, 303, 303, 270, 206, 242, 303, 299, 311, 303, 303, 303, 303, 214, 212, - 303, 122, 74, 114, 303, 303, 303, 303, 102, 303, 303, 257, 280, 303, 303, 303, 270, - 206, 242, 303, 299, 311, 303, 303, 303, 303, 214, 212, 303, 122, 62, 114, 303, 303, - 303, 303, 102, 303, 303, 257, 280, 303, 303, 303, 270, 206, 242, 303, 299, 311, - 303, 303, 303, 303, 214, 212, 303, 122, 60, 114, 303, 303, 303, 303, 102, 303, 303, - 257, 280, 303, 303, 303, 270, 206, 242, 303, 299, 311, 303, 303, 303, 303, 214, - 212, 303, 122, 45, 114, 303, 303, 303, 303, 102, 303, 303, 257, 280, 303, 303, 303, - 270, 206, 242, 303, 299, 311, 303, 303, 303, 303, 214, 212, 303, 122, 64, 114, 303, - 303, 303, 303, 102, 303, 303, 257, 280, 303, 303, 303, 270, 206, 242, 303, 299, - 311, 303, 303, 303, 303, 214, 212, 303, 122, 75, 114, 303, 303, 303, 303, 102, 303, - 303, 257, 280, 303, 303, 303, 270, 206, 242, 303, 299, 311, 303, 303, 303, 303, - 214, 212, 303, 122, 63, 114, 303, 303, 303, 303, 102, 303, 303, 257, 280, 303, 303, - 303, 270, 206, 242, 303, 299, 311, 303, 303, 303, 303, 214, 212, 303, 122, 66, 114, - 303, 303, 303, 303, 102, 303, 303, 257, 280, 303, 412, 412, 270, 206, 242, 303, - 299, 311, 303, 303, 303, 303, 214, 212, 303, 122, 53, 114, 303, 303, 303, 303, 102, - 303, 303, 257, 280, 210, 303, 303, 270, 206, 242, 303, 299, 446, 301, 412, 412, - 412, 303, 531, 52, 259, 260, 261, 222, 446, 303, 214, 303, 303, 35, 303, 412, 412, - 412, 412, 303, 13, 303, 303, 303, 303, 43, 40, 37, 210, 303, 303, 311, 303, 303, - 303, 303, 214, 212, 210, 130, 303, 114, 327, 323, 288, 287, 102, 303, 303, 303, - 241, 31, 303, 35, 270, 206, 242, 303, 299, 303, 13, 303, 303, 35, 303, 43, 40, 37, - 303, 303, 13, 303, 303, 303, 303, 43, 40, 37, 303, 303, 303, 311, 327, 323, 288, - 287, 214, 212, 210, 124, 303, 114, 327, 323, 288, 287, 102, 192, 303, 303, 310, - 303, 303, 303, 270, 206, 242, 311, 299, 226, 303, 303, 214, 212, 303, 120, 303, - 114, 475, 475, 303, 28, 102, 475, 459, 43, 40, 37, 303, 303, 270, 206, 242, 303, - 299, 303, 303, 303, 303, 303, 303, 311, 327, 323, 288, 287, 214, 212, 303, 126, - 303, 114, 459, 303, 303, 459, 102, 475, 303, 459, 226, 303, 303, 303, 270, 206, - 242, 303, 299, 475, 475, 226, 18, 303, 475, 459, 303, 303, 303, 303, 475, 475, 303, - 303, 226, 475, 459, 283, 11, 303, 303, 303, 282, 475, 475, 303, 303, 303, 475, 459, - 303, 303, 35, 459, 144, 303, 459, 303, 475, 13, 459, 303, 303, 303, 459, 303, 303, - 459, 311, 475, 303, 459, 321, 214, 212, 303, 119, 459, 114, 303, 459, 303, 475, - 102, 459, 303, 303, 303, 303, 303, 303, 270, 206, 242, 303, 299, 311, 210, 14, 303, - 303, 214, 212, 303, 127, 303, 114, 303, 284, 303, 303, 102, 129, 303, 303, 303, - 303, 102, 303, 270, 206, 242, 311, 299, 210, 303, 293, 214, 212, 299, 121, 303, - 114, 311, 43, 40, 37, 102, 214, 212, 303, 125, 303, 114, 303, 270, 206, 242, 102, - 299, 156, 327, 323, 288, 287, 210, 270, 206, 242, 210, 299, 43, 40, 37, 210, 303, - 303, 303, 244, 303, 303, 303, 303, 303, 303, 110, 303, 303, 327, 323, 288, 287, - 303, 303, 303, 303, 303, 303, 303, 303, 303, 303, 43, 40, 37, 210, 43, 40, 37, 210, - 303, 43, 40, 37, 240, 210, 303, 303, 191, 327, 323, 288, 287, 327, 323, 288, 287, - 303, 327, 323, 288, 287, 303, 306, 303, 303, 303, 303, 303, 303, 303, 303, 43, 40, - 37, 303, 43, 40, 37, 210, 303, 238, 43, 40, 37, 303, 303, 303, 303, 327, 323, 288, - 287, 327, 323, 288, 287, 15, 303, 327, 323, 288, 287, 303, 303, 303, 475, 475, 303, - 303, 303, 475, 459, 210, 303, 246, 43, 40, 37, 210, 303, 303, 303, 303, 303, 475, - 475, 283, 11, 303, 475, 459, 282, 327, 323, 288, 287, 303, 303, 303, 459, 303, 35, - 459, 157, 475, 303, 459, 303, 13, 43, 40, 37, 303, 303, 303, 43, 40, 37, 459, 303, - 303, 459, 303, 475, 328, 459, 327, 323, 288, 287, 303, 303, 327, 323, 288, 287, - 303, 406, 303, 303, 303, 303, 303, 303, 303, 303, 303, 303, 406, 303, 406, 303, - 303, 406, 303, 303, 303, 303, 303, 303, 406, 303, 406, 303, 406, 303, 303, 303, - 303, 303, 303, 303, 235,); - - static public $yy_lookahead = array(11, 12, 13, 1, 15, 16, 76, 18, 19, 20, 7, 8, 9, 22, 25, 85, 86, 87, 29, 13, 31, - 32, 16, 34, 75, 36, 77, 78, 39, 80, 100, 42, 43, 44, 45, 71, 47, 46, 49, 75, 51, - 52, 53, 54, 80, 11, 12, 13, 59, 15, 16, 22, 18, 19, 20, 49, 92, 51, 66, 25, 54, - 69, 65, 29, 30, 31, 32, 70, 34, 14, 36, 35, 17, 39, 16, 46, 42, 43, 44, 45, 26, - 47, 53, 49, 10, 51, 52, 33, 54, 53, 11, 12, 13, 59, 15, 16, 22, 18, 19, 20, 26, - 104, 105, 48, 25, 12, 13, 33, 29, 16, 31, 32, 75, 34, 77, 36, 13, 80, 39, 16, - 46, 42, 43, 44, 45, 45, 47, 34, 49, 10, 51, 52, 52, 54, 36, 11, 12, 13, 59, 15, - 16, 22, 18, 19, 20, 26, 48, 54, 14, 25, 13, 34, 33, 29, 51, 31, 32, 54, 34, 94, - 36, 96, 97, 39, 97, 46, 42, 43, 44, 45, 14, 47, 75, 49, 77, 51, 52, 80, 54, 45, - 11, 12, 13, 59, 15, 16, 52, 18, 19, 20, 36, 54, 11, 12, 25, 21, 100, 16, 29, 45, - 31, 32, 48, 34, 16, 36, 14, 53, 39, 35, 1, 42, 43, 44, 45, 93, 47, 45, 49, 10, - 51, 52, 1, 54, 52, 11, 12, 13, 59, 15, 16, 50, 18, 19, 20, 26, 27, 45, 50, 25, - 12, 13, 33, 29, 16, 31, 32, 26, 34, 14, 36, 1, 17, 39, 33, 1, 42, 43, 44, 45, - 10, 47, 22, 49, 10, 51, 52, 1, 54, 17, 11, 12, 13, 59, 15, 16, 10, 18, 19, 20, - 26, 45, 54, 48, 25, 36, 46, 33, 29, 53, 31, 32, 26, 34, 93, 36, 95, 48, 39, 33, - 60, 42, 43, 44, 45, 81, 47, 35, 49, 37, 51, 52, 1, 54, 17, 11, 12, 13, 59, 15, - 16, 10, 18, 19, 20, 11, 12, 11, 12, 25, 16, 101, 16, 29, 14, 31, 32, 26, 34, 93, - 36, 95, 22, 39, 33, 48, 42, 43, 44, 45, 81, 47, 76, 49, 41, 51, 52, 35, 54, 37, - 11, 12, 13, 59, 15, 16, 50, 18, 19, 20, 11, 12, 11, 12, 25, 16, 100, 16, 29, 1, - 31, 32, 28, 34, 2, 36, 96, 97, 39, 72, 36, 42, 43, 44, 45, 17, 47, 76, 49, 82, - 51, 52, 48, 54, 16, 11, 12, 13, 59, 15, 16, 50, 18, 19, 20, 75, 35, 100, 37, 25, - 80, 100, 101, 29, 13, 31, 32, 65, 34, 37, 36, 13, 70, 39, 16, 91, 42, 43, 44, - 45, 16, 47, 98, 49, 17, 51, 52, 36, 54, 36, 11, 12, 13, 59, 15, 16, 12, 18, 19, - 20, 1, 48, 4, 76, 25, 54, 16, 105, 29, 10, 31, 32, 45, 34, 53, 36, 17, 36, 39, - 52, 36, 42, 43, 44, 45, 26, 47, 100, 49, 16, 51, 65, 33, 54, 80, 36, 70, 71, 59, - 73, 74, 75, 64, 65, 66, 67, 80, 48, 70, 83, 84, 76, 98, 91, 88, 89, 90, 72, 92, - 1, 98, 16, 3, 4, 5, 6, 7, 82, 102, 103, 11, 12, 72, 72, 15, 100, 76, 18, 19, 20, - 1, 16, 82, 82, 25, 100, 28, 65, 29, 51, 31, 32, 70, 71, 26, 73, 74, 75, 72, 72, - 100, 33, 80, 72, 10, 83, 84, 76, 82, 82, 88, 89, 90, 82, 92, 16, 85, 86, 87, 45, - 65, 99, 95, 72, 51, 70, 71, 76, 73, 74, 75, 100, 53, 82, 93, 80, 72, 13, 83, 84, - 76, 93, 72, 88, 89, 90, 82, 92, 1, 2, 65, 100, 82, 72, 99, 70, 71, 53, 73, 74, - 75, 16, 77, 82, 100, 80, 16, 10, 83, 84, 36, 14, 34, 88, 89, 90, 65, 92, 54, 72, - 13, 70, 71, 26, 73, 74, 75, 72, 77, 82, 33, 80, 23, 36, 83, 84, 82, 82, 72, 88, - 89, 90, 95, 92, 4, 48, 96, 97, 82, 81, 95, 11, 12, 13, 93, 15, 80, 80, 18, 19, - 20, 95, 80, 80, 95, 25, 80, 94, 65, 29, 79, 31, 32, 70, 71, 8, 73, 74, 75, 68, - 106, 93, 93, 80, 106, 93, 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 106, 106, - 106, 59, 60, 65, 99, 106, 106, 106, 70, 71, 106, 73, 74, 75, 106, 38, 39, 40, - 80, 106, 106, 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 4, 55, 56, 57, 58, - 106, 106, 11, 12, 13, 103, 15, 106, 106, 18, 19, 20, 106, 106, 106, 106, 25, - 106, 106, 65, 29, 106, 31, 32, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, - 106, 106, 83, 84, 106, 11, 12, 88, 89, 90, 16, 92, 106, 65, 106, 59, 60, 106, - 70, 71, 26, 73, 74, 75, 106, 106, 106, 33, 80, 72, 106, 83, 84, 76, 106, 106, - 88, 89, 90, 82, 92, 65, 85, 86, 87, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, - 106, 80, 100, 106, 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, - 106, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, 106, 106, 83, 84, - 106, 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, 106, 106, 70, 71, 106, 73, 74, - 75, 106, 106, 106, 106, 80, 72, 106, 83, 84, 76, 106, 106, 88, 89, 90, 82, 92, - 65, 85, 86, 87, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, 100, 106, - 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, 106, 106, 70, 71, 106, - 73, 74, 75, 106, 106, 106, 106, 80, 72, 106, 83, 84, 76, 106, 106, 88, 89, 90, - 82, 92, 65, 85, 86, 87, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, - 100, 106, 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, 106, 106, - 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, 72, 106, 83, 84, 76, 106, 106, - 88, 89, 90, 82, 92, 65, 85, 86, 87, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, - 106, 80, 100, 106, 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, - 106, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, 72, 106, 83, 84, 76, - 106, 106, 88, 89, 90, 82, 92, 65, 85, 86, 87, 106, 70, 71, 106, 73, 74, 75, 106, - 106, 106, 106, 80, 100, 106, 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 65, - 106, 106, 106, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, 106, 106, - 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, 106, 106, 70, 71, 106, - 73, 74, 75, 106, 106, 106, 106, 80, 106, 106, 83, 84, 106, 106, 106, 88, 89, 90, - 106, 92, 65, 106, 106, 106, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, - 80, 106, 106, 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, 106, - 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, 106, 106, 83, 84, 106, - 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, 106, 106, 70, 71, 106, 73, 74, 75, - 106, 106, 106, 106, 80, 106, 106, 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, - 65, 106, 106, 106, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, 106, - 106, 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, 106, 106, 70, 71, - 106, 73, 74, 75, 106, 106, 106, 106, 80, 106, 106, 83, 84, 106, 106, 106, 88, - 89, 90, 106, 92, 65, 106, 106, 106, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, - 106, 80, 106, 106, 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, - 106, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, 106, 106, 83, 84, - 106, 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, 106, 106, 70, 71, 106, 73, 74, - 75, 106, 106, 106, 106, 80, 106, 106, 83, 84, 106, 106, 106, 88, 89, 90, 106, - 92, 65, 106, 106, 106, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, - 106, 106, 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, 106, 106, - 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, 106, 106, 83, 84, 106, 106, - 106, 88, 89, 90, 106, 92, 65, 106, 106, 106, 106, 70, 71, 106, 73, 74, 75, 106, - 106, 106, 106, 80, 106, 106, 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 65, - 106, 106, 106, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, 106, 106, - 83, 84, 106, 106, 106, 88, 89, 90, 106, 92, 65, 106, 106, 106, 106, 70, 71, 106, - 73, 74, 75, 106, 106, 106, 106, 80, 106, 106, 83, 84, 106, 106, 106, 88, 89, 90, - 106, 92, 65, 106, 106, 106, 106, 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, - 80, 106, 106, 83, 84, 106, 1, 2, 88, 89, 90, 106, 92, 65, 106, 106, 106, 106, - 70, 71, 106, 73, 74, 75, 106, 106, 106, 106, 80, 106, 106, 83, 84, 1, 106, 106, - 88, 89, 90, 106, 92, 36, 10, 38, 39, 40, 106, 62, 63, 64, 65, 66, 67, 48, 106, - 70, 106, 106, 26, 106, 55, 56, 57, 58, 106, 33, 106, 106, 106, 106, 38, 39, 40, - 1, 106, 106, 65, 106, 106, 106, 106, 70, 71, 1, 73, 106, 75, 55, 56, 57, 58, 80, - 106, 106, 106, 84, 24, 106, 26, 88, 89, 90, 106, 92, 106, 33, 106, 106, 26, 106, - 38, 39, 40, 106, 106, 33, 106, 106, 106, 106, 38, 39, 40, 106, 106, 106, 65, 55, - 56, 57, 58, 70, 71, 1, 73, 106, 75, 55, 56, 57, 58, 80, 10, 106, 106, 84, 106, - 106, 106, 88, 89, 90, 65, 92, 2, 106, 106, 70, 71, 106, 73, 106, 75, 11, 12, - 106, 14, 80, 16, 17, 38, 39, 40, 106, 106, 88, 89, 90, 106, 92, 106, 106, 106, - 106, 106, 106, 65, 55, 56, 57, 58, 70, 71, 106, 73, 106, 75, 45, 106, 106, 48, - 80, 50, 106, 52, 2, 106, 106, 106, 88, 89, 90, 106, 92, 11, 12, 2, 14, 106, 16, - 17, 106, 106, 106, 106, 11, 12, 106, 106, 2, 16, 17, 11, 12, 106, 106, 106, 16, - 11, 12, 106, 106, 106, 16, 17, 106, 106, 26, 45, 28, 106, 48, 106, 50, 33, 52, - 106, 106, 106, 45, 106, 106, 48, 65, 50, 106, 52, 53, 70, 71, 106, 73, 45, 75, - 106, 48, 106, 50, 80, 52, 106, 106, 106, 106, 106, 106, 88, 89, 90, 106, 92, 65, - 1, 2, 106, 106, 70, 71, 106, 73, 106, 75, 106, 71, 106, 106, 80, 75, 106, 106, - 106, 106, 80, 106, 88, 89, 90, 65, 92, 1, 106, 89, 70, 71, 92, 73, 106, 75, 65, - 38, 39, 40, 80, 70, 71, 106, 73, 106, 75, 106, 88, 89, 90, 80, 92, 27, 55, 56, - 57, 58, 1, 88, 89, 90, 1, 92, 38, 39, 40, 1, 106, 106, 106, 10, 106, 106, 106, - 106, 106, 106, 21, 106, 106, 55, 56, 57, 58, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 38, 39, 40, 1, 38, 39, 40, 1, 106, 38, 39, 40, 10, 1, 106, 106, - 10, 55, 56, 57, 58, 55, 56, 57, 58, 106, 55, 56, 57, 58, 106, 60, 106, 106, 106, - 106, 106, 106, 106, 106, 38, 39, 40, 106, 38, 39, 40, 1, 106, 37, 38, 39, 40, - 106, 106, 106, 106, 55, 56, 57, 58, 55, 56, 57, 58, 2, 106, 55, 56, 57, 58, 106, - 106, 106, 11, 12, 106, 106, 106, 16, 17, 1, 106, 37, 38, 39, 40, 1, 106, 106, - 106, 106, 106, 11, 12, 11, 12, 106, 16, 17, 16, 55, 56, 57, 58, 106, 106, 106, - 45, 106, 26, 48, 28, 50, 106, 52, 106, 33, 38, 39, 40, 106, 106, 106, 38, 39, - 40, 45, 106, 106, 48, 106, 50, 53, 52, 55, 56, 57, 58, 106, 106, 55, 56, 57, 58, - 106, 10, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 21, 106, 23, 106, - 106, 26, 106, 106, 106, 106, 106, 106, 33, 106, 35, 106, 37, 106, 106, 106, 106, - 106, 106, 106, 45,); - - const YY_SHIFT_USE_DFLT = - 12; - - const YY_SHIFT_MAX = 238; - - static public $yy_shift_ofst = array(519, 349, 79, 349, 304, 79, 79, 304, 34, - 11, 34, 79, 394, 79, 79, 124, 79, - 169, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 259, 79, 79, 79, 79, 79, 79, 169, - 79, 214, 214, 439, 439, 439, 439, 439, 439, 1617, 1577, 1627, 1627, 1627, 1627, - 1627, 519, 1944, 1978, 2012, 1903, 1938, 1677, 1836, 1934, 1863, 1898, 1894, - 2018, 2018, 2018, 2018, 2018, 2018, 2018, 2018, 2018, 2018, 2018, 2018, 695, - 695, 6, 660, 459, 311, 103, 221, 411, 745, 1766, 2016, 783, 783, 411, 221, 411, - 427, 221, 607, 74, 119, 209, 266, 254, 228, 181, 55, 314, 3, 314, 235, 418, - 418, 584, 250, 528, 378, 297, 54, 518, 54, 539, 2, 2, 2, 2, 2, 2, 2, 2, 2, 252, - 252, - 12, 1697, 1759, 1748, 1995, 1772, 2014, 93, 361, 359, 134, 54, 137, 54, - 137, 54, 54, 54, 54, 54, 54, 54, 54, 80, 54, 54, 137, 137, 54, 54, 54, 54, 54, - 172, 54, 172, 444, 172, 320, 80, 172, 172, 172, 54, 172, 172, 687, 594, 2, 252, - 2, 382, 382, 2, 2, 252, 252, 2, - 12, - 12, - 12, - 12, - 12, 1550, 2068, 617, - 316, 154, 29, 240, 354, 98, 174, 236, 192, 272, 413, 249, 322, 381, 188, 36, - - 9, 598, 554, 424, 533, 525, 441, 498, 505, 473, 458, 450, 421, 559, 610, 594, - 627, 605, 564, 534, 392, 388, 629, 117, 58, 156, 313,); - - const YY_REDUCE_USE_DFLT = - 71; - - const YY_REDUCE_MAX = 192; - - static public $yy_reduce_ofst = array(1530, 426, 482, 656, 545, 515, 623, 571, 1017, 961, 1101, 1325, 933, 793, 849, - 821, 1465, 1157, 1129, 1185, 1073, 989, 1045, 1241, 1381, 1437, 1493, 1409, - 1269, 1297, 1353, 1213, 708, 737, 905, 877, 765, 1606, 1556, 1632, 1808, 1797, - 1771, 1666, 1743, 886, 491, 830, 491, 746, 942, 998, 438, - 70, - 70, - 70, - - 70, - 70, - 70, - 70, - 70, - 70, - 70, - 70, - 70, - 70, - 70, - 70, - 70, - - 70, - 70, - 70, - 70, - 70, - 70, - 70, - 70, - 70, 1777, - 3, 524, 460, - - 36, 511, - 51, 362, 487, 575, 567, 586, 37, 445, 97, 65, 317, 321, 541, 541, - 276, 276, 276, 414, 246, 290, 246, - 8, 201, 290, 344, 422, 340, 276, 461, - 387, 290, 486, 276, 530, 276, 276, 276, 276, 276, 435, 276, 276, 276, 276, - 570, 290, 276, 122, 122, 122, 122, 122, 122, 602, 589, 122, 122, 574, 606, - 574, 603, 574, 574, 574, 574, 574, 574, 574, 574, 581, 574, 574, 597, 596, - 574, 574, 574, 574, 574, 593, 574, 593, 609, 593, 611, 608, 593, 593, 593, - 574, 593, 593, 631, 612, 96, 67, 96, 230, 230, 96, 96, 67, 67, 96, 269, 224, - 588, 508, 501,); - - static public $yyExpectedTokens = array(array(3, 4, 5, 6, 7, 11, 12, 15, 18, 19, 20, 25, 29, 31, 32,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 30, 31, 32, 34, 36, 39, 42, - 43, 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 53, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 30, 31, 32, 34, 36, 39, 42, - 43, 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 52, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 54, 59,), - array(11, 12, 13, 15, 16, 18, 19, 20, 25, 29, 31, 32, 34, 36, 39, 42, 43, - 44, 45, 47, 49, 51, 54, 59,), - array(1, 24, 26, 33, 38, 39, 40, 55, 56, 57, 58,), - array(1, 10, 26, 33, 38, 39, 40, 55, 56, 57, 58,), - array(1, 26, 33, 38, 39, 40, 55, 56, 57, 58,), - array(1, 26, 33, 38, 39, 40, 55, 56, 57, 58,), - array(1, 26, 33, 38, 39, 40, 55, 56, 57, 58,), - array(1, 26, 33, 38, 39, 40, 55, 56, 57, 58,), - array(1, 26, 33, 38, 39, 40, 55, 56, 57, 58,), - array(3, 4, 5, 6, 7, 11, 12, 15, 18, 19, 20, 25, 29, 31, 32,), - array(1, 37, 38, 39, 40, 55, 56, 57, 58,), - array(1, 37, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 53, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58, 60,), - array(1, 10, 38, 39, 40, 55, 56, 57, 58,), - array(1, 10, 38, 39, 40, 55, 56, 57, 58,), - array(1, 2, 38, 39, 40, 55, 56, 57, 58,), - array(1, 10, 38, 39, 40, 55, 56, 57, 58,), - array(1, 27, 38, 39, 40, 55, 56, 57, 58,), - array(1, 10, 38, 39, 40, 55, 56, 57, 58,), - array(1, 21, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58,), - array(1, 38, 39, 40, 55, 56, 57, 58,), array(38, 39, 40, 55, 56, 57, 58,), - array(38, 39, 40, 55, 56, 57, 58,), array(13, 16, 49, 51, 54,), - array(4, 11, 12, 13, 15, 18, 19, 20, 25, 29, 31, 32, 59, 60,), - array(1, 10, 17, 26, 33, 36, 48,), array(1, 10, 26, 33,), - array(13, 16, 51, 54,), array(1, 26, 33,), array(13, 36, 54,), - array(4, 11, 12, 13, 15, 18, 19, 20, 25, 29, 31, 32, 59, 60,), - array(11, 12, 16, 26, 28, 33,), array(11, 12, 16, 26, 28, 33,), - array(11, 12, 16, 26, 33,), array(11, 12, 16, 26, 33,), array(13, 36, 54,), - array(1, 26, 33,), array(13, 36, 54,), array(17, 45, 52,), - array(1, 26, 33,), array(1, 2,), array(10, 22, 26, 33, 46,), - array(10, 22, 26, 33, 46,), array(1, 10, 26, 27, 33,), - array(1, 10, 26, 33,), array(1, 10, 26, 33,), array(12, 13, 16, 54,), - array(11, 12, 16, 50,), array(14, 17, 48,), array(11, 12, 16,), - array(7, 8, 9,), array(11, 12, 16,), array(14, 17, 48,), array(13, 16,), - array(13, 16,), array(13, 54,), array(1, 10,), array(26, 33,), - array(1, 17,), array(17, 48,), array(26, 33,), array(1, 28,), - array(26, 33,), array(1, 53,), array(1,), array(1,), array(1,), array(1,), - array(1,), array(1,), array(1,), array(1,), array(1,), array(17,), - array(17,), array(), array(2, 11, 12, 14, 16, 17, 45, 48, 50, 52,), - array(2, 11, 12, 16, 17, 45, 48, 50, 52, 53,), - array(2, 11, 12, 14, 16, 17, 45, 48, 50, 52,), - array(2, 11, 12, 16, 17, 45, 48, 50, 52,), - array(2, 11, 12, 16, 17, 45, 48, 50, 52,), - array(11, 12, 16, 17, 45, 48, 50, 52,), array(12, 13, 16, 34, 54,), - array(11, 12, 16, 50,), array(11, 12, 16,), array(14, 45, 52,), - array(26, 33,), array(13, 54,), array(26, 33,), array(13, 54,), - array(26, 33,), array(26, 33,), array(26, 33,), array(26, 33,), - array(26, 33,), array(26, 33,), array(26, 33,), array(26, 33,), - array(45, 52,), array(26, 33,), array(26, 33,), array(13, 54,), - array(13, 54,), array(26, 33,), array(26, 33,), array(26, 33,), - array(26, 33,), array(26, 33,), array(45, 52,), array(26, 33,), - array(45, 52,), array(12, 36,), array(45, 52,), array(14, 22,), - array(45, 52,), array(45, 52,), array(45, 52,), array(45, 52,), - array(26, 33,), array(45, 52,), array(45, 52,), array(8,), array(36,), - array(1,), array(17,), array(1,), array(2,), array(2,), array(1,), - array(1,), array(17,), array(17,), array(1,), array(), array(), array(), - array(), array(), array(1, 2, 36, 38, 39, 40, 48, 55, 56, 57, 58,), - array(10, 21, 23, 26, 33, 35, 37, 45,), array(10, 14, 26, 33, 36, 48,), - array(11, 12, 16, 50,), array(36, 45, 48, 53,), array(22, 46, 53,), - array(22, 46, 60,), array(28, 36, 48,), array(36, 48,), array(21, 35,), - array(45, 53,), array(14, 45,), array(35, 37,), array(36, 48,), - array(36, 48,), array(35, 37,), array(35, 37,), array(16, 50,), - array(35, 53,), array(22, 46,), array(34,), array(10,), array(16,), - array(51,), array(16,), array(36,), array(51,), array(16,), array(16,), - array(4,), array(16,), array(53,), array(16,), array(16,), array(36,), - array(13,), array(16,), array(53,), array(45,), array(37,), array(16,), - array(23,), array(34,), array(16,), array(14,), array(41,), array(), - array(), array(), array(), array(), array(), array(), array(), array(), - array(), array(), array(), array(), array(), array(), array(), array(), - array(), array(), array(), array(), array(), array(), array(), array(), - array(), array(), array(), array(), array(), array(), array(), array(), - array(), array(), array(), array(), array(), array(), array(), array(), - array(), array(), array(), array(), array(), array(), array(), array(), - array(), array(), array(), array(), array(), array(), array(), array(), - array(), array(), array(), array(), array(), array(), array(), array(), - array(), array(), array(), array(), array(), array(), array(), array(), - array(), array(), array(), array(), array(), array(), array(), array(), - array(), array(), array(), array(), array(), array(), array(), array(), - array(), array(), array(), array(), array(), array(), array(),); - - static public $yy_default = array(338, 515, 494, 530, 530, 494, 494, 530, 530, 530, 530, 530, 530, 530, 530, 530, - 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, - 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, 396, 530, 396, - 359, 372, 362, 396, 335, 530, 530, 530, 530, 530, 530, 530, 530, 401, 530, 530, - 377, 517, 492, 493, 418, 516, 403, 401, 518, 398, 407, 408, 423, 422, 530, 530, - 434, 410, 530, 396, 530, 530, 396, 396, 396, 396, 530, 396, 530, 506, 396, 386, - 424, 424, 410, 410, 410, 530, 459, 449, 459, 530, 459, 449, 530, 530, 530, 410, - 396, 390, 449, 396, 410, 374, 410, 417, 426, 425, 410, 392, 421, 414, 413, 427, - 503, 449, 501, 448, 448, 448, 448, 448, 448, 530, 461, 459, 475, 382, 530, 381, - 530, 369, 366, 364, 368, 360, 363, 358, 370, 452, 384, 356, 530, 530, 385, 375, - 380, 379, 373, 455, 376, 484, 459, 487, 530, 454, 453, 486, 485, 383, 456, 457, - 350, 459, 443, 481, 387, 495, 496, 416, 391, 507, 504, 393, 500, 500, 500, 459, - 459, 434, 430, 434, 460, 434, 424, 424, 434, 434, 530, 430, 430, 530, 530, 444, - 530, 530, 530, 530, 424, 530, 530, 530, 530, 530, 505, 530, 530, 530, 342, 530, - 439, 530, 530, 475, 530, 530, 530, 430, 530, 530, 404, 432, 530, 530, 436, 439, - 480, 502, 440, 490, 465, 365, 436, 475, 394, 405, 343, 344, 345, 346, 347, 409, - 429, 411, 337, 336, 339, 340, 341, 431, 348, 397, 353, 464, 354, 463, 435, 378, - 351, 349, 489, 352, 433, 462, 419, 477, 415, 446, 478, 479, 438, 388, 519, 511, - 510, 521, 520, 412, 482, 437, 498, 497, 491, 476, 483, 451, 526, 527, 428, 499, - 450, 389, 524, 523, 488, 458, 420, 442, 445, 371, 471, 468, 474, 467, 466, 469, - 472, 470, 522, 509, 529, 528, 525, 508, 473, 513, 447, 514, 395, 512, 441,); - - const YYNOCODE = 107; - - const YYSTACKDEPTH = 500; - - const YYNSTATE = 335; - - const YYNRULE = 195; - - const YYERRORSYMBOL = 61; - - const YYERRSYMDT = 'yy0'; - - const YYFALLBACK = 0; - - public static $yyFallback = array(); - public function Trace($TraceFILE, $zTracePrompt) { if (!$TraceFILE) { $zTracePrompt = 0; - } elseif (!$zTracePrompt) { + } else if (!$zTracePrompt) { $TraceFILE = 0; } $this->yyTraceFILE = $TraceFILE; @@ -900,136 +1722,6 @@ class Smarty_Internal_Templateparser $this->yyTracePrompt = '
    '; } - public $yyTraceFILE; - - public $yyTracePrompt; - - public $yyidx; /* Index of top element in stack */ - public $yyerrcnt; /* Shifts left before out of the error */ - public $yystack = array(); /* The parser's stack */ - - public $yyTokenName = array('$', 'VERT', 'COLON', 'PHP', 'TEXT', 'STRIPON', 'STRIPOFF', 'LITERALSTART', - 'LITERALEND', 'LITERAL', 'RDEL', 'SIMPELOUTPUT', 'LDEL', 'DOLLARID', 'EQUAL', - 'SIMPLETAG', 'ID', 'PTR', 'LDELMAKENOCACHE', 'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC', - 'TO', 'STEP', 'LDELFOREACH', 'SPACE', 'AS', 'APTR', 'LDELSETFILTER', - 'SMARTYBLOCKCHILDPARENT', 'CLOSETAG', 'LDELSLASH', 'ATTR', 'INTEGER', 'COMMA', 'OPENP', - 'CLOSEP', 'MATH', 'UNIMATH', 'ISIN', 'QMARK', 'NOT', 'TYPECAST', 'HEX', 'DOT', - 'INSTANCEOF', 'SINGLEQUOTESTRING', 'DOUBLECOLON', 'NAMESPACE', 'AT', 'HATCH', 'OPENB', - 'CLOSEB', 'DOLLAR', 'LOGOP', 'SLOGOP', 'TLOGOP', 'SINGLECOND', 'QUOTE', 'BACKTICK', - 'error', 'start', 'template', 'template_element', 'smartytag', 'literal', - 'text_content', 'literal_elements', 'literal_element', 'tag', 'variable', 'attributes', - 'value', 'expr', 'varindexed', 'modifierlist', 'statement', 'statements', 'foraction', - 'varvar', 'modparameters', 'attribute', 'ternary', 'array', 'tlop', 'lop', 'scond', - 'function', 'ns1', 'doublequoted_with_quotes', 'static_class_access', 'object', - 'arrayindex', 'indexdef', 'varvarele', 'objectchain', 'objectelement', 'method', - 'params', 'modifier', 'modparameter', 'arrayelements', 'arrayelement', 'doublequoted', - 'doublequotedcontent',); - - public static $yyRuleName = array('start ::= template', 'template ::= template_element', - 'template ::= template template_element', 'template ::=', - 'template_element ::= smartytag', 'template_element ::= literal', - 'template_element ::= PHP', 'template_element ::= text_content', - 'text_content ::= TEXT', 'text_content ::= text_content TEXT', - 'template_element ::= STRIPON', 'template_element ::= STRIPOFF', - 'literal ::= LITERALSTART LITERALEND', - 'literal ::= LITERALSTART literal_elements LITERALEND', - 'literal_elements ::= literal_elements literal_element', 'literal_elements ::=', - 'literal_element ::= literal', 'literal_element ::= LITERAL', - 'smartytag ::= tag RDEL', 'smartytag ::= SIMPELOUTPUT', 'tag ::= LDEL variable', - 'tag ::= LDEL variable attributes', 'tag ::= LDEL value', - 'tag ::= LDEL value attributes', 'tag ::= LDEL expr', - 'tag ::= LDEL expr attributes', 'tag ::= LDEL DOLLARID EQUAL value', - 'tag ::= LDEL DOLLARID EQUAL expr', 'tag ::= LDEL DOLLARID EQUAL expr attributes', - 'tag ::= LDEL varindexed EQUAL expr attributes', 'smartytag ::= SIMPLETAG', - 'tag ::= LDEL ID attributes', 'tag ::= LDEL ID', - 'tag ::= LDEL ID modifierlist attributes', 'tag ::= LDEL ID PTR ID attributes', - 'tag ::= LDEL ID PTR ID modifierlist attributes', - 'tag ::= LDELMAKENOCACHE DOLLARID', 'tag ::= LDELIF expr', - 'tag ::= LDELIF expr attributes', 'tag ::= LDELIF statement', - 'tag ::= LDELIF statement attributes', - 'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes', - 'foraction ::= EQUAL expr', 'foraction ::= INCDEC', - 'tag ::= LDELFOR statement TO expr attributes', - 'tag ::= LDELFOR statement TO expr STEP expr attributes', - 'tag ::= LDELFOREACH attributes', - 'tag ::= LDELFOREACH SPACE value AS varvar attributes', - 'tag ::= LDELFOREACH SPACE value AS varvar APTR varvar attributes', - 'tag ::= LDELFOREACH SPACE expr AS varvar attributes', - 'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes', - 'tag ::= LDELSETFILTER ID modparameters', - 'tag ::= LDELSETFILTER ID modparameters modifierlist', - 'tag ::= LDEL SMARTYBLOCKCHILDPARENT', 'smartytag ::= CLOSETAG', - 'tag ::= LDELSLASH ID', 'tag ::= LDELSLASH ID modifierlist', - 'tag ::= LDELSLASH ID PTR ID', 'tag ::= LDELSLASH ID PTR ID modifierlist', - 'attributes ::= attributes attribute', 'attributes ::= attribute', - 'attributes ::=', 'attribute ::= SPACE ID EQUAL ID', 'attribute ::= ATTR expr', - 'attribute ::= ATTR value', 'attribute ::= SPACE ID', 'attribute ::= SPACE expr', - 'attribute ::= SPACE value', 'attribute ::= SPACE INTEGER EQUAL expr', - 'statements ::= statement', 'statements ::= statements COMMA statement', - 'statement ::= DOLLARID EQUAL INTEGER', 'statement ::= DOLLARID EQUAL expr', - 'statement ::= varindexed EQUAL expr', 'statement ::= OPENP statement CLOSEP', - 'expr ::= value', 'expr ::= ternary', 'expr ::= DOLLARID COLON ID', - 'expr ::= expr MATH value', 'expr ::= expr UNIMATH value', 'expr ::= array', - 'expr ::= expr modifierlist', 'expr ::= expr tlop value', - 'expr ::= expr lop expr', 'expr ::= expr scond', 'expr ::= expr ISIN array', - 'expr ::= expr ISIN value', - 'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr', - 'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr', 'value ::= variable', - 'value ::= UNIMATH value', 'value ::= NOT value', 'value ::= TYPECAST value', - 'value ::= variable INCDEC', 'value ::= HEX', 'value ::= INTEGER', - 'value ::= INTEGER DOT INTEGER', 'value ::= INTEGER DOT', 'value ::= DOT INTEGER', - 'value ::= ID', 'value ::= function', 'value ::= OPENP expr CLOSEP', - 'value ::= variable INSTANCEOF ns1', 'value ::= variable INSTANCEOF variable', - 'value ::= SINGLEQUOTESTRING', 'value ::= doublequoted_with_quotes', - 'value ::= varindexed DOUBLECOLON static_class_access', 'value ::= smartytag', - 'value ::= value modifierlist', 'value ::= NAMESPACE', - 'value ::= ns1 DOUBLECOLON static_class_access', 'ns1 ::= ID', - 'ns1 ::= NAMESPACE', 'variable ::= DOLLARID', 'variable ::= varindexed', - 'variable ::= varvar AT ID', 'variable ::= object', 'variable ::= HATCH ID HATCH', - 'variable ::= HATCH ID HATCH arrayindex', 'variable ::= HATCH variable HATCH', - 'variable ::= HATCH variable HATCH arrayindex', - 'varindexed ::= DOLLARID arrayindex', 'varindexed ::= varvar arrayindex', - 'arrayindex ::= arrayindex indexdef', 'arrayindex ::=', - 'indexdef ::= DOT DOLLARID', 'indexdef ::= DOT varvar', - 'indexdef ::= DOT varvar AT ID', 'indexdef ::= DOT ID', - 'indexdef ::= DOT INTEGER', 'indexdef ::= DOT LDEL expr RDEL', - 'indexdef ::= OPENB ID CLOSEB', 'indexdef ::= OPENB ID DOT ID CLOSEB', - 'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB', - 'indexdef ::= OPENB INTEGER CLOSEB', 'indexdef ::= OPENB DOLLARID CLOSEB', - 'indexdef ::= OPENB variable CLOSEB', 'indexdef ::= OPENB value CLOSEB', - 'indexdef ::= OPENB expr CLOSEB', 'indexdef ::= OPENB CLOSEB', - 'varvar ::= DOLLARID', 'varvar ::= DOLLAR', 'varvar ::= varvar varvarele', - 'varvarele ::= ID', 'varvarele ::= SIMPELOUTPUT', 'varvarele ::= LDEL expr RDEL', - 'object ::= varindexed objectchain', 'objectchain ::= objectelement', - 'objectchain ::= objectchain objectelement', - 'objectelement ::= PTR ID arrayindex', 'objectelement ::= PTR varvar arrayindex', - 'objectelement ::= PTR LDEL expr RDEL arrayindex', - 'objectelement ::= PTR ID LDEL expr RDEL arrayindex', - 'objectelement ::= PTR method', 'function ::= ns1 OPENP params CLOSEP', - 'method ::= ID OPENP params CLOSEP', 'method ::= DOLLARID OPENP params CLOSEP', - 'params ::= params COMMA expr', 'params ::= expr', 'params ::=', - 'modifierlist ::= modifierlist modifier modparameters', - 'modifierlist ::= modifier modparameters', 'modifier ::= VERT AT ID', - 'modifier ::= VERT ID', 'modparameters ::= modparameters modparameter', - 'modparameters ::=', 'modparameter ::= COLON value', - 'modparameter ::= COLON array', 'static_class_access ::= method', - 'static_class_access ::= method objectchain', 'static_class_access ::= ID', - 'static_class_access ::= DOLLARID arrayindex', - 'static_class_access ::= DOLLARID arrayindex objectchain', 'lop ::= LOGOP', - 'lop ::= SLOGOP', 'tlop ::= TLOGOP', 'scond ::= SINGLECOND', - 'array ::= OPENB arrayelements CLOSEB', 'arrayelements ::= arrayelement', - 'arrayelements ::= arrayelements COMMA arrayelement', 'arrayelements ::=', - 'arrayelement ::= value APTR expr', 'arrayelement ::= ID APTR expr', - 'arrayelement ::= expr', 'doublequoted_with_quotes ::= QUOTE QUOTE', - 'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE', - 'doublequoted ::= doublequoted doublequotedcontent', - 'doublequoted ::= doublequotedcontent', - 'doublequotedcontent ::= BACKTICK variable BACKTICK', - 'doublequotedcontent ::= BACKTICK expr BACKTICK', - 'doublequotedcontent ::= DOLLARID', 'doublequotedcontent ::= LDEL variable RDEL', - 'doublequotedcontent ::= LDEL expr RDEL', 'doublequotedcontent ::= smartytag', - 'doublequotedcontent ::= TEXT',); - public function tokenName($tokenType) { if ($tokenType === 0) { @@ -1038,7 +1730,7 @@ class Smarty_Internal_Templateparser if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) { return $this->yyTokenName[ $tokenType ]; } else { - return "Unknown"; + return 'Unknown'; } } @@ -1057,12 +1749,13 @@ class Smarty_Internal_Templateparser } $yytos = array_pop($this->yystack); if ($this->yyTraceFILE && $this->yyidx >= 0) { - fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] . "\n"); + fwrite($this->yyTraceFILE, + $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] . + "\n"); } $yymajor = $yytos->major; self::yy_destructor($yymajor, $yytos->minor); - $this->yyidx --; - + $this->yyidx--; return $yymajor; } @@ -1099,7 +1792,7 @@ class Smarty_Internal_Templateparser // reduce action $done = 0; do { - if ($done ++ == 100) { + if ($done++ === 100) { $this->yyidx = $yyidx; $this->yystack = $stack; // too much recursion prevents proper detection @@ -1108,8 +1801,9 @@ class Smarty_Internal_Templateparser } $yyruleno = $yyact - self::YYNSTATE; $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ]; - $nextstate = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, - self::$yyRuleInfo[ $yyruleno ][ 0 ]); + $nextstate = $this->yy_find_reduce_action( + $this->yystack[ $this->yyidx ]->stateno, + self::$yyRuleInfo[ $yyruleno ][ 0 ]); if (isset(self::$yyExpectedTokens[ $nextstate ])) { $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]); if (isset($res4[ $nextstate ][ $token ])) { @@ -1120,8 +1814,7 @@ class Smarty_Internal_Templateparser } } else { if ($res4[ $nextstate ][ $token ] = - in_array($token, self::$yyExpectedTokens[ $nextstate ], true) - ) { + in_array($token, self::$yyExpectedTokens[ $nextstate ], true)) { $this->yyidx = $yyidx; $this->yystack = $stack; return array_unique($expected); @@ -1130,20 +1823,20 @@ class Smarty_Internal_Templateparser } if ($nextstate < self::YYNSTATE) { // we need to shift a non-terminal - $this->yyidx ++; + $this->yyidx++; $x = new TP_yyStackEntry; $x->stateno = $nextstate; $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ]; $this->yystack[ $this->yyidx ] = $x; continue 2; - } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) { + } else if ($nextstate === self::YYNSTATE + self::YYNRULE + 1) { $this->yyidx = $yyidx; $this->yystack = $stack; // the last token was just ignored, we can't accept // by ignoring input, this is in essence ignoring a // syntax error! return array_unique($expected); - } elseif ($nextstate === self::YY_NO_ACTION) { + } else if ($nextstate === self::YY_NO_ACTION) { $this->yyidx = $yyidx; $this->yystack = $stack; // input accepted, but not shifted (I guess) @@ -1151,15 +1844,12 @@ class Smarty_Internal_Templateparser } else { $yyact = $nextstate; } - } - while (true); + } while (true); } break; - } - while (true); + } while (true); $this->yyidx = $yyidx; $this->yystack = $stack; - return array_unique($expected); } @@ -1188,7 +1878,7 @@ class Smarty_Internal_Templateparser // reduce action $done = 0; do { - if ($done ++ == 100) { + if ($done++ === 100) { $this->yyidx = $yyidx; $this->yystack = $stack; // too much recursion prevents proper detection @@ -1197,8 +1887,9 @@ class Smarty_Internal_Templateparser } $yyruleno = $yyact - self::YYNSTATE; $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ]; - $nextstate = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, - self::$yyRuleInfo[ $yyruleno ][ 0 ]); + $nextstate = $this->yy_find_reduce_action( + $this->yystack[ $this->yyidx ]->stateno, + self::$yyRuleInfo[ $yyruleno ][ 0 ]); if (isset($res2[ $nextstate ][ $token ])) { if ($res2[ $nextstate ][ $token ]) { $this->yyidx = $yyidx; @@ -1207,9 +1898,9 @@ class Smarty_Internal_Templateparser } } else { if ($res2[ $nextstate ][ $token ] = (isset(self::$yyExpectedTokens[ $nextstate ]) && - in_array($token, self::$yyExpectedTokens[ $nextstate ], - true)) - ) { + in_array($token, + self::$yyExpectedTokens[ $nextstate ], + true))) { $this->yyidx = $yyidx; $this->yystack = $stack; return true; @@ -1217,13 +1908,13 @@ class Smarty_Internal_Templateparser } if ($nextstate < self::YYNSTATE) { // we need to shift a non-terminal - $this->yyidx ++; + $this->yyidx++; $x = new TP_yyStackEntry; $x->stateno = $nextstate; $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ]; $this->yystack[ $this->yyidx ] = $x; continue 2; - } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) { + } else if ($nextstate === self::YYNSTATE + self::YYNRULE + 1) { $this->yyidx = $yyidx; $this->yystack = $stack; if (!$token) { @@ -1234,7 +1925,7 @@ class Smarty_Internal_Templateparser // by ignoring input, this is in essence ignoring a // syntax error! return false; - } elseif ($nextstate === self::YY_NO_ACTION) { + } else if ($nextstate === self::YY_NO_ACTION) { $this->yyidx = $yyidx; $this->yystack = $stack; // input accepted, but not shifted (I guess) @@ -1242,22 +1933,18 @@ class Smarty_Internal_Templateparser } else { $yyact = $nextstate; } - } - while (true); + } while (true); } break; - } - while (true); + } while (true); $this->yyidx = $yyidx; $this->yystack = $stack; - return true; } public function yy_find_shift_action($iLookAhead) { $stateno = $this->yystack[ $this->yyidx ]->stateno; - /* if ($this->yyidx < 0) return self::YY_NO_ACTION; */ if (!isset(self::$yy_shift_ofst[ $stateno ])) { // no shift actions @@ -1267,23 +1954,22 @@ class Smarty_Internal_Templateparser if ($i === self::YY_SHIFT_USE_DFLT) { return self::$yy_default[ $stateno ]; } - if ($iLookAhead == self::YYNOCODE) { + if ($iLookAhead === self::YYNOCODE) { return self::YY_NO_ACTION; } $i += $iLookAhead; - if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[ $i ] != $iLookAhead) { - if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) && - ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0 - ) { + if ($i < 0 || $i >= self::YY_SZ_ACTTAB || + self::$yy_lookahead[ $i ] != $iLookAhead) { + if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) + && ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0) { if ($this->yyTraceFILE) { fwrite($this->yyTraceFILE, - $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[ $iLookAhead ] . " => " . + $this->yyTracePrompt . 'FALLBACK ' . + $this->yyTokenName[ $iLookAhead ] . ' => ' . $this->yyTokenName[ $iFallback ] . "\n"); } - return $this->yy_find_shift_action($iFallback); } - return self::$yy_default[ $stateno ]; } else { return self::$yy_action[ $i ]; @@ -1293,41 +1979,41 @@ class Smarty_Internal_Templateparser public function yy_find_reduce_action($stateno, $iLookAhead) { /* $stateno = $this->yystack[$this->yyidx]->stateno; */ - if (!isset(self::$yy_reduce_ofst[ $stateno ])) { return self::$yy_default[ $stateno ]; } $i = self::$yy_reduce_ofst[ $stateno ]; - if ($i == self::YY_REDUCE_USE_DFLT) { + if ($i === self::YY_REDUCE_USE_DFLT) { return self::$yy_default[ $stateno ]; } - if ($iLookAhead == self::YYNOCODE) { + if ($iLookAhead === self::YYNOCODE) { return self::YY_NO_ACTION; } $i += $iLookAhead; - if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[ $i ] != $iLookAhead) { + if ($i < 0 || $i >= self::YY_SZ_ACTTAB || + self::$yy_lookahead[ $i ] != $iLookAhead) { return self::$yy_default[ $stateno ]; } else { return self::$yy_action[ $i ]; } } + #line 234 "../smarty/lexer/smarty_internal_templateparser.y" + public function yy_shift($yyNewState, $yyMajor, $yypMinor) { - $this->yyidx ++; + $this->yyidx++; if ($this->yyidx >= self::YYSTACKDEPTH) { - $this->yyidx --; + $this->yyidx--; if ($this->yyTraceFILE) { fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt); } while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); } - #line 207 "../smarty/lexer/smarty_internal_templateparser.y" - + #line 221 "../smarty/lexer/smarty_internal_templateparser.y" $this->internalError = true; - $this->compiler->trigger_template_error("Stack overflow in template parser"); - + $this->compiler->trigger_template_error('Stack overflow in template parser'); return; } $yytos = new TP_yyStackEntry; @@ -1336,111 +2022,22 @@ class Smarty_Internal_Templateparser $yytos->minor = $yypMinor; $this->yystack[] = $yytos; if ($this->yyTraceFILE && $this->yyidx > 0) { - fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState); + fprintf($this->yyTraceFILE, + "%sShift %d\n", + $this->yyTracePrompt, + $yyNewState); fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt); - for ($i = 1; $i <= $this->yyidx; $i ++) { - fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[ $this->yystack[ $i ]->major ]); + for ($i = 1; $i <= $this->yyidx; $i++) { + fprintf($this->yyTraceFILE, + " %s", + $this->yyTokenName[ $this->yystack[ $i ]->major ]); } fwrite($this->yyTraceFILE, "\n"); } } - public static $yyRuleInfo = array(array(0 => 62, 1 => 1), array(0 => 63, 1 => 1), array(0 => 63, 1 => 2), - array(0 => 63, 1 => 0), array(0 => 64, 1 => 1), array(0 => 64, 1 => 1), - array(0 => 64, 1 => 1), array(0 => 64, 1 => 1), array(0 => 67, 1 => 1), - array(0 => 67, 1 => 2), array(0 => 64, 1 => 1), array(0 => 64, 1 => 1), - array(0 => 66, 1 => 2), array(0 => 66, 1 => 3), array(0 => 68, 1 => 2), - array(0 => 68, 1 => 0), array(0 => 69, 1 => 1), array(0 => 69, 1 => 1), - array(0 => 65, 1 => 2), array(0 => 65, 1 => 1), array(0 => 70, 1 => 2), - array(0 => 70, 1 => 3), array(0 => 70, 1 => 2), array(0 => 70, 1 => 3), - array(0 => 70, 1 => 2), array(0 => 70, 1 => 3), array(0 => 70, 1 => 4), - array(0 => 70, 1 => 4), array(0 => 70, 1 => 5), array(0 => 70, 1 => 5), - array(0 => 65, 1 => 1), array(0 => 70, 1 => 3), array(0 => 70, 1 => 2), - array(0 => 70, 1 => 4), array(0 => 70, 1 => 5), array(0 => 70, 1 => 6), - array(0 => 70, 1 => 2), array(0 => 70, 1 => 2), array(0 => 70, 1 => 3), - array(0 => 70, 1 => 2), array(0 => 70, 1 => 3), array(0 => 70, 1 => 8), - array(0 => 79, 1 => 2), array(0 => 79, 1 => 1), array(0 => 70, 1 => 5), - array(0 => 70, 1 => 7), array(0 => 70, 1 => 2), array(0 => 70, 1 => 6), - array(0 => 70, 1 => 8), array(0 => 70, 1 => 6), array(0 => 70, 1 => 8), - array(0 => 70, 1 => 3), array(0 => 70, 1 => 4), array(0 => 70, 1 => 2), - array(0 => 65, 1 => 1), array(0 => 70, 1 => 2), array(0 => 70, 1 => 3), - array(0 => 70, 1 => 4), array(0 => 70, 1 => 5), array(0 => 72, 1 => 2), - array(0 => 72, 1 => 1), array(0 => 72, 1 => 0), array(0 => 82, 1 => 4), - array(0 => 82, 1 => 2), array(0 => 82, 1 => 2), array(0 => 82, 1 => 2), - array(0 => 82, 1 => 2), array(0 => 82, 1 => 2), array(0 => 82, 1 => 4), - array(0 => 78, 1 => 1), array(0 => 78, 1 => 3), array(0 => 77, 1 => 3), - array(0 => 77, 1 => 3), array(0 => 77, 1 => 3), array(0 => 77, 1 => 3), - array(0 => 74, 1 => 1), array(0 => 74, 1 => 1), array(0 => 74, 1 => 3), - array(0 => 74, 1 => 3), array(0 => 74, 1 => 3), array(0 => 74, 1 => 1), - array(0 => 74, 1 => 2), array(0 => 74, 1 => 3), array(0 => 74, 1 => 3), - array(0 => 74, 1 => 2), array(0 => 74, 1 => 3), array(0 => 74, 1 => 3), - array(0 => 83, 1 => 7), array(0 => 83, 1 => 7), array(0 => 73, 1 => 1), - array(0 => 73, 1 => 2), array(0 => 73, 1 => 2), array(0 => 73, 1 => 2), - array(0 => 73, 1 => 2), array(0 => 73, 1 => 1), array(0 => 73, 1 => 1), - array(0 => 73, 1 => 3), array(0 => 73, 1 => 2), array(0 => 73, 1 => 2), - array(0 => 73, 1 => 1), array(0 => 73, 1 => 1), array(0 => 73, 1 => 3), - array(0 => 73, 1 => 3), array(0 => 73, 1 => 3), array(0 => 73, 1 => 1), - array(0 => 73, 1 => 1), array(0 => 73, 1 => 3), array(0 => 73, 1 => 1), - array(0 => 73, 1 => 2), array(0 => 73, 1 => 1), array(0 => 73, 1 => 3), - array(0 => 89, 1 => 1), array(0 => 89, 1 => 1), array(0 => 71, 1 => 1), - array(0 => 71, 1 => 1), array(0 => 71, 1 => 3), array(0 => 71, 1 => 1), - array(0 => 71, 1 => 3), array(0 => 71, 1 => 4), array(0 => 71, 1 => 3), - array(0 => 71, 1 => 4), array(0 => 75, 1 => 2), array(0 => 75, 1 => 2), - array(0 => 93, 1 => 2), array(0 => 93, 1 => 0), array(0 => 94, 1 => 2), - array(0 => 94, 1 => 2), array(0 => 94, 1 => 4), array(0 => 94, 1 => 2), - array(0 => 94, 1 => 2), array(0 => 94, 1 => 4), array(0 => 94, 1 => 3), - array(0 => 94, 1 => 5), array(0 => 94, 1 => 3), array(0 => 94, 1 => 3), - array(0 => 94, 1 => 3), array(0 => 94, 1 => 3), array(0 => 94, 1 => 3), - array(0 => 94, 1 => 3), array(0 => 94, 1 => 2), array(0 => 80, 1 => 1), - array(0 => 80, 1 => 1), array(0 => 80, 1 => 2), array(0 => 95, 1 => 1), - array(0 => 95, 1 => 1), array(0 => 95, 1 => 3), array(0 => 92, 1 => 2), - array(0 => 96, 1 => 1), array(0 => 96, 1 => 2), array(0 => 97, 1 => 3), - array(0 => 97, 1 => 3), array(0 => 97, 1 => 5), array(0 => 97, 1 => 6), - array(0 => 97, 1 => 2), array(0 => 88, 1 => 4), array(0 => 98, 1 => 4), - array(0 => 98, 1 => 4), array(0 => 99, 1 => 3), array(0 => 99, 1 => 1), - array(0 => 99, 1 => 0), array(0 => 76, 1 => 3), array(0 => 76, 1 => 2), - array(0 => 100, 1 => 3), array(0 => 100, 1 => 2), array(0 => 81, 1 => 2), - array(0 => 81, 1 => 0), array(0 => 101, 1 => 2), array(0 => 101, 1 => 2), - array(0 => 91, 1 => 1), array(0 => 91, 1 => 2), array(0 => 91, 1 => 1), - array(0 => 91, 1 => 2), array(0 => 91, 1 => 3), array(0 => 86, 1 => 1), - array(0 => 86, 1 => 1), array(0 => 85, 1 => 1), array(0 => 87, 1 => 1), - array(0 => 84, 1 => 3), array(0 => 102, 1 => 1), array(0 => 102, 1 => 3), - array(0 => 102, 1 => 0), array(0 => 103, 1 => 3), array(0 => 103, 1 => 3), - array(0 => 103, 1 => 1), array(0 => 90, 1 => 2), array(0 => 90, 1 => 3), - array(0 => 104, 1 => 2), array(0 => 104, 1 => 1), array(0 => 105, 1 => 3), - array(0 => 105, 1 => 3), array(0 => 105, 1 => 1), array(0 => 105, 1 => 3), - array(0 => 105, 1 => 3), array(0 => 105, 1 => 1), array(0 => 105, 1 => 1),); - - public static $yyReduceMap = array(0 => 0, 1 => 1, 2 => 2, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 16 => 8, 17 => 8, - 43 => 8, 66 => 8, 67 => 8, 75 => 8, 76 => 8, 80 => 8, 89 => 8, 94 => 8, 95 => 8, - 100 => 8, 104 => 8, 105 => 8, 109 => 8, 111 => 8, 116 => 8, 178 => 8, 183 => 8, - 9 => 9, 10 => 10, 11 => 11, 12 => 12, 15 => 12, 13 => 13, 74 => 13, 14 => 14, - 90 => 14, 92 => 14, 93 => 14, 123 => 14, 18 => 18, 19 => 19, 20 => 20, 22 => 20, - 24 => 20, 21 => 21, 23 => 21, 25 => 21, 26 => 26, 27 => 26, 28 => 28, 29 => 29, - 30 => 30, 31 => 31, 32 => 32, 33 => 33, 34 => 34, 35 => 35, 36 => 36, 37 => 37, - 38 => 38, 40 => 38, 39 => 39, 41 => 41, 42 => 42, 44 => 44, 45 => 45, 46 => 46, - 47 => 47, 49 => 47, 48 => 48, 50 => 48, 51 => 51, 52 => 52, 53 => 53, 54 => 54, - 55 => 55, 56 => 56, 57 => 57, 58 => 58, 59 => 59, 60 => 60, 69 => 60, 158 => 60, - 162 => 60, 166 => 60, 167 => 60, 61 => 61, 159 => 61, 165 => 61, 62 => 62, - 63 => 63, 64 => 63, 65 => 65, 143 => 65, 68 => 68, 70 => 70, 71 => 71, 72 => 71, - 73 => 73, 77 => 77, 78 => 78, 79 => 78, 81 => 81, 108 => 81, 82 => 82, 83 => 83, - 84 => 84, 85 => 85, 86 => 86, 87 => 87, 88 => 88, 91 => 91, 96 => 96, 97 => 97, - 98 => 98, 99 => 99, 101 => 101, 102 => 102, 103 => 102, 106 => 106, 107 => 107, - 110 => 110, 112 => 112, 113 => 113, 114 => 114, 115 => 115, 117 => 117, - 118 => 118, 119 => 119, 120 => 120, 121 => 121, 122 => 122, 124 => 124, - 180 => 124, 125 => 125, 126 => 126, 127 => 127, 128 => 128, 129 => 129, - 130 => 130, 138 => 130, 131 => 131, 132 => 132, 133 => 133, 134 => 133, - 136 => 133, 137 => 133, 135 => 135, 139 => 139, 140 => 140, 141 => 141, - 184 => 141, 142 => 142, 144 => 144, 145 => 145, 146 => 146, 147 => 147, - 148 => 148, 149 => 149, 150 => 150, 151 => 151, 152 => 152, 153 => 153, - 154 => 154, 155 => 155, 156 => 156, 157 => 157, 160 => 160, 161 => 161, - 163 => 163, 164 => 164, 168 => 168, 169 => 169, 170 => 170, 171 => 171, - 172 => 172, 173 => 173, 174 => 174, 175 => 175, 176 => 176, 177 => 177, - 179 => 179, 181 => 181, 182 => 182, 185 => 185, 186 => 186, 187 => 187, - 188 => 188, 189 => 188, 191 => 188, 190 => 190, 192 => 192, 193 => 193, - 194 => 194,); - - #line 218 "../smarty/lexer/smarty_internal_templateparser.y" + #line 242 "../smarty/lexer/smarty_internal_templateparser.y" + function yy_r0() { $this->root_buffer->prepend_array($this, $this->template_prefix); @@ -1448,431 +2045,472 @@ class Smarty_Internal_Templateparser $this->_retvalue = $this->root_buffer->to_smarty_php($this); } - #line 228 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r1() - { - if ($this->yystack[ $this->yyidx + 0 ]->minor != null) { - $this->current_buffer->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor); - } - } - - #line 235 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r2() - { - if ($this->yystack[ $this->yyidx + 0 ]->minor != null) { - // because of possible code injection - $this->current_buffer->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor); - } - } - - #line 249 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r4() - { - if ($this->compiler->has_code) { - $this->_retvalue = $this->mergePrefixCode($this->yystack[ $this->yyidx + 0 ]->minor); - } else { - $this->_retvalue = null; - } - $this->compiler->has_variable_string = false; - $this->block_nesting_level = count($this->compiler->_tag_stack); - } - - #line 260 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r5() - { - $this->_retvalue = new Smarty_Internal_ParseTree_Text($this->yystack[ $this->yyidx + 0 ]->minor); - } + #line 251 "../smarty/lexer/smarty_internal_templateparser.y" - #line 264 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r6() + function yy_r1() { $code = $this->compiler->compileTag('private_php', array(array('code' => $this->yystack[ $this->yyidx + 0 ]->minor), - array('type' => $this->lex->phpType)), array()); + array('type' => $this->lex->phpType)), + array()); if ($this->compiler->has_code && !empty($code)) { $tmp = ''; foreach ($this->compiler->prefix_code as $code) { $tmp .= $code; } $this->compiler->prefix_code = array(); - $this->_retvalue = - new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp . $code, true)); - } else { - $this->_retvalue = null; + $this->current_buffer->append_subtree($this, + new Smarty_Internal_ParseTree_Tag($this, + $this->compiler->processNocacheCode($tmp . + $code, + true))); } } - #line 275 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r7() + #line 255 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r2() { - $this->_retvalue = $this->compiler->processText($this->yystack[ $this->yyidx + 0 ]->minor); + $this->current_buffer->append_subtree($this, + $this->compiler->processText($this->yystack[ $this->yyidx + 0 ]->minor)); } - #line 279 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r8() + #line 259 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r3() { - $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor; + $this->strip = true; } - #line 283 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r9() + #line 264 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r4() { - $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor; + $this->strip = false; } - #line 288 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r10() + #line 269 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r5() { - $this->strip = true; + $this->current_buffer->append_subtree($this, + new Smarty_Internal_ParseTree_Text($this->yystack[ $this->yyidx + + -1 ]->minor)); } - #line 292 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r11() + #line 272 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r6() { - $this->strip = false; + $this->_retvalue = $this->yystack[ $this->yyidx + -3 ]->minor . $this->yystack[ $this->yyidx + -1 ]->minor; } - #line 297 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r12() + #line 276 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r7() { - $this->_retvalue = ''; + $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 301 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r13() + #line 281 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r8() { - $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor; + $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 305 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r14() + #line 285 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r9() { - $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor; + $this->_retvalue = ''; } - #line 321 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r18() + #line 297 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r10() { - $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor; + if ($this->compiler->has_code) { + $this->current_buffer->append_subtree($this, + $this->mergePrefixCode($this->yystack[ $this->yyidx + 0 ]->minor)); + } + $this->compiler->has_variable_string = false; + $this->block_nesting_level = count($this->compiler->_tag_stack); } - #line 327 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r19() + #line 307 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r12() { - $var = - trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->lex->ldel_length, - $this->lex->rdel_length), - ' $'); + $var = trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, + $this->compiler->getLdelLength(), + -$this->compiler->getRdelLength()), + ' $'); if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) { - $this->_retvalue = $this->compiler->compileTag('private_print_expression', array('nocache'), + $this->_retvalue = $this->compiler->compileTag('private_print_expression', + array('nocache'), array('value' => $this->compiler->compileVariable('\'' . $match[ 1 ] . '\''))); } else { - $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), + $this->_retvalue = $this->compiler->compileTag('private_print_expression', + array(), array('value' => $this->compiler->compileVariable('\'' . $var . '\''))); } } - #line 337 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r20() + #line 328 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r13() { - $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), - array('value' => $this->yystack[ $this->yyidx + 0 ]->minor)); + $tag = trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, + $this->compiler->getLdelLength(), + -$this->compiler->getRdelLength())); + if ($tag == 'strip') { + $this->strip = true; + $this->_retvalue = null;; + } else { + if (defined($tag)) { + if ($this->security) { + $this->security->isTrustedConstant($tag, $this->compiler); + } + $this->_retvalue = + $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag)); + } else { + if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) { + $this->_retvalue = $this->compiler->compileTag($match[ 1 ], array('\'nocache\'')); + } else { + $this->_retvalue = $this->compiler->compileTag($tag, array()); + } + } + } } - #line 341 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r21() + #line 339 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r14() { - $this->_retvalue = - $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor, - array('value' => $this->yystack[ $this->yyidx + - 1 ]->minor)); + $j = strrpos($this->yystack[ $this->yyidx + 0 ]->minor, '.'); + if ($this->yystack[ $this->yyidx + 0 ]->minor[ $j + 1 ] == 'c') { + // {$smarty.block.child} + $this->_retvalue = + $this->compiler->compileTag('child', array(), array($this->yystack[ $this->yyidx + 0 ]->minor));; + } else { + // {$smarty.block.parent} + $this->_retvalue = + $this->compiler->compileTag('parent', array(), array($this->yystack[ $this->yyidx + 0 ]->minor));; + } } - #line 364 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r26() + #line 343 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r15() { - $this->_retvalue = $this->compiler->compileTag('assign', array(array('value' => $this->yystack[ $this->yyidx + - 0 ]->minor), - array('var' => '\'' . - substr($this->yystack[ $this->yyidx + - - 2 ]->minor, - 1) . '\''))); + $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor; } - #line 372 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r28() + #line 347 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r16() + { + $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor; + } + + #line 356 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r17() + { + $this->_retvalue = $this->compiler->compileTag('private_print_expression', + $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ], + array('value' => $this->yystack[ $this->yyidx + + 0 ]->minor[ 0 ])); + } + + #line 360 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r18() { $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[ $this->yyidx + - - 1 ]->minor), + 0 ]->minor[ 0 ]), array('var' => '\'' . substr($this->yystack[ $this->yyidx + - - 3 ]->minor, + -1 ]->minor, 1) . '\'')), - $this->yystack[ $this->yyidx + 0 ]->minor)); + $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ])); } - #line 376 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r29() + #line 364 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r19() { $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[ $this->yyidx + - - 1 ]->minor), + 0 ]->minor[ 0 ]), array('var' => $this->yystack[ $this->yyidx + - - 3 ]->minor[ 'var' ])), - $this->yystack[ $this->yyidx + 0 ]->minor), + -1 ]->minor[ 'var' ])), + $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]), array('smarty_internal_index' => $this->yystack[ $this->yyidx + - - 3 ]->minor[ 'smarty_internal_index' ])); + -1 ]->minor[ 'smarty_internal_index' ])); } - #line 381 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r30() + #line 368 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r20() { - $tag = - trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->lex->ldel_length, - $this->lex->rdel_length)); - if ($tag == 'strip') { - $this->strip = true; - $this->_retvalue = null;; - } else { - if (defined($tag)) { - if ($this->security) { - $this->security->isTrustedConstant($tag, $this->compiler); - } - $this->_retvalue = - $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag)); - } else { - if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) { - $this->_retvalue = $this->compiler->compileTag($match[ 1 ], array("'nocache'")); - } else { - $this->_retvalue = $this->compiler->compileTag($tag, array()); - } - } - } + $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 403 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r31() + #line 383 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r21() { - if (defined($this->yystack[ $this->yyidx + - 1 ]->minor)) { + $this->_retvalue = array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor); + } + + #line 393 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r25() + { + if (defined($this->yystack[ $this->yyidx + -1 ]->minor)) { if ($this->security) { - $this->security->isTrustedConstant($this->yystack[ $this->yyidx + - 1 ]->minor, $this->compiler); + $this->security->isTrustedConstant($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler); } - $this->_retvalue = - $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor, - array('value' => $this->yystack[ $this->yyidx + - 1 ]->minor)); + $this->_retvalue = $this->compiler->compileTag('private_print_expression', + $this->yystack[ $this->yyidx + 0 ]->minor, + array('value' => $this->yystack[ $this->yyidx + + -1 ]->minor)); } else { - $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + - 1 ]->minor, + $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor); } } - #line 413 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r32() + #line 406 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r26() { if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) { if ($this->security) { $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler); } - $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), + $this->_retvalue = $this->compiler->compileTag('private_print_expression', + array(), array('value' => $this->yystack[ $this->yyidx + 0 ]->minor)); } else { $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + 0 ]->minor, array()); } } - #line 426 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r33() + #line 418 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r27() { - if (defined($this->yystack[ $this->yyidx + - 2 ]->minor)) { + if (defined($this->yystack[ $this->yyidx + -2 ]->minor)) { if ($this->security) { - $this->security->isTrustedConstant($this->yystack[ $this->yyidx + - 2 ]->minor, $this->compiler); + $this->security->isTrustedConstant($this->yystack[ $this->yyidx + -2 ]->minor, $this->compiler); } - $this->_retvalue = - $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor, - array('value' => $this->yystack[ $this->yyidx + - 2 ]->minor, - 'modifierlist' => $this->yystack[ $this->yyidx + - 1 ]->minor)); + $this->_retvalue = $this->compiler->compileTag('private_print_expression', + $this->yystack[ $this->yyidx + 0 ]->minor, + array('value' => $this->yystack[ $this->yyidx + + -2 ]->minor, + 'modifierlist' => $this->yystack[ $this->yyidx + + -1 ]->minor)); } else { - $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + - 2 ]->minor, + $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + -2 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, array('modifierlist' => $this->yystack[ $this->yyidx + - - 1 ]->minor)); + -1 ]->minor)); } } - #line 438 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r34() + #line 423 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r28() { - $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + - 3 ]->minor, + $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + -3 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, array('object_method' => $this->yystack[ $this->yyidx + - - 1 ]->minor)); + -1 ]->minor)); } - #line 443 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r35() + #line 428 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r29() { - $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + - 4 ]->minor, + $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + -4 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, - array('modifierlist' => $this->yystack[ $this->yyidx + - - 1 ]->minor, + array('modifierlist' => $this->yystack[ $this->yyidx + + -1 ]->minor, 'object_method' => $this->yystack[ $this->yyidx + - - 2 ]->minor)); + -2 ]->minor)); } - #line 448 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r36() + #line 433 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r30() { - $this->_retvalue = $this->compiler->compileTag('make_nocache', array(array('var' => '\'' . - substr($this->yystack[ $this->yyidx + - 0 ]->minor, - 1) . '\''))); + $this->_retvalue = $this->compiler->compileTag('make_nocache', + array(array('var' => '\'' . substr($this->yystack[ $this->yyidx + + 0 ]->minor, + 1) . '\''))); } - #line 453 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r37() + #line 438 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r31() { - $tag = trim(substr($this->yystack[ $this->yyidx + - 1 ]->minor, $this->lex->ldel_length)); - $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), + $tag = trim(substr($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler->getLdelLength())); + $this->_retvalue = $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag, + array(), array('if condition' => $this->yystack[ $this->yyidx + 0 ]->minor)); } - #line 458 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r38() + #line 443 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r32() { - $tag = trim(substr($this->yystack[ $this->yyidx + - 2 ]->minor, $this->lex->ldel_length)); - $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, + $tag = trim(substr($this->yystack[ $this->yyidx + -2 ]->minor, $this->compiler->getLdelLength())); + $this->_retvalue = $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag, $this->yystack[ $this->yyidx + 0 ]->minor, array('if condition' => $this->yystack[ $this->yyidx + - - 1 ]->minor)); + -1 ]->minor)); } - #line 463 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r39() + #line 454 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r33() { - $tag = trim(substr($this->yystack[ $this->yyidx + - 1 ]->minor, $this->lex->ldel_length)); - $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), + $tag = trim(substr($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler->getLdelLength())); + $this->_retvalue = $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag, + array(), array('if condition' => $this->yystack[ $this->yyidx + 0 ]->minor)); } - #line 474 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r41() + #line 458 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r35() { - $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, - array(array('start' => $this->yystack[ $this->yyidx + - - 6 ]->minor), - array('ifexp' => $this->yystack[ $this->yyidx + - - 4 ]->minor), - array('var' => $this->yystack[ $this->yyidx + - - 2 ]->minor), - array('step' => $this->yystack[ $this->yyidx + - - 1 ]->minor))), + $this->_retvalue = $this->compiler->compileTag('for', + array_merge($this->yystack[ $this->yyidx + 0 ]->minor, + array(array('start' => $this->yystack[ $this->yyidx + + -6 ]->minor), + array('ifexp' => $this->yystack[ $this->yyidx + + -4 ]->minor), + array('var' => $this->yystack[ $this->yyidx + + -2 ]->minor), + array('step' => $this->yystack[ $this->yyidx + + -1 ]->minor))), 1); } - #line 478 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r42() + #line 466 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r36() { $this->_retvalue = '=' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 486 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r44() + #line 470 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r38() { - $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, - array(array('start' => $this->yystack[ $this->yyidx + - - 3 ]->minor), - array('to' => $this->yystack[ $this->yyidx + - - 1 ]->minor))), + $this->_retvalue = $this->compiler->compileTag('for', + array_merge($this->yystack[ $this->yyidx + 0 ]->minor, + array(array('start' => $this->yystack[ $this->yyidx + + -3 ]->minor), + array('to' => $this->yystack[ $this->yyidx + + -1 ]->minor))), 0); } - #line 490 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r45() + #line 475 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r39() { - $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, - array(array('start' => $this->yystack[ $this->yyidx + - - 5 ]->minor), - array('to' => $this->yystack[ $this->yyidx + - - 3 ]->minor), - array('step' => $this->yystack[ $this->yyidx + - - 1 ]->minor))), + $this->_retvalue = $this->compiler->compileTag('for', + array_merge($this->yystack[ $this->yyidx + 0 ]->minor, + array(array('start' => $this->yystack[ $this->yyidx + + -5 ]->minor), + array('to' => $this->yystack[ $this->yyidx + + -3 ]->minor), + array('step' => $this->yystack[ $this->yyidx + + -1 ]->minor))), 0); } - #line 495 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r46() + #line 479 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r40() { - $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[ $this->yyidx + 0 ]->minor); + $this->_retvalue = $this->compiler->compileTag('foreach', + array_merge($this->yystack[ $this->yyidx + 0 ]->minor, + array(array('from' => $this->yystack[ $this->yyidx + + -3 ]->minor), + array('item' => $this->yystack[ $this->yyidx + + -1 ]->minor)))); } - #line 500 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r47() + #line 482 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r41() { - $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, - array(array('from' => $this->yystack[ $this->yyidx + - - 3 ]->minor), - array('item' => $this->yystack[ $this->yyidx + - - 1 ]->minor)))); + $this->_retvalue = $this->compiler->compileTag('foreach', + array_merge($this->yystack[ $this->yyidx + 0 ]->minor, + array(array('from' => $this->yystack[ $this->yyidx + + -5 ]->minor), + array('item' => $this->yystack[ $this->yyidx + + -1 ]->minor), + array('key' => $this->yystack[ $this->yyidx + + -3 ]->minor)))); } - #line 504 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r48() + #line 487 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r42() { - $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, - array(array('from' => $this->yystack[ $this->yyidx + - - 5 ]->minor), - array('item' => $this->yystack[ $this->yyidx + - - 1 ]->minor), - array('key' => $this->yystack[ $this->yyidx + - - 3 ]->minor)))); + $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[ $this->yyidx + 0 ]->minor); } - #line 517 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r51() + #line 491 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r43() { - $this->_retvalue = $this->compiler->compileTag('setfilter', array(), + $this->_retvalue = $this->compiler->compileTag('setfilter', + array(), array('modifier_list' => array(array_merge(array($this->yystack[ $this->yyidx + - - 1 ]->minor), + -1 ]->minor), $this->yystack[ $this->yyidx + 0 ]->minor)))); } - #line 521 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r52() + #line 497 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r44() { - $this->_retvalue = $this->compiler->compileTag('setfilter', array(), + $this->_retvalue = $this->compiler->compileTag('setfilter', + array(), array('modifier_list' => array_merge(array(array_merge(array($this->yystack[ $this->yyidx + - - 2 ]->minor), + -2 ]->minor), $this->yystack[ $this->yyidx + - - 1 ]->minor)), + -1 ]->minor)), $this->yystack[ $this->yyidx + 0 ]->minor))); } - #line 526 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r53() - { - $j = strrpos($this->yystack[ $this->yyidx + 0 ]->minor, '.'); - if ($this->yystack[ $this->yyidx + 0 ]->minor[ $j + 1 ] == 'c') { - // {$smarty.block.child} - $this->_retvalue = $this->compiler->compileTag('block_child', array());; - } else { - // {$smarty.block.parent} - $this->_retvalue = $this->compiler->compileTag('block_parent', array());; - } - } + #line 506 "../smarty/lexer/smarty_internal_templateparser.y" - #line 539 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r54() + function yy_r45() { - $tag = - trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->lex->ldel_length, - $this->lex->rdel_length), - ' /'); - if ($tag == 'strip') { + $tag = trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, + $this->compiler->getLdelLength(), + -$this->compiler->getRdelLength()), + ' /'); + if ($tag === 'strip') { $this->strip = false; $this->_retvalue = null; } else { @@ -1880,222 +2518,269 @@ class Smarty_Internal_Templateparser } } - #line 548 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r55() + #line 510 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r46() { $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + 0 ]->minor . 'close', array()); } - #line 552 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r56() + #line 515 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r47() { - $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + - 1 ]->minor . 'close', array(), + $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + -1 ]->minor . 'close', + array(), array('modifier_list' => $this->yystack[ $this->yyidx + 0 ]->minor)); } - #line 557 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r57() + #line 519 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r48() { - $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + - 2 ]->minor . 'close', array(), + $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + -2 ]->minor . 'close', + array(), array('object_method' => $this->yystack[ $this->yyidx + 0 ]->minor)); } - #line 561 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r58() + #line 527 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r49() { - $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + - 3 ]->minor . 'close', array(), + $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + -3 ]->minor . 'close', + array(), array('object_method' => $this->yystack[ $this->yyidx + - - 1 ]->minor, + -1 ]->minor, 'modifier_list' => $this->yystack[ $this->yyidx + 0 ]->minor)); } - #line 569 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r59() + #line 533 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r50() { - $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor; + $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor; $this->_retvalue[] = $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 575 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r60() + #line 538 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r51() { $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor); } - #line 580 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r61() + #line 543 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r52() { $this->_retvalue = array(); } - #line 585 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r62() + #line 554 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r53() { if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) { if ($this->security) { $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler); } $this->_retvalue = - array($this->yystack[ $this->yyidx + - 2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor); + array($this->yystack[ $this->yyidx + -2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor); } else { $this->_retvalue = - array($this->yystack[ $this->yyidx + - 2 ]->minor => '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . - '\''); + array($this->yystack[ $this->yyidx + -2 ]->minor => '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . + '\''); } } - #line 596 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r63() + #line 562 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r54() { $this->_retvalue = - array(trim($this->yystack[ $this->yyidx + - 1 ]->minor, " =\n\r\t") => $this->yystack[ $this->yyidx + - 0 ]->minor); + array(trim($this->yystack[ $this->yyidx + -1 ]->minor, " =\n\r\t") => $this->yystack[ $this->yyidx + + 0 ]->minor); } - #line 604 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r65() + #line 574 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r56() { $this->_retvalue = '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\''; } - #line 616 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r68() + #line 587 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r59() { $this->_retvalue = - array($this->yystack[ $this->yyidx + - 2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor); + array($this->yystack[ $this->yyidx + -2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor); } - #line 629 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r70() + #line 592 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r61() { - $this->yystack[ $this->yyidx + - 2 ]->minor[] = $this->yystack[ $this->yyidx + 0 ]->minor; - $this->_retvalue = $this->yystack[ $this->yyidx + - 2 ]->minor; + $this->yystack[ $this->yyidx + -2 ]->minor[] = $this->yystack[ $this->yyidx + 0 ]->minor; + $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor; } - #line 634 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r71() + #line 599 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r62() { - $this->_retvalue = array('var' => '\'' . substr($this->yystack[ $this->yyidx + - 2 ]->minor, 1) . '\'', + $this->_retvalue = array('var' => '\'' . substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) . '\'', 'value' => $this->yystack[ $this->yyidx + 0 ]->minor); } - #line 641 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r73() + #line 603 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r64() { - $this->_retvalue = array('var' => $this->yystack[ $this->yyidx + - 2 ]->minor, + $this->_retvalue = array('var' => $this->yystack[ $this->yyidx + -2 ]->minor, 'value' => $this->yystack[ $this->yyidx + 0 ]->minor); } - #line 665 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r77() + #line 623 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r65() + { + $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor; + } + + #line 628 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r68() { $this->_retvalue = - '$_smarty_tpl->getStreamVariable(\'' . substr($this->yystack[ $this->yyidx + - 2 ]->minor, 1) . '://' . + '$_smarty_tpl->getStreamVariable(\'' . substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) . '://' . $this->yystack[ $this->yyidx + 0 ]->minor . '\')'; } - #line 670 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r78() + #line 642 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r69() { $this->_retvalue = - $this->yystack[ $this->yyidx + - 2 ]->minor . trim($this->yystack[ $this->yyidx + - 1 ]->minor) . + $this->yystack[ $this->yyidx + -2 ]->minor . trim($this->yystack[ $this->yyidx + -1 ]->minor) . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 684 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r81() + #line 648 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r72() { - $this->_retvalue = $this->compiler->compileTag('private_modifier', array(), - array('value' => $this->yystack[ $this->yyidx + - 1 ]->minor, + $this->_retvalue = $this->compiler->compileTag('private_modifier', + array(), + array('value' => $this->yystack[ $this->yyidx + + -1 ]->minor, 'modifierlist' => $this->yystack[ $this->yyidx + 0 ]->minor)); } - #line 690 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r82() + #line 652 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r73() { $this->_retvalue = - $this->yystack[ $this->yyidx + - 1 ]->minor[ 'pre' ] . $this->yystack[ $this->yyidx + - 2 ]->minor . - $this->yystack[ $this->yyidx + - 1 ]->minor[ 'op' ] . $this->yystack[ $this->yyidx + 0 ]->minor . ')'; + $this->yystack[ $this->yyidx + -1 ]->minor[ 'pre' ] . $this->yystack[ $this->yyidx + -2 ]->minor . + $this->yystack[ $this->yyidx + -1 ]->minor[ 'op' ] . $this->yystack[ $this->yyidx + 0 ]->minor . ')'; } - #line 694 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r83() + #line 656 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r74() { - $this->_retvalue = $this->yystack[ $this->yyidx + - 2 ]->minor . $this->yystack[ $this->yyidx + - 1 ]->minor . + $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor . $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 698 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r84() + #line 660 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r75() { - $this->_retvalue = - $this->yystack[ $this->yyidx + 0 ]->minor . $this->yystack[ $this->yyidx + - 1 ]->minor . ')'; + $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor . $this->yystack[ $this->yyidx + -1 ]->minor . ')'; } - #line 702 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r85() + #line 664 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r76() { - $this->_retvalue = 'in_array(' . $this->yystack[ $this->yyidx + - 2 ]->minor . ',' . - $this->yystack[ $this->yyidx + 0 ]->minor . ')'; + $this->_retvalue = + 'in_array(' . $this->yystack[ $this->yyidx + -2 ]->minor . ',' . $this->yystack[ $this->yyidx + 0 ]->minor . + ')'; } - #line 706 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r86() + #line 672 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r77() { - $this->_retvalue = 'in_array(' . $this->yystack[ $this->yyidx + - 2 ]->minor . ',(array)' . + $this->_retvalue = 'in_array(' . $this->yystack[ $this->yyidx + -2 ]->minor . ',(array)' . $this->yystack[ $this->yyidx + 0 ]->minor . ')'; } - #line 714 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r87() + #line 676 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r78() { - $this->_retvalue = $this->yystack[ $this->yyidx + - 5 ]->minor . ' ? ' . $this->compiler->compileVariable('\'' . - substr($this->yystack[ $this->yyidx + - - 2 ]->minor, - 1) . - '\'') . + $this->_retvalue = $this->yystack[ $this->yyidx + -5 ]->minor . ' ? ' . $this->compiler->compileVariable('\'' . + substr($this->yystack[ $this->yyidx + + -2 ]->minor, + 1) . + '\'') . ' : ' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 718 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r88() + #line 686 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r79() { $this->_retvalue = - $this->yystack[ $this->yyidx + - 5 ]->minor . ' ? ' . $this->yystack[ $this->yyidx + - 2 ]->minor . ' : ' . + $this->yystack[ $this->yyidx + -5 ]->minor . ' ? ' . $this->yystack[ $this->yyidx + -2 ]->minor . ' : ' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 733 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r91() + #line 691 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r81() + { + $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor; + } + + #line 712 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r82() { $this->_retvalue = '!' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 754 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r96() + #line 716 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r87() { - $this->_retvalue = - $this->yystack[ $this->yyidx + - 2 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor; + $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 758 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r97() + #line 720 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r88() { - $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor . '.'; + $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . '.'; } - #line 762 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r98() + #line 725 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r89() { $this->_retvalue = '.' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 767 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r99() + #line 742 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r90() { if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) { if ($this->security) { @@ -2107,90 +2792,99 @@ class Smarty_Internal_Templateparser } } - #line 784 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r101() + #line 746 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r92() { - $this->_retvalue = "(" . $this->yystack[ $this->yyidx + - 1 ]->minor . ")"; + $this->_retvalue = '(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')'; } - #line 788 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r102() + #line 764 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r93() { - $this->_retvalue = $this->yystack[ $this->yyidx + - 2 ]->minor . $this->yystack[ $this->yyidx + - 1 ]->minor . + $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor . $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 806 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r106() + #line 775 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r97() { $prefixVar = $this->compiler->getNewPrefixVariable(); - if ($this->yystack[ $this->yyidx + - 2 ]->minor[ 'var' ] == '\'smarty\'') { - $this->compiler->appendPrefixCode("compiler->compileTag('private_special_variable', array(), + if ($this->yystack[ $this->yyidx + -2 ]->minor[ 'var' ] === '\'smarty\'') { + $this->compiler->appendPrefixCode("compiler->compileTag('private_special_variable', + array(), $this->yystack[ $this->yyidx + - - 2 ]->minor[ 'smarty_internal_index' ]) . + -2 ]->minor[ 'smarty_internal_index' ]) . ';?>'); } else { - $this->compiler->appendPrefixCode("compiler->appendPrefixCode("compiler->compileVariable($this->yystack[ $this->yyidx + - - 2 ]->minor[ 'var' ]) . - $this->yystack[ $this->yyidx + - 2 ]->minor[ 'smarty_internal_index' ] . + -2 ]->minor[ 'var' ]) . + $this->yystack[ $this->yyidx + -2 ]->minor[ 'smarty_internal_index' ] . ';?>'); } $this->_retvalue = $prefixVar . '::' . $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] . $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]; } - #line 817 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r107() + #line 792 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r98() { $prefixVar = $this->compiler->getNewPrefixVariable(); $tmp = $this->compiler->appendCode('', $this->yystack[ $this->yyidx + 0 ]->minor); - $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "')); + $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "")); $this->_retvalue = $prefixVar; } - #line 834 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r110() + #line 811 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r101() { - if (!in_array(strtolower($this->yystack[ $this->yyidx + - 2 ]->minor), array('self', 'parent')) && - (!$this->security || - $this->security->isTrustedStaticClassAccess($this->yystack[ $this->yyidx + - 2 ]->minor, - $this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler)) - ) { - if (isset($this->smarty->registered_classes[ $this->yystack[ $this->yyidx + - 2 ]->minor ])) { + if (!in_array(strtolower($this->yystack[ $this->yyidx + -2 ]->minor), array('self', 'parent')) && + (!$this->security || $this->security->isTrustedStaticClassAccess($this->yystack[ $this->yyidx + -2 ]->minor, + $this->yystack[ $this->yyidx + 0 ]->minor, + $this->compiler))) { + if (isset($this->smarty->registered_classes[ $this->yystack[ $this->yyidx + -2 ]->minor ])) { $this->_retvalue = - $this->smarty->registered_classes[ $this->yystack[ $this->yyidx + - 2 ]->minor ] . '::' . + $this->smarty->registered_classes[ $this->yystack[ $this->yyidx + -2 ]->minor ] . '::' . $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] . $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]; } else { - $this->_retvalue = $this->yystack[ $this->yyidx + - 2 ]->minor . '::' . - $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] . - $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]; + $this->_retvalue = + $this->yystack[ $this->yyidx + -2 ]->minor . '::' . $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] . + $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]; } } else { - $this->compiler->trigger_template_error("static class '" . $this->yystack[ $this->yyidx + - 2 ]->minor . - "' is undefined or not allowed by security setting"); + $this->compiler->trigger_template_error('static class \'' . $this->yystack[ $this->yyidx + -2 ]->minor . + '\' is undefined or not allowed by security setting'); } } - #line 853 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r112() + #line 822 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r103() { $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 864 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r113() + #line 825 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r104() { $this->_retvalue = $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\''); } - #line 867 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r114() + #line 838 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r105() { - if ($this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ] == '\'smarty\'') { - $smarty_var = $this->compiler->compileTag('private_special_variable', array(), + if ($this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ] === '\'smarty\'') { + $smarty_var = $this->compiler->compileTag('private_special_variable', + array(), $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ]); $this->_retvalue = $smarty_var; @@ -2203,480 +2897,556 @@ class Smarty_Internal_Templateparser } } - #line 880 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r115() + #line 848 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r106() { - $this->_retvalue = '$_smarty_tpl->tpl_vars[' . $this->yystack[ $this->yyidx + - 2 ]->minor . ']->' . + $this->_retvalue = '$_smarty_tpl->tpl_vars[' . $this->yystack[ $this->yyidx + -2 ]->minor . ']->' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 890 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r117() + #line 852 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r108() { $this->_retvalue = - $this->compiler->compileConfigVariable("'" . $this->yystack[ $this->yyidx + - 1 ]->minor . "'"); + $this->compiler->compileConfigVariable('\'' . $this->yystack[ $this->yyidx + -1 ]->minor . '\''); } - #line 894 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r118() + #line 856 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r109() { $this->_retvalue = '(is_array($tmp = ' . - $this->compiler->compileConfigVariable("'" . $this->yystack[ $this->yyidx + - 2 ]->minor . - "'") . ') ? $tmp' . + $this->compiler->compileConfigVariable('\'' . $this->yystack[ $this->yyidx + -2 ]->minor . + '\'') . ') ? $tmp' . $this->yystack[ $this->yyidx + 0 ]->minor . ' :null)'; } - #line 898 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r119() + #line 860 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r110() { - $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + - 1 ]->minor); + $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + -1 ]->minor); } - #line 902 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r120() + #line 864 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r111() { $this->_retvalue = - '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + - 2 ]->minor) . + '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + -2 ]->minor) . ') ? $tmp' . $this->yystack[ $this->yyidx + 0 ]->minor . ' : null)'; } - #line 906 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r121() + #line 867 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r112() { - $this->_retvalue = array('var' => '\'' . substr($this->yystack[ $this->yyidx + - 1 ]->minor, 1) . '\'', + $this->_retvalue = array('var' => '\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'', 'smarty_internal_index' => $this->yystack[ $this->yyidx + 0 ]->minor); } - #line 909 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r122() + #line 880 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r113() { - $this->_retvalue = array('var' => $this->yystack[ $this->yyidx + - 1 ]->minor, + $this->_retvalue = array('var' => $this->yystack[ $this->yyidx + -1 ]->minor, 'smarty_internal_index' => $this->yystack[ $this->yyidx + 0 ]->minor); } - #line 922 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r124() + #line 886 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r115() { return; } - #line 928 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r125() + #line 889 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r116() { $this->_retvalue = '[' . $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'') . ']'; } - #line 931 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r126() + #line 893 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r117() { $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[ $this->yyidx + 0 ]->minor) . ']'; } - #line 935 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r127() + #line 897 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r118() { - $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[ $this->yyidx + - 2 ]->minor) . '->' . + $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[ $this->yyidx + -2 ]->minor) . '->' . $this->yystack[ $this->yyidx + 0 ]->minor . ']'; } - #line 939 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r128() + #line 901 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r119() { - $this->_retvalue = "['" . $this->yystack[ $this->yyidx + 0 ]->minor . "']"; + $this->_retvalue = '[\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\']'; } - #line 943 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r129() + #line 906 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r120() { $this->_retvalue = '[' . $this->yystack[ $this->yyidx + 0 ]->minor . ']'; } - #line 948 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r130() + #line 911 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r121() { - $this->_retvalue = '[' . $this->yystack[ $this->yyidx + - 1 ]->minor . ']'; + $this->_retvalue = '[' . $this->yystack[ $this->yyidx + -1 ]->minor . ']'; } - #line 953 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r131() + #line 915 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r122() { - $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . - $this->yystack[ $this->yyidx + - - 1 ]->minor . - '\'][\'index\']') . - ']'; + $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', + array(), + '[\'section\'][\'' . + $this->yystack[ $this->yyidx + -1 ]->minor . + '\'][\'index\']') . ']'; } - #line 957 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r132() + #line 918 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r123() { - $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . - $this->yystack[ $this->yyidx + - - 3 ]->minor . - '\'][\'' . - $this->yystack[ $this->yyidx + - - 1 ]->minor . - '\']') . ']'; + $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', + array(), + '[\'section\'][\'' . + $this->yystack[ $this->yyidx + -3 ]->minor . '\'][\'' . + $this->yystack[ $this->yyidx + -1 ]->minor . '\']') . ']'; } - #line 960 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r133() + #line 924 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r124() { - $this->_retvalue = '[' . $this->yystack[ $this->yyidx + - 1 ]->minor . ']'; + $this->_retvalue = '[' . $this->yystack[ $this->yyidx + -1 ]->minor . ']'; } - #line 966 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r135() + #line 940 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r126() { $this->_retvalue = '[' . $this->compiler->compileVariable('\'' . - substr($this->yystack[ $this->yyidx + - 1 ]->minor, + substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'') . ']';; } - #line 982 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r139() + #line 950 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r130() { $this->_retvalue = '[]'; } - #line 992 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r140() + #line 954 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r131() { $this->_retvalue = '\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\''; } - #line 996 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r141() + #line 959 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r132() { - $this->_retvalue = "''"; + $this->_retvalue = '\'\''; } - #line 1001 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r142() + #line 967 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r133() { - $this->_retvalue = - $this->yystack[ $this->yyidx + - 1 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor; + $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 1009 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r144() + #line 973 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r135() { - $var = - trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->lex->ldel_length, - $this->lex->rdel_length), - ' $'); + $var = trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, + $this->compiler->getLdelLength(), + -$this->compiler->getRdelLength()), + ' $'); $this->_retvalue = $this->compiler->compileVariable('\'' . $var . '\''); } - #line 1015 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r145() + #line 980 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r136() { - $this->_retvalue = '(' . $this->yystack[ $this->yyidx + - 1 ]->minor . ')'; + $this->_retvalue = '(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')'; } - #line 1022 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r146() + #line 989 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r137() { - if ($this->yystack[ $this->yyidx + - 1 ]->minor[ 'var' ] == '\'smarty\'') { - $this->_retvalue = $this->compiler->compileTag('private_special_variable', array(), + if ($this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ] === '\'smarty\'') { + $this->_retvalue = $this->compiler->compileTag('private_special_variable', + array(), $this->yystack[ $this->yyidx + - - 1 ]->minor[ 'smarty_internal_index' ]) . + -1 ]->minor[ 'smarty_internal_index' ]) . $this->yystack[ $this->yyidx + 0 ]->minor; } else { - $this->_retvalue = $this->compiler->compileVariable($this->yystack[ $this->yyidx + - 1 ]->minor[ 'var' ]) . - $this->yystack[ $this->yyidx + - 1 ]->minor[ 'smarty_internal_index' ] . + $this->_retvalue = $this->compiler->compileVariable($this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ]) . + $this->yystack[ $this->yyidx + -1 ]->minor[ 'smarty_internal_index' ] . $this->yystack[ $this->yyidx + 0 ]->minor; } } - #line 1031 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r147() + #line 994 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r138() { $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 1036 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r148() + #line 999 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r139() { - $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor; + $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 1041 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r149() + #line 1006 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r140() { - if ($this->security && substr($this->yystack[ $this->yyidx + - 1 ]->minor, 0, 1) == '_') { + if ($this->security && substr($this->yystack[ $this->yyidx + -1 ]->minor, 0, 1) === '_') { $this->compiler->trigger_template_error(self::Err1); } $this->_retvalue = - '->' . $this->yystack[ $this->yyidx + - 1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor; + '->' . $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 1048 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r150() + #line 1013 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r141() { if ($this->security) { $this->compiler->trigger_template_error(self::Err2); } - $this->_retvalue = '->{' . $this->compiler->compileVariable($this->yystack[ $this->yyidx + - 1 ]->minor) . + $this->_retvalue = '->{' . $this->compiler->compileVariable($this->yystack[ $this->yyidx + -1 ]->minor) . $this->yystack[ $this->yyidx + 0 ]->minor . '}'; } - #line 1055 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r151() + #line 1020 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r142() { if ($this->security) { $this->compiler->trigger_template_error(self::Err2); } $this->_retvalue = - '->{' . $this->yystack[ $this->yyidx + - 2 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor . '}'; + '->{' . $this->yystack[ $this->yyidx + -2 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor . '}'; } - #line 1062 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r152() + #line 1028 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r143() { if ($this->security) { $this->compiler->trigger_template_error(self::Err2); } - $this->_retvalue = '->{\'' . $this->yystack[ $this->yyidx + - 4 ]->minor . '\'.' . - $this->yystack[ $this->yyidx + - 2 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor . - '}'; + $this->_retvalue = + '->{\'' . $this->yystack[ $this->yyidx + -4 ]->minor . '\'.' . $this->yystack[ $this->yyidx + -2 ]->minor . + $this->yystack[ $this->yyidx + 0 ]->minor . '}'; } - #line 1070 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r153() + #line 1036 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r144() { $this->_retvalue = '->' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 1078 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r154() + #line 1044 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r145() { - $this->_retvalue = $this->compiler->compilePHPFunctionCall($this->yystack[ $this->yyidx + - 3 ]->minor, - $this->yystack[ $this->yyidx + - 1 ]->minor); + $this->_retvalue = $this->compiler->compilePHPFunctionCall($this->yystack[ $this->yyidx + -3 ]->minor, + $this->yystack[ $this->yyidx + -1 ]->minor); } - #line 1086 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r155() + #line 1051 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r146() { - if ($this->security && substr($this->yystack[ $this->yyidx + - 3 ]->minor, 0, 1) == '_') { + if ($this->security && substr($this->yystack[ $this->yyidx + -3 ]->minor, 0, 1) === '_') { $this->compiler->trigger_template_error(self::Err1); } - $this->_retvalue = $this->yystack[ $this->yyidx + - 3 ]->minor . "(" . - implode(',', $this->yystack[ $this->yyidx + - 1 ]->minor) . ")"; + $this->_retvalue = $this->yystack[ $this->yyidx + -3 ]->minor . '(' . + implode(',', $this->yystack[ $this->yyidx + -1 ]->minor) . ')'; } - #line 1093 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r156() + #line 1062 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r147() { if ($this->security) { $this->compiler->trigger_template_error(self::Err2); } $prefixVar = $this->compiler->getNewPrefixVariable(); - $this->compiler->appendPrefixCode("compiler->compileVariable('\'' . - substr($this->yystack[ $this->yyidx + - - 3 ]->minor, - 1) . - '\'') . ';?>'); - $this->_retvalue = $prefixVar . '(' . implode(',', $this->yystack[ $this->yyidx + - 1 ]->minor) . ')'; + $this->compiler->appendPrefixCode("compiler->compileVariable('\'' . + substr($this->yystack[ $this->yyidx + + -3 ]->minor, + 1) . '\'') . + ';?>'); + $this->_retvalue = $prefixVar . '(' . implode(',', $this->yystack[ $this->yyidx + -1 ]->minor) . ')'; } - #line 1104 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r157() + #line 1079 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r148() { $this->_retvalue = - array_merge($this->yystack[ $this->yyidx + - 2 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor)); + array_merge($this->yystack[ $this->yyidx + -2 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor)); } - #line 1121 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r160() + #line 1083 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r151() { - $this->_retvalue = array_merge($this->yystack[ $this->yyidx + - 2 ]->minor, - array(array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, + $this->_retvalue = array_merge($this->yystack[ $this->yyidx + -2 ]->minor, + array(array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor))); } - #line 1125 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r161() + #line 1091 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r152() { $this->_retvalue = - array(array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor)); + array(array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor)); } - #line 1133 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r163() + #line 1099 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r154() { $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor); } - #line 1141 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r164() + #line 1118 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r155() { $this->_retvalue = - array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor); + array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor); } - #line 1160 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r168() + #line 1123 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r159() { $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '', 'method'); } - #line 1165 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r169() + #line 1128 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r160() { $this->_retvalue = - array($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'method'); + array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'method'); } - #line 1170 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r170() + #line 1133 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r161() { $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, ''); } - #line 1175 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r171() + #line 1138 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r162() { $this->_retvalue = - array($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'property'); + array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'property'); } - #line 1180 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r172() + #line 1144 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r163() { - $this->_retvalue = array($this->yystack[ $this->yyidx + - 2 ]->minor, - $this->yystack[ $this->yyidx + - 1 ]->minor . - $this->yystack[ $this->yyidx + 0 ]->minor, 'property'); + $this->_retvalue = array($this->yystack[ $this->yyidx + -2 ]->minor, + $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor, + 'property'); } - #line 1186 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r173() + #line 1148 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r164() { $this->_retvalue = ' ' . trim($this->yystack[ $this->yyidx + 0 ]->minor) . ' '; } - #line 1190 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r174() - { - static $lops = - array('eq' => ' == ', 'ne' => ' != ', 'neq' => ' != ', 'gt' => ' > ', 'ge' => ' >= ', 'gte' => ' >= ', - 'lt' => ' < ', 'le' => ' <= ', 'lte' => ' <= ', 'mod' => ' % ', 'and' => ' && ', 'or' => ' || ', - 'xor' => ' xor ',); + #line 1167 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r165() + { + static $lops = array( + 'eq' => ' == ', + 'ne' => ' != ', + 'neq' => ' != ', + 'gt' => ' > ', + 'ge' => ' >= ', + 'gte' => ' >= ', + 'lt' => ' < ', + 'le' => ' <= ', + 'lte' => ' <= ', + 'mod' => ' % ', + 'and' => ' && ', + 'or' => ' || ', + 'xor' => ' xor ', + ); $op = strtolower(preg_replace('/\s*/', '', $this->yystack[ $this->yyidx + 0 ]->minor)); $this->_retvalue = $lops[ $op ]; } - #line 1209 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r175() + #line 1180 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r166() { - static $tlops = - array('isdivby' => array('op' => ' % ', 'pre' => '!('), 'isnotdivby' => array('op' => ' % ', 'pre' => '('), - 'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '), - 'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '), - 'isoddby' => array('op' => ' / ', 'pre' => '(1 & '), - 'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),); + static $tlops = array( + 'isdivby' => array('op' => ' % ', 'pre' => '!('), + 'isnotdivby' => array('op' => ' % ', 'pre' => '('), + 'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '), + 'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '), + 'isoddby' => array('op' => ' / ', 'pre' => '(1 & '), + 'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '), + ); $op = strtolower(preg_replace('/\s*/', '', $this->yystack[ $this->yyidx + 0 ]->minor)); $this->_retvalue = $tlops[ $op ]; } - #line 1222 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r176() + #line 1194 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r167() { - static $scond = - array('iseven' => '!(1 & ', 'isnoteven' => '(1 & ', 'isodd' => '(1 & ', 'isnotodd' => '!(1 & ',); + static $scond = array( + 'iseven' => '!(1 & ', + 'isnoteven' => '(1 & ', + 'isodd' => '(1 & ', + 'isnotodd' => '!(1 & ', + ); $op = strtolower(str_replace(' ', '', $this->yystack[ $this->yyidx + 0 ]->minor)); $this->_retvalue = $scond[ $op ]; } - #line 1236 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r177() + #line 1202 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r168() { - $this->_retvalue = 'array(' . $this->yystack[ $this->yyidx + - 1 ]->minor . ')'; + $this->_retvalue = 'array(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')'; } - #line 1244 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r179() + #line 1210 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r170() { - $this->_retvalue = - $this->yystack[ $this->yyidx + - 2 ]->minor . ',' . $this->yystack[ $this->yyidx + 0 ]->minor; + $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor . ',' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 1252 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r181() + #line 1214 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r172() { $this->_retvalue = - $this->yystack[ $this->yyidx + - 2 ]->minor . '=>' . $this->yystack[ $this->yyidx + 0 ]->minor; + $this->yystack[ $this->yyidx + -2 ]->minor . '=>' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 1256 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r182() + #line 1230 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r173() { $this->_retvalue = - '\'' . $this->yystack[ $this->yyidx + - 2 ]->minor . '\'=>' . $this->yystack[ $this->yyidx + 0 ]->minor; + '\'' . $this->yystack[ $this->yyidx + -2 ]->minor . '\'=>' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 1272 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r185() + #line 1236 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r176() { - $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor->to_smarty_php($this); + $this->compiler->leaveDoubleQuote(); + $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor->to_smarty_php($this); } - #line 1277 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r186() + #line 1241 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r177() { - $this->yystack[ $this->yyidx + - 1 ]->minor->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor); - $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor; + $this->yystack[ $this->yyidx + -1 ]->minor->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor); + $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor; } - #line 1282 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r187() + #line 1245 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r178() { $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[ $this->yyidx + 0 ]->minor); } - #line 1286 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r188() + #line 1249 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r179() + { + $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . $this->yystack[ $this->yyidx + -1 ]->minor); + } + + #line 1253 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r180() { - $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . $this->yystack[ $this->yyidx + - 1 ]->minor); + $this->_retvalue = + new Smarty_Internal_ParseTree_Code('(string)(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')'); } - #line 1294 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r190() + #line 1265 "../smarty/lexer/smarty_internal_templateparser.y" + + function yy_r181() { $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\']->value'); } - #line 1302 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r192() - { - $this->_retvalue = - new Smarty_Internal_ParseTree_Code('(string)(' . $this->yystack[ $this->yyidx + - 1 ]->minor . ')'); - } + #line 1269 "../smarty/lexer/smarty_internal_templateparser.y" - #line 1306 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r193() + function yy_r184() { $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[ $this->yyidx + 0 ]->minor); } - #line 1310 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r194() + function yy_r185() { $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[ $this->yyidx + 0 ]->minor); } - private $_retvalue; - public function yy_reduce($yyruleno) { - if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) { - fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno, + if ($this->yyTraceFILE && $yyruleno >= 0 + && $yyruleno < count(self::$yyRuleName)) { + fprintf($this->yyTraceFILE, + "%sReduce (%d) [%s].\n", + $this->yyTracePrompt, + $yyruleno, self::$yyRuleName[ $yyruleno ]); } - $this->_retvalue = $yy_lefthand_side = null; if (isset(self::$yyReduceMap[ $yyruleno ])) { // call the action @@ -2687,14 +3457,14 @@ class Smarty_Internal_Templateparser $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ]; $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ]; $this->yyidx -= $yysize; - for ($i = $yysize; $i; $i --) { + for ($i = $yysize; $i; $i--) { // pop all of the right-hand side parameters array_pop($this->yystack); } $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto); if ($yyact < self::YYNSTATE) { if (!$this->yyTraceFILE && $yysize) { - $this->yyidx ++; + $this->yyidx++; $x = new TP_yyStackEntry; $x->stateno = $yyact; $x->major = $yygoto; @@ -2703,7 +3473,7 @@ class Smarty_Internal_Templateparser } else { $this->yy_shift($yyact, $yygoto, $yy_lefthand_side); } - } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) { + } else if ($yyact === self::YYNSTATE + self::YYNRULE + 1) { $this->yy_accept(); } } @@ -2720,8 +3490,7 @@ class Smarty_Internal_Templateparser public function yy_syntax_error($yymajor, $TOKEN) { - #line 200 "../smarty/lexer/smarty_internal_templateparser.y" - + #line 214 "../smarty/lexer/smarty_internal_templateparser.y" $this->internalError = true; $this->yymajor = $yymajor; $this->compiler->trigger_template_error(); @@ -2735,8 +3504,7 @@ class Smarty_Internal_Templateparser while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); } - #line 193 "../smarty/lexer/smarty_internal_templateparser.y" - + #line 207 "../smarty/lexer/smarty_internal_templateparser.y" $this->successful = !$this->internalError; $this->internalError = false; $this->retvalue = $this->_retvalue; @@ -2745,10 +3513,9 @@ class Smarty_Internal_Templateparser public function doParse($yymajor, $yytokenvalue) { $yyerrorhit = 0; /* True if yymajor has invoked an error */ - if ($this->yyidx === null || $this->yyidx < 0) { $this->yyidx = 0; - $this->yyerrcnt = - 1; + $this->yyerrcnt = -1; $x = new TP_yyStackEntry; $x->stateno = 0; $x->major = 0; @@ -2756,53 +3523,61 @@ class Smarty_Internal_Templateparser $this->yystack[] = $x; } $yyendofinput = ($yymajor == 0); - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]); + fprintf($this->yyTraceFILE, + "%sInput %s\n", + $this->yyTracePrompt, + $this->yyTokenName[ $yymajor ]); } - do { $yyact = $this->yy_find_shift_action($yymajor); - if ($yymajor < self::YYERRORSYMBOL && !$this->yy_is_expected_token($yymajor)) { + if ($yymajor < self::YYERRORSYMBOL && + !$this->yy_is_expected_token($yymajor)) { // force a syntax error $yyact = self::YY_ERROR_ACTION; } if ($yyact < self::YYNSTATE) { $this->yy_shift($yyact, $yymajor, $yytokenvalue); - $this->yyerrcnt --; + $this->yyerrcnt--; if ($yyendofinput && $this->yyidx >= 0) { $yymajor = 0; } else { $yymajor = self::YYNOCODE; } - } elseif ($yyact < self::YYNSTATE + self::YYNRULE) { + } else if ($yyact < self::YYNSTATE + self::YYNRULE) { $this->yy_reduce($yyact - self::YYNSTATE); - } elseif ($yyact == self::YY_ERROR_ACTION) { + } else if ($yyact === self::YY_ERROR_ACTION) { if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt); + fprintf($this->yyTraceFILE, + "%sSyntax Error!\n", + $this->yyTracePrompt); } if (self::YYERRORSYMBOL) { if ($this->yyerrcnt < 0) { $this->yy_syntax_error($yymajor, $yytokenvalue); } $yymx = $this->yystack[ $this->yyidx ]->major; - if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) { + if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) { if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt, + fprintf($this->yyTraceFILE, + "%sDiscard input token %s\n", + $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]); } $this->yy_destructor($yymajor, $yytokenvalue); $yymajor = self::YYNOCODE; } else { - while ($this->yyidx >= 0 && $yymx != self::YYERRORSYMBOL && - ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE) { + while ($this->yyidx >= 0 && + $yymx !== self::YYERRORSYMBOL && + ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE + ) { $this->yy_pop_parser_stack(); } if ($this->yyidx < 0 || $yymajor == 0) { $this->yy_destructor($yymajor, $yytokenvalue); $this->yy_parse_failed(); $yymajor = self::YYNOCODE; - } elseif ($yymx != self::YYERRORSYMBOL) { + } else if ($yymx !== self::YYERRORSYMBOL) { $u2 = 0; $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2); } @@ -2824,8 +3599,7 @@ class Smarty_Internal_Templateparser $this->yy_accept(); $yymajor = self::YYNOCODE; } - } - while ($yymajor != self::YYNOCODE && $this->yyidx >= 0); + } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0); } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_testinstall.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_testinstall.php index 7cb575573..bea8b3a80 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_testinstall.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_testinstall.php @@ -28,15 +28,12 @@ class Smarty_Internal_TestInstall public static function testInstall(Smarty $smarty, &$errors = null) { $status = true; - if ($errors === null) { echo "
    \n";
             echo "Smarty Installation test...\n";
             echo "Testing template directory...\n";
         }
-
         $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
         // test if all registered template_dir are accessible
         foreach ($smarty->getTemplateDir() as $template_dir) {
             $_template_dir = $template_dir;
@@ -50,12 +47,10 @@ class Smarty_Internal_TestInstall
                     } else {
                         $template_dir = $smarty->ext->_getIncludePath->getIncludePath($_template_dir, null, $smarty);
                     }
-
                     if ($template_dir !== false) {
                         if ($errors === null) {
                             echo "$template_dir is OK.\n";
                         }
-
                         continue;
                     } else {
                         $status = false;
@@ -66,7 +61,6 @@ class Smarty_Internal_TestInstall
                         } else {
                             $errors[ 'template_dir' ] = $message;
                         }
-
                         continue;
                     }
                 } else {
@@ -77,11 +71,9 @@ class Smarty_Internal_TestInstall
                     } else {
                         $errors[ 'template_dir' ] = $message;
                     }
-
                     continue;
                 }
             }
-
             if (!is_dir($template_dir)) {
                 $status = false;
                 $message = "FAILED: $template_dir is not a directory";
@@ -90,7 +82,7 @@ class Smarty_Internal_TestInstall
                 } else {
                     $errors[ 'template_dir' ] = $message;
                 }
-            } elseif (!is_readable($template_dir)) {
+            } else if (!is_readable($template_dir)) {
                 $status = false;
                 $message = "FAILED: $template_dir is not readable";
                 if ($errors === null) {
@@ -104,11 +96,9 @@ class Smarty_Internal_TestInstall
                 }
             }
         }
-
         if ($errors === null) {
             echo "Testing compile directory...\n";
         }
-
         // test if registered compile_dir is accessible
         $__compile_dir = $smarty->getCompileDir();
         $_compile_dir = realpath($__compile_dir);
@@ -120,7 +110,7 @@ class Smarty_Internal_TestInstall
             } else {
                 $errors[ 'compile_dir' ] = $message;
             }
-        } elseif (!is_dir($_compile_dir)) {
+        } else if (!is_dir($_compile_dir)) {
             $status = false;
             $message = "FAILED: {$_compile_dir} is not a directory";
             if ($errors === null) {
@@ -128,7 +118,7 @@ class Smarty_Internal_TestInstall
             } else {
                 $errors[ 'compile_dir' ] = $message;
             }
-        } elseif (!is_readable($_compile_dir)) {
+        } else if (!is_readable($_compile_dir)) {
             $status = false;
             $message = "FAILED: {$_compile_dir} is not readable";
             if ($errors === null) {
@@ -136,7 +126,7 @@ class Smarty_Internal_TestInstall
             } else {
                 $errors[ 'compile_dir' ] = $message;
             }
-        } elseif (!is_writable($_compile_dir)) {
+        } else if (!is_writable($_compile_dir)) {
             $status = false;
             $message = "FAILED: {$_compile_dir} is not writable";
             if ($errors === null) {
@@ -149,11 +139,9 @@ class Smarty_Internal_TestInstall
                 echo "{$_compile_dir} is OK.\n";
             }
         }
-
         if ($errors === null) {
             echo "Testing plugins directory...\n";
         }
-
         // test if all registered plugins_dir are accessible
         // and if core plugins directory is still registered
         $_core_plugins_dir = realpath(dirname(__FILE__) . '/../plugins');
@@ -170,12 +158,10 @@ class Smarty_Internal_TestInstall
                     } else {
                         $plugin_dir = $smarty->ext->_getIncludePath->getIncludePath($_plugin_dir, null, $smarty);
                     }
-
                     if ($plugin_dir !== false) {
                         if ($errors === null) {
                             echo "$plugin_dir is OK.\n";
                         }
-
                         continue;
                     } else {
                         $status = false;
@@ -185,7 +171,6 @@ class Smarty_Internal_TestInstall
                         } else {
                             $errors[ 'plugins_dir' ] = $message;
                         }
-
                         continue;
                     }
                 } else {
@@ -196,11 +181,9 @@ class Smarty_Internal_TestInstall
                     } else {
                         $errors[ 'plugins_dir' ] = $message;
                     }
-
                     continue;
                 }
             }
-
             if (!is_dir($plugin_dir)) {
                 $status = false;
                 $message = "FAILED: $plugin_dir is not a directory";
@@ -209,7 +192,7 @@ class Smarty_Internal_TestInstall
                 } else {
                     $errors[ 'plugins_dir' ] = $message;
                 }
-            } elseif (!is_readable($plugin_dir)) {
+            } else if (!is_readable($plugin_dir)) {
                 $status = false;
                 $message = "FAILED: $plugin_dir is not readable";
                 if ($errors === null) {
@@ -217,7 +200,7 @@ class Smarty_Internal_TestInstall
                 } else {
                     $errors[ 'plugins_dir' ] = $message;
                 }
-            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
+            } else if ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
                 $_core_plugins_available = true;
                 if ($errors === null) {
                     echo "$plugin_dir is OK.\n";
@@ -233,15 +216,13 @@ class Smarty_Internal_TestInstall
             $message = "WARNING: Smarty's own libs/plugins is not available";
             if ($errors === null) {
                 echo $message . ".\n";
-            } elseif (!isset($errors[ 'plugins_dir' ])) {
+            } else if (!isset($errors[ 'plugins_dir' ])) {
                 $errors[ 'plugins_dir' ] = $message;
             }
         }
-
         if ($errors === null) {
             echo "Testing cache directory...\n";
         }
-
         // test if all registered cache_dir is accessible
         $__cache_dir = $smarty->getCacheDir();
         $_cache_dir = realpath($__cache_dir);
@@ -253,7 +234,7 @@ class Smarty_Internal_TestInstall
             } else {
                 $errors[ 'cache_dir' ] = $message;
             }
-        } elseif (!is_dir($_cache_dir)) {
+        } else if (!is_dir($_cache_dir)) {
             $status = false;
             $message = "FAILED: {$_cache_dir} is not a directory";
             if ($errors === null) {
@@ -261,7 +242,7 @@ class Smarty_Internal_TestInstall
             } else {
                 $errors[ 'cache_dir' ] = $message;
             }
-        } elseif (!is_readable($_cache_dir)) {
+        } else if (!is_readable($_cache_dir)) {
             $status = false;
             $message = "FAILED: {$_cache_dir} is not readable";
             if ($errors === null) {
@@ -269,7 +250,7 @@ class Smarty_Internal_TestInstall
             } else {
                 $errors[ 'cache_dir' ] = $message;
             }
-        } elseif (!is_writable($_cache_dir)) {
+        } else if (!is_writable($_cache_dir)) {
             $status = false;
             $message = "FAILED: {$_cache_dir} is not writable";
             if ($errors === null) {
@@ -282,11 +263,9 @@ class Smarty_Internal_TestInstall
                 echo "{$_cache_dir} is OK.\n";
             }
         }
-
         if ($errors === null) {
             echo "Testing configs directory...\n";
         }
-
         // test if all registered config_dir are accessible
         foreach ($smarty->getConfigDir() as $config_dir) {
             $_config_dir = $config_dir;
@@ -299,12 +278,10 @@ class Smarty_Internal_TestInstall
                     } else {
                         $config_dir = $smarty->ext->_getIncludePath->getIncludePath($_config_dir, null, $smarty);
                     }
-
                     if ($config_dir !== false) {
                         if ($errors === null) {
                             echo "$config_dir is OK.\n";
                         }
-
                         continue;
                     } else {
                         $status = false;
@@ -314,7 +291,6 @@ class Smarty_Internal_TestInstall
                         } else {
                             $errors[ 'config_dir' ] = $message;
                         }
-
                         continue;
                     }
                 } else {
@@ -325,11 +301,9 @@ class Smarty_Internal_TestInstall
                     } else {
                         $errors[ 'config_dir' ] = $message;
                     }
-
                     continue;
                 }
             }
-
             if (!is_dir($config_dir)) {
                 $status = false;
                 $message = "FAILED: $config_dir is not a directory";
@@ -338,7 +312,7 @@ class Smarty_Internal_TestInstall
                 } else {
                     $errors[ 'config_dir' ] = $message;
                 }
-            } elseif (!is_readable($config_dir)) {
+            } else if (!is_readable($config_dir)) {
                 $status = false;
                 $message = "FAILED: $config_dir is not readable";
                 if ($errors === null) {
@@ -352,153 +326,165 @@ class Smarty_Internal_TestInstall
                 }
             }
         }
-
         if ($errors === null) {
             echo "Testing sysplugin files...\n";
         }
         // test if sysplugins are available
         $source = SMARTY_SYSPLUGINS_DIR;
         if (is_dir($source)) {
-            $expectedSysplugins = array('smartycompilerexception.php' => true, 'smartyexception.php' => true,
-                                        'smarty_cacheresource.php' => true, 'smarty_cacheresource_custom.php' => true,
-                                        'smarty_cacheresource_keyvaluestore.php' => true, 'smarty_data.php' => true,
-                                        'smarty_internal_block.php' => true,
-                                        'smarty_internal_cacheresource_file.php' => true,
-                                        'smarty_internal_compilebase.php' => true,
-                                        'smarty_internal_compile_append.php' => true,
-                                        'smarty_internal_compile_assign.php' => true,
-                                        'smarty_internal_compile_block.php' => true,
-                                        'smarty_internal_compile_block_child.php' => true,
-                                        'smarty_internal_compile_block_parent.php' => true,
-                                        'smarty_internal_compile_break.php' => true,
-                                        'smarty_internal_compile_call.php' => true,
-                                        'smarty_internal_compile_capture.php' => true,
-                                        'smarty_internal_compile_config_load.php' => true,
-                                        'smarty_internal_compile_continue.php' => true,
-                                        'smarty_internal_compile_debug.php' => true,
-                                        'smarty_internal_compile_eval.php' => true,
-                                        'smarty_internal_compile_extends.php' => true,
-                                        'smarty_internal_compile_for.php' => true,
-                                        'smarty_internal_compile_foreach.php' => true,
-                                        'smarty_internal_compile_function.php' => true,
-                                        'smarty_internal_compile_if.php' => true,
-                                        'smarty_internal_compile_include.php' => true,
-                                        'smarty_internal_compile_include_php.php' => true,
-                                        'smarty_internal_compile_insert.php' => true,
-                                        'smarty_internal_compile_ldelim.php' => true,
-                                        'smarty_internal_compile_make_nocache.php' => true,
-                                        'smarty_internal_compile_nocache.php' => true,
-                                        'smarty_internal_compile_private_block_plugin.php' => true,
-                                        'smarty_internal_compile_private_foreachsection.php' => true,
-                                        'smarty_internal_compile_private_function_plugin.php' => true,
-                                        'smarty_internal_compile_private_modifier.php' => true,
+            $expectedSysplugins = array('smartycompilerexception.php'                               => true,
+                                        'smartyexception.php'                                       => true,
+                                        'smarty_cacheresource.php'                                  => true,
+                                        'smarty_cacheresource_custom.php'                           => true,
+                                        'smarty_cacheresource_keyvaluestore.php'                    => true,
+                                        'smarty_data.php'                                           => true,
+                                        'smarty_internal_block.php'                                 => true,
+                                        'smarty_internal_cacheresource_file.php'                    => true,
+                                        'smarty_internal_compilebase.php'                           => true,
+                                        'smarty_internal_compile_append.php'                        => true,
+                                        'smarty_internal_compile_assign.php'                        => true,
+                                        'smarty_internal_compile_block.php'                         => true,
+                                        'smarty_internal_compile_block_child.php'                   => true,
+                                        'smarty_internal_compile_block_parent.php'                  => true,
+                                        'smarty_internal_compile_child.php'                   => true,
+                                        'smarty_internal_compile_parent.php'                  => true,
+                                        'smarty_internal_compile_break.php'                         => true,
+                                        'smarty_internal_compile_call.php'                          => true,
+                                        'smarty_internal_compile_capture.php'                       => true,
+                                        'smarty_internal_compile_config_load.php'                   => true,
+                                        'smarty_internal_compile_continue.php'                      => true,
+                                        'smarty_internal_compile_debug.php'                         => true,
+                                        'smarty_internal_compile_eval.php'                          => true,
+                                        'smarty_internal_compile_extends.php'                       => true,
+                                        'smarty_internal_compile_for.php'                           => true,
+                                        'smarty_internal_compile_foreach.php'                       => true,
+                                        'smarty_internal_compile_function.php'                      => true,
+                                        'smarty_internal_compile_if.php'                            => true,
+                                        'smarty_internal_compile_include.php'                       => true,
+                                        'smarty_internal_compile_include_php.php'                   => true,
+                                        'smarty_internal_compile_insert.php'                        => true,
+                                        'smarty_internal_compile_ldelim.php'                        => true,
+                                        'smarty_internal_compile_make_nocache.php'                  => true,
+                                        'smarty_internal_compile_nocache.php'                       => true,
+                                        'smarty_internal_compile_private_block_plugin.php'          => true,
+                                        'smarty_internal_compile_private_foreachsection.php'        => true,
+                                        'smarty_internal_compile_private_function_plugin.php'       => true,
+                                        'smarty_internal_compile_private_modifier.php'              => true,
                                         'smarty_internal_compile_private_object_block_function.php' => true,
-                                        'smarty_internal_compile_private_object_function.php' => true,
-                                        'smarty_internal_compile_private_php.php' => true,
-                                        'smarty_internal_compile_private_print_expression.php' => true,
-                                        'smarty_internal_compile_private_registered_block.php' => true,
-                                        'smarty_internal_compile_private_registered_function.php' => true,
-                                        'smarty_internal_compile_private_special_variable.php' => true,
-                                        'smarty_internal_compile_rdelim.php' => true,
-                                        'smarty_internal_compile_section.php' => true,
-                                        'smarty_internal_compile_setfilter.php' => true,
-                                        'smarty_internal_compile_shared_inheritance.php' => true,
-                                        'smarty_internal_compile_while.php' => true,
-                                        'smarty_internal_configfilelexer.php' => true,
-                                        'smarty_internal_configfileparser.php' => true,
-                                        'smarty_internal_config_file_compiler.php' => true,
-                                        'smarty_internal_data.php' => true, 'smarty_internal_debug.php' => true,
-                                        'smarty_internal_extension_handler.php' => true,
-                                        'smarty_internal_method_addautoloadfilters.php' => true,
-                                        'smarty_internal_method_adddefaultmodifiers.php' => true,
-                                        'smarty_internal_method_append.php' => true,
-                                        'smarty_internal_method_appendbyref.php' => true,
-                                        'smarty_internal_method_assignbyref.php' => true,
-                                        'smarty_internal_method_assignglobal.php' => true,
-                                        'smarty_internal_method_clearallassign.php' => true,
-                                        'smarty_internal_method_clearallcache.php' => true,
-                                        'smarty_internal_method_clearassign.php' => true,
-                                        'smarty_internal_method_clearcache.php' => true,
-                                        'smarty_internal_method_clearcompiledtemplate.php' => true,
-                                        'smarty_internal_method_clearconfig.php' => true,
-                                        'smarty_internal_method_compileallconfig.php' => true,
-                                        'smarty_internal_method_compilealltemplates.php' => true,
-                                        'smarty_internal_method_configload.php' => true,
-                                        'smarty_internal_method_createdata.php' => true,
-                                        'smarty_internal_method_getautoloadfilters.php' => true,
-                                        'smarty_internal_method_getconfigvariable.php' => true,
-                                        'smarty_internal_method_getconfigvars.php' => true,
-                                        'smarty_internal_method_getdebugtemplate.php' => true,
-                                        'smarty_internal_method_getdefaultmodifiers.php' => true,
-                                        'smarty_internal_method_getglobal.php' => true,
-                                        'smarty_internal_method_getregisteredobject.php' => true,
-                                        'smarty_internal_method_getstreamvariable.php' => true,
-                                        'smarty_internal_method_gettags.php' => true,
-                                        'smarty_internal_method_gettemplatevars.php' => true,
-                                        'smarty_internal_method_loadfilter.php' => true,
-                                        'smarty_internal_method_loadplugin.php' => true,
-                                        'smarty_internal_method_mustcompile.php' => true,
-                                        'smarty_internal_method_registercacheresource.php' => true,
-                                        'smarty_internal_method_registerclass.php' => true,
-                                        'smarty_internal_method_registerdefaultconfighandler.php' => true,
-                                        'smarty_internal_method_registerdefaultpluginhandler.php' => true,
+                                        'smarty_internal_compile_private_object_function.php'       => true,
+                                        'smarty_internal_compile_private_php.php'                   => true,
+                                        'smarty_internal_compile_private_print_expression.php'      => true,
+                                        'smarty_internal_compile_private_registered_block.php'      => true,
+                                        'smarty_internal_compile_private_registered_function.php'   => true,
+                                        'smarty_internal_compile_private_special_variable.php'      => true,
+                                        'smarty_internal_compile_rdelim.php'                        => true,
+                                        'smarty_internal_compile_section.php'                       => true,
+                                        'smarty_internal_compile_setfilter.php'                     => true,
+                                        'smarty_internal_compile_shared_inheritance.php'            => true,
+                                        'smarty_internal_compile_while.php'                         => true,
+                                        'smarty_internal_configfilelexer.php'                       => true,
+                                        'smarty_internal_configfileparser.php'                      => true,
+                                        'smarty_internal_config_file_compiler.php'                  => true,
+                                        'smarty_internal_data.php'                                  => true,
+                                        'smarty_internal_debug.php'                                 => true,
+                                        'smarty_internal_errorhandler.php'                          => true,
+                                        'smarty_internal_extension_handler.php'                     => true,
+                                        'smarty_internal_method_addautoloadfilters.php'             => true,
+                                        'smarty_internal_method_adddefaultmodifiers.php'            => true,
+                                        'smarty_internal_method_append.php'                         => true,
+                                        'smarty_internal_method_appendbyref.php'                    => true,
+                                        'smarty_internal_method_assignbyref.php'                    => true,
+                                        'smarty_internal_method_assignglobal.php'                   => true,
+                                        'smarty_internal_method_clearallassign.php'                 => true,
+                                        'smarty_internal_method_clearallcache.php'                  => true,
+                                        'smarty_internal_method_clearassign.php'                    => true,
+                                        'smarty_internal_method_clearcache.php'                     => true,
+                                        'smarty_internal_method_clearcompiledtemplate.php'          => true,
+                                        'smarty_internal_method_clearconfig.php'                    => true,
+                                        'smarty_internal_method_compileallconfig.php'               => true,
+                                        'smarty_internal_method_compilealltemplates.php'            => true,
+                                        'smarty_internal_method_configload.php'                     => true,
+                                        'smarty_internal_method_createdata.php'                     => true,
+                                        'smarty_internal_method_getautoloadfilters.php'             => true,
+                                        'smarty_internal_method_getconfigvariable.php'              => true,
+                                        'smarty_internal_method_getconfigvars.php'                  => true,
+                                        'smarty_internal_method_getdebugtemplate.php'               => true,
+                                        'smarty_internal_method_getdefaultmodifiers.php'            => true,
+                                        'smarty_internal_method_getglobal.php'                      => true,
+                                        'smarty_internal_method_getregisteredobject.php'            => true,
+                                        'smarty_internal_method_getstreamvariable.php'              => true,
+                                        'smarty_internal_method_gettags.php'                        => true,
+                                        'smarty_internal_method_gettemplatevars.php'                => true,
+                                        'smarty_internal_method_literals.php'                       => true,
+                                        'smarty_internal_method_loadfilter.php'                     => true,
+                                        'smarty_internal_method_loadplugin.php'                     => true,
+                                        'smarty_internal_method_mustcompile.php'                    => true,
+                                        'smarty_internal_method_registercacheresource.php'          => true,
+                                        'smarty_internal_method_registerclass.php'                  => true,
+                                        'smarty_internal_method_registerdefaultconfighandler.php'   => true,
+                                        'smarty_internal_method_registerdefaultpluginhandler.php'   => true,
                                         'smarty_internal_method_registerdefaulttemplatehandler.php' => true,
-                                        'smarty_internal_method_registerfilter.php' => true,
-                                        'smarty_internal_method_registerobject.php' => true,
-                                        'smarty_internal_method_registerplugin.php' => true,
-                                        'smarty_internal_method_registerresource.php' => true,
-                                        'smarty_internal_method_setautoloadfilters.php' => true,
-                                        'smarty_internal_method_setdebugtemplate.php' => true,
-                                        'smarty_internal_method_setdefaultmodifiers.php' => true,
-                                        'smarty_internal_method_unloadfilter.php' => true,
-                                        'smarty_internal_method_unregistercacheresource.php' => true,
-                                        'smarty_internal_method_unregisterfilter.php' => true,
-                                        'smarty_internal_method_unregisterobject.php' => true,
-                                        'smarty_internal_method_unregisterplugin.php' => true,
-                                        'smarty_internal_method_unregisterresource.php' => true,
-                                        'smarty_internal_nocache_insert.php' => true,
-                                        'smarty_internal_parsetree.php' => true,
-                                        'smarty_internal_parsetree_code.php' => true,
-                                        'smarty_internal_parsetree_dq.php' => true,
-                                        'smarty_internal_parsetree_dqcontent.php' => true,
-                                        'smarty_internal_parsetree_tag.php' => true,
-                                        'smarty_internal_parsetree_template.php' => true,
-                                        'smarty_internal_parsetree_text.php' => true,
-                                        'smarty_internal_resource_eval.php' => true,
-                                        'smarty_internal_resource_extends.php' => true,
-                                        'smarty_internal_resource_file.php' => true,
-                                        'smarty_internal_resource_php.php' => true,
-                                        'smarty_internal_resource_registered.php' => true,
-                                        'smarty_internal_resource_stream.php' => true,
-                                        'smarty_internal_resource_string.php' => true,
-                                        'smarty_internal_runtime_cachemodify.php' => true,
-                                        'smarty_internal_runtime_cacheresourcefile.php' => true,
-                                        'smarty_internal_runtime_capture.php' => true,
-                                        'smarty_internal_runtime_codeframe.php' => true,
-                                        'smarty_internal_runtime_filterhandler.php' => true,
-                                        'smarty_internal_runtime_foreach.php' => true,
-                                        'smarty_internal_runtime_getincludepath.php' => true,
-                                        'smarty_internal_runtime_inheritance.php' => true,
-                                        'smarty_internal_runtime_make_nocache.php' => true,
-                                        'smarty_internal_runtime_tplfunction.php' => true,
-                                        'smarty_internal_runtime_updatecache.php' => true,
-                                        'smarty_internal_runtime_updatescope.php' => true,
-                                        'smarty_internal_runtime_writefile.php' => true,
-                                        'smarty_internal_smartytemplatecompiler.php' => true,
-                                        'smarty_internal_template.php' => true,
-                                        'smarty_internal_templatebase.php' => true,
-                                        'smarty_internal_templatecompilerbase.php' => true,
-                                        'smarty_internal_templatelexer.php' => true,
-                                        'smarty_internal_templateparser.php' => true,
-                                        'smarty_internal_testinstall.php' => true,
-                                        'smarty_internal_undefined.php' => true, 'smarty_resource.php' => true,
-                                        'smarty_resource_custom.php' => true, 'smarty_resource_recompiled.php' => true,
-                                        'smarty_resource_uncompiled.php' => true, 'smarty_security.php' => true,
-                                        'smarty_template_cached.php' => true, 'smarty_template_compiled.php' => true,
-                                        'smarty_template_config.php' => true,
-                                        'smarty_template_resource_base.php' => true,
-                                        'smarty_template_source.php' => true, 'smarty_undefined_variable.php' => true,
-                                        'smarty_variable.php' => true,);
+                                        'smarty_internal_method_registerfilter.php'                 => true,
+                                        'smarty_internal_method_registerobject.php'                 => true,
+                                        'smarty_internal_method_registerplugin.php'                 => true,
+                                        'smarty_internal_method_registerresource.php'               => true,
+                                        'smarty_internal_method_setautoloadfilters.php'             => true,
+                                        'smarty_internal_method_setdebugtemplate.php'               => true,
+                                        'smarty_internal_method_setdefaultmodifiers.php'            => true,
+                                        'smarty_internal_method_unloadfilter.php'                   => true,
+                                        'smarty_internal_method_unregistercacheresource.php'        => true,
+                                        'smarty_internal_method_unregisterfilter.php'               => true,
+                                        'smarty_internal_method_unregisterobject.php'               => true,
+                                        'smarty_internal_method_unregisterplugin.php'               => true,
+                                        'smarty_internal_method_unregisterresource.php'             => true,
+                                        'smarty_internal_nocache_insert.php'                        => true,
+                                        'smarty_internal_parsetree.php'                             => true,
+                                        'smarty_internal_parsetree_code.php'                        => true,
+                                        'smarty_internal_parsetree_dq.php'                          => true,
+                                        'smarty_internal_parsetree_dqcontent.php'                   => true,
+                                        'smarty_internal_parsetree_tag.php'                         => true,
+                                        'smarty_internal_parsetree_template.php'                    => true,
+                                        'smarty_internal_parsetree_text.php'                        => true,
+                                        'smarty_internal_resource_eval.php'                         => true,
+                                        'smarty_internal_resource_extends.php'                      => true,
+                                        'smarty_internal_resource_file.php'                         => true,
+                                        'smarty_internal_resource_php.php'                          => true,
+                                        'smarty_internal_resource_registered.php'                   => true,
+                                        'smarty_internal_resource_stream.php'                       => true,
+                                        'smarty_internal_resource_string.php'                       => true,
+                                        'smarty_internal_runtime_cachemodify.php'                   => true,
+                                        'smarty_internal_runtime_cacheresourcefile.php'             => true,
+                                        'smarty_internal_runtime_capture.php'                       => true,
+                                        'smarty_internal_runtime_codeframe.php'                     => true,
+                                        'smarty_internal_runtime_filterhandler.php'                 => true,
+                                        'smarty_internal_runtime_foreach.php'                       => true,
+                                        'smarty_internal_runtime_getincludepath.php'                => true,
+                                        'smarty_internal_runtime_inheritance.php'                   => true,
+                                        'smarty_internal_runtime_make_nocache.php'                  => true,
+                                        'smarty_internal_runtime_tplfunction.php'                   => true,
+                                        'smarty_internal_runtime_updatecache.php'                   => true,
+                                        'smarty_internal_runtime_updatescope.php'                   => true,
+                                        'smarty_internal_runtime_writefile.php'                     => true,
+                                        'smarty_internal_smartytemplatecompiler.php'                => true,
+                                        'smarty_internal_template.php'                              => true,
+                                        'smarty_internal_templatebase.php'                          => true,
+                                        'smarty_internal_templatecompilerbase.php'                  => true,
+                                        'smarty_internal_templatelexer.php'                         => true,
+                                        'smarty_internal_templateparser.php'                        => true,
+                                        'smarty_internal_testinstall.php'                           => true,
+                                        'smarty_internal_undefined.php'                             => true,
+                                        'smarty_resource.php'                                       => true,
+                                        'smarty_resource_custom.php'                                => true,
+                                        'smarty_resource_recompiled.php'                            => true,
+                                        'smarty_resource_uncompiled.php'                            => true,
+                                        'smarty_security.php'                                       => true,
+                                        'smarty_template_cached.php'                                => true,
+                                        'smarty_template_compiled.php'                              => true,
+                                        'smarty_template_config.php'                                => true,
+                                        'smarty_template_resource_base.php'                         => true,
+                                        'smarty_template_source.php'                                => true,
+                                        'smarty_undefined_variable.php'                             => true,
+                                        'smarty_variable.php'                                       => true,);
             $iterator = new DirectoryIterator($source);
             foreach ($iterator as $file) {
                 if (!$file->isDot()) {
@@ -516,7 +502,7 @@ class Smarty_Internal_TestInstall
                 } else {
                     $errors[ 'sysplugins' ] = $message;
                 }
-            } elseif ($errors === null) {
+            } else if ($errors === null) {
                 echo "... OK\n";
             }
         } else {
@@ -528,36 +514,61 @@ class Smarty_Internal_TestInstall
                 $errors[ 'sysplugins_dir_constant' ] = $message;
             }
         }
-
         if ($errors === null) {
             echo "Testing plugin files...\n";
         }
         // test if core plugins are available
         $source = SMARTY_PLUGINS_DIR;
         if (is_dir($source)) {
-            $expectedPlugins =
-                array('block.textformat.php' => true, 'function.counter.php' => true, 'function.cycle.php' => true,
-                      'function.fetch.php' => true, 'function.html_checkboxes.php' => true,
-                      'function.html_image.php' => true, 'function.html_options.php' => true,
-                      'function.html_radios.php' => true, 'function.html_select_date.php' => true,
-                      'function.html_select_time.php' => true, 'function.html_table.php' => true,
-                      'function.mailto.php' => true, 'function.math.php' => true, 'modifier.capitalize.php' => true,
-                      'modifier.date_format.php' => true, 'modifier.debug_print_var.php' => true,
-                      'modifier.escape.php' => true, 'modifier.regex_replace.php' => true,
-                      'modifier.replace.php' => true, 'modifier.spacify.php' => true, 'modifier.truncate.php' => true,
-                      'modifiercompiler.cat.php' => true, 'modifiercompiler.count_characters.php' => true,
-                      'modifiercompiler.count_paragraphs.php' => true, 'modifiercompiler.count_sentences.php' => true,
-                      'modifiercompiler.count_words.php' => true, 'modifiercompiler.default.php' => true,
-                      'modifiercompiler.escape.php' => true, 'modifiercompiler.from_charset.php' => true,
-                      'modifiercompiler.indent.php' => true, 'modifiercompiler.lower.php' => true,
-                      'modifiercompiler.noprint.php' => true, 'modifiercompiler.string_format.php' => true,
-                      'modifiercompiler.strip.php' => true, 'modifiercompiler.strip_tags.php' => true,
-                      'modifiercompiler.to_charset.php' => true, 'modifiercompiler.unescape.php' => true,
-                      'modifiercompiler.upper.php' => true, 'modifiercompiler.wordwrap.php' => true,
-                      'outputfilter.trimwhitespace.php' => true, 'shared.escape_special_chars.php' => true,
-                      'shared.literal_compiler_param.php' => true, 'shared.make_timestamp.php' => true,
-                      'shared.mb_str_replace.php' => true, 'shared.mb_unicode.php' => true,
-                      'shared.mb_wordwrap.php' => true, 'variablefilter.htmlspecialchars.php' => true,);
+            $expectedPlugins = array(
+                'block.textformat.php'                  => true,
+                'function.counter.php'                  => true,
+                'function.cycle.php'                    => true,
+                'function.fetch.php'                    => true,
+                'function.html_checkboxes.php'          => true,
+                'function.html_image.php'               => true,
+                'function.html_options.php'             => true,
+                'function.html_radios.php'              => true,
+                'function.html_select_date.php'         => true,
+                'function.html_select_time.php'         => true,
+                'function.html_table.php'               => true,
+                'function.mailto.php'                   => true,
+                'function.math.php'                     => true,
+                'modifier.capitalize.php'               => true,
+                'modifier.date_format.php'              => true,
+                'modifier.debug_print_var.php'          => true,
+                'modifier.escape.php'                   => true,
+                'modifier.mb_wordwrap.php'              => true,
+                'modifier.regex_replace.php'            => true,
+                'modifier.replace.php'                  => true,
+                'modifier.spacify.php'                  => true,
+                'modifier.truncate.php'                 => true,
+                'modifiercompiler.cat.php'              => true,
+                'modifiercompiler.count_characters.php' => true,
+                'modifiercompiler.count_paragraphs.php' => true,
+                'modifiercompiler.count_sentences.php'  => true,
+                'modifiercompiler.count_words.php'      => true,
+                'modifiercompiler.default.php'          => true,
+                'modifiercompiler.escape.php'           => true,
+                'modifiercompiler.from_charset.php'     => true,
+                'modifiercompiler.indent.php'           => true,
+                'modifiercompiler.lower.php'            => true,
+                'modifiercompiler.noprint.php'          => true,
+                'modifiercompiler.string_format.php'    => true,
+                'modifiercompiler.strip.php'            => true,
+                'modifiercompiler.strip_tags.php'       => true,
+                'modifiercompiler.to_charset.php'       => true,
+                'modifiercompiler.unescape.php'         => true,
+                'modifiercompiler.upper.php'            => true,
+                'modifiercompiler.wordwrap.php'         => true,
+                'outputfilter.trimwhitespace.php'       => true,
+                'shared.escape_special_chars.php'       => true,
+                'shared.literal_compiler_param.php'     => true,
+                'shared.make_timestamp.php'             => true,
+                'shared.mb_str_replace.php'             => true,
+                'shared.mb_unicode.php'                 => true,
+                'variablefilter.htmlspecialchars.php'   => true,
+            );
             $iterator = new DirectoryIterator($source);
             foreach ($iterator as $file) {
                 if (!$file->isDot()) {
@@ -575,7 +586,7 @@ class Smarty_Internal_TestInstall
                 } else {
                     $errors[ 'plugins' ] = $message;
                 }
-            } elseif ($errors === null) {
+            } else if ($errors === null) {
                 echo "... OK\n";
             }
         } else {
@@ -587,12 +598,10 @@ class Smarty_Internal_TestInstall
                 $errors[ 'plugins_dir_constant' ] = $message;
             }
         }
-
         if ($errors === null) {
             echo "Tests complete.\n";
             echo "
    \n"; } - return $status; } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_resource.php b/vendor/smarty/smarty/libs/sysplugins/smarty_resource.php index ea673ead1..b76b9c783 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_resource.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_resource.php @@ -20,32 +20,29 @@ */ abstract class Smarty_Resource { + /** + * resource types provided by the core + * + * @var array + */ + public static $sysplugins = array('file' => 'smarty_internal_resource_file.php', + 'string' => 'smarty_internal_resource_string.php', + 'extends' => 'smarty_internal_resource_extends.php', + 'stream' => 'smarty_internal_resource_stream.php', + 'eval' => 'smarty_internal_resource_eval.php', + 'php' => 'smarty_internal_resource_php.php'); /** * Source is bypassing compiler * * @var boolean */ public $uncompiled = false; - /** * Source must be recompiled on every occasion * * @var boolean */ public $recompiled = false; - - /** - * resource types provided by the core - * - * @var array - */ - public static $sysplugins = array('file' => 'smarty_internal_resource_file.php', - 'string' => 'smarty_internal_resource_string.php', - 'extends' => 'smarty_internal_resource_extends.php', - 'stream' => 'smarty_internal_resource_stream.php', - 'eval' => 'smarty_internal_resource_eval.php', - 'php' => 'smarty_internal_resource_php.php'); - /** * Flag if resource does implement populateCompiledFilepath() method * @@ -53,70 +50,6 @@ abstract class Smarty_Resource */ public $hasCompiledHandler = false; - /** - * Load template's source into current template object - * - * @param Smarty_Template_Source $source source object - * - * @return string template source - * @throws SmartyException if source cannot be loaded - */ - abstract public function getContent(Smarty_Template_Source $source); - - /** - * populate Source Object with meta data from Resource - * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - */ - abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null); - - /** - * populate Source Object with timestamp and exists from Resource - * - * @param Smarty_Template_Source $source source object - */ - public function populateTimestamp(Smarty_Template_Source $source) - { - // intentionally left blank - } - - /** - * modify resource_name according to resource handlers specifications - * - * @param Smarty $smarty Smarty instance - * @param string $resource_name resource_name to make unique - * @param boolean $isConfig flag for config resource - * - * @return string unique resource name - */ - public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false) - { - if ($isConfig) { - if (!isset($smarty->_joined_config_dir)) { - $smarty->getTemplateDir(null, true); - } - return get_class($this) . '#' . $smarty->_joined_config_dir . '#' . $resource_name; - } else { - if (!isset($smarty->_joined_template_dir)) { - $smarty->getTemplateDir(); - } - return get_class($this) . '#' . $smarty->_joined_template_dir . '#' . $resource_name; - } - } - - /** - * Determine basename for compiled filename - * - * @param Smarty_Template_Source $source source object - * - * @return string resource's basename - */ - public function getBasename(Smarty_Template_Source $source) - { - return basename(preg_replace('![^\w]+!', '_', $source->name)); - } - /** * Load Resource Handler * @@ -132,20 +65,17 @@ abstract class Smarty_Resource if (isset($smarty->_cache[ 'resource_handlers' ][ $type ])) { return $smarty->_cache[ 'resource_handlers' ][ $type ]; } - // try registered resource if (isset($smarty->registered_resources[ $type ])) { return $smarty->_cache[ 'resource_handlers' ][ $type ] = $smarty->registered_resources[ $type ] instanceof Smarty_Resource ? $smarty->registered_resources[ $type ] : new Smarty_Internal_Resource_Registered(); } - // try sysplugins dir if (isset(self::$sysplugins[ $type ])) { $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type); return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class(); } - // try plugins dir $_resource_class = 'Smarty_Resource_' . ucfirst($type); if ($smarty->loadPlugin($_resource_class)) { @@ -159,7 +89,6 @@ abstract class Smarty_Resource return self::load($smarty, $type); } } - // try streams $_known_stream = stream_get_wrappers(); if (in_array($type, $_known_stream)) { @@ -169,9 +98,7 @@ abstract class Smarty_Resource } return $smarty->_cache[ 'resource_handlers' ][ $type ] = new Smarty_Internal_Resource_Stream(); } - // TODO: try default_(template|config)_handler - // give up throw new SmartyException("Unknown resource type '{$type}'"); } @@ -206,6 +133,7 @@ abstract class Smarty_Resource * @param string $template_resource template_resource to extract resource handler and name of * * @return string unique resource name + * @throws \SmartyException */ public static function getUniqueTemplateName($obj, $template_resource) { @@ -214,26 +142,15 @@ abstract class Smarty_Resource // TODO: optimize for Smarty's internal resource types $resource = Smarty_Resource::load($smarty, $type); // go relative to a given template? - $_file_is_dotted = $name[ 0 ] == '.' && ($name[ 1 ] == '.' || $name[ 1 ] == '/'); + $_file_is_dotted = $name[ 0 ] === '.' && ($name[ 1 ] === '.' || $name[ 1 ] === '/'); if ($obj->_isTplObj() && $_file_is_dotted && - ($obj->source->type == 'file' || $obj->parent->source->type == 'extends') + ($obj->source->type === 'file' || $obj->parent->source->type === 'extends') ) { - $name = $smarty->_realpath(dirname($obj->parent->source->filepath) . $smarty->ds . $name); + $name = $smarty->_realpath(dirname($obj->parent->source->filepath) . DIRECTORY_SEPARATOR . $name); } return $resource->buildUniqueResourceName($smarty, $name); } - /* - * Check if resource must check time stamps when when loading complied or cached templates. - * Resources like 'extends' which use source components my disable timestamp checks on own resource. - * - * @return bool - */ - public function checkTimestamps() - { - return true; - } - /** * initialize Source Object for given resource * wrapper for backward compatibility to versions < 3.1.22 @@ -243,12 +160,93 @@ abstract class Smarty_Resource * @param Smarty $smarty smarty object * @param string $template_resource resource identifier * - * @return Smarty_Template_Source Source Object + * @return \Smarty_Template_Source Source Object + * @throws \SmartyException */ - public static function source(Smarty_Internal_Template $_template = null, Smarty $smarty = null, + public static function source(Smarty_Internal_Template $_template = null, + Smarty $smarty = null, $template_resource = null) { return Smarty_Template_Source::load($_template, $smarty, $template_resource); } + + /** + * Load template's source into current template object + * + * @param Smarty_Template_Source $source source object + * + * @return string template source + * @throws SmartyException if source cannot be loaded + */ + abstract public function getContent(Smarty_Template_Source $source); + + /** + * populate Source Object with meta data from Resource + * + * @param Smarty_Template_Source $source source object + * @param Smarty_Internal_Template $_template template object + */ + abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null); + + /** + * populate Source Object with timestamp and exists from Resource + * + * @param Smarty_Template_Source $source source object + */ + public function populateTimestamp(Smarty_Template_Source $source) + { + // intentionally left blank + } + + /** + * modify resource_name according to resource handlers specifications + * + * @param Smarty $smarty Smarty instance + * @param string $resource_name resource_name to make unique + * @param boolean $isConfig flag for config resource + * + * @return string unique resource name + */ + public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false) + { + if ($isConfig) { + if (!isset($smarty->_joined_config_dir)) { + $smarty->getTemplateDir(null, true); + } + return get_class($this) . '#' . $smarty->_joined_config_dir . '#' . $resource_name; + } else { + if (!isset($smarty->_joined_template_dir)) { + $smarty->getTemplateDir(); + } + return get_class($this) . '#' . $smarty->_joined_template_dir . '#' . $resource_name; + } + } + + /* + * Check if resource must check time stamps when when loading complied or cached templates. + * Resources like 'extends' which use source components my disable timestamp checks on own resource. + * + * @return bool + */ + + /** + * Determine basename for compiled filename + * + * @param Smarty_Template_Source $source source object + * + * @return string resource's basename + */ + public function getBasename(Smarty_Template_Source $source) + { + return basename(preg_replace('![^\w]+!', '_', $source->name)); + } + + /** + * @return bool + */ + public function checkTimestamps() + { + return true; + } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_resource_custom.php b/vendor/smarty/smarty/libs/sysplugins/smarty_resource_custom.php index 619f2d6f0..77f619eca 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_resource_custom.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_resource_custom.php @@ -47,7 +47,7 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource */ public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null) { - $source->filepath = $source->type . ':' . $source->name; + $source->filepath = $source->type . ':' . substr(preg_replace('/[^A-Za-z0-9.]/','',$source->name),0,25); $source->uid = sha1($source->type . ':' . $source->name); $mtime = $this->fetchTimestamp($source->name); @@ -90,6 +90,6 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource */ public function getBasename(Smarty_Template_Source $source) { - return basename($source->name); + return basename(substr(preg_replace('/[^A-Za-z0-9.]/','',$source->name),0,25)); } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_resource_recompiled.php b/vendor/smarty/smarty/libs/sysplugins/smarty_resource_recompiled.php index 7e51d1b1d..322cdabfa 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_resource_recompiled.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_resource_recompiled.php @@ -49,7 +49,7 @@ abstract class Smarty_Resource_Recompiled extends Smarty_Resource $_smarty_tpl->loadCompiler(); // call compiler try { - eval("?>" . $_smarty_tpl->compiler->compileTemplate($_smarty_tpl)); + eval('?>' . $_smarty_tpl->compiler->compileTemplate($_smarty_tpl)); } catch (Exception $e) { unset($_smarty_tpl->compiler); @@ -85,6 +85,9 @@ abstract class Smarty_Resource_Recompiled extends Smarty_Resource * * @return bool */ + /** + * @return bool + */ public function checkTimestamps() { return false; diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_resource_uncompiled.php b/vendor/smarty/smarty/libs/sysplugins/smarty_resource_uncompiled.php index 554f3aea3..a11e2c14c 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_resource_uncompiled.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_resource_uncompiled.php @@ -29,7 +29,7 @@ abstract class Smarty_Resource_Uncompiled extends Smarty_Resource * @var bool */ public $hasCompiledHandler = true; - + /** * populate compiled object with compiled filepath * diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_security.php b/vendor/smarty/smarty/libs/sysplugins/smarty_security.php index 4f75f7529..126f6fb46 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_security.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_security.php @@ -322,7 +322,7 @@ class Smarty_Security // fall back return $this->isTrustedStaticClass($class_name, $compiler); } - if ($params[ 2 ] == 'method') { + if ($params[ 2 ] === 'method') { $allowed = $this->trusted_static_methods; $name = substr($params[ 0 ], 0, strpos($params[ 0 ], '(')); } else { @@ -514,60 +514,39 @@ class Smarty_Security public function isTrustedResourceDir($filepath, $isConfig = null) { if ($this->_include_path_status !== $this->smarty->use_include_path) { - foreach ($this->_include_dir as $directory) { - unset($this->_resource_dir[ $directory ]); - } - if ($this->smarty->use_include_path) { - $this->_include_dir = array(); - $_dirs = $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty); - foreach ($_dirs as $directory) { - $this->_include_dir[] = $directory; - $this->_resource_dir[ $directory ] = true; - } + $_dir = $this->smarty->use_include_path ? $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty) : array(); + if ($this->_include_dir !== $_dir) { + $this->_updateResourceDir($this->_include_dir, $_dir); + $this->_include_dir = $_dir; } $this->_include_path_status = $this->smarty->use_include_path; } - if ($isConfig !== true && - (!isset($this->smarty->_cache[ 'template_dir_new' ]) || $this->smarty->_cache[ 'template_dir_new' ]) - ) { + if ($isConfig !== true) { $_dir = $this->smarty->getTemplateDir(); if ($this->_template_dir !== $_dir) { - foreach ($this->_template_dir as $directory) { - unset($this->_resource_dir[ $directory ]); - } - foreach ($_dir as $directory) { - $this->_resource_dir[ $directory ] = true; - } + $this->_updateResourceDir($this->_template_dir, $_dir); $this->_template_dir = $_dir; } - $this->smarty->_cache[ 'template_dir_new' ] = false; } - if ($isConfig !== false && - (!isset($this->smarty->_cache[ 'config_dir_new' ]) || $this->smarty->_cache[ 'config_dir_new' ]) - ) { + if ($isConfig !== false) { $_dir = $this->smarty->getConfigDir(); if ($this->_config_dir !== $_dir) { - foreach ($this->_config_dir as $directory) { - unset($this->_resource_dir[ $directory ]); - } - foreach ($_dir as $directory) { - $this->_resource_dir[ $directory ] = true; - } + $this->_updateResourceDir($this->_config_dir, $_dir); $this->_config_dir = $_dir; } - $this->smarty->_cache[ 'config_dir_new' ] = false; } - if ($this->_secure_dir !== (array) $this->secure_dir) { - foreach ($this->_secure_dir as $directory) { - unset($this->_resource_dir[ $directory ]); - } - foreach ((array) $this->secure_dir as $directory) { - $directory = $this->smarty->_realpath($directory . DIRECTORY_SEPARATOR, true); - $this->_resource_dir[ $directory ] = true; + if ($this->_secure_dir !== $this->secure_dir) { + $this->secure_dir = (array)$this->secure_dir; + foreach($this->secure_dir as $k => $d) { + $this->secure_dir[$k] = $this->smarty->_realpath($d.DIRECTORY_SEPARATOR,true); } - $this->_secure_dir = (array) $this->secure_dir; + $this->_updateResourceDir($this->_secure_dir, $this->secure_dir); + $this->_secure_dir = $this->secure_dir; + } + $addPath = $this->_checkDir($filepath, $this->_resource_dir); + if ($addPath !== false) { + $this->_resource_dir = array_merge($this->_resource_dir, $addPath); } - $this->_resource_dir = $this->_checkDir($filepath, $this->_resource_dir); return true; } @@ -622,40 +601,64 @@ class Smarty_Security $this->_php_resource_dir[ $directory ] = true; } } + $addPath = $this->_checkDir($filepath, $this->_php_resource_dir); + if ($addPath !== false) { + $this->_php_resource_dir = array_merge($this->_php_resource_dir, $addPath); + } + return true; + } - $this->_php_resource_dir = - $this->_checkDir($this->smarty->_realpath($filepath, true), $this->_php_resource_dir); - return true; + /** + * Remove old directories and its sub folders, add new directories + * + * @param array $oldDir + * @param array $newDir + */ + private function _updateResourceDir($oldDir, $newDir) { + foreach ($oldDir as $directory) { + $directory = $this->smarty->_realpath($directory, true); + $length = strlen($directory); + foreach ($this->_resource_dir as $dir) { + if (substr($dir, 0,$length) === $directory) { + unset($this->_resource_dir[ $dir ]); + } + } + } + foreach ($newDir as $directory) { + $directory = $this->smarty->_realpath($directory, true); + $this->_resource_dir[ $directory ] = true; + } } - /** * Check if file is inside a valid directory * * @param string $filepath * @param array $dirs valid directories * - * @return array + * @return array|bool * @throws \SmartyException */ private function _checkDir($filepath, $dirs) { + $directory = dirname($filepath) . DIRECTORY_SEPARATOR; + if (isset($dirs[ $directory ])) { + return false; + } + $filepath = $this->smarty->_realpath($filepath, true); $directory = dirname($filepath) . DIRECTORY_SEPARATOR; $_directory = array(); while (true) { - // remember the directory to add it to _resource_dir in case we're successful - $_directory[ $directory ] = true; - // test if the directory is trusted + // test if the directory is trusted if (isset($dirs[ $directory ])) { - // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup - $dirs = array_merge($dirs, $_directory); - - return $dirs; + return $_directory; } // abort if we've reached root if (!preg_match('#[\\\/][^\\\/]+[\\\/]$#', $directory)) { break; } - // bubble up one level + // remember the directory to add it to _resource_dir in case we're successful + $_directory[ $directory ] = true; + // bubble up one level $directory = preg_replace('#[\\\/][^\\\/]+[\\\/]$#', DIRECTORY_SEPARATOR, $directory); } @@ -676,11 +679,11 @@ class Smarty_Security { if ($security_class instanceof Smarty_Security) { $smarty->security_policy = $security_class; - return; + return $smarty; } elseif (is_object($security_class)) { throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security."); } - if ($security_class == null) { + if ($security_class === null) { $security_class = $smarty->security_class; } if (!class_exists($security_class)) { @@ -690,7 +693,7 @@ class Smarty_Security } else { $smarty->security_policy = new $security_class($smarty); } - return; + return $smarty; } /** * Start template processing diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_template_cached.php b/vendor/smarty/smarty/libs/sysplugins/smarty_template_cached.php index 58f0daf28..45c83c895 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_template_cached.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_template_cached.php @@ -83,6 +83,8 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base * create Cached Object container * * @param Smarty_Internal_Template $_template template object + * + * @throws \SmartyException */ public function __construct(Smarty_Internal_Template $_template) { @@ -105,8 +107,7 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base $_template->cached = new Smarty_Template_Cached($_template); $_template->cached->handler->populate($_template->cached, $_template); // caching enabled ? - if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || - $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->handler->recompiled + if (!$_template->caching || $_template->source->handler->recompiled ) { $_template->cached->valid = false; } @@ -162,13 +163,13 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base } else { $this->valid = true; } - if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT && + if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_CURRENT && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime) ) { // lifetime expired $this->valid = false; } - if ($this->valid && $_template->smarty->compile_check == 1 && + if ($this->valid && $_template->compile_check === Smarty::COMPILECHECK_ON && $_template->source->getTimeStamp() > $this->timestamp ) { $this->valid = false; diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_template_compiled.php b/vendor/smarty/smarty/libs/sysplugins/smarty_template_compiled.php index 18f9d562c..7ca2ebcb4 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_template_compiled.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_template_compiled.php @@ -11,7 +11,6 @@ */ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base { - /** * nocache hash * @@ -49,21 +48,22 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base $this->filepath = $smarty->getCompileDir(); if (isset($_template->compile_id)) { $this->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) . - ($smarty->use_sub_dirs ? $smarty->ds : '^'); + ($smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^'); } // if use_sub_dirs, break file into directories if ($smarty->use_sub_dirs) { - $this->filepath .= $source->uid[ 0 ] . $source->uid[ 1 ] . $smarty->ds . $source->uid[ 2 ] . - $source->uid[ 3 ] . $smarty->ds . $source->uid[ 4 ] . $source->uid[ 5 ] . $smarty->ds; + $this->filepath .= $source->uid[ 0 ] . $source->uid[ 1 ] . DIRECTORY_SEPARATOR . $source->uid[ 2 ] . + $source->uid[ 3 ] . DIRECTORY_SEPARATOR . $source->uid[ 4 ] . $source->uid[ 5 ] . + DIRECTORY_SEPARATOR; } $this->filepath .= $source->uid . '_'; if ($source->isConfig) { - $this->filepath .= (int) $smarty->config_read_hidden + (int) $smarty->config_booleanize * 2 + - (int) $smarty->config_overwrite * 4; + $this->filepath .= (int)$smarty->config_read_hidden + (int)$smarty->config_booleanize * 2 + + (int)$smarty->config_overwrite * 4; } else { - $this->filepath .= (int) $smarty->merge_compiled_includes + (int) $smarty->escape_html * 2 + + $this->filepath .= (int)$smarty->merge_compiled_includes + (int)$smarty->escape_html * 2 + (($smarty->merge_compiled_includes && $source->type === 'extends') ? - (int) $smarty->extends_recursion * 4 : 0); + (int)$smarty->extends_recursion * 4 : 0); } $this->filepath .= '.' . $source->type; $basename = $source->handler->getBasename($source); @@ -80,64 +80,6 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base } } - /** - * load compiled template or compile from source - * - * @param Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template - * - * @throws Exception - */ - public function process(Smarty_Internal_Template $_smarty_tpl) - { - $source = &$_smarty_tpl->source; - $smarty = &$_smarty_tpl->smarty; - if ($source->handler->recompiled) { - $source->handler->process($_smarty_tpl); - } elseif (!$source->handler->uncompiled) { - if (!$this->exists || $smarty->force_compile || - ($smarty->compile_check && $source->getTimeStamp() > $this->getTimeStamp()) - ) { - $this->compileTemplateSource($_smarty_tpl); - $compileCheck = $smarty->compile_check; - $smarty->compile_check = false; - $this->loadCompiledTemplate($_smarty_tpl); - $smarty->compile_check = $compileCheck; - } else { - $_smarty_tpl->mustCompile = true; - @include($this->filepath); - if ($_smarty_tpl->mustCompile) { - $this->compileTemplateSource($_smarty_tpl); - $compileCheck = $smarty->compile_check; - $smarty->compile_check = false; - $this->loadCompiledTemplate($_smarty_tpl); - $smarty->compile_check = $compileCheck; - } - } - $_smarty_tpl->_subTemplateRegister(); - $this->processed = true; - } - } - - /** - * Load fresh compiled template by including the PHP file - * HHVM requires a work around because of a PHP incompatibility - * - * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template - */ - private function loadCompiledTemplate(Smarty_Internal_Template $_smarty_tpl) - { - if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) { - opcache_invalidate($this->filepath, true); - } elseif (function_exists('apc_compile_file')) { - apc_compile_file($this->filepath); - } - if (defined('HHVM_VERSION')) { - eval("?>" . file_get_contents($this->filepath)); - } else { - include($this->filepath); - } - } - /** * render compiled template code * @@ -179,6 +121,44 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base } } + /** + * load compiled template or compile from source + * + * @param Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template + * + * @throws Exception + */ + public function process(Smarty_Internal_Template $_smarty_tpl) + { + $source = &$_smarty_tpl->source; + $smarty = &$_smarty_tpl->smarty; + if ($source->handler->recompiled) { + $source->handler->process($_smarty_tpl); + } else if (!$source->handler->uncompiled) { + if (!$this->exists || $smarty->force_compile || + ($_smarty_tpl->compile_check && $source->getTimeStamp() > $this->getTimeStamp()) + ) { + $this->compileTemplateSource($_smarty_tpl); + $compileCheck = $_smarty_tpl->compile_check; + $_smarty_tpl->compile_check = Smarty::COMPILECHECK_OFF; + $this->loadCompiledTemplate($_smarty_tpl); + $_smarty_tpl->compile_check = $compileCheck; + } else { + $_smarty_tpl->mustCompile = true; + @include($this->filepath); + if ($_smarty_tpl->mustCompile) { + $this->compileTemplateSource($_smarty_tpl); + $compileCheck = $_smarty_tpl->compile_check; + $_smarty_tpl->compile_check = Smarty::COMPILECHECK_OFF; + $this->loadCompiledTemplate($_smarty_tpl); + $_smarty_tpl->compile_check = $compileCheck; + } + } + $_smarty_tpl->_subTemplateRegister(); + $this->processed = true; + } + } + /** * compile template from source * @@ -193,8 +173,8 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base $this->nocache_hash = null; $this->unifunc = null; // compile locking - $saved_timestamp = $_template->source->handler->recompiled ? false : $this->getTimeStamp(); - if ($saved_timestamp) { + if ($saved_timestamp = (!$_template->source->handler->recompiled && is_file($this->filepath))) { + $saved_timestamp = $this->getTimeStamp(); touch($this->filepath); } // compile locking @@ -205,7 +185,7 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base } catch (Exception $e) { // restore old timestamp in case of error - if ($saved_timestamp) { + if ($saved_timestamp && is_file($this->filepath)) { touch($this->filepath, $saved_timestamp); } unset($_template->compiler); @@ -221,7 +201,8 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base * @param Smarty_Internal_Template $_template template object * @param string $code compiled code * - * @return boolean success + * @return bool success + * @throws \SmartyException */ public function write(Smarty_Internal_Template $_template, $code) { @@ -252,4 +233,26 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base } return isset($this->content) ? $this->content : false; } + + /** + * Load fresh compiled template by including the PHP file + * HHVM requires a work around because of a PHP incompatibility + * + * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template + */ + private function loadCompiledTemplate(Smarty_Internal_Template $_smarty_tpl) + { + if (function_exists('opcache_invalidate') + && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1) + ) { + opcache_invalidate($this->filepath, true); + } else if (function_exists('apc_compile_file')) { + apc_compile_file($this->filepath); + } + if (defined('HHVM_VERSION')) { + eval('?>' . file_get_contents($this->filepath)); + } else { + include($this->filepath); + } + } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_template_resource_base.php b/vendor/smarty/smarty/libs/sysplugins/smarty_template_resource_base.php index 6cc008a10..951e02af3 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_template_resource_base.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_template_resource_base.php @@ -73,16 +73,11 @@ abstract class Smarty_Template_Resource_Base public $content = null; /** - * required plugins + * Included sub templates + * - index name + * - value use count * - * @var array - */ - public $required_plugins = array(); - - /** - * Included subtemplates - * - * @var array + * @var int[] */ public $includes = array(); diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_template_source.php b/vendor/smarty/smarty/libs/sysplugins/smarty_template_source.php index fdb3deaa8..4868706c8 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_template_source.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_template_source.php @@ -126,12 +126,13 @@ class Smarty_Template_Source /** * create Source Object container * - * @param Smarty_Resource $handler Resource Handler this source object communicates with - * @param Smarty $smarty Smarty instance this source object belongs to - * @param string $resource full template_resource - * @param string $type type of resource - * @param string $name resource name + * @param Smarty $smarty Smarty instance this source object belongs to + * @param string $resource full template_resource + * @param string $type type of resource + * @param string $name resource name * + * @throws \SmartyException + * @internal param \Smarty_Resource $handler Resource Handler this source object communicates with */ public function __construct(Smarty $smarty, $resource, $type, $name) { @@ -202,6 +203,7 @@ class Smarty_Template_Source * Get source content * * @return string + * @throws \SmartyException */ public function getContent() { diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php b/vendor/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php index 88bc6f68c..e064f6551 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php +++ b/vendor/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php @@ -7,22 +7,18 @@ * @package Smarty * @subpackage Template */ -class Smarty_Undefined_Variable +class Smarty_Undefined_Variable extends Smarty_Variable { /** - * Returns FALSE for 'nocache' and NULL otherwise. + * Returns null for not existing properties * * @param string $name * - * @return bool + * @return null */ public function __get($name) { - if ($name == 'nocache') { - return false; - } else { return null; - } } /** @@ -32,6 +28,6 @@ class Smarty_Undefined_Variable */ public function __toString() { - return ""; + return ''; } } diff --git a/vendor/smarty/smarty/libs/sysplugins/smartycompilerexception.php b/vendor/smarty/smarty/libs/sysplugins/smartycompilerexception.php index 763bab159..f7ad39b93 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smartycompilerexception.php +++ b/vendor/smarty/smarty/libs/sysplugins/smartycompilerexception.php @@ -7,6 +7,9 @@ */ class SmartyCompilerException extends SmartyException { + /** + * @return string + */ public function __toString() { return ' --> Smarty Compiler: ' . $this->message . ' <-- '; diff --git a/vendor/smarty/smarty/libs/sysplugins/smartyexception.php b/vendor/smarty/smarty/libs/sysplugins/smartyexception.php index 431d8f8e9..7f7b9aa43 100644 --- a/vendor/smarty/smarty/libs/sysplugins/smartyexception.php +++ b/vendor/smarty/smarty/libs/sysplugins/smartyexception.php @@ -9,6 +9,9 @@ class SmartyException extends Exception { public static $escape = false; + /** + * @return string + */ public function __toString() { return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- '; -- cgit v1.2.3 From 9acf007687d58a0e4fe1f1b348e668c3329655f7 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 9 May 2018 17:03:10 -0700 Subject: hubzilla issue #1166 --- include/markdown.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/markdown.php b/include/markdown.php index 431ba84a4..de9862801 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -75,10 +75,10 @@ function markdown_to_bb($s, $use_zrl = false, $options = []) { // Convert everything that looks like a link to a link if($use_zrl) { $s = str_replace(['[img', '/img]'], ['[zmg', '/zmg]'], $s); - $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", '$1[zrl=$2$3]$2$3[/zrl]',$s); + $s = preg_replace("/([^\]\=\{]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", '$1[zrl=$2$3]$2$3[/zrl]',$s); } else { - $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", '$1[url=$2$3]$2$3[/url]',$s); + $s = preg_replace("/([^\]\=\{]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", '$1[url=$2$3]$2$3[/url]',$s); } // remove duplicate adjacent code tags -- cgit v1.2.3 From 50796079fa0f129b0fd084e80f345837dccee0e3 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 9 May 2018 17:09:38 -0700 Subject: loose ends discovered while fixing hubzilla #1166 --- include/text.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index 5be44c3cb..681103389 100644 --- a/include/text.php +++ b/include/text.php @@ -816,7 +816,7 @@ function get_tags($s) { // match any double quoted tags - if(preg_match_all('/([@#!]\"\;.*?\"\;)/',$s,$match)) { + if(preg_match_all('/([@#\!]\"\;.*?\"\;)/',$s,$match)) { foreach($match[1] as $mtch) { $ret[] = $mtch; } @@ -833,7 +833,7 @@ function get_tags($s) { // Pull out single word tags. These can be @nickname, @first_last // and #hash tags. - if(preg_match_all('/(? Date: Wed, 9 May 2018 18:20:28 -0700 Subject: minor regression on date queries from channel page --- Zotlabs/Module/Channel.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 2ed40047b..9ce57d6eb 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -248,6 +248,9 @@ class Channel extends \Zotlabs\Web\Controller { $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); } + if($datequery || $datequery2) { + $sql_extra2 .= " and item.item_thread_top != 0 "; + } $itemspage = get_pconfig(local_channel(),'system','itemspage'); \App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); -- cgit v1.2.3 From b4be1da91eadb3fffbee5ea526790d1b68c4d38a Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 9 May 2018 21:08:12 -0700 Subject: thread_author_menu - add some more checks as to whether to show certain links. This should complete work on hubzilla issue #1052 --- include/conversation.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 97dd402fc..4eabf7783 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1001,18 +1001,21 @@ function thread_author_menu($item, $mode = '') { $profile_link = chanlink_hash($item['author_xchan']); $contact = false; - if(App::$contacts && array_key_exists($item['author_xchan'],App::$contacts)) - $contact = App::$contacts[$item['author_xchan']]; - else - if($local_channel && $item['author']['xchan_addr']) - $follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']) . '&interactive=0'; - + if($channel['channel_hash'] !== $item['author_xchan']) { + if(App::$contacts && array_key_exists($item['author_xchan'],App::$contacts)) { + $contact = App::$contacts[$item['author_xchan']]; + } + else { + if($local_channel && $item['author']['xchan_addr'] && (! in_array($item['author']['xchan_network'],[ 'rss', 'anon','unknown' ]))) { + $follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']) . '&interactive=0'; + } + } - if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) { - $pm_url = z_root() . '/mail/new/?f=&hash=' . urlencode($item['author_xchan']); + if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) { + $pm_url = z_root() . '/mail/new/?f=&hash=' . urlencode($item['author_xchan']); + } } - if($contact) { $poke_link = z_root() . '/poke/?f=&c=' . $contact['abook_id']; if (! intval($contact['abook_self'])) -- cgit v1.2.3 From 67bb167cf83f384a9bfd52a0b1fc65098d4b13d7 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 9 May 2018 21:22:25 -0700 Subject: Change hovertip on paperclip button to read 'Attach/Upload file' because a lot of people gravitate to 'insert photo from album' instead, looking for a way to upload into the post. --- Zotlabs/Lib/ThreadItem.php | 2 +- include/conversation.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index b7fc8e65d..c7a2c9373 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -760,7 +760,7 @@ class ThreadItem { '$edquote' => t('Quote'), '$edcode' => t('Code'), '$edimg' => t('Image'), - '$edatt' => t('Attach File'), + '$edatt' => t('Attach/Upload file'), '$edurl' => t('Insert Link'), '$edvideo' => t('Video'), '$preview' => t('Preview'), // ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''), diff --git a/include/conversation.php b/include/conversation.php index 4eabf7783..3dc55d759 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1385,7 +1385,7 @@ function status_editor($a, $x, $popup = false) { '$underline' => t('Underline'), '$quote' => t('Quote'), '$code' => t('Code'), - '$attach' => t('Attach file'), + '$attach' => t('Attach/Upload file'), '$weblink' => $weblink, '$embedPhotos' => $embedPhotos, '$embedPhotosModalTitle' => t('Embed an image from your albums'), -- cgit v1.2.3 From bb1aa04689ee02682482280baafb233e0b0665ed Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 9 May 2018 21:28:48 -0700 Subject: change the embed from albums hovertip as well to emphasise 'existing' --- include/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 3dc55d759..3041d2e21 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1282,7 +1282,7 @@ function status_editor($a, $x, $popup = false) { if(x($x, 'hide_weblink')) $weblink = false; - $embedPhotos = t('Embed image from photo albums'); + $embedPhotos = t('Embed (existing) photo from your photo albums'); $writefiles = (($mimetype === 'text/bbcode') ? perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage') : false); if(x($x, 'hide_attach')) -- cgit v1.2.3 From 1650ac2edd28b2007188a9e0c43ebab68b1660ee Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 9 May 2018 23:44:24 -0700 Subject: tag search not finding articles --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 9d6e53c1e..d7cf9c558 100755 --- a/include/items.php +++ b/include/items.php @@ -178,7 +178,7 @@ function item_normal() { } function item_normal_search() { - return " and item.item_hidden = 0 and item.item_type in (0,3,6) and item.item_deleted = 0 + return " and item.item_hidden = 0 and item.item_type in (0,3,6,7) and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_blocked = 0 and item.obj_type != '" . ACTIVITY_OBJ_FILE . "' "; } -- cgit v1.2.3 From be225164ebdde1b76a376fade83b93697507264e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 10 May 2018 13:48:18 -0700 Subject: allow either --- include/follow.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/follow.php b/include/follow.php index d803afa3f..e2f0a8f4d 100644 --- a/include/follow.php +++ b/include/follow.php @@ -158,7 +158,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $feeds = get_config('system','feed_contacts'); - if(($feeds) && ($protocol === '' || $protocol === 'feed')) { + if(($feeds) && ($protocol === '' || $protocol === 'feed' || $protocol === 'rss')) { $d = discover_by_url($url); } else { -- cgit v1.2.3 From 721496f9220fa59059f90d16d3b3fb19337b2f16 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 10 May 2018 17:11:03 -0700 Subject: hubzilla issue #1169 --- Zotlabs/Lib/MessageFilter.php | 79 +++++++++++++++++++++++++++++++++++++++++++ Zotlabs/Module/Admin/Site.php | 10 +++++- include/feedutils.php | 12 +++++++ include/items.php | 63 +--------------------------------- include/zot.php | 5 +++ view/tpl/admin_site.tpl | 2 ++ 6 files changed, 108 insertions(+), 63 deletions(-) create mode 100644 Zotlabs/Lib/MessageFilter.php diff --git a/Zotlabs/Lib/MessageFilter.php b/Zotlabs/Lib/MessageFilter.php new file mode 100644 index 000000000..df59aa57e --- /dev/null +++ b/Zotlabs/Lib/MessageFilter.php @@ -0,0 +1,79 @@ + 0) ? intval($_POST['force_queue']) : 3000); + $pub_incl = escape_tags(trim($_POST['pub_incl'])); + $pub_excl = escape_tags(trim($_POST['pub_excl'])); $permissions_role = escape_tags(trim($_POST['permissions_role'])); @@ -105,6 +107,8 @@ class Site { set_config('system', 'imagick_convert_path' , $imagick_path); set_config('system', 'thumbnail_security' , $thumbnail_security); set_config('system', 'default_permissions_role', $permissions_role); + set_config('system', 'pubstream_incl',$pub_incl); + set_config('system', 'pubstream_excl',$pub_excl); set_config('system', 'techlevel_lock', $techlevel_lock); @@ -340,6 +344,10 @@ class Site { '$disable_discover_tab' => array('disable_discover_tab', t('Import Public Streams'), $discover_tab, t('Import and allow access to public content pulled from other sites. Warning: this content is unmoderated.')), '$site_firehose' => array('site_firehose', t('Site only Public Streams'), get_config('system','site_firehose'), t('Allow access to public content originating only from this site if Imported Public Streams are disabled.')), '$open_pubstream' => array('open_pubstream', t('Allow anybody on the internet to access the Public streams'), get_config('system','open_pubstream',1), t('Disable to require authentication before viewing. Warning: this content is unmoderated.')), + '$incl' => array('pub_incl',t('Only import Public stream posts with this text'), $contact['abook_incl'],t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), + '$excl' => array('pub_excl',t('Do not import Public stream posts with this text'), $contact['abook_excl'],t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), + + '$login_on_homepage' => array('login_on_homepage', t("Login on Homepage"),((intval($homelogin) || $homelogin === false) ? 1 : '') , t("Present a login box to visitors on the home page if no other content has been configured.")), '$enable_context_help' => array('enable_context_help', t("Enable context help"),((intval($enable_context_help) === 1 || $enable_context_help === false) ? 1 : 0) , t("Display contextual help for the current page when the help button is pressed.")), @@ -363,7 +371,7 @@ class Site { '$active_expire_days' => array('active_expire_days', t('Do not expire any posts which have comments less than this many days ago'), intval(get_config('system','active_expire_days',7)), ''), '$sellpage' => array('site_sellpage', t('Public servers: Optional landing (marketing) webpage for new registrants'), get_config('system','sellpage',''), sprintf( t('Create this page first. Default is %s/register'),z_root())), - '$first_page' => array('first_page', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Recommend: profiles, go, or settings')), + '$first_page' => array('first_page', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Default: profiles')), '$location' => array('site_location', t('Optional: site location'), get_config('system','site_location',''), t('Region or country')), diff --git a/include/feedutils.php b/include/feedutils.php index 023caaad6..afbe4229e 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -1332,6 +1332,12 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { // immediate parent wasn't found. Turn into a top-level post if permissions allow // but save the thread_parent in case we need to refer to it later. + if($importer['channel_system']) { + if( ! \Zotlabs\Lib\MessageFilter::evaluate($datarray,get_config('system','pubstream_incl'),get_config('system','pubstream_excl'))) { + continue; + } + } + if(! post_is_importable($datarray, $contact)) continue; @@ -1482,6 +1488,12 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { $author['owner_avatar'] = $contact['thumb']; } + if($importer['channel_system']) { + if( ! \Zotlabs\Lib\MessageFilter::evaluate($datarray,get_config('system','pubstream_incl'),get_config('system','pubstream_excl'))) { + continue; + } + } + if(! post_is_importable($datarray, $contact)) continue; diff --git a/include/items.php b/include/items.php index d7cf9c558..1c0ef418a 100755 --- a/include/items.php +++ b/include/items.php @@ -3129,69 +3129,8 @@ function post_is_importable($item,$abook) { if(! ($abook['abook_incl'] || $abook['abook_excl'])) return true; - require_once('include/html2plain.php'); - - unobscure($item); - - $text = prepare_text($item['body'],$item['mimetype']); - $text = html2plain(($item['title']) ? $item['title'] . ' ' . $text : $text); - - - $lang = null; - - if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_excl'],'lang=') !== false)) { - $lang = detect_language($text); - } - $tags = ((count($item['term'])) ? $item['term'] : false); - - // exclude always has priority - - $exclude = (($abook['abook_excl']) ? explode("\n",$abook['abook_excl']) : null); - - if($exclude) { - foreach($exclude as $word) { - $word = trim($word); - if(! $word) - continue; - if(substr($word,0,1) === '#' && $tags) { - foreach($tags as $t) - if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*'))) - return false; - } - elseif((strpos($word,'/') === 0) && preg_match($word,$text)) - return false; - elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0)) - return false; - elseif(stristr($text,$word) !== false) - return false; - } - } - - $include = (($abook['abook_incl']) ? explode("\n",$abook['abook_incl']) : null); + return \Zotlabs\Lib\MessageFilter::evaluate($item,$abook['abook_incl'],$abook['abook_excl']); - if($include) { - foreach($include as $word) { - $word = trim($word); - if(! $word) - continue; - if(substr($word,0,1) === '#' && $tags) { - foreach($tags as $t) - if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*'))) - return true; - } - elseif((strpos($word,'/') === 0) && preg_match($word,$text)) - return true; - elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0)) - return true; - elseif(stristr($text,$word) !== false) - return true; - } - } - else { - return true; - } - - return false; } diff --git a/include/zot.php b/include/zot.php index 0343f4464..14c9f6ae5 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1787,6 +1787,10 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ $local_public = false; continue; } + if(! \Zotlabs\Lib\MessageFilter::evaluate($arr,get_config('system','pubstream_incl'),get_config('system','pubstream_excl'))) { + $local_public = false; + continue; + } } $tag_delivery = tgroup_check($channel['channel_id'],$arr); @@ -1923,6 +1927,7 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ continue; } + $r = q("select * from item where mid = '%s' and uid = %d limit 1", dbesc($arr['mid']), intval($channel['channel_id']) diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index ed85bd6b2..3288c2988 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -86,6 +86,8 @@ {{include file="field_checkbox.tpl" field=$disable_discover_tab}} {{include file="field_checkbox.tpl" field=$site_firehose}} {{include file="field_checkbox.tpl" field=$open_pubstream}} + {{include file="field_textarea.tpl" field=$incl}} + {{include file="field_textarea.tpl" field=$excl}}
    -- cgit v1.2.3 From ef6e067a45efa43eb30b4639676ed179636d2a1d Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 10 May 2018 18:42:58 -0700 Subject: add top level posts containing the cid's url to the cid search in mod_network. We could alternatively search for mention tags here for a bit more precision but the sql could get pretty hairy with all the joins going on. --- Zotlabs/Module/Network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index e97ebf1d0..2d6307eb1 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -251,7 +251,7 @@ class Network extends \Zotlabs\Web\Controller { ); if($r) { $item_thread_top = ''; - $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) $item_normal ) "; + $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or (body like '" . protect_sprintf('%' . $r[0]['xchan_url'] . '%') . "' and item_thread_top = 1 )) $item_normal ) "; $title = replace_macros(get_markup_template("section_title.tpl"),array( '$title' => '' . urlencode($r[0]['xchan_name']) . ' ' . $r[0]['xchan_name'] . '' )); -- cgit v1.2.3 From 62bc5e8051ea7eb96359da5ff335a67b0e1af4ac Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 10 May 2018 19:31:51 -0700 Subject: use Zlib/MessageFilter for sourced messages also --- include/items.php | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/include/items.php b/include/items.php index 1c0ef418a..55b5a73db 100755 --- a/include/items.php +++ b/include/items.php @@ -3071,44 +3071,14 @@ function check_item_source($uid, $item) { return false; } - - // since we now have connection filters with more features, the source filter is redundant and can probably go away - - if(! $r[0]['src_patt']) { + if (! $r[0]['src_patt']) { logger('source: success'); return true; } - - require_once('include/html2plain.php'); - $text = prepare_text($item['body'],$item['mimetype']); - $text = html2plain($text); - - $tags = ((count($item['term'])) ? $item['term'] : false); - - $words = explode("\n",$r[0]['src_patt']); - if($words) { - foreach($words as $word) { - $w = trim($word); - if(! $w) - continue; - if(substr($w,0,1) === '#' && $tags) { - foreach($tags as $t) { - if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($w,1)) || (substr($w,1) === '*'))) { - logger('source: tag filter success'); - return true; - } - } - } - elseif((strpos($w,'/') === 0) && preg_match($w,$text)) { - logger('source: preg filter success'); - return true; - } - elseif(stristr($text,$w) !== false) { - logger('source: text filter success'); - return true; - } - } + if (\Zotlabs\Lib\MessageFilter::evaluate($item, $r[0]['src_patt'], EMPTY_STR)) { + logger('source: text filter success'); + return true; } logger('source: filter fail'); -- cgit v1.2.3 From 5dae0ef4f9be92d76260739348e7adf85c2fff19 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 10 May 2018 20:54:48 -0700 Subject: add cancel button to editor, fix issue with autosave of categories --- Zotlabs/Module/Article_edit.php | 1 + Zotlabs/Module/Card_edit.php | 1 + Zotlabs/Module/Editblock.php | 1 + Zotlabs/Module/Editlayout.php | 1 + Zotlabs/Module/Editpost.php | 1 + Zotlabs/Module/Editwebpage.php | 1 + Zotlabs/Module/Rpost.php | 1 + view/tpl/edpost_head.tpl | 7 +++++-- view/tpl/jot-header.tpl | 10 +++++++++- 9 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Module/Article_edit.php b/Zotlabs/Module/Article_edit.php index 758c1db2e..89abccc40 100644 --- a/Zotlabs/Module/Article_edit.php +++ b/Zotlabs/Module/Article_edit.php @@ -128,6 +128,7 @@ class Article_edit extends \Zotlabs\Web\Controller { '$title' => t('Edit Article'), '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), '$id' => $itm[0]['id'], + '$cancel' => t('Cancel'), '$editor' => $editor )); diff --git a/Zotlabs/Module/Card_edit.php b/Zotlabs/Module/Card_edit.php index 7cc563fd2..694bdc4ea 100644 --- a/Zotlabs/Module/Card_edit.php +++ b/Zotlabs/Module/Card_edit.php @@ -128,6 +128,7 @@ class Card_edit extends \Zotlabs\Web\Controller { '$title' => t('Edit Card'), '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), '$id' => $itm[0]['id'], + '$cancel' => t('Cancel'), '$editor' => $editor )); diff --git a/Zotlabs/Module/Editblock.php b/Zotlabs/Module/Editblock.php index 8a7e87a09..563ad9ca2 100644 --- a/Zotlabs/Module/Editblock.php +++ b/Zotlabs/Module/Editblock.php @@ -138,6 +138,7 @@ class Editblock extends \Zotlabs\Web\Controller { '$title' => t('Edit Block'), '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), '$id' => $itm[0]['id'], + '$cancel' => t('Cancel'), '$editor' => $editor )); diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php index 3d6a79507..67e0bcd32 100644 --- a/Zotlabs/Module/Editlayout.php +++ b/Zotlabs/Module/Editlayout.php @@ -137,6 +137,7 @@ class Editlayout extends \Zotlabs\Web\Controller { '$title' => t('Edit Layout'), '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), '$id' => $itm[0]['id'], + '$cancel' => t('Cancel'), '$editor' => $editor )); diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php index 57a4cb97f..45d8e7644 100644 --- a/Zotlabs/Module/Editpost.php +++ b/Zotlabs/Module/Editpost.php @@ -106,6 +106,7 @@ class Editpost extends \Zotlabs\Web\Controller { $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit post'), + '$cancel' => t('Cancel'), '$editor' => $editor )); diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php index da536a729..b67421cd5 100644 --- a/Zotlabs/Module/Editwebpage.php +++ b/Zotlabs/Module/Editwebpage.php @@ -166,6 +166,7 @@ class Editwebpage extends \Zotlabs\Web\Controller { '$title' => t('Edit Webpage'), '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), '$editor' => $editor, + '$cancel' => t('Cancel'), '$id' => $itm[0]['id'] )); diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index f0c4a06b9..86ee296ec 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -142,6 +142,7 @@ class Rpost extends \Zotlabs\Web\Controller { $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit post'), + '$cancel' => '', '$editor' => $editor )); diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl index b2ab5db4e..4f39137ab 100755 --- a/view/tpl/edpost_head.tpl +++ b/view/tpl/edpost_head.tpl @@ -1,10 +1,13 @@
    - {{if $delete}}
    + {{if $cancel}} + + {{/if}} + {{if $delete}}  {{$delete}} + {{/if}}
    - {{/if}}

    {{$title}}

    diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index df67e9b2d..f2b68ece0 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -357,6 +357,14 @@ var activeCommentText = ''; } } + function itemCancel() { + $("#jot-title").val(''); + $("#profile-jot-text").val(''); + $("#jot-category").val(''); + postSaveChanges('clean',''); + window.history.back(); + } + function itemFiler(id) { if($('#item-filer-dialog').length) $('#item-filer-dialog').remove(); @@ -575,7 +583,7 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del localStorage.setItem("post_title" + postid, $("#jot-title").val()); localStorage.setItem("post_body" + postid, $("#profile-jot-text").val()); if($("#jot-category").length) - localStorage.setItem("post_category + postid", $("#jot-category").val()); + localStorage.setItem("post_category" + postid, $("#jot-category").val()); } if(action == 'start') { -- cgit v1.2.3 From bcaa0dacdf94670401c3eedf1e648415d2c3ed06 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 10 May 2018 21:26:21 -0700 Subject: use '[feed]' in the doc --- doc/member/member_guide.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb index 76150fee8..2b772d1c5 100644 --- a/doc/member/member_guide.bb +++ b/doc/member/member_guide.bb @@ -203,7 +203,7 @@ Some communications offer more than one protocol. If you wish to connect with so [ostatus]foobar@foo.bar [diaspora]foobar@foo.bar [zot]foobar@foo.bar -[rss]https://foo.bar/foobar +[feed]https://foo.bar/foobar [/code] -- cgit v1.2.3 From 2c819c8619eec9daa1843da9d9b8bcb2a69c2384 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 12 May 2018 12:46:09 +0200 Subject: fix postgres issue if register mode is set to yes - with approval --- include/account.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/account.php b/include/account.php index 2b24364f4..51118c3c5 100644 --- a/include/account.php +++ b/include/account.php @@ -331,7 +331,9 @@ function verify_email_address($arr) { function send_reg_approval_email($arr) { - $r = q("select * from account where account_roles & " . intval(ACCOUNT_ROLE_ADMIN)); + $r = q("select * from account where (account_roles & %d) >= 4096", + intval(ACCOUNT_ROLE_ADMIN) + ); if(! ($r && count($r))) return false; @@ -828,4 +830,4 @@ function get_account_techlevel($account_id = 0) { return (($x) ? intval($x['account_level']) : 0); -} \ No newline at end of file +} -- cgit v1.2.3 From efb0ac599613129ff514d3a5a7c3b90ff2522654 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 12 May 2018 13:28:04 +0200 Subject: fix php warning --- Zotlabs/Lib/MessageFilter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Lib/MessageFilter.php b/Zotlabs/Lib/MessageFilter.php index df59aa57e..eb0fc3d2c 100644 --- a/Zotlabs/Lib/MessageFilter.php +++ b/Zotlabs/Lib/MessageFilter.php @@ -23,7 +23,7 @@ class MessageFilter { $lang = detect_language($text); } - $tags = ((count($item['term'])) ? $item['term'] : false); + $tags = ((is_array($item['term']) && count($item['term'])) ? $item['term'] : false); // exclude always has priority @@ -76,4 +76,4 @@ class MessageFilter { } -} \ No newline at end of file +} -- cgit v1.2.3 From 7991db14be2078aacc4f731214c36e3fa3c6c507 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 12 May 2018 16:41:09 -0700 Subject: hubzilla issue #1045 - display pubsites link in info area if invite only --- Zotlabs/Module/Register.php | 12 ++++++++++-- view/tpl/register.tpl | 3 --- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 6bdffd034..4ab1ccd81 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -201,6 +201,15 @@ class Register extends \Zotlabs\Web\Controller { $registration_is = t('Registration on this hub is by approval only.'); $other_sites = t('Register at another affiliated hub.'); } + + + $invitations = false; + + if(intval(get_config('system','invitation_only'))) { + $invitations = true; + $registration_is = t('Registration on this hub is by invitation only.'); + $other_sites = t('Register at another affiliated hub.'); + } $max_dailies = intval(get_config('system','max_daily_registrations')); if($max_dailies) { @@ -270,8 +279,7 @@ class Register extends \Zotlabs\Web\Controller { '$reg_is' => $registration_is, '$registertext' => bbcode(get_config('system','register_text')), '$other_sites' => $other_sites, - '$invitations' => get_config('system','invitation_only'), - '$invite_desc' => t('Membership on this site is by invitation only.'), + '$invitations' => $invitations, '$invite_code' => $invite_code, '$auto_create' => $auto_create, '$name' => $name, diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 335d5f979..33ca46ba1 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -18,9 +18,6 @@ {{/if}} {{if $invitations}} -
    -
    {{$invite_desc}}
    -
    {{include file="field_input.tpl" field=$invite_code}} {{/if}} -- cgit v1.2.3 From 0b05203cf47cfca3ffa8dc2b1f03dd6fb60e9f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= Date: Sun, 13 May 2018 13:07:36 +0200 Subject: Added one space & Grammatical consistency error on Spanish translation --- view/es-es/hmessages.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index ec03b4c2c..ac00a6017 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-23 11:34+0200\n" -"PO-Revision-Date: 2018-04-24 09:02+0000\n" +"PO-Revision-Date: 2018-05-06 10:55+0000\n" "Last-Translator: Manuel Jiménez Friaza \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -1473,7 +1473,7 @@ msgstr "foto" #: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 #: ../../include/conversation.php:144 ../../include/text.php:2011 msgid "status" -msgstr "el mensaje de estado" +msgstr "el mensaje de estado " #: ../../Zotlabs/Module/Subthread.php:142 #, php-format @@ -4539,7 +4539,7 @@ msgstr "Ocultas" #: ../../Zotlabs/Module/Connections.php:75 #: ../../Zotlabs/Module/Connections.php:178 msgid "Archived/Unreachable" -msgstr "Archivado o inaccesible" +msgstr "Archivadas o inaccesibles" #: ../../Zotlabs/Module/Connections.php:80 #: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:116 -- cgit v1.2.3 From 9a82b8414b99e26e7d9367072df52ec86d82b9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= Date: Sun, 13 May 2018 13:10:39 +0200 Subject: Added one space & Grammatical consistency error on Spanish translation --- view/es-es/hstrings.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index 7679529ff..5cd0c98b7 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -24,7 +24,7 @@ App::$strings["Can chat with me"] = "Se puede chatear conmigo"; App::$strings["Can source my public posts in derived channels"] = "Pueden utilizarse mis entradas públicas como origen de contenidos en canales derivados"; App::$strings["Can administer my channel"] = "Se puede administrar mi canal"; App::$strings["Social Networking"] = "Redes sociales"; -App::$strings["Social - Party"] = "Social - Extra público"; +App::$strings["Social - Federation"] = "Social - Federación"; App::$strings["Social - Mostly Public"] = "Social - Público en su mayor parte"; App::$strings["Social - Restricted"] = "Social - Restringido"; App::$strings["Social - Private"] = "Social - Privado"; @@ -257,7 +257,7 @@ App::$strings["Location (URL) to purchase app"] = "Dirección (URL) donde adquir App::$strings["Please login."] = "Por favor, inicie sesión."; App::$strings["Hub not found."] = "Servidor no encontrado"; App::$strings["photo"] = "foto"; -App::$strings["status"] = "el mensaje de estado"; +App::$strings["status"] = "el mensaje de estado "; App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo %3\$s de %2\$s"; App::$strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s ha dejado de seguir %3\$s de %2\$s"; App::$strings["Channel not found."] = "Canal no encontrado."; @@ -281,7 +281,8 @@ App::$strings["Channel role and privacy"] = "Clase de canal y privacidad"; App::$strings["Select a channel role with your privacy requirements."] = "Seleccione un tipo de canal con sus requisitos de privacidad"; App::$strings["Read more about roles"] = "Leer más sobre los roles"; App::$strings["Create Channel"] = "Crear un canal"; -App::$strings["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."] = "Un canal es su identidad en esta red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con una gama de permisos extremadamente detallada."; +App::$strings["A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things. Channels can make connections with other channels to share information with each other."] = "Un canal es una identidad única en la red. Puede representar a una persona (un perfil de una red social), un foro o grupo, un negocio o una página de una celebridad, un \"feed\" de noticias, y muchas otras cosas. Los canales pueden conectarse con otros canales para compartir información unos con otros."; +App::$strings["The type of channel you create affects the basic privacy settings, the permissions that are granted to connections/friends, and also the channel's visibility across the network."] = "El tipo de canal que cree afecta a la configuración básica de privacidad, a los permisos que se conceden a las conexiones/amigos y también a la visibilidad del canal en la red."; App::$strings["or import an existing channel from another location."] = "O importar un canal existente desde otro lugar."; App::$strings["Validate"] = "Validar"; App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "La eliminación de canales no está permitida hasta pasadas 48 horas desde el último cambio de contraseña."; @@ -728,7 +729,6 @@ App::$strings["May reduce spam activity"] = "Podría reducir la actividad de spa App::$strings["Default Privacy Group"] = "Grupo de canales predeterminado"; App::$strings["Use my default audience setting for the type of object published"] = "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación"; App::$strings["Profile to assign new connections"] = "Perfil para asignar a las nuevas conexiones"; -App::$strings["Channel permissions category:"] = "Categoría de los permisos del canal:"; App::$strings["Default Permissions Group"] = "Grupo de permisos predeterminados"; App::$strings["Maximum private messages per day from unknown people:"] = "Máximo de mensajes privados por día de gente desconocida:"; App::$strings["Useful to reduce spamming"] = "Útil para reducir el envío de correo no deseado"; @@ -927,7 +927,7 @@ App::$strings["Active"] = "Activo/a"; App::$strings["Blocked"] = "Bloqueadas"; App::$strings["Ignored"] = "Ignoradas"; App::$strings["Hidden"] = "Ocultas"; -App::$strings["Archived/Unreachable"] = "Archivado o inaccesible"; +App::$strings["Archived/Unreachable"] = "Archivadas o inaccesibles"; App::$strings["New"] = "Nuevas"; App::$strings["All"] = "Todos/as"; App::$strings["Active Connections"] = "Conexiones activas"; @@ -2302,6 +2302,12 @@ App::$strings["The default zoom level. (1:world, 18:highest, also depends on til App::$strings["Include marker on map"] = "Incluir un marcador en el mapa"; App::$strings["Include a marker on the map."] = "Incluir un marcador en el mapa."; App::$strings["text to include in all outgoing posts from this site"] = "texto a incluir en todos los mensajes salientes de este sitio"; +App::$strings["Fuzzloc Settings updated."] = "Los ajustes de Fuzzloc se han actualizado."; +App::$strings["Fuzzloc allows you to blur your precise location if your channel uses browser location mapping."] = "Fuzzloc le permite desdibujar su ubicación precisa si su canal utiliza la asignación de ubicación del navegador."; +App::$strings["Enable Fuzzloc Plugin"] = "Habilitar el plugin Fuzzloc"; +App::$strings["Minimum offset in meters"] = "Offset mínimo en metros"; +App::$strings["Maximum offset in meters"] = "Offset máximo en metros"; +App::$strings["Fuzzloc Settings"] = "Ajustes de Fuzzloc"; App::$strings["Post to Friendica"] = "Publicar en Friendica"; App::$strings["rtof Settings saved."] = "Se han guardado los ajustes de rtof"; App::$strings["Allow posting to Friendica"] = "Permitir publicar en Friendica"; -- cgit v1.2.3 From 4f69bcfc38290db87c97645e311fda7a48e1468e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 13 May 2018 14:29:09 +0200 Subject: streamline appearence of guest tokens individual perms with those in connedit --- Zotlabs/Module/Settings/Tokens.php | 6 +++--- view/tpl/field_acheckbox.tpl | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Module/Settings/Tokens.php b/Zotlabs/Module/Settings/Tokens.php index bf22ec7aa..619c8b5ba 100644 --- a/Zotlabs/Module/Settings/Tokens.php +++ b/Zotlabs/Module/Settings/Tokens.php @@ -161,8 +161,8 @@ class Tokens { '$me' => t('My Settings'), '$perms' => $perms, '$inherited' => t('inherited'), - '$notself' => 0, - '$self' => 1, + '$notself' => 1, + '$self' => 0, '$permlbl' => t('Individual Permissions'), '$permnote' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can not change those settings here.'), '$submit' => t('Submit') @@ -170,4 +170,4 @@ class Tokens { return $o; } -} \ No newline at end of file +} diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index c87b9ac79..1810e1ee1 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -5,11 +5,12 @@ {{if $notself}} - {{if $field.2}}{{else}}{{/if}} + {{if $field.2 === 1}}{{/if}} + {{if $field.2 === 0}}{{/if}} {{/if}} - {{if $self || !$field.5 || $twocol }} + {{if $self || !$field.5 }} {{/if}} {{if $notself && $field.5}} -- cgit v1.2.3 From 7ed32a764cc0ffe8335affec37f28f63d9fd52c5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 13 May 2018 23:09:30 +0200 Subject: consolidate recent autocomplete changes --- view/js/autocomplete.js | 32 ++++++++++++++------------------ view/js/mod_connections.js | 11 ----------- view/tpl/connections.tpl | 6 +++--- 3 files changed, 17 insertions(+), 32 deletions(-) diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index b61af23f8..e5a551344 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -82,11 +82,6 @@ function trim_replace(item) { return '$1'+item.name; } - -function submit_form(e) { - $(e).parents('form').submit(); -} - function getWord(text, caretPos) { var index = text.indexOf(caretPos); var postText = text.substring(caretPos, caretPos+13); @@ -264,14 +259,17 @@ function string2bb(element) { this.attr('autocomplete', 'off'); + var textcomplete; var Textarea = Textcomplete.editors.Textarea; + $(this).each(function() { var editor = new Textarea(this); - var textcomplete = new Textcomplete(editor); + textcomplete = new Textcomplete(editor); textcomplete.register([contacts,forums,tags], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'}); }); - this.on('select', function(e, value, strategy) { submit_form(this); }); + textcomplete.on('selected', function() { this.editor.el.form.submit(); }); + }; })( jQuery ); @@ -296,19 +294,20 @@ function string2bb(element) { this.attr('autocomplete','off'); + var textcomplete; var Textarea = Textcomplete.editors.Textarea; + $(this).each(function() { var editor = new Textarea(this); - var textcomplete = new Textcomplete(editor); + textcomplete = new Textcomplete(editor); textcomplete.register([contacts], {className:'acpopup', zIndex:1020}); - textcomplete.on('select', function() { aItem = textcomplete.dropdown.getActiveItem(); }); }); if(autosubmit) - this.on('select', function() { submit_form(this); }); + textcomplete.on('selected', function() { this.editor.el.form.submit(); }); if(typeof onselect !== 'undefined') - this.on('select', function() { onselect(aItem.searchResult.data); }); + textcomplete.on('select', function() { var item = this.dropdown.getActiveItem(); onselect(item.searchResult.data); }); }; })( jQuery ); @@ -334,21 +333,20 @@ function string2bb(element) { this.attr('autocomplete','off'); - var aItem; + var textcomplete; var Textarea = Textcomplete.editors.Textarea; $(this).each(function() { var editor = new Textarea(this); - var textcomplete = new Textcomplete(editor); + textcomplete = new Textcomplete(editor); textcomplete.register([names], {className:'acpopup', zIndex:1020}); - textcomplete.on('select', function() { aItem = textcomplete.dropdown.getActiveItem(); }); }); if(autosubmit) - this.on('select', function() { submit_form(this); }); + textcomplete.on('selected', function() { this.editor.el.form.submit(); }); if(typeof onselect !== 'undefined') - this.on('select', function() { onselect(aItem.searchResult.data); }); + textcomplete.on('select', function() { var item = this.dropdown.getActiveItem(); onselect(item.searchResult.data); }); }; })( jQuery ); @@ -425,8 +423,6 @@ function string2bb(element) { textcomplete.register([bbco], {className:'acpopup', zIndex:1020}); }); - this.on('select', function(e, value, strategy) { value; }); - this.keypress(function(e){ if (e.keyCode == 13) { var x = listNewLineAutocomplete(this.id); diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js index 68add4eed..db18e078d 100644 --- a/view/js/mod_connections.js +++ b/view/js/mod_connections.js @@ -3,14 +3,3 @@ $(document).ready(function() { $(".autotime").timeago(); }); -$("#contacts-search").keyup(function(event){ - if(event.keyCode == 13){ - $("#contacts-search").click(); - } -}); -$(".autocomplete-w1 .selected").keyup(function(event){ - if(event.keyCode == 13){ - $("#contacts-search").click(); - } -}); - diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 0bf88b818..021c33146 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,7 +1,7 @@
    -
    - +
    - +
    -- cgit v1.2.3 From 83f8a03964cef46e35242af0e150e62d99fde5cf Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 13 May 2018 23:10:13 +0200 Subject: bump version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 4eed19254..b2186246d 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.5.3' ); +define ( 'STD_VERSION', '3.5.4' ); define ( 'ZOT_REVISION', '6.0a' ); -- cgit v1.2.3 From 356c7003f2d18a283a819c22c255f03397e99fc9 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 13 May 2018 15:50:42 -0700 Subject: We're no longer setting a backup ACL for private mention typos. --- include/text.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/text.php b/include/text.php index 681103389..7a6fb3d4e 100644 --- a/include/text.php +++ b/include/text.php @@ -2717,10 +2717,6 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i } } - if(($exclusive) && (! $access_tag)) { - $access_tag .= 'cid:' . $channel['channel_hash']; - } - // if there is an url for this channel if(isset($profile)) { -- cgit v1.2.3 From 2d1dbc8f40d0b9fa89b99861fac30d579a400e34 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 14 May 2018 09:10:36 +0200 Subject: Revert "We're no longer setting a backup ACL for private mention typos." This reverts commit 356c7003f2d18a283a819c22c255f03397e99fc9. --- include/text.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/text.php b/include/text.php index 7a6fb3d4e..681103389 100644 --- a/include/text.php +++ b/include/text.php @@ -2717,6 +2717,10 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i } } + if(($exclusive) && (! $access_tag)) { + $access_tag .= 'cid:' . $channel['channel_hash']; + } + // if there is an url for this channel if(isset($profile)) { -- cgit v1.2.3 From d9759ba63c8fd70c4da66669389bd19bae3333ff Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 14 May 2018 17:20:25 -0700 Subject: more refactor tags/mentions --- Zotlabs/Module/Item.php | 2 +- include/text.php | 113 +++++++++++++++++++++++------------------------- 2 files changed, 54 insertions(+), 61 deletions(-) diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 640b4fa5c..ef1eb3700 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -533,7 +533,7 @@ class Item extends \Zotlabs\Web\Controller { // Look for tags and linkify them $results = linkify_tags($a, $body, ($uid) ? $uid : $profile_uid); - +logger('linkify: ' . print_r($results,true)); if($results) { // Set permissions based on tag replacements diff --git a/include/text.php b/include/text.php index 7a6fb3d4e..1c4f5e2ec 100644 --- a/include/text.php +++ b/include/text.php @@ -824,7 +824,7 @@ function get_tags($s) { // match bracket mentions - if(preg_match_all('/([@!]\{.*?\})/',$s,$match)) { + if(preg_match_all('/([@!]\!?\{.*?\})/',$s,$match)) { foreach($match[1] as $mtch) { $ret[] = $mtch; } @@ -833,12 +833,19 @@ function get_tags($s) { // Pull out single word tags. These can be @nickname, @first_last // and #hash tags. - if(preg_match_all('/(? $termtype, 'term' => $basetag, 'url' => $url, - 'contact' => $r[0] + 'contact' => [] ]; } - //is it a person tag? + // END hashtags - $grouptag = false; + // BEGIN mentions - if(strpos($tag,'!') === 0) { - $grouptag = true; - } + if ( in_array($termtype, [ TERM_MENTION, TERM_FORUM ] )) { - if(strpos($tag,'@') === 0 || $grouptag) { + // The @! tag and !! tag will alter permissions - // The @! tag will alter permissions - $exclusive = (((! $grouptag) && (strpos($tag,'!') === 1) && $in_network) ? true : false); - if(($grouptag) && (strpos($tag,'!!') === 0)) { - $exclusive = true; - } + // $in_network is set to false to avoid false positives on posts originating + // on a network which does not implement privacy tags or implements them differently. + + $exclusive = (((strpos($tag,'!') === 1) && $in_network) ? true : false); //is it already replaced? if(strpos($tag,'[zrl=') || strpos($tag,'[url=')) return $replaced; - //get the person's name + // get the channel name + // First extract the name or name fragment we are going to replace - $name = substr($tag,(($exclusive) ? 2 : 1)); // The name or name fragment we are going to replace - $newname = $name; // a copy that we can mess with + $name = substr($tag,(($exclusive) ? 2 : 1)); + $newname = $name; // make a copy that we can mess with $tagcid = 0; $r = null; - // is it some generated name? - - $forum = false; - $trailing_plus_name = false; + // is it some generated (autocompleted) name? if(substr($name,0,1) === '{' && substr($name,-1,1) === '}') { $newname = substr($name,1); @@ -2639,15 +2642,17 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i // look for matching names in the address book - // Two ways to deal with spaces - double quote the name or use underscores - // we see this after input filtering so quotes have been html entity encoded + // Double quote the entire mentioned term to include special characters + // such as spaces and some punctuation. + + // We see this after input filtering so quotes have been html entity encoded if((substr($name,0,6) === '"') && (substr($name,-6,6) === '"')) { $newname = substr($name,6); $newname = substr($newname,0,-6); } - //select someone from this user's contacts by name + // select someone from this user's contacts by name $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1", @@ -2664,7 +2669,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i ); } - //select someone by attag or nick and the name passed in + // select someone by attag or nick and the name passed in if(! $r) { $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash @@ -2679,7 +2684,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i // $r is set if we found something $channel = App::get_channel(); - + if($r) { $profile = $r[0]['xchan_url']; $newname = $r[0]['xchan_name']; @@ -2717,23 +2722,24 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i } } - // if there is an url for this channel + // if there is a url for this channel if(isset($profile)) { $replaced = true; //create profile link $profile = str_replace(',','%2c',$profile); $url = $profile; - if($grouptag) { + if($termtype === TERM_FORUM) { $newtag = '!' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; $body = str_replace('!' . (($exclusive) ? '!' : '') . $name, $newtag, $body); } else { + // ( $termtype === TERM_MENTION ) $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); } - //append tag to str_tags + // append tag to str_tags if(! stristr($str_tags,$newtag)) { if(strlen($str_tags)) $str_tags .= ','; @@ -2747,14 +2753,14 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i 'termtype' => $termtype, 'term' => $newname, 'url' => $url, - 'contact' => $r[0] + 'contact' => (($r) ? $r[0] : []) ]; } function linkify_tags($a, &$body, $uid, $in_network = true) { - $str_tags = ''; - $tagged = array(); - $results = array(); + $str_tags = EMPTY_STR; + $tagged = []; + $results = []; $tags = get_tags($body); @@ -2762,19 +2768,6 @@ function linkify_tags($a, &$body, $uid, $in_network = true) { foreach($tags as $tag) { $access_tag = ''; - // If we already tagged 'Robert Johnson', don't try and tag 'Robert'. - // Robert Johnson should be first in the $tags array - - $fullnametagged = false; - for($x = 0; $x < count($tagged); $x ++) { - if(stristr($tagged[$x],$tag . ' ')) { - $fullnametagged = true; - break; - } - } - if($fullnametagged) - continue; - $success = handle_tag($a, $body, $access_tag, $str_tags, ($uid) ? $uid : App::$profile_uid , $tag, $in_network); $results[] = array('success' => $success, 'access_tag' => $access_tag); -- cgit v1.2.3 From 301e405769ad9fbe80955cdad7d9d9192cbfe5b6 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 14 May 2018 18:27:12 -0700 Subject: fine tuning the refactored tag/mention code --- include/text.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index 1c4f5e2ec..ef3c8871c 100644 --- a/include/text.php +++ b/include/text.php @@ -2604,6 +2604,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i // BEGIN mentions + if ( in_array($termtype, [ TERM_MENTION, TERM_FORUM ] )) { // The @! tag and !! tag will alter permissions @@ -2611,7 +2612,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i // $in_network is set to false to avoid false positives on posts originating // on a network which does not implement privacy tags or implements them differently. - $exclusive = (((strpos($tag,'!') === 1) && $in_network) ? true : false); + $exclusive = (((strpos(substr($tag,1), '!') === 0) && $in_network) ? true : false); //is it already replaced? if(strpos($tag,'[zrl=') || strpos($tag,'[url=')) -- cgit v1.2.3 From c8fc3ad7cd47a1545da030109ba743105417c047 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 14 May 2018 19:19:25 -0700 Subject: refactor the 'where does the register link point?' logic --- Zotlabs/Module/Home.php | 4 ++-- Zotlabs/Module/Login.php | 2 +- Zotlabs/Module/Register.php | 6 +++--- Zotlabs/Module/Regmod.php | 3 +-- boot.php | 46 +++++++++++++++++++++++++++++++++++---------- 5 files changed, 43 insertions(+), 18 deletions(-) diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php index 79449c3b2..4b3e596a9 100644 --- a/Zotlabs/Module/Home.php +++ b/Zotlabs/Module/Home.php @@ -89,11 +89,11 @@ class Home extends \Zotlabs\Web\Controller { $sitename = get_config('system','sitename'); if($sitename) - $o .= '

    ' . sprintf( t("Welcome to %s") ,$sitename) . '

    '; + $o .= '

    ' . sprintf( t('Welcome to %s') ,$sitename) . '

    '; $loginbox = get_config('system','login_on_homepage'); if(intval($loginbox) || $loginbox === false) - $o .= login((\App::$config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1); + $o .= login(true); return $o; diff --git a/Zotlabs/Module/Login.php b/Zotlabs/Module/Login.php index ae35b922f..6430939b4 100644 --- a/Zotlabs/Module/Login.php +++ b/Zotlabs/Module/Login.php @@ -10,7 +10,7 @@ class Login extends \Zotlabs\Web\Controller { if(remote_channel() && $_SESSION['atoken']) goaway(z_root()); - return login((\App::$config['system']['register_policy'] == REGISTER_CLOSED) ? false : true); + return login(true); } } diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 4ab1ccd81..3dded19c7 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -187,8 +187,8 @@ class Register extends \Zotlabs\Web\Controller { $registration_is = ''; $other_sites = ''; - if(get_config('system','register_policy') == REGISTER_CLOSED) { - if(get_config('system','directory_mode') == DIRECTORY_MODE_STANDALONE) { + if(intval(get_config('system','register_policy')) === REGISTER_CLOSED) { + if(intval(get_config('system','directory_mode')) === DIRECTORY_MODE_STANDALONE) { notice( t('Registration on this hub is disabled.') . EOL); return; } @@ -197,7 +197,7 @@ class Register extends \Zotlabs\Web\Controller { return $mod->get(); } - if(get_config('system','register_policy') == REGISTER_APPROVE) { + if(intval(get_config('system','register_policy')) == REGISTER_APPROVE) { $registration_is = t('Registration on this hub is by approval only.'); $other_sites = t('Register at another affiliated hub.'); } diff --git a/Zotlabs/Module/Regmod.php b/Zotlabs/Module/Regmod.php index 70635d707..6fe89ca90 100644 --- a/Zotlabs/Module/Regmod.php +++ b/Zotlabs/Module/Regmod.php @@ -13,8 +13,7 @@ class Regmod extends \Zotlabs\Web\Controller { if(! local_channel()) { info( t('Please login.') . EOL); - $o .= '

    ' . login((\App::$config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1); - return $o; + return login(); } if(! is_site_admin()) { diff --git a/boot.php b/boot.php index b2186246d..b19817197 100755 --- a/boot.php +++ b/boot.php @@ -1559,17 +1559,43 @@ function fix_system_urls($oldurl, $newurl) { * @return string Parsed HTML code. */ function login($register = false, $form_id = 'main-login', $hiddens = false, $login_page = true) { + $o = ''; - $reg = false; - $reglink = get_config('system', 'register_link'); - if(! strlen($reglink)) - $reglink = 'register'; - - $reg = array( - 'title' => t('Create an account to access services and applications'), - 'desc' => t('Register'), - 'link' => (($register) ? $reglink : 'pubsites') - ); + $reg = null; + + // Here's the current description of how the register link works (2018-05-15) + + // Register links are enabled on the site home page and login page and navbar. + // They are not shown by default on other pages which may require login. + + // If the register link is enabled and registration is closed, the request is directed + // to /pubsites. If registration is allowed, /register is the default destination + + // system.register_link can over-ride the default behaviour and redirect to an arbitrary + // webpage for paid/custom or organisational registrations, regardless of whether + // registration is allowed. + + // system.register_link may or may not be the same destination as system.sellpage + + // system.sellpage is the destination linked from the /pubsites page on other sites. If + // system.sellpage is not set, the 'register' link in /pubsites will go to 'register' on your + // site. + + // If system.register_link is set to the word 'none', no registration link will be shown on + // your site. + + + $register_policy = get_config('system','register_policy'); + + $reglink = get_config('system', 'register_link', z_root() . '/' . ((intval($register_policy) === REGISTER_CLOSED) ? 'pubsites' : 'register')); + + if($reglink !== 'none') { + $reg = [ + 'title' => t('Create an account to access services and applications'), + 'desc' => t('Register'), + 'link' => $reglink + ]; + } $dest_url = z_root() . '/' . App::$query_string; -- cgit v1.2.3 From 46152cc56b84538df9ba80621d70367112819819 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 14 May 2018 20:17:00 -0700 Subject: ensure all password checking goes through the authenticate plugin hook (for instance in mod_removeme) --- include/auth.php | 178 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 98 insertions(+), 80 deletions(-) diff --git a/include/auth.php b/include/auth.php index c44eeb8fc..b952754fd 100644 --- a/include/auth.php +++ b/include/auth.php @@ -49,51 +49,91 @@ function account_verify_password($login, $pass) { $channel = null; $xchan = null; - if(! strpos($login,'@')) { - $channel = channelx_by_nick($login); - if(! $channel) { - $x = q("select * from atoken where atoken_name = '%s' and atoken_token = '%s' limit 1", - dbesc($login), - dbesc($pass) - ); - if($x) { - $ret['xchan'] = atoken_xchan($x[0]); - atoken_create_xchan($ret['xchan']); - return $ret; + $addon_auth = [ + 'username' => $login, + 'password' => trim($pass), + 'authenticated' => 0, + 'user_record' => null + ]; + + /** + * + * A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record + * Plugins should never set 'authenticated' except to indicate success - as hooks may be chained + * and later plugins should not interfere with an earlier one that succeeded. + * + */ + + call_hooks('authenticate', $addon_auth); + + if(($addon_auth['authenticated']) && is_array($addon_auth['user_record']) && (! empty($addon_auth['user_record']))) { + $ret['account'] = $addon_auth['user_record']; + return $ret; + } + else { + if(! strpos($login,'@')) { + $channel = channelx_by_nick($login); + if(! $channel) { + $x = q("select * from atoken where atoken_name = '%s' and atoken_token = '%s' limit 1", + dbesc($login), + dbesc($pass) + ); + if($x) { + $ret['xchan'] = atoken_xchan($x[0]); + atoken_create_xchan($ret['xchan']); + return $ret; + } } } - } - if($channel) { - $where = " where account_id = " . intval($channel['channel_account_id']) . " "; - } - else { - $where = " where account_email = '" . dbesc($login) . "' "; - } + if($channel) { + $where = " where account_id = " . intval($channel['channel_account_id']) . " "; + } + else { + $where = " where account_email = '" . dbesc($login) . "' "; + } - $a = q("select * from account $where"); - if(! $a) { - return null; - } + $a = q("select * from account $where"); + if(! $a) { + return null; + } - $account = $a[0]; + $account = $a[0]; - // Currently we only verify email address if there is an open registration policy. - // This isn't because of any policy - it's because the workflow gets too complicated if - // you have to verify the email and then go through the account approval workflow before - // letting them login. + // Currently we only verify email address if there is an open registration policy. + // This isn't because of any policy - it's because the workflow gets too complicated if + // you have to verify the email and then go through the account approval workflow before + // letting them login. - if(($email_verify) && ($register_policy == REGISTER_OPEN) && ($account['account_flags'] & ACCOUNT_UNVERIFIED)) { - logger('email verification required for ' . $login); - return ( [ 'reason' => 'unvalidated' ] ); - } + if(($email_verify) && ($register_policy == REGISTER_OPEN) && ($account['account_flags'] & ACCOUNT_UNVERIFIED)) { + logger('email verification required for ' . $login); + return ( [ 'reason' => 'unvalidated' ] ); + } - if(($account['account_flags'] == ACCOUNT_OK) - && (hash('whirlpool',$account['account_salt'] . $pass) === $account['account_password'])) { - logger('password verified for ' . $login); - $ret['account'] = $account; - if($channel) - $ret['channel'] = $channel; - return $ret; + if($channel) { + // Try the authentication plugin again since weve determined we are using the channel login instead of account login + $addon_auth = [ + 'username' => $account['account_email'], + 'password' => trim($pass), + 'authenticated' => 0, + 'user_record' => null + ]; + + call_hooks('authenticate', $addon_auth); + + if(($addon_auth['authenticated']) && is_array($addon_auth['user_record']) && (! empty($addon_auth['user_record']))) { + $ret['account'] = $addon_auth['user_record']; + return $ret; + } + } + + if(($account['account_flags'] == ACCOUNT_OK) + && (hash('whirlpool',$account['account_salt'] . $pass) === $account['account_password'])) { + logger('password verified for ' . $login); + $ret['account'] = $account; + if($channel) + $ret['channel'] = $channel; + return $ret; + } } $error = 'password failed for ' . $login; @@ -242,52 +282,29 @@ else { if((x($_POST, 'auth-params')) && $_POST['auth-params'] === 'login') { - $record = null; - - $addon_auth = array( - 'username' => punify(trim($_POST['username'])), - 'password' => trim($_POST['password']), - 'authenticated' => 0, - 'user_record' => null - ); - - /** - * - * A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record - * Plugins should never set 'authenticated' except to indicate success - as hooks may be chained - * and later plugins should not interfere with an earlier one that succeeded. - * - */ - - call_hooks('authenticate', $addon_auth); - $atoken = null; $account = null; + $channel = null; - if(($addon_auth['authenticated']) && (count($addon_auth['user_record']))) { - $account = $addon_auth['user_record']; + $verify = account_verify_password($_POST['username'], $_POST['password']); + if($verify && array_key_exists('reason',$verify) && $verify['reason'] === 'unvalidated') { + notice( t('Email validation is incomplete. Please check your email.')); + goaway(z_root() . '/email_validation/' . bin2hex(punify(trim(escape_tags($_POST['username']))))); + } + elseif($verify) { + $atoken = $verify['xchan']; + $channel = $verify['channel']; + $account = App::$account = $verify['account']; } - else { - $verify = account_verify_password($_POST['username'], $_POST['password']); - if($verify && array_key_exists('reason',$verify) && $verify['reason'] === 'unvalidated') { - notice( t('Email validation is incomplete. Please check your email.')); - goaway(z_root() . '/email_validation/' . bin2hex(punify(trim(escape_tags($_POST['username']))))); - } - elseif($verify) { - $atoken = $verify['xchan']; - $channel = $verify['channel']; - $account = App::$account = $verify['account']; - } - if(App::$account) { - $_SESSION['account_id'] = App::$account['account_id']; - } - elseif($atoken) { - atoken_login($atoken); - } - else { - notice( t('Failed authentication') . EOL); - } + if(App::$account) { + $_SESSION['account_id'] = App::$account['account_id']; + } + elseif($atoken) { + atoken_login($atoken); + } + else { + notice( t('Failed authentication') . EOL); } if(! ($account || $atoken)) { @@ -326,8 +343,9 @@ else { // if we haven't failed up this point, log them in. $_SESSION['last_login_date'] = datetime_convert(); - if(! $atoken) + if(! $atoken) { authenticate_success($account,$channel,true, true); + } } } -- cgit v1.2.3 From 959667c009ece0d67945ad09774c2bd091ba1450 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 14 May 2018 20:23:00 -0700 Subject: If somebody used hooks to create a new permission role, there was no mechanism to insert the new role into the dropdown list of roles at selection time. --- Zotlabs/Access/PermissionRoles.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Zotlabs/Access/PermissionRoles.php b/Zotlabs/Access/PermissionRoles.php index 9855a05c4..c8b4953a5 100644 --- a/Zotlabs/Access/PermissionRoles.php +++ b/Zotlabs/Access/PermissionRoles.php @@ -308,6 +308,8 @@ class PermissionRoles { ] ]; + call_hooks('list_permission_roles',$roles); + return $roles; } -- cgit v1.2.3 From 062dea8e13ddafb1ff466d4a1c4a262d1e525e55 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 14 May 2018 22:10:21 -0700 Subject: code whitespace and formatting --- Zotlabs/Module/Removeme.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Removeme.php b/Zotlabs/Module/Removeme.php index ca2080e83..111230937 100644 --- a/Zotlabs/Module/Removeme.php +++ b/Zotlabs/Module/Removeme.php @@ -56,12 +56,12 @@ class Removeme extends \Zotlabs\Web\Controller { $tpl = get_markup_template('removeme.tpl'); $o .= replace_macros($tpl, array( '$basedir' => z_root(), - '$hash' => $hash, - '$title' => t('Remove This Channel'), - '$desc' => array(t('WARNING: '), t('This channel will be completely removed from the network. '), t('This action is permanent and can not be undone!')), - '$passwd' => t('Please enter your password for verification:'), - '$global' => array('global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network'), array(t('No'),t('Yes'))), - '$submit' => t('Remove Channel') + '$hash' => $hash, + '$title' => t('Remove This Channel'), + '$desc' => [ t('WARNING: '), t('This channel will be completely removed from the network. '), t('This action is permanent and can not be undone!') ], + '$passwd' => t('Please enter your password for verification:'), + '$global' => [ 'global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network'), [ t('No'),t('Yes') ] ], + '$submit' => t('Remove Channel') )); return $o; -- cgit v1.2.3 From 803e85caeb959c730fcb69135aa2ccd55bea751b Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 14 May 2018 23:10:20 -0700 Subject: make get_default_profile_photo() pluggable --- include/channel.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/channel.php b/include/channel.php index 42a392e8e..1a62dcd3c 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1776,6 +1776,17 @@ function get_default_profile_photo($size = 300) { if(! $scheme) $scheme = 'rainbow_man'; + if(! is_dir('images/default_profile_photos/' . $scheme)) { + $x = [ 'scheme' => $scheme, 'size' => $size, 'url' => '' ]; + call_hooks('default_profile_photo',$x); + if($x['url']) { + return $x['url']; + } + else { + $scheme = 'rainbow_man'; + } + } + return 'images/default_profile_photos/' . $scheme . '/' . $size . '.png'; } -- cgit v1.2.3 From de63e40a704761c2efd1e04e1313a37c43fef20e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 15 May 2018 10:20:20 +0200 Subject: we must now provide the full path to the profile image for the cavatar plugin to work --- Zotlabs/Module/Chatsvc.php | 8 ++++---- Zotlabs/Module/Photo.php | 12 ++++++------ Zotlabs/Module/Ping.php | 2 +- include/security.php | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Zotlabs/Module/Chatsvc.php b/Zotlabs/Module/Chatsvc.php index b4657e84d..d6708d95c 100644 --- a/Zotlabs/Module/Chatsvc.php +++ b/Zotlabs/Module/Chatsvc.php @@ -119,10 +119,10 @@ class Chatsvc extends \Zotlabs\Web\Controller { $rv['xchan_network'] = 'unknown'; $rv['xchan_url'] = z_root(); $rv['xchan_hidden'] = 1; - $rv['xchan_photo_mimetype'] = 'image/jpeg'; - $rv['xchan_photo_l'] = get_default_profile_photo(300); - $rv['xchan_photo_m'] = get_default_profile_photo(80); - $rv['xchan_photo_s'] = get_default_profile_photo(48); + $rv['xchan_photo_mimetype'] = 'image/png'; + $rv['xchan_photo_l'] = z_root() . '/' . get_default_profile_photo(300); + $rv['xchan_photo_m'] = z_root() . '/' . get_default_profile_photo(80); + $rv['xchan_photo_s'] = z_root() . '/' . get_default_profile_photo(48); } diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 9cafc8d07..ccc59ed09 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -31,7 +31,7 @@ class Photo extends \Zotlabs\Web\Controller { $observer_xchan = get_observer_hash(); - $default = get_default_profile_photo(); + $default = z_root() . '/' . get_default_profile_photo(); if(isset($type)) { @@ -45,11 +45,11 @@ class Photo extends \Zotlabs\Web\Controller { case 'm': $resolution = 5; - $default = get_default_profile_photo(80); + $default = z_root() . '/' . get_default_profile_photo(80); break; case 's': $resolution = 6; - $default = get_default_profile_photo(48); + $default = z_root() . '/' . get_default_profile_photo(48); break; case 'l': default: @@ -183,15 +183,15 @@ class Photo extends \Zotlabs\Web\Controller { switch($resolution) { case 4: - $data = file_get_contents(get_default_profile_photo()); + $data = file_get_contents(z_root() . '/' . get_default_profile_photo()); $mimetype = 'image/png'; break; case 5: - $data = file_get_contents(get_default_profile_photo(80)); + $data = file_get_contents(z_root() . '/' . get_default_profile_photo(80)); $mimetype = 'image/png'; break; case 6: - $data = file_get_contents(get_default_profile_photo(48)); + $data = file_get_contents(z_root() . '/' . get_default_profile_photo(48)); $mimetype = 'image/png'; break; default: diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 206b8c3d1..bb80adc41 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -401,7 +401,7 @@ class Ping extends \Zotlabs\Web\Controller { 'notify_link' => z_root() . '/admin/accounts', 'name' => $rr['account_email'], 'url' => '', - 'photo' => get_default_profile_photo(48), + 'photo' => z_root() . '/' . get_default_profile_photo(48), 'when' => relative_date($rr['account_created']), 'hclass' => ('notify-unseen'), 'message' => t('requires approval') diff --git a/include/security.php b/include/security.php index 19278d5cb..88988a7c0 100644 --- a/include/security.php +++ b/include/security.php @@ -118,10 +118,10 @@ function atoken_xchan($atoken) { 'xchan_network' => 'unknown', 'xchan_url' => z_root() . '/guest/' . substr($c['channel_hash'],0,16) . '.' . $atoken['atoken_name'], 'xchan_hidden' => 1, - 'xchan_photo_mimetype' => 'image/jpeg', - 'xchan_photo_l' => get_default_profile_photo(300), - 'xchan_photo_m' => get_default_profile_photo(80), - 'xchan_photo_s' => get_default_profile_photo(48) + 'xchan_photo_mimetype' => 'image/png', + 'xchan_photo_l' => z_root() . '/' . get_default_profile_photo(300), + 'xchan_photo_m' => z_root() . '/' . get_default_profile_photo(80), + 'xchan_photo_s' => z_root() . '/' . get_default_profile_photo(48) ]; } -- cgit v1.2.3 From 76a2a5c432826926da2aa526dd8e805022bdc925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= Date: Tue, 15 May 2018 11:58:37 +0200 Subject: Added spaces at PHP replacements & Grammatical consistency error on Spanish translation --- view/es-es/hmessages.po | 18 +++++++++--------- view/es-es/hstrings.php | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index ac00a6017..b4087fef8 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-23 11:34+0200\n" -"PO-Revision-Date: 2018-05-06 10:55+0000\n" +"PO-Revision-Date: 2018-05-15 09:50+0000\n" "Last-Translator: Manuel Jiménez Friaza \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -1282,7 +1282,7 @@ msgstr "Evento no encontrado." #: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119 #: ../../include/text.php:2008 ../../include/event.php:1153 msgid "event" -msgstr "evento" +msgstr "el/su evento" #: ../../Zotlabs/Module/Events.php:460 msgid "Edit event title" @@ -8077,7 +8077,7 @@ msgstr "Por favor visite %s para ver y/o responder a su mensaje privado." #: ../../Zotlabs/Lib/Enotify.php:144 msgid "commented on" -msgstr "ha comentado sobre" +msgstr "ha comentado sobre " #: ../../Zotlabs/Lib/Enotify.php:155 msgid "liked" @@ -8127,12 +8127,12 @@ msgstr "Para ver o comentar la conversación, visite %s" #: ../../Zotlabs/Lib/Enotify.php:240 ../../Zotlabs/Lib/Enotify.php:241 #, php-format msgid "Please visit %s to approve or reject this comment." -msgstr "Por favor, visite %spara aprobar o rechazar este comentario." +msgstr "Por favor, visite %s para aprobar o rechazar este comentario." #: ../../Zotlabs/Lib/Enotify.php:299 #, php-format msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]" -msgstr "A %1$sle ha gustado [zrl=%2$s]su%3$s [/zrl]" +msgstr "A %1$sle ha gustado [zrl=%2$s]su %3$s [/zrl]" #: ../../Zotlabs/Lib/Enotify.php:313 #, php-format @@ -8187,7 +8187,7 @@ msgstr "%1$sle ha dado un toque en %2$s" #: ../../Zotlabs/Lib/Enotify.php:367 #, php-format msgid "%1$s [zrl=%2$s]poked you[/zrl]." -msgstr "%1$s [zrl=%2$s]le ha dado un toque[/zrl]." +msgstr "%1$s [zrl=%2$s] le ha dado un toque[/zrl]." #: ../../Zotlabs/Lib/Enotify.php:382 #, php-format @@ -8272,7 +8272,7 @@ msgstr "ha comentado la entrada de %s" #: ../../Zotlabs/Lib/Enotify.php:816 #, php-format msgid "edited a post dated %s" -msgstr "ha editado una entrada fechada el%s" +msgstr "ha editado una entrada fechada el %s" #: ../../Zotlabs/Lib/Enotify.php:820 #, php-format @@ -12659,7 +12659,7 @@ msgstr "Tipo de contenido de la página" #: ../../include/text.php:2018 msgid "activity" -msgstr "la actividad" +msgstr "la/su actividad" #: ../../include/text.php:2100 msgid "a-z, 0-9, -, and _ only" @@ -13956,7 +13956,7 @@ msgstr "Proveer nube de etiquetas personal en su página de canal" #: ../../include/taxonomy.php:320 msgid "Trending" -msgstr "Populares" +msgstr "Trending" #: ../../include/taxonomy.php:552 msgid "Keywords" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index 5cd0c98b7..6f07ece43 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -213,7 +213,7 @@ App::$strings["Event can not end before it has started."] = "Un evento no puede App::$strings["Unable to generate preview."] = "No se puede crear la vista previa."; App::$strings["Event title and start time are required."] = "Se requieren el título del evento y su hora de inicio."; App::$strings["Event not found."] = "Evento no encontrado."; -App::$strings["event"] = "evento"; +App::$strings["event"] = "el/su evento"; App::$strings["Edit event title"] = "Editar el título del evento"; App::$strings["Required"] = "Obligatorio"; App::$strings["Categories (comma-separated list)"] = "Temas (lista separada por comas)"; @@ -1748,7 +1748,7 @@ App::$strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s le ha e App::$strings["%1\$s sent you %2\$s."] = "%1\$s le ha enviado %2\$s."; App::$strings["a private message"] = "un mensaje privado"; App::$strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado."; -App::$strings["commented on"] = "ha comentado sobre"; +App::$strings["commented on"] = "ha comentado sobre "; App::$strings["liked"] = "ha gustado de "; App::$strings["disliked"] = "no ha gustado de "; App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s%2\$s [zrl=%3\$s ]un %4\$s[/zrl]"; @@ -1758,8 +1758,8 @@ App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d b App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] Nuevo comentario de %2\$s en la conversación #%1\$d"; App::$strings["%1\$s commented on an item/conversation you have been following."] = "%1\$sha comentado un elemento/conversación que ha estado siguiendo."; App::$strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s"; -App::$strings["Please visit %s to approve or reject this comment."] = "Por favor, visite %spara aprobar o rechazar este comentario."; -App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = "A %1\$sle ha gustado [zrl=%2\$s]su%3\$s [/zrl]"; +App::$strings["Please visit %s to approve or reject this comment."] = "Por favor, visite %s para aprobar o rechazar este comentario."; +App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = "A %1\$sle ha gustado [zrl=%2\$s]su %3\$s [/zrl]"; App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] \"Me gusta\" de %2\$s en la conversación #%1\$d"; App::$strings["%1\$s liked an item/conversation you created."] = "A %1\$s le ha gustado un elemento o conversación que ha creado usted."; App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = "[\$Projectname:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")"; @@ -1770,7 +1770,7 @@ App::$strings["%1\$s tagged you at %2\$s"] = "%1\$sle ha etiquetado en %2\$s"; App::$strings["%1\$s [zrl=%2\$s]tagged you[/zrl]."] = "%1\$s [zrl=%2\$s]le ha etiquetado[/zrl]."; App::$strings["[\$Projectname:Notify] %1\$s poked you"] = "[\$Projectname:Aviso] %1\$s le ha dado un toque"; App::$strings["%1\$s poked you at %2\$s"] = "%1\$sle ha dado un toque en %2\$s"; -App::$strings["%1\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s [zrl=%2\$s]le ha dado un toque[/zrl]."; +App::$strings["%1\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s [zrl=%2\$s] le ha dado un toque[/zrl]."; App::$strings["[\$Projectname:Notify] %s tagged your post"] = "[\$Projectname:Aviso] %s ha etiquetado su entrada"; App::$strings["%1\$s tagged your post at %2\$s"] = "%1\$sha etiquetado su entrada en %2\$s"; App::$strings["%1\$s tagged [zrl=%2\$s]your post[/zrl]"] = "%1\$s ha etiquetado [zrl=%2\$s]su entrada[/zrl]"; @@ -1788,7 +1788,7 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Por fav App::$strings["[\$Projectname:Notify]"] = "[\$Projectname:Aviso]"; App::$strings["created a new post"] = "ha creado una nueva entrada"; App::$strings["commented on %s's post"] = "ha comentado la entrada de %s"; -App::$strings["edited a post dated %s"] = "ha editado una entrada fechada el%s"; +App::$strings["edited a post dated %s"] = "ha editado una entrada fechada el %s"; App::$strings["edited a comment dated %s"] = "ha editado un comentario fechado el %s"; App::$strings["Wiki updated successfully"] = "El wiki se ha actualizado con éxito"; App::$strings["Wiki files deleted successfully"] = "Se han borrado con éxito los ficheros del wiki"; @@ -2843,7 +2843,7 @@ App::$strings["HTML"] = "HTML"; App::$strings["Comanche Layout"] = "Plantilla de Comanche"; App::$strings["PHP"] = "PHP"; App::$strings["Page content type"] = "Tipo de contenido de la página"; -App::$strings["activity"] = "la actividad"; +App::$strings["activity"] = "la/su actividad"; App::$strings["a-z, 0-9, -, and _ only"] = "a-z, 0-9, -, and _ only"; App::$strings["Design Tools"] = "Herramientas de diseño web"; App::$strings["Pages"] = "Páginas"; @@ -3155,7 +3155,7 @@ App::$strings["Star Posts"] = "Entradas destacadas"; App::$strings["Ability to mark special posts with a star indicator"] = "Capacidad de marcar entradas destacadas con un indicador de estrella"; App::$strings["Tag Cloud"] = "Nube de etiquetas"; App::$strings["Provide a personal tag cloud on your channel page"] = "Proveer nube de etiquetas personal en su página de canal"; -App::$strings["Trending"] = "Populares"; +App::$strings["Trending"] = "Trending"; App::$strings["Keywords"] = "Palabras clave"; App::$strings["have"] = "tener"; App::$strings["has"] = "tiene"; -- cgit v1.2.3 From 16930c1c54ef4bb3077bb868a366c0165eb33fae Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 15 May 2018 16:08:51 -0700 Subject: anybody authenticated not correctly handled in can_comment_on_post() --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 55b5a73db..e75a9659d 100755 --- a/include/items.php +++ b/include/items.php @@ -261,6 +261,7 @@ function can_comment_on_post($observer_xchan, $item) { return true; break; case 'public': + case 'authenticated': // We don't really allow or support public comments yet, but anonymous // folks won't ever reach this point (as $observer_xchan will be empty). // This means the viewer has an xchan and we can identify them. @@ -268,7 +269,6 @@ function can_comment_on_post($observer_xchan, $item) { break; case 'any connections': case 'contacts': - case 'authenticated': case '': if(array_key_exists('owner',$item) && get_abconfig($item['uid'],$item['owner']['abook_xchan'],'their_perms','post_comments')) { return true; -- cgit v1.2.3 From aac5fd96cc9ea03a329234f6b2bd8b12a0f4ae5f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 15 May 2018 16:51:04 -0700 Subject: provide function to fetch photo contents from url --- Zotlabs/Module/Linkinfo.php | 6 +++--- Zotlabs/Module/Photo.php | 11 ++++------- include/photos.php | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php index 3f58f3e01..f0d62b5e0 100644 --- a/Zotlabs/Module/Linkinfo.php +++ b/Zotlabs/Module/Linkinfo.php @@ -55,10 +55,10 @@ class Linkinfo extends \Zotlabs\Web\Controller { $h = explode("\n",$result['header']); foreach ($h as $l) { list($k,$v) = array_map("trim", explode(":", trim($l), 2)); - $hdrs[$k] = $v; + $hdrs[strtolower($k)] = $v; } - if (array_key_exists('Content-Type', $hdrs)) - $type = $hdrs['Content-Type']; + if (array_key_exists('content-type', $hdrs)) + $type = $hdrs['content-type']; if($type) { $zrl = is_matrix_url($url); if(stripos($type,'image/') !== false) { diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index ccc59ed09..29ad06e80 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -83,7 +83,7 @@ class Photo extends \Zotlabs\Web\Controller { $data = file_get_contents($data); } if(! $data) { - $data = file_get_contents($default); + $data = fetch_image_from_url($default,$mimetype); } if(! $mimetype) { $mimetype = 'image/png'; @@ -183,16 +183,13 @@ class Photo extends \Zotlabs\Web\Controller { switch($resolution) { case 4: - $data = file_get_contents(z_root() . '/' . get_default_profile_photo()); - $mimetype = 'image/png'; + $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(),$mimetype); break; case 5: - $data = file_get_contents(z_root() . '/' . get_default_profile_photo(80)); - $mimetype = 'image/png'; + $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(80),$mimetype); break; case 6: - $data = file_get_contents(z_root() . '/' . get_default_profile_photo(48)); - $mimetype = 'image/png'; + $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(48),$mimetype); break; default: killme(); diff --git a/include/photos.php b/include/photos.php index 2d2c9cc13..9fb872700 100644 --- a/include/photos.php +++ b/include/photos.php @@ -1011,3 +1011,23 @@ function profile_photo_set_profile_perms($uid, $profileid = 0) { } } } + +function fetch_image_from_url($url,&$mimetype) { + + $redirects = 0; + $x = z_fetch_url($url,true,$redirects,[ 'novalidate' => true ]); + if($x['success']) { + $hdrs = []; + $h = explode("\n",$x['header']); + foreach ($h as $l) { + list($k,$v) = array_map("trim", explode(":", trim($l), 2)); + $hdrs[strtolower($k)] = $v; + } + if (array_key_exists('content-type', $hdrs)) + $mimetype = $hdrs['content-type']; + + return $x['body']; + } + + return EMPTY_STR; +} \ No newline at end of file -- cgit v1.2.3 From 179eeb10a6e1b661dc7788d74d60a7c11dfca6bf Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Tue, 15 May 2018 19:57:40 -0400 Subject: Rename Permission Groups to Permission Categories and clarify feature settings text. --- Zotlabs/Widget/Settings_menu.php | 2 +- doc/feature/additional/access.md | 6 +++--- include/features.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php index 9574becc3..f35d6f147 100644 --- a/Zotlabs/Widget/Settings_menu.php +++ b/Zotlabs/Widget/Settings_menu.php @@ -105,7 +105,7 @@ class Settings_menu { if(feature_enabled(local_channel(),'permcats')) { $tabs[] = array( - 'label' => t('Permission Groups'), + 'label' => t('Permission Categories'), 'url' => z_root() . '/settings/permcats', 'selected' => ((argv(1) === 'permcats') ? 'active' : ''), ); diff --git a/doc/feature/additional/access.md b/doc/feature/additional/access.md index 3581ca11d..b7f0df717 100644 --- a/doc/feature/additional/access.md +++ b/doc/feature/additional/access.md @@ -17,10 +17,10 @@ Ability to create multiple profiles. Minimum required technical skill level to see this feature: 3 -### Permission Groups +### Permission Categories -Provide alternate connection permission roles. - +Provide alternate connection permission limits. + Minimum required technical skill level to see this feature: 2 diff --git a/include/features.php b/include/features.php index c865f6754..616e3f6c5 100644 --- a/include/features.php +++ b/include/features.php @@ -237,8 +237,8 @@ function get_features($filtered = true, $level = (-1)) { [ 'permcats', - t('Permission Groups'), - t('Provide alternate connection permission roles.'), + t('Permission Categories'), + t('Create custom connection permission limits'), false, get_config('feature_lock','permcats'), feature_level('permcats',2), -- cgit v1.2.3 From 12c571a1878348c77362a345853eb9575943ef38 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 16 May 2018 10:47:18 +0200 Subject: missing include --- Zotlabs/Module/Photo.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 29ad06e80..f348866d9 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -4,6 +4,7 @@ namespace Zotlabs\Module; require_once('include/security.php'); require_once('include/attach.php'); require_once('include/photo/photo_driver.php'); +require_once('include/photos.php'); class Photo extends \Zotlabs\Web\Controller { -- cgit v1.2.3 From 5a6141faa2a87a4aeb00a566c1230f35544ff3d2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 17 May 2018 12:58:59 +0200 Subject: display address in contact_format() instead of nick --- view/js/autocomplete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index e5a551344..54eb03e13 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -40,7 +40,7 @@ function contact_format(item) { var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick); if(typeof desc === 'undefined') desc = ''; if(desc) desc = ' ('+desc+')'; - return "
    {2}{3}
    ".format(item.taggable, item.photo, item.name, desc, typeof(item.link) !== 'undefined' ? item.link : desc.replace('(','').replace(')','')); + return "
    {2}{4}
    ".format(item.taggable, item.photo, item.name, desc, typeof(item.link) !== 'undefined' ? item.link : desc.replace('(','').replace(')','')); } else return "
    " + item.text + "
    "; -- cgit v1.2.3 From b955c2d2c5185ee958e73dbe04b867d5a8a35306 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Thu, 17 May 2018 16:08:20 +0200 Subject: Update hmessages.po --- view/fr/hmessages.po | 332 +++++++++++++++++++++++++++++---------------------- 1 file changed, 188 insertions(+), 144 deletions(-) diff --git a/view/fr/hmessages.po b/view/fr/hmessages.po index f13ec864b..a830d06ef 100644 --- a/view/fr/hmessages.po +++ b/view/fr/hmessages.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-13 21:54+0200\n" -"PO-Revision-Date: 2018-04-16 12:24+0000\n" +"POT-Creation-Date: 2018-04-23 11:34+0200\n" +"PO-Revision-Date: 2018-05-06 07:46+0000\n" "Last-Translator: Philip Wittamore \n" "Language-Team: French (http://www.transifex.com/Friendica/red-matrix/language/fr/)\n" "MIME-Version: 1.0\n" @@ -101,8 +101,8 @@ msgid "Social Networking" msgstr "Réseau social" #: ../../Zotlabs/Access/PermissionRoles.php:284 -msgid "Social - Party" -msgstr "Social - Fête" +msgid "Social - Federation" +msgstr "Sociale - Fédération" #: ../../Zotlabs/Access/PermissionRoles.php:285 msgid "Social - Mostly Public" @@ -256,7 +256,7 @@ msgstr "Accès refusé." msgid "Block Name" msgstr "Nom du Bloc" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2405 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2422 msgid "Blocks" msgstr "Blocs" @@ -425,7 +425,7 @@ msgstr "3. Cliquez sur [Ajouter]" #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Account_edit.php:74 #: ../../Zotlabs/Module/Admin/Security.php:104 -#: ../../Zotlabs/Module/Settings/Permcats.php:110 +#: ../../Zotlabs/Module/Settings/Permcats.php:115 #: ../../Zotlabs/Module/Settings/Channel.php:495 #: ../../Zotlabs/Module/Settings/Features.php:79 #: ../../Zotlabs/Module/Settings/Tokens.php:168 @@ -461,15 +461,16 @@ msgstr "3. Cliquez sur [Ajouter]" #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:823 +#: ../../addon/diaspora/diaspora.php:825 #: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84 #: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161 #: ../../addon/mailtest/mailtest.php:100 #: ../../addon/openstreetmap/openstreetmap.php:168 -#: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371 +#: ../../addon/fuzzloc/fuzzloc.php:191 ../../addon/rtof/rtof.php:101 +#: ../../addon/jappixmini/jappixmini.php:371 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1069 +#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1072 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 @@ -569,7 +570,7 @@ msgstr "Sommaire :" #: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273 #: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:878 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891 #: ../../include/conversation.php:1160 msgid "Unknown" msgstr "Inconnu" @@ -687,7 +688,7 @@ msgstr "Tout supprimer" #: ../../Zotlabs/Module/Profile_photo.php:464 #: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:365 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:366 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 #: ../../include/conversation.php:1389 ../../include/conversation.php:1438 msgid "Cancel" @@ -731,7 +732,7 @@ msgstr "Téléphone" #: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1776 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1770 msgid "Email" msgstr "Courriel" @@ -947,7 +948,7 @@ msgstr "Eléments étiquetés avec : %s" msgid "Search results for: %s" msgstr "Résultats de recherche pour : %s" -#: ../../Zotlabs/Module/Pubstream.php:93 +#: ../../Zotlabs/Module/Pubstream.php:95 #: ../../Zotlabs/Widget/Notifications.php:131 msgid "Public Stream" msgstr "Flux public" @@ -1093,8 +1094,8 @@ msgstr "Utiliser l'authentification distante, quand disponible" #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 #: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 #: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 -#: ../../addon/rtof/rtof.php:81 ../../addon/rtof/rtof.php:85 -#: ../../addon/jappixmini/jappixmini.php:309 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 +#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 #: ../../addon/jappixmini/jappixmini.php:351 @@ -1145,8 +1146,8 @@ msgstr "Non" #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 #: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 #: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 -#: ../../addon/rtof/rtof.php:81 ../../addon/rtof/rtof.php:85 -#: ../../addon/jappixmini/jappixmini.php:309 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 +#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 #: ../../addon/jappixmini/jappixmini.php:351 @@ -1463,13 +1464,13 @@ msgstr "Hub introuvable." #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 #: ../../Zotlabs/Module/Like.php:384 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1388 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 #: ../../include/conversation.php:116 ../../include/text.php:2005 msgid "photo" msgstr "photo" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 -#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1388 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 #: ../../include/conversation.php:144 ../../include/text.php:2011 msgid "status" msgstr "état" @@ -1577,6 +1578,7 @@ msgid "" msgstr "Votre pseudo sera utilisé pour créer une adresse de canal facile à mémoriser, par ex. pseudo%s" #: ../../Zotlabs/Module/New_channel.php:149 +#: ../../Zotlabs/Module/Settings/Channel.php:539 #: ../../Zotlabs/Module/Register.php:257 msgid "Channel role and privacy" msgstr "Rôle et confidentialité du canal" @@ -1597,10 +1599,18 @@ msgstr "Créer le canal" #: ../../Zotlabs/Module/New_channel.php:153 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 "Un canal est votre identité sur ce réseau. Il peut représenter une personne, un blog, ou un forum par exemple. Les canaux peuvent entrer en contact les uns avec les autres pour partager des informations avec des droits d'accès très fins." +"A channel is a unique network identity. It can represent a person (social " +"network profile), a forum (group), a business or celebrity page, a newsfeed," +" and many other things. Channels can make connections with other channels to" +" share information with each other." +msgstr "Un canal est une identité réseau unique. Il peut représenter une personne (profil de réseau social), un forum (groupe), une page commerciale ou de célébrités, un flux d'informations et bien d'autres choses. Les canaux peuvent établir des connexions avec d'autres canaux pour partager l'information entre eux." + +#: ../../Zotlabs/Module/New_channel.php:153 +msgid "" +"The type of channel you create affects the basic privacy settings, the " +"permissions that are granted to connections/friends, and also the channel's " +"visibility across the network." +msgstr "Le type de canal que vous créez affecte les paramètres de confidentialité de base, les permissions accordées aux connexions/amis, ainsi que la visibilité du canal sur le réseau." #: ../../Zotlabs/Module/New_channel.php:154 msgid "" @@ -2661,7 +2671,7 @@ msgstr "Paramètres du site sauvegardés." #: ../../Zotlabs/Module/Admin/Site.php:191 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3089 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3106 msgid "Default" msgstr "Défaut" @@ -3028,7 +3038,7 @@ msgstr "Distributions par processus" msgid "" "Number of deliveries to attempt in a single operating system process. Adjust" " if necessary to tune system performance. Recommend: 1-5." -msgstr "Nombre de distributions à tenter au sein d'un seul processus système. Ajuster si nécessaire pour affiner la performance du système. Recommandé :1-5." +msgstr "Nombre de distributions à tenter au sein d'un seul processus système. Ajuster si nécessaire pour affiner la performance du système. Recommandé:1-5." #: ../../Zotlabs/Module/Admin/Site.php:347 msgid "Queue Threshold" @@ -3081,7 +3091,7 @@ msgstr "Charge système maximale au-delà de laquelle distribution et scrutation #: ../../Zotlabs/Module/Admin/Site.php:352 msgid "Expiration period in days for imported (grid/network) content" -msgstr "Délai d'expiration pour le contenu importé (réseau)" +msgstr "Délai d'expiration en jours pour le contenu importé (grille/réseau)" #: ../../Zotlabs/Module/Admin/Site.php:352 msgid "0 for no expiration of imported content" @@ -3365,51 +3375,55 @@ msgctxt "acl" msgid "Profile" msgstr "Profil" -#: ../../Zotlabs/Module/Moderate.php:62 +#: ../../Zotlabs/Module/Moderate.php:65 msgid "Comment approved" msgstr "Commentaire validé" -#: ../../Zotlabs/Module/Moderate.php:66 +#: ../../Zotlabs/Module/Moderate.php:69 msgid "Comment deleted" msgstr "Commentaire supprimé" -#: ../../Zotlabs/Module/Settings/Permcats.php:37 +#: ../../Zotlabs/Module/Settings/Permcats.php:23 +msgid "Permission Name is required." +msgstr "Le nom de permission est requis." + +#: ../../Zotlabs/Module/Settings/Permcats.php:42 msgid "Permission category saved." msgstr "Profil d'accès enregistré." -#: ../../Zotlabs/Module/Settings/Permcats.php:61 +#: ../../Zotlabs/Module/Settings/Permcats.php:66 msgid "" "Use this form to create permission rules for various classes of people or " "connections." msgstr "Utilisez ce formulaire pour créer des règles d'accès pour différentes catégories de personnes ou de contacts." -#: ../../Zotlabs/Module/Settings/Permcats.php:94 +#: ../../Zotlabs/Module/Settings/Permcats.php:99 msgid "Permission Categories" msgstr "Profils d'accès" -#: ../../Zotlabs/Module/Settings/Permcats.php:102 +#: ../../Zotlabs/Module/Settings/Permcats.php:107 msgid "Permission Name" msgstr "Nom du droit d'accès" -#: ../../Zotlabs/Module/Settings/Permcats.php:103 +#: ../../Zotlabs/Module/Settings/Permcats.php:108 #: ../../Zotlabs/Module/Settings/Tokens.php:161 #: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250 msgid "My Settings" msgstr "Mes paramètres" -#: ../../Zotlabs/Module/Settings/Permcats.php:105 +#: ../../Zotlabs/Module/Settings/Permcats.php:110 #: ../../Zotlabs/Module/Settings/Tokens.php:163 #: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248 msgid "inherited" msgstr "héritée" -#: ../../Zotlabs/Module/Settings/Permcats.php:108 +#: ../../Zotlabs/Module/Settings/Permcats.php:113 #: ../../Zotlabs/Module/Settings/Tokens.php:166 #: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253 msgid "Individual Permissions" msgstr "Droits d'accès individuels" -#: ../../Zotlabs/Module/Settings/Permcats.php:109 +#: ../../Zotlabs/Module/Settings/Permcats.php:114 #: ../../Zotlabs/Module/Settings/Tokens.php:167 #: ../../Zotlabs/Module/Connedit.php:894 msgid "" @@ -3629,10 +3643,6 @@ msgstr "Utiliser mon paramètre de publication par défaut pour le type d'objet msgid "Profile to assign new connections" msgstr "Profil pour assigner de nouvelles connexions" -#: ../../Zotlabs/Module/Settings/Channel.php:539 -msgid "Channel permissions category:" -msgstr "Profils d'accès du canal :" - #: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Default Permissions Group" msgstr "Groupe d'accès par défaut" @@ -4260,7 +4270,7 @@ msgstr "Modifier l'album" #: ../../Zotlabs/Module/Embedphotos.php:158 #: ../../Zotlabs/Module/Photos.php:712 #: ../../Zotlabs/Module/Profile_photo.php:458 -#: ../../Zotlabs/Module/Cover_photo.php:361 +#: ../../Zotlabs/Module/Cover_photo.php:362 #: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Widget/Cdav.php:133 #: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110 #: ../../Zotlabs/Widget/Album.php:97 @@ -4442,7 +4452,7 @@ msgstr "Authentifier" msgid "Permissions denied." msgstr "Accès refusés." -#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2429 +#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2446 msgid "Import" msgstr "Import" @@ -4906,7 +4916,7 @@ msgstr "Voir tout" #: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205 #: ../../include/conversation.php:1981 ../../include/channel.php:1539 -#: ../../include/taxonomy.php:601 +#: ../../include/taxonomy.php:661 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -4923,7 +4933,7 @@ msgstr[1] "N'aime pas" #: ../../Zotlabs/Module/Photos.php:1265 msgid "Photo Tools" -msgstr "Ouitls pour photos" +msgstr "Outils pour photos" #: ../../Zotlabs/Module/Photos.php:1274 msgid "In This Photo:" @@ -4949,7 +4959,7 @@ msgid "Close" msgstr "Fermer" #: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378 -#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:663 +#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:667 msgid "Recent Photos" msgstr "Photos récentes" @@ -5084,48 +5094,48 @@ msgstr "Intégrer une image de votre album photo" #: ../../Zotlabs/Module/Wiki.php:380 #: ../../Zotlabs/Module/Profile_photo.php:465 -#: ../../Zotlabs/Module/Cover_photo.php:366 +#: ../../Zotlabs/Module/Cover_photo.php:367 #: ../../include/conversation.php:1390 ../../include/conversation.php:1437 msgid "OK" msgstr "OK" #: ../../Zotlabs/Module/Wiki.php:381 #: ../../Zotlabs/Module/Profile_photo.php:466 -#: ../../Zotlabs/Module/Cover_photo.php:367 +#: ../../Zotlabs/Module/Cover_photo.php:368 #: ../../include/conversation.php:1320 msgid "Choose images to embed" msgstr "Choisissez des images à intégrer" #: ../../Zotlabs/Module/Wiki.php:382 #: ../../Zotlabs/Module/Profile_photo.php:467 -#: ../../Zotlabs/Module/Cover_photo.php:368 +#: ../../Zotlabs/Module/Cover_photo.php:369 #: ../../include/conversation.php:1321 msgid "Choose an album" msgstr "Choisir un album" #: ../../Zotlabs/Module/Wiki.php:383 #: ../../Zotlabs/Module/Profile_photo.php:468 -#: ../../Zotlabs/Module/Cover_photo.php:369 +#: ../../Zotlabs/Module/Cover_photo.php:370 msgid "Choose a different album" msgstr "Choisissez un autre album" #: ../../Zotlabs/Module/Wiki.php:384 #: ../../Zotlabs/Module/Profile_photo.php:469 -#: ../../Zotlabs/Module/Cover_photo.php:370 +#: ../../Zotlabs/Module/Cover_photo.php:371 #: ../../include/conversation.php:1323 msgid "Error getting album list" msgstr "Erreur venant de la liste de l'album" #: ../../Zotlabs/Module/Wiki.php:385 #: ../../Zotlabs/Module/Profile_photo.php:470 -#: ../../Zotlabs/Module/Cover_photo.php:371 +#: ../../Zotlabs/Module/Cover_photo.php:372 #: ../../include/conversation.php:1324 msgid "Error getting photo link" msgstr "Erreur provenant du lien de la photo" #: ../../Zotlabs/Module/Wiki.php:386 #: ../../Zotlabs/Module/Profile_photo.php:471 -#: ../../Zotlabs/Module/Cover_photo.php:372 +#: ../../Zotlabs/Module/Cover_photo.php:373 #: ../../include/conversation.php:1325 msgid "Error getting album" msgstr "Erreur venant de l'album" @@ -5262,7 +5272,7 @@ msgstr "L'image a été téléversée, mais le recadrage a échoué." #: ../../Zotlabs/Module/Profile_photo.php:120 #: ../../Zotlabs/Module/Profile_photo.php:248 -#: ../../include/photo/photo_driver.php:740 +#: ../../include/photo/photo_driver.php:741 msgid "Profile Photos" msgstr "Photos du profil" @@ -5301,12 +5311,12 @@ msgid "Photo not available." msgstr "Photo inaccessible." #: ../../Zotlabs/Module/Profile_photo.php:455 -#: ../../Zotlabs/Module/Cover_photo.php:358 +#: ../../Zotlabs/Module/Cover_photo.php:359 msgid "Upload File:" msgstr "Téléverser fichier :" #: ../../Zotlabs/Module/Profile_photo.php:456 -#: ../../Zotlabs/Module/Cover_photo.php:359 +#: ../../Zotlabs/Module/Cover_photo.php:360 msgid "Select a profile:" msgstr "Choisir un profil :" @@ -5324,28 +5334,28 @@ msgstr "Utiliser" #: ../../Zotlabs/Module/Profile_photo.php:462 #: ../../Zotlabs/Module/Profile_photo.php:463 -#: ../../Zotlabs/Module/Cover_photo.php:363 #: ../../Zotlabs/Module/Cover_photo.php:364 +#: ../../Zotlabs/Module/Cover_photo.php:365 msgid "Use a photo from your albums" msgstr "Utiliser une photo de vos albums" #: ../../Zotlabs/Module/Profile_photo.php:473 -#: ../../Zotlabs/Module/Cover_photo.php:375 +#: ../../Zotlabs/Module/Cover_photo.php:376 msgid "Select existing photo" msgstr "Sélectionner une photo existante" #: ../../Zotlabs/Module/Profile_photo.php:492 -#: ../../Zotlabs/Module/Cover_photo.php:392 +#: ../../Zotlabs/Module/Cover_photo.php:393 msgid "Crop Image" msgstr "Recadrer l'image" #: ../../Zotlabs/Module/Profile_photo.php:493 -#: ../../Zotlabs/Module/Cover_photo.php:393 +#: ../../Zotlabs/Module/Cover_photo.php:394 msgid "Please adjust the image cropping for optimum viewing." msgstr "Merci d'ajuster le cadre pour une visualisation optimale." #: ../../Zotlabs/Module/Profile_photo.php:495 -#: ../../Zotlabs/Module/Cover_photo.php:395 +#: ../../Zotlabs/Module/Cover_photo.php:396 msgid "Done Editing" msgstr "J'ai terminé" @@ -5875,7 +5885,7 @@ msgstr "Le menu pourra être utilisé pour stocker des favoris" msgid "Submit and proceed" msgstr "Valider et continuer" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2406 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2423 msgid "Menus" msgstr "Menus" @@ -5927,7 +5937,7 @@ msgstr "Titre du menu tel que vu par les visiteurs" msgid "Allow bookmarks" msgstr "Autoriser l'usage de favoris" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2407 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2424 msgid "Layouts" msgstr "Mises-en-page" @@ -6014,7 +6024,7 @@ 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 "Attention :modifier certains paramètres peut rendre votre canal inutilisable. Merci d'ignorer cette page à moins d'être suffisamment à l'aise de savoir comment utiliser correctement cette fonctionnalité." +msgstr "Attention:modifier certains paramètres peut rendre votre canal inutilisable. Merci d'ignorer cette page à moins d'être suffisamment à l'aise de savoir comment utiliser correctement cette fonctionnalité." #: ../../Zotlabs/Module/Defperms.php:239 msgid "" @@ -6295,7 +6305,7 @@ msgstr "Qui (si applicable)" #: ../../Zotlabs/Module/Profiles.php:762 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Exemples : marie123, Marie Deschamps, marie@exemple.com" +msgstr "Exemples : marie123, Marie Deschamps, marie@exemple.com" #: ../../Zotlabs/Module/Profiles.php:763 msgid "Since (date)" @@ -6835,12 +6845,12 @@ msgid "Previous action reversed." msgstr "Action précédente annulée." #: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529 -#: ../../addon/pubcrawl/as.php:1423 ../../include/conversation.php:160 +#: ../../addon/pubcrawl/as.php:1440 ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s aime %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1425 +#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442 #: ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" @@ -7353,7 +7363,7 @@ msgstr "%1$s a mis a jour sa %2$s" msgid "cover photo" msgstr "Photo principale" -#: ../../Zotlabs/Module/Cover_photo.php:360 +#: ../../Zotlabs/Module/Cover_photo.php:361 msgid "Change Cover Photo" msgstr "Changer la photo de couverture" @@ -7422,19 +7432,19 @@ msgstr "forum" msgid "Search Results For:" msgstr "Résultats de recherche pour :" -#: ../../Zotlabs/Module/Network.php:230 +#: ../../Zotlabs/Module/Network.php:229 msgid "Privacy group is empty" msgstr "Groupe de contacts vide" -#: ../../Zotlabs/Module/Network.php:240 +#: ../../Zotlabs/Module/Network.php:238 msgid "Privacy group: " msgstr "Groupe de contacts :" -#: ../../Zotlabs/Module/Network.php:268 +#: ../../Zotlabs/Module/Network.php:265 msgid "Invalid connection." msgstr "Contact non valide." -#: ../../Zotlabs/Module/Network.php:289 ../../addon/redred/redred.php:65 +#: ../../Zotlabs/Module/Network.php:285 ../../addon/redred/redred.php:65 msgid "Invalid channel." msgstr "Canal invalide." @@ -8273,7 +8283,7 @@ msgstr "a édité un commentaire daté du %s" msgid "Wiki updated successfully" msgstr "Wiki mis à jour avec succès" -#: ../../Zotlabs/Lib/NativeWiki.php:198 +#: ../../Zotlabs/Lib/NativeWiki.php:205 msgid "Wiki files deleted successfully" msgstr "Fichiers du wiki supprimés avec succès" @@ -8347,11 +8357,11 @@ msgstr "Signature du message incorrecte" msgid "Add Tag" msgstr "Ajouter une étiquette" -#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:514 +#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575 msgid "like" msgstr "aiment" -#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:515 +#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576 msgid "dislike" msgstr "n'aiment pas" @@ -8508,7 +8518,7 @@ msgstr "Bienvenue %s. L'authentification distante a fonctionné." msgid "parent" msgstr "retour" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2828 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2845 msgid "Collection" msgstr "Groupe de contacts" @@ -8653,9 +8663,9 @@ msgstr "Sélectionner un carnet d'adresses à importer dans" #: ../../Zotlabs/Widget/Appcategories.php:40 #: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141 -#: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:348 -#: ../../include/taxonomy.php:430 ../../include/taxonomy.php:450 -#: ../../include/taxonomy.php:471 +#: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:409 +#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 +#: ../../include/taxonomy.php:532 msgid "Categories" msgstr "Catégories" @@ -8843,8 +8853,8 @@ msgstr "Dossiers sauvegardés" msgid "Click to show more" msgstr "Cliquer pour voir plus" -#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:388 -#: ../../include/taxonomy.php:409 +#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320 +#: ../../include/taxonomy.php:449 ../../include/taxonomy.php:470 msgid "Tags" msgstr "Étiquettes" @@ -9145,6 +9155,10 @@ msgstr "Les taches planifiées ne tournent pas." msgid "never" msgstr "jamais" +#: ../../store/[data]/smarty3/compiled/a0a1289f91f53b2c12e4e0b45ffe8291540ba895_0.file.cover_photo.tpl.php:123 +msgid "Cover Photo" +msgstr "Photo de couverture" + #: ../../view/theme/redbasic_c/php/config.php:16 #: ../../view/theme/redbasic_c/php/config.php:19 #: ../../view/theme/redbasic/php/config.php:16 @@ -10158,39 +10172,39 @@ msgstr "Déclarer un amour éternel pour" msgid "declared undying love for" msgstr "A déclaré l'amour éternel pour" -#: ../../addon/diaspora/diaspora.php:779 +#: ../../addon/diaspora/diaspora.php:781 msgid "Diaspora Protocol Settings updated." msgstr "Paramètres du protocole Diaspora mis à jour." -#: ../../addon/diaspora/diaspora.php:798 +#: ../../addon/diaspora/diaspora.php:800 msgid "" "The Diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "Le protocole Diaspora ne gère pas les canaux localisés sur plusieurs serveurs. Vos contacts sur ce réseau peuvent donc être injoignables à partir des autres emplacements (clones) de ce canal." -#: ../../addon/diaspora/diaspora.php:801 +#: ../../addon/diaspora/diaspora.php:803 msgid "Enable the Diaspora protocol for this channel" msgstr "Activer le protocole Diaspora pour ce canal" -#: ../../addon/diaspora/diaspora.php:805 +#: ../../addon/diaspora/diaspora.php:807 msgid "Allow any Diaspora member to comment on your public posts" msgstr "Permettre à tous les membres de Diaspora de commenter vos publications publiques" -#: ../../addon/diaspora/diaspora.php:809 +#: ../../addon/diaspora/diaspora.php:811 msgid "Prevent your hashtags from being redirected to other sites" msgstr "Empêcher la redirection de vos mots-clés (hashtags) vers d'autres sites" -#: ../../addon/diaspora/diaspora.php:813 +#: ../../addon/diaspora/diaspora.php:815 msgid "" "Sign and forward posts and comments with no existing Diaspora signature" msgstr "Signer et faire suivre les publications et commentaires n'ayant aucune signature Diaspora" -#: ../../addon/diaspora/diaspora.php:818 +#: ../../addon/diaspora/diaspora.php:820 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "Mots-clés suivis (séparer par une virgule, ne pas mettre le #)" -#: ../../addon/diaspora/diaspora.php:823 +#: ../../addon/diaspora/diaspora.php:825 msgid "Diaspora Protocol Settings" msgstr "Paramètres du protocole Diaspora" @@ -10433,6 +10447,32 @@ msgstr "Inclure un marqueur sur la carte." msgid "text to include in all outgoing posts from this site" msgstr "Texte à inclure dans tous les messages sortants de ce site" +#: ../../addon/fuzzloc/fuzzloc.php:148 +msgid "Fuzzloc Settings updated." +msgstr "Paramètres Fuzzloc mis à jour." + +#: ../../addon/fuzzloc/fuzzloc.php:175 +msgid "" +"Fuzzloc allows you to blur your precise location if your channel uses " +"browser location mapping." +msgstr "Fuzzloc vous permet de brouiller votre position précise si votre canal utilise la cartographie de position du navigateur." + +#: ../../addon/fuzzloc/fuzzloc.php:178 +msgid "Enable Fuzzloc Plugin" +msgstr "Activer le greffon Fuzzloc" + +#: ../../addon/fuzzloc/fuzzloc.php:182 +msgid "Minimum offset in meters" +msgstr "Décalage minimum en mètres" + +#: ../../addon/fuzzloc/fuzzloc.php:186 +msgid "Maximum offset in meters" +msgstr "Décalage maximum en mètres" + +#: ../../addon/fuzzloc/fuzzloc.php:191 +msgid "Fuzzloc Settings" +msgstr "Paramètres de Fuzzloc" + #: ../../addon/rtof/rtof.php:45 msgid "Post to Friendica" msgstr "Publier sur Friendica" @@ -10635,35 +10675,35 @@ msgstr "Identifiant de connexion Friendica" msgid "Friendica Login Password" msgstr "Mot de passe de connexion Friendica" -#: ../../addon/pubcrawl/as.php:1129 ../../addon/pubcrawl/as.php:1256 -#: ../../addon/pubcrawl/as.php:1432 ../../include/network.php:1775 +#: ../../addon/pubcrawl/as.php:1146 ../../addon/pubcrawl/as.php:1273 +#: ../../addon/pubcrawl/as.php:1449 ../../include/network.php:1769 msgid "ActivityPub" msgstr "ActivityPub" -#: ../../addon/pubcrawl/pubcrawl.php:1050 +#: ../../addon/pubcrawl/pubcrawl.php:1053 msgid "ActivityPub Protocol Settings updated." msgstr "Paramètres du protocole ActivityPub Protocol mise à jour." -#: ../../addon/pubcrawl/pubcrawl.php:1059 +#: ../../addon/pubcrawl/pubcrawl.php:1062 msgid "" "The ActivityPub protocol does not support location independence. Connections" " you make within that network may be unreachable from alternate channel " "locations." msgstr "Le protocole ActivityPub ne prend pas en charge l'indépendance de localisation. Les connexions que vous établissez au sein de ce réseau peuvent être inaccessibles à partir d'autres emplacements de canaux." -#: ../../addon/pubcrawl/pubcrawl.php:1062 +#: ../../addon/pubcrawl/pubcrawl.php:1065 msgid "Enable the ActivityPub protocol for this channel" msgstr "Activer le protocole ActivityPub pour ce canal." -#: ../../addon/pubcrawl/pubcrawl.php:1065 +#: ../../addon/pubcrawl/pubcrawl.php:1068 msgid "Send multi-media HTML articles" msgstr "Envoyer des articles HTML multimédia" -#: ../../addon/pubcrawl/pubcrawl.php:1065 +#: ../../addon/pubcrawl/pubcrawl.php:1068 msgid "Not supported by some microblog services such as Mastodon" msgstr "Non pris en charge par certains services de microblog tels que Mastodon." -#: ../../addon/pubcrawl/pubcrawl.php:1069 +#: ../../addon/pubcrawl/pubcrawl.php:1072 msgid "ActivityPub Protocol Settings" msgstr "Paramètres du protocole ActivityPub " @@ -12224,7 +12264,7 @@ msgid "Profile Details" msgstr "Détails du profil" #: ../../include/conversation.php:1837 ../../include/nav.php:404 -#: ../../include/photos.php:662 +#: ../../include/photos.php:666 msgid "Photo Albums" msgstr "Albums photo" @@ -12625,71 +12665,71 @@ msgstr "activité" msgid "a-z, 0-9, -, and _ only" msgstr "a-z, 0-9, -, -, et _ seulement" -#: ../../include/text.php:2402 +#: ../../include/text.php:2419 msgid "Design Tools" msgstr "Outils de conception" -#: ../../include/text.php:2408 +#: ../../include/text.php:2425 msgid "Pages" msgstr "Pages" -#: ../../include/text.php:2430 +#: ../../include/text.php:2447 msgid "Import website..." msgstr "Importer le site web…" -#: ../../include/text.php:2431 +#: ../../include/text.php:2448 msgid "Select folder to import" msgstr "Sélectionner le dossier à importer" -#: ../../include/text.php:2432 +#: ../../include/text.php:2449 msgid "Import from a zipped folder:" msgstr "Importer à partir d'un dossier zippé :" -#: ../../include/text.php:2433 +#: ../../include/text.php:2450 msgid "Import from cloud files:" msgstr "Importer à partir de fichiers dans le cloud :" -#: ../../include/text.php:2434 +#: ../../include/text.php:2451 msgid "/cloud/channel/path/to/folder" msgstr "/cloud/channel/chemain/du/repertoire" -#: ../../include/text.php:2435 +#: ../../include/text.php:2452 msgid "Enter path to website files" msgstr "Entrer le chemin vers les fichiers du site web" -#: ../../include/text.php:2436 +#: ../../include/text.php:2453 msgid "Select folder" msgstr "Sélectionner un répertoire" -#: ../../include/text.php:2437 +#: ../../include/text.php:2454 msgid "Export website..." msgstr "Exporter le site web…" -#: ../../include/text.php:2438 +#: ../../include/text.php:2455 msgid "Export to a zip file" msgstr "Exporter dans un fichier zip" -#: ../../include/text.php:2439 +#: ../../include/text.php:2456 msgid "website.zip" msgstr "website.zip" -#: ../../include/text.php:2440 +#: ../../include/text.php:2457 msgid "Enter a name for the zip file." msgstr "Entrer un nom pour le fichier zip." -#: ../../include/text.php:2441 +#: ../../include/text.php:2458 msgid "Export to cloud files" msgstr "Exporter dans des fichiers sur le cloud" -#: ../../include/text.php:2442 +#: ../../include/text.php:2459 msgid "/path/to/export/folder" msgstr "/chemin/vers/le/dossier/d'export" -#: ../../include/text.php:2443 +#: ../../include/text.php:2460 msgid "Enter a path to a cloud files destination." msgstr "Entrer le chemin vers le cloud de fichiers" -#: ../../include/text.php:2444 +#: ../../include/text.php:2461 msgid "Specify folder" msgstr "Spécifier un répertoire" @@ -13126,7 +13166,7 @@ msgstr "l'écriture dans la base de données a échoué." msgid "Empty path" msgstr "Chemin vide" -#: ../../include/security.php:532 +#: ../../include/security.php:541 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." @@ -13406,43 +13446,43 @@ msgstr "Travail, Fax" msgid "view full size" msgstr "voir en taille réelle" -#: ../../include/network.php:1770 ../../include/network.php:1771 +#: ../../include/network.php:1764 ../../include/network.php:1765 msgid "Friendica" msgstr "Friendica" -#: ../../include/network.php:1772 +#: ../../include/network.php:1766 msgid "OStatus" msgstr "OStatus" -#: ../../include/network.php:1773 +#: ../../include/network.php:1767 msgid "GNU-Social" msgstr "GNU-Social" -#: ../../include/network.php:1774 +#: ../../include/network.php:1768 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:1777 +#: ../../include/network.php:1771 msgid "Diaspora" msgstr "Diaspora" -#: ../../include/network.php:1778 +#: ../../include/network.php:1772 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:1779 +#: ../../include/network.php:1773 msgid "Zot" msgstr "Zot" -#: ../../include/network.php:1780 +#: ../../include/network.php:1774 msgid "LinkedIn" msgstr "Linkedin" -#: ../../include/network.php:1781 +#: ../../include/network.php:1775 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1782 +#: ../../include/network.php:1776 msgid "MySpace" msgstr "MySpace" @@ -13601,7 +13641,7 @@ msgstr "Notes privées" #: ../../include/features.php:115 msgid "Enables a tool to store notes and reminders (note: not encrypted)" -msgstr "Active un outil pour stocker des notes et des rappels (note :non chiffré)" +msgstr "Active un outil pour stocker des notes et des rappels (note:non chiffré)" #: ../../include/features.php:124 msgid "Create personal planning cards" @@ -13685,11 +13725,11 @@ msgstr "Contrôle d'accès et autorisations" #: ../../include/features.php:221 ../../include/group.php:328 msgid "Privacy Groups" -msgstr "Groupes de contacts" +msgstr "Groupes confidentiels" #: ../../include/features.php:222 msgid "Enable management and selection of privacy groups" -msgstr "Active la gestion et la sélection des groupes de contacts" +msgstr "Active la gestion et la sélection des groupes confidentiels" #: ../../include/features.php:230 msgid "Multiple Profiles" @@ -13914,31 +13954,35 @@ msgstr "Nuage de tags" msgid "Provide a personal tag cloud on your channel page" msgstr "Afficher un nuage de vos tags sur votre canal" -#: ../../include/taxonomy.php:491 +#: ../../include/taxonomy.php:320 +msgid "Trending" +msgstr "Tendance" + +#: ../../include/taxonomy.php:552 msgid "Keywords" msgstr "Mots-clefs" -#: ../../include/taxonomy.php:512 +#: ../../include/taxonomy.php:573 msgid "have" msgstr "ont" -#: ../../include/taxonomy.php:512 +#: ../../include/taxonomy.php:573 msgid "has" msgstr "a" -#: ../../include/taxonomy.php:513 +#: ../../include/taxonomy.php:574 msgid "want" msgstr "veulent" -#: ../../include/taxonomy.php:513 +#: ../../include/taxonomy.php:574 msgid "wants" msgstr "veut" -#: ../../include/taxonomy.php:514 +#: ../../include/taxonomy.php:575 msgid "likes" msgstr "aime" -#: ../../include/taxonomy.php:515 +#: ../../include/taxonomy.php:576 msgid "dislikes" msgstr "n'aime pas" @@ -14140,16 +14184,16 @@ msgid "Help and documentation" msgstr "Aide et documentation" #: ../../include/nav.php:179 -msgid "Search site @name, #tag, ?docs, content" -msgstr "Recherche @nom, #tag, contenu" +msgid "Search site @name, !forum, #tag, ?docs, content" +msgstr "Rechercher un site @nom, !forum, #etiquette, ?document, contenu" #: ../../include/nav.php:199 msgid "Site Setup and Configuration" msgstr "Configuration du site" #: ../../include/nav.php:290 -msgid "@name, #tag, ?doc, content" -msgstr "@nom, #étiquette, ?doc, contenu" +msgid "@name, !forum, #tag, ?doc, content" +msgstr "@nom, !forum, #etiquette, ?document, contenu" #: ../../include/nav.php:291 msgid "Please wait..." @@ -14176,21 +14220,21 @@ msgstr "L'image dépasse la taille limite de %lu octets" msgid "Image file is empty." msgstr "L'image est vide." -#: ../../include/photos.php:322 +#: ../../include/photos.php:326 msgid "Photo storage failed." msgstr "Le stockage de l'image a échoué." -#: ../../include/photos.php:371 +#: ../../include/photos.php:375 msgid "a new photo" msgstr "une nouvelle photo" -#: ../../include/photos.php:375 +#: ../../include/photos.php:379 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "%1$s a publié %2$s pour %3$s" -#: ../../include/photos.php:667 +#: ../../include/photos.php:671 msgid "Upload New Photos" msgstr "Ajouter des photos" @@ -14207,7 +14251,7 @@ msgstr "Impossible de vérifier la signature du canal" msgid "Unable to verify site signature for %s" msgstr "Impossible de vérifier la signature de site pour %s" -#: ../../include/zot.php:4206 +#: ../../include/zot.php:4219 msgid "invalid target signature" msgstr "signature de la cible invalide" -- cgit v1.2.3 From eabf804dc944092173c45ac45b26cb36210a5d34 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Thu, 17 May 2018 16:09:42 +0200 Subject: Update hstrings.php --- view/fr/hstrings.php | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/view/fr/hstrings.php b/view/fr/hstrings.php index 6941f6321..a1077ad41 100644 --- a/view/fr/hstrings.php +++ b/view/fr/hstrings.php @@ -1,7 +1,7 @@ 1);; }} App::$rtl = 0; @@ -24,7 +24,7 @@ App::$strings["Can chat with me"] = "Peut discuter avec moi"; App::$strings["Can source my public posts in derived channels"] = "Peut rediriger mes publications publiques vers des canaux dérivés"; App::$strings["Can administer my channel"] = "Peut administrer mon canal"; App::$strings["Social Networking"] = "Réseau social"; -App::$strings["Social - Party"] = "Social - Fête"; +App::$strings["Social - Federation"] = "Sociale - Fédération"; App::$strings["Social - Mostly Public"] = "Social - principalement public"; App::$strings["Social - Restricted"] = "Social - restreint"; App::$strings["Social - Private"] = "Social - privé"; @@ -281,7 +281,8 @@ App::$strings["Channel role and privacy"] = "Rôle et confidentialité du canal" App::$strings["Select a channel role with your privacy requirements."] = "Sélectionner un rôle de canal adapté à vos besoins de confidentialité."; App::$strings["Read more about roles"] = "En savoir plus sur les rôles"; App::$strings["Create Channel"] = "Créer le canal"; -App::$strings["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."] = "Un canal est votre identité sur ce réseau. Il peut représenter une personne, un blog, ou un forum par exemple. Les canaux peuvent entrer en contact les uns avec les autres pour partager des informations avec des droits d'accès très fins."; +App::$strings["A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things. Channels can make connections with other channels to share information with each other."] = "Un canal est une identité réseau unique. Il peut représenter une personne (profil de réseau social), un forum (groupe), une page commerciale ou de célébrités, un flux d'informations et bien d'autres choses. Les canaux peuvent établir des connexions avec d'autres canaux pour partager l'information entre eux."; +App::$strings["The type of channel you create affects the basic privacy settings, the permissions that are granted to connections/friends, and also the channel's visibility across the network."] = "Le type de canal que vous créez affecte les paramètres de confidentialité de base, les permissions accordées aux connexions/amis, ainsi que la visibilité du canal sur le réseau."; App::$strings["or import an existing channel from another location."] = "ou importer un canal existant d'un autre serveur."; App::$strings["Validate"] = "Valider"; App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Il est impossible de supprimer un canal moins de 48 heures après avoir changé le mot de passe d'un compte."; @@ -597,7 +598,7 @@ App::$strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] App::$strings["Delivery interval"] = "Intervalle de distribution"; App::$strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Temporise le processus de distribution de tant de secondes pour réduire la charge sur le système. Valeurs recommandées : 4-5 pour les serveurs mutualisés, 2-3 pour les VPS. 0-1 pour les gros serveurs dédiés."; App::$strings["Deliveries per process"] = "Distributions par processus"; -App::$strings["Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5."] = "Nombre de distributions à tenter au sein d'un seul processus système. Ajuster si nécessaire pour affiner la performance du système. Recommandé :1-5."; +App::$strings["Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5."] = "Nombre de distributions à tenter au sein d'un seul processus système. Ajuster si nécessaire pour affiner la performance du système. Recommandé:1-5."; App::$strings["Queue Threshold"] = "Seuil de file d'attente"; App::$strings["Always defer immediate delivery if queue contains more than this number of entries."] = "Reportez toujours la livraison immédiate si la file d'attente contient plus que ce nombre d'entrées."; App::$strings["Poll interval"] = "Intervalle de scrutation"; @@ -608,7 +609,7 @@ App::$strings["Allow SVG thumbnails in file browser"] = "Autoriser les vignettes App::$strings["WARNING: SVG images may contain malicious code."] = "ATTENTION : les images SVG peuvent contenir du code malveillant."; App::$strings["Maximum Load Average"] = "Charge maximale moyenne"; App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Charge système maximale au-delà de laquelle distribution et scrutation sont reportées - par défaut 50."; -App::$strings["Expiration period in days for imported (grid/network) content"] = "Délai d'expiration pour le contenu importé (réseau)"; +App::$strings["Expiration period in days for imported (grid/network) content"] = "Délai d'expiration en jours pour le contenu importé (grille/réseau)"; App::$strings["0 for no expiration of imported content"] = "0 pour ne pas expirer le contenu importé"; App::$strings["Do not expire any posts which have comments less than this many days ago"] = "Ne pas considérer comme expirés les messages qui ont reçu des commentaires depuis moins de ce nombre de jours"; App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Serveurs publics : page Web facultative d'atterrissage (marketing) pour les nouveaux inscrits."; @@ -672,6 +673,7 @@ App::$strings["Visible to:"] = "Visible par :"; App::$strings["__ctx:acl__ Profile"] = "Profil"; App::$strings["Comment approved"] = "Commentaire validé"; App::$strings["Comment deleted"] = "Commentaire supprimé"; +App::$strings["Permission Name is required."] = "Le nom de permission est requis."; App::$strings["Permission category saved."] = "Profil d'accès enregistré."; App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Utilisez ce formulaire pour créer des règles d'accès pour différentes catégories de personnes ou de contacts."; App::$strings["Permission Categories"] = "Profils d'accès"; @@ -727,7 +729,6 @@ App::$strings["May reduce spam activity"] = "Contribue à réduire l'impact des App::$strings["Default Privacy Group"] = "Groupe de contacts par défaut :"; App::$strings["Use my default audience setting for the type of object published"] = "Utiliser mon paramètre de publication par défaut pour le type d'objet publié"; App::$strings["Profile to assign new connections"] = "Profil pour assigner de nouvelles connexions"; -App::$strings["Channel permissions category:"] = "Profils d'accès du canal :"; App::$strings["Default Permissions Group"] = "Groupe d'accès par défaut"; App::$strings["Maximum private messages per day from unknown people:"] = "Nombre maximum de messages privés émanant d'inconnus, par jour :"; App::$strings["Useful to reduce spamming"] = "Utile pour réduire les indésirables"; @@ -1020,7 +1021,7 @@ App::$strings["__ctx:noun__ Dislike"] = array( 0 => "N'aime pas", 1 => "N'aime pas", ); -App::$strings["Photo Tools"] = "Ouitls pour photos"; +App::$strings["Photo Tools"] = "Outils pour photos"; App::$strings["In This Photo:"] = "Dans cette photo :"; App::$strings["Map"] = "Carte"; App::$strings["__ctx:noun__ Likes"] = "Aime"; @@ -1265,7 +1266,7 @@ App::$strings["comment"] = "commentaire"; App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s a étiqueté le %3\$s de %2\$s avec %4\$s"; App::$strings["This setting requires special processing and editing has been blocked."] = "Ce paramètre nécessité un traitement spécial, les modifications ont été bloquées."; App::$strings["Configuration Editor"] = "Editeur de configuration"; -App::$strings["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."] = "Attention :modifier certains paramètres peut rendre votre canal inutilisable. Merci d'ignorer cette page à moins d'être suffisamment à l'aise de savoir comment utiliser correctement cette fonctionnalité."; +App::$strings["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."] = "Attention:modifier certains paramètres peut rendre votre canal inutilisable. Merci d'ignorer cette page à moins d'être suffisamment à l'aise de savoir comment utiliser correctement cette fonctionnalité."; App::$strings["If enabled, connection requests will be approved without your interaction"] = "Si cette option est activée, les demandes de connexion seront approuvées sans votre intervention."; App::$strings["Automatic approval settings"] = "Paramètres d'approbation automatique"; App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "Certaines permissions individuelles peuvent avoir été prédéfinies ou verrouillées en fonction de votre type de canal et de vos paramètres de confidentialité."; @@ -1333,7 +1334,7 @@ App::$strings["Locality/City"] = "Ville"; App::$strings["Region/State"] = "Région"; App::$strings["Postal/Zip code"] = "Code postal"; App::$strings["Who (if applicable)"] = "Qui (si applicable)"; -App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Exemples : marie123, Marie Deschamps, marie@exemple.com"; +App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Exemples : marie123, Marie Deschamps, marie@exemple.com"; App::$strings["Since (date)"] = "Depuis (date)"; App::$strings["Tell us about yourself"] = "Parlez nous de vous..."; App::$strings["Homepage URL"] = "URL de mon site Internet :"; @@ -2001,6 +2002,7 @@ App::$strings["Website SSL certificate is not valid. Please correct."] = "Le cer App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Tâches Cron inactives sur %s"; App::$strings["Cron/Scheduled tasks not running."] = "Les taches planifiées ne tournent pas."; App::$strings["never"] = "jamais"; +App::$strings["Cover Photo"] = "Photo de couverture"; App::$strings["Focus (Hubzilla default)"] = "Focus (par défaut pour Hubzilla)"; App::$strings["Theme settings"] = "Paramètres du thème"; App::$strings["Narrow navbar"] = "Barre de navigation fine"; @@ -2300,6 +2302,12 @@ App::$strings["The default zoom level. (1:world, 18:highest, also depends on til App::$strings["Include marker on map"] = "Inclure le marqueur sur la carte"; App::$strings["Include a marker on the map."] = "Inclure un marqueur sur la carte."; App::$strings["text to include in all outgoing posts from this site"] = "Texte à inclure dans tous les messages sortants de ce site"; +App::$strings["Fuzzloc Settings updated."] = "Paramètres Fuzzloc mis à jour."; +App::$strings["Fuzzloc allows you to blur your precise location if your channel uses browser location mapping."] = "Fuzzloc vous permet de brouiller votre position précise si votre canal utilise la cartographie de position du navigateur."; +App::$strings["Enable Fuzzloc Plugin"] = "Activer le greffon Fuzzloc"; +App::$strings["Minimum offset in meters"] = "Décalage minimum en mètres"; +App::$strings["Maximum offset in meters"] = "Décalage maximum en mètres"; +App::$strings["Fuzzloc Settings"] = "Paramètres de Fuzzloc"; App::$strings["Post to Friendica"] = "Publier sur Friendica"; App::$strings["rtof Settings saved."] = "Paramètres rtof sauvegardés."; App::$strings["Allow posting to Friendica"] = "Autoriser la publication sur Friendica"; @@ -3071,7 +3079,7 @@ App::$strings["Web Pages"] = "Pages web"; App::$strings["Provide managed web pages on your channel"] = "Fournir des pages web, sous votre contrôle, sur votre canal"; App::$strings["Provide a wiki for your channel"] = "Fournir un wiki pour votre canal."; App::$strings["Private Notes"] = "Notes privées"; -App::$strings["Enables a tool to store notes and reminders (note: not encrypted)"] = "Active un outil pour stocker des notes et des rappels (note :non chiffré)"; +App::$strings["Enables a tool to store notes and reminders (note: not encrypted)"] = "Active un outil pour stocker des notes et des rappels (note:non chiffré)"; App::$strings["Create personal planning cards"] = "Créer des cartes de planification personnelle"; App::$strings["Create interactive articles"] = "Créer des articles interactifs"; App::$strings["Navigation Channel Select"] = "Sélection du canal par la navigation"; @@ -3091,8 +3099,8 @@ App::$strings["Allows creation of complex directory search queries"] = "Autorise App::$strings["Advanced Theme and Layout Settings"] = "Paramètres avancés du thème et de l'agencement."; App::$strings["Allows fine tuning of themes and page layouts"] = "Autoriser la personnalisation fine des thèmes et des agencements."; App::$strings["Access Control and Permissions"] = "Contrôle d'accès et autorisations"; -App::$strings["Privacy Groups"] = "Groupes de contacts"; -App::$strings["Enable management and selection of privacy groups"] = "Active la gestion et la sélection des groupes de contacts"; +App::$strings["Privacy Groups"] = "Groupes confidentiels"; +App::$strings["Enable management and selection of privacy groups"] = "Active la gestion et la sélection des groupes confidentiels"; App::$strings["Multiple Profiles"] = "Profils multiples"; App::$strings["Ability to create multiple profiles"] = "Possibilité de créer plusieurs profils"; App::$strings["Provide alternate connection permission roles."] = "Fournir des rôles d'accès différents pour ce contact."; @@ -3147,6 +3155,7 @@ App::$strings["Star Posts"] = "Pouvoir mettre en avant les publications"; App::$strings["Ability to mark special posts with a star indicator"] = "Pouvoir marquer certaines publications d'une étoile"; App::$strings["Tag Cloud"] = "Nuage de tags"; App::$strings["Provide a personal tag cloud on your channel page"] = "Afficher un nuage de vos tags sur votre canal"; +App::$strings["Trending"] = "Tendance"; App::$strings["Keywords"] = "Mots-clefs"; App::$strings["have"] = "ont"; App::$strings["has"] = "a"; @@ -3217,9 +3226,9 @@ App::$strings["Take me home"] = "Retourner sur mon serveur"; App::$strings["Log me out of this site"] = "Déconnectez-moi de ce site"; App::$strings["Create an account"] = "Créer un compte"; App::$strings["Help and documentation"] = "Aide et documentation"; -App::$strings["Search site @name, #tag, ?docs, content"] = "Recherche @nom, #tag, contenu"; +App::$strings["Search site @name, !forum, #tag, ?docs, content"] = "Rechercher un site @nom, !forum, #etiquette, ?document, contenu"; App::$strings["Site Setup and Configuration"] = "Configuration du site"; -App::$strings["@name, #tag, ?doc, content"] = "@nom, #étiquette, ?doc, contenu"; +App::$strings["@name, !forum, #tag, ?doc, content"] = "@nom, !forum, #etiquette, ?document, contenu"; App::$strings["Please wait..."] = "Merci de patienter..."; App::$strings["Add Apps"] = "Ajouter des applications"; App::$strings["Arrange Apps"] = "Réarranger les applications"; -- cgit v1.2.3 From 2dd66df8ebb395a7154968f14c77390ec75460fb Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Fri, 18 May 2018 16:05:30 +0200 Subject: Update hstrings.php --- view/fr/hstrings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/fr/hstrings.php b/view/fr/hstrings.php index a1077ad41..f7fd25224 100644 --- a/view/fr/hstrings.php +++ b/view/fr/hstrings.php @@ -1,7 +1,7 @@ 1);; }} App::$rtl = 0; -- cgit v1.2.3 From 7f7e049397fcd7526ca75dd91bd881369219f019 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 18 May 2018 21:30:07 +0200 Subject: an attempt to fix the new_channel validation situation --- Zotlabs/Module/New_channel.php | 11 +++-- view/js/mod_new_channel.js | 96 +++++++++++++++++++++++++++++++----------- view/tpl/new_channel.tpl | 5 +-- 3 files changed, 80 insertions(+), 32 deletions(-) diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php index df7da2fe8..c946961bc 100644 --- a/Zotlabs/Module/New_channel.php +++ b/Zotlabs/Module/New_channel.php @@ -137,16 +137,19 @@ class New_channel extends \Zotlabs\Web\Controller { } } - $name_help = (($default_role) + $name_help = ''; + $name_help .= (($default_role) ? t('Your real name is recommended.') : t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"') - ); - - $nick_help = t('This will be used to create a unique network address (like an email address).'); + ); + $name_help .= ''; + $nick_help = ''; + $nick_help .= t('This will be used to create a unique network address (like an email address).'); if(! get_config('system','unicode_usernames')) { $nick_help .= ' ' . t('Allowed characters are a-z 0-9, - and _'); } + $nick_help .= ''; $privacy_role = ((x($_REQUEST,'permissions_role')) ? $_REQUEST['permissions_role'] : "" ); diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js index e78de2596..889911d49 100644 --- a/view/js/mod_new_channel.js +++ b/view/js/mod_new_channel.js @@ -1,43 +1,91 @@ $(document).ready(function() { - - $("#newchannel-submit-button").attr('disabled','disabled'); + $("#id_name").focus(); $("#id_name").blur(function() { - $("#name-spinner").show(); - var zreg_name = $("#id_name").val(); - $.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) { - $("#id_nickname").val(data); - if(data.error) { - $("#help_name").html(""); - zFormError("#help_name",data.error); - } - else { - $("#newchannel-submit-button").removeAttr('disabled'); - } - $("#name-spinner").hide(); - }); + if(validate_name()) { + var zreg_name = $("#id_name").val(); + $("#name_help_loading").show(); + $("#name_help_text").hide(); + $.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) { + $("#id_nickname").val(data); + $("#id_nickname").addClass('is-validated'); + $("#name_help_loading").hide(); + $("#name_help_text").show(); + }); + } }); - $("#id_nickname").click(function() { - $("#newchannel-submit-button").attr('disabled','disabled'); + $("#id_nickname").on('input', function() { + $("#id_nickname").removeClass('is-validated'); }); - }); + $("#newchannel-form").on('submit', function(event) { + if(! validate_name()) { + $("#id_name").focus() + return false; + } + + if(! validate_channel()) { + $("#id_nickname").focus() + return false; + } + + if(! $("#id_nickname").hasClass('is-validated')) { + event.preventDefault(); + } + else { + event.preventDefault(); + console.log('channel created'); + } + }); + }); function validate_channel() { - $("#nick-spinner").show(); + if($("#id_nickname").hasClass('is-validated')) + return true; + + $("#nick_help_loading").show(); + $("#nick_help_text").hide(); var zreg_nick = $("#id_nickname").val(); $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) { $("#id_nickname").val(data); - if(data.error) { - $("#help_nickname").html(""); - zFormError("#help_nickname",data.error); + if(data !== zreg_nick) { + $("#id_nickname").addClass('is-validated'); + $("#help_nickname").addClass('text-danger').removeClass('text-muted'); + $("#help_nickname").html('Your chosen nickname was either already taken or not valid. Please use our suggestion (' + data + ') or enter a new one.'); + $("#id_nickname").focus(); } else { - $("#newchannel-submit-button").removeAttr('disabled'); + $("#id_nickname").addClass('is-validated'); + $("#help_nickname").addClass('text-success').removeClass('text-muted').removeClass('text-danger'); + $("#help_nickname").html("Thank you, this nickname is valid."); } - $("#nick-spinner").hide(); + $("#nick_help_loading").hide(); + $("#nick_help_text").show(); + }); + return true; + + } + + function validate_name() { + if($("#id_name").hasClass('is-validated')) + return true; + + var verbs = ['lovely', 'wonderful', 'gorgeous', 'great']; + var verb = verbs[Math.floor((Math.random() * 4) + 0)]; + if(! $("#id_name").val()) { + $("#id_name").focus(); + $("#help_name").addClass('text-danger').removeClass('text-muted'); + $("#help_name").html("A channel name is required."); + return false; + } + else { + $("#help_name").addClass('text-success').removeClass('text-muted').removeClass('text-danger'); + $("#help_name").html('This is a ' + verb + ' channel name.'); + $("#id_name").addClass('is-validated'); + return true; + } } diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index a89208228..51880e1f6 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -21,14 +21,11 @@ {{/if}} {{include file="field_input.tpl" field=$name}} - {{include file="field_input.tpl" field=$nickname}} - + - -
    -- cgit v1.2.3 From 620e8f2f0b23dc1b77744b3da6dbcd1f9bd07399 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 18 May 2018 21:30:58 +0200 Subject: version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index b19817197..48b32d45b 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.5.4' ); +define ( 'STD_VERSION', '3.5.5' ); define ( 'ZOT_REVISION', '6.0a' ); -- cgit v1.2.3 From 056f3d352cb8855c0845bebc459973ddcb4c0b2f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 18 May 2018 21:32:18 +0200 Subject: remove debug code --- view/js/mod_new_channel.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js index 889911d49..c01029046 100644 --- a/view/js/mod_new_channel.js +++ b/view/js/mod_new_channel.js @@ -33,10 +33,6 @@ if(! $("#id_nickname").hasClass('is-validated')) { event.preventDefault(); } - else { - event.preventDefault(); - console.log('channel created'); - } }); }); -- cgit v1.2.3 From dae89ce91c65679003d10da113a45f3ff37a8d39 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 18 May 2018 16:57:45 -0700 Subject: wrong default param for pubstream_incl (this checkin also picked up a few minor and hopefully non-significant changes) --- Zotlabs/Module/Admin/Site.php | 4 ++-- Zotlabs/Module/Photo.php | 5 +++-- Zotlabs/Module/Removeme.php | 2 +- include/nav.php | 10 +--------- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index ff4f56ac8..292de4c3a 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -344,8 +344,8 @@ class Site { '$disable_discover_tab' => array('disable_discover_tab', t('Import Public Streams'), $discover_tab, t('Import and allow access to public content pulled from other sites. Warning: this content is unmoderated.')), '$site_firehose' => array('site_firehose', t('Site only Public Streams'), get_config('system','site_firehose'), t('Allow access to public content originating only from this site if Imported Public Streams are disabled.')), '$open_pubstream' => array('open_pubstream', t('Allow anybody on the internet to access the Public streams'), get_config('system','open_pubstream',1), t('Disable to require authentication before viewing. Warning: this content is unmoderated.')), - '$incl' => array('pub_incl',t('Only import Public stream posts with this text'), $contact['abook_incl'],t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), - '$excl' => array('pub_excl',t('Do not import Public stream posts with this text'), $contact['abook_excl'],t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), + '$incl' => array('pub_incl',t('Only import Public stream posts with this text'), get_config('system','pubstream_incl'),t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), + '$excl' => array('pub_excl',t('Do not import Public stream posts with this text'), get_config('system','pubstream_excl'),t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), '$login_on_homepage' => array('login_on_homepage', t("Login on Homepage"),((intval($homelogin) || $homelogin === false) ? 1 : '') , t("Present a login box to visitors on the home page if no other content has been configured.")), diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index f348866d9..8efc00707 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -14,7 +14,8 @@ class Photo extends \Zotlabs\Web\Controller { $prvcachecontrol = false; $streaming = null; $channel = null; - + $person = 0; + switch(argc()) { case 4: $person = argv(3); @@ -31,7 +32,7 @@ class Photo extends \Zotlabs\Web\Controller { } $observer_xchan = get_observer_hash(); - + $default = z_root() . '/' . get_default_profile_photo(); if(isset($type)) { diff --git a/Zotlabs/Module/Removeme.php b/Zotlabs/Module/Removeme.php index 111230937..451e280c3 100644 --- a/Zotlabs/Module/Removeme.php +++ b/Zotlabs/Module/Removeme.php @@ -38,7 +38,7 @@ class Removeme extends \Zotlabs\Web\Controller { } $global_remove = intval($_POST['global']); - + channel_remove(local_channel(),1 - $global_remove,true); } diff --git a/include/nav.php b/include/nav.php index a443c58ff..c5ceb97c5 100644 --- a/include/nav.php +++ b/include/nav.php @@ -17,15 +17,7 @@ function nav($template = 'default') { if(!(x(App::$page,'nav'))) App::$page['nav'] = ''; - $base = z_root(); - - App::$page['htmlhead'] .= <<< EOT - -EOT; + App::$page['htmlhead'] .= ''; $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false); -- cgit v1.2.3 From 8b4af7cf0ba59fe0a50ca7caf843569578ac3044 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 19 May 2018 00:54:47 -0700 Subject: hubzilla issue #1086, pending count on admin summary page --- Zotlabs/Module/Admin.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 30f3dfa48..934312efe 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -100,8 +100,12 @@ class Admin extends \Zotlabs\Web\Controller { } // pending registrations - $r = q("SELECT COUNT(id) AS rtotal FROM register WHERE uid != '0'"); - $pending = $r[0]['rtotal']; + + $pdg = q("SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) > 0 ", + intval(ACCOUNT_PENDING) + ); + + $pending = (($pdg) ? count($pdg) : 0); // available channels, primary and clones $channels = array(); -- cgit v1.2.3 From 0bc2a4f603a87e13d495eb7c245b85507aac6e44 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 19 May 2018 11:04:34 +0200 Subject: fix issues with attachment labels --- include/text.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index ef3c8871c..aafba2168 100644 --- a/include/text.php +++ b/include/text.php @@ -1415,15 +1415,21 @@ function unobscure_mail(&$item) { function theme_attachments(&$item) { $arr = json_decode($item['attach'],true); + if(is_array($arr) && count($arr)) { $attaches = array(); foreach($arr as $r) { $icon = getIconFromType($r['type']); - $label = (($r['title']) ? urldecode(htmlspecialchars($r['title'], ENT_COMPAT, 'UTF-8')) : t('Unknown Attachment')); + + if($r['title']) + $label = urldecode(htmlspecialchars($r['title'], ENT_COMPAT, 'UTF-8')); + + if(! $label && $r['href']) + $label = basename($r['href']); //some feeds provide an attachment where title an empty space - if($label == ' ') + if(! $label || $label == ' ') $label = t('Unknown Attachment'); $title = t('Size') . ' ' . (($r['length']) ? userReadableSize($r['length']) : t('unknown')); -- cgit v1.2.3 From 244e813bfa9baa5ade89b371ec109775cdae2664 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 19 May 2018 21:21:02 +0200 Subject: fix issue where images were not visible in acl selector after using search --- view/js/acl.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/js/acl.js b/view/js/acl.js index a5fae19bc..29652acb5 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -394,6 +394,10 @@ ACL.prototype.get = function(start, count, search) { data: postdata, dataType: 'json', success: that.populate + }) + .done(function() { + if(search !== undefined) + datasrc2src('#acl-list-content .list-group-item img[data-src]'); }); }; -- cgit v1.2.3 From 7a1afc315d51366efcf604fc1fe3737375aac799 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 19 May 2018 22:01:10 +0200 Subject: update to fork-awesome 1.1 and fix an old font-awesome reference --- library/fork-awesome/css/fork-awesome.css | 68 +++++++- library/fork-awesome/css/fork-awesome.min.css | 6 +- library/fork-awesome/css/fork-awesome.min.css.map | 2 +- library/fork-awesome/fonts/forkawesome-webfont.eot | Bin 174246 -> 182286 bytes library/fork-awesome/fonts/forkawesome-webfont.svg | 188 ++++++++++++++++----- library/fork-awesome/fonts/forkawesome-webfont.ttf | Bin 174056 -> 182096 bytes .../fork-awesome/fonts/forkawesome-webfont.woff | Bin 104140 -> 110252 bytes .../fork-awesome/fonts/forkawesome-webfont.woff2 | Bin 82580 -> 87876 bytes view/theme/redbasic/css/style.css | 2 +- 9 files changed, 215 insertions(+), 51 deletions(-) diff --git a/library/fork-awesome/css/fork-awesome.css b/library/fork-awesome/css/fork-awesome.css index 5670fbe13..820f8792f 100644 --- a/library/fork-awesome/css/fork-awesome.css +++ b/library/fork-awesome/css/fork-awesome.css @@ -1,13 +1,13 @@ /*! - * Fork Awesome 1.0.9, originaly by Dave Gandy - http://forkawesome.github.com/Fork-Awesome/ - * License - http://forkawesome.github.com/Fork-Awesome//license (Font: SIL OFL 1.1, CSS: MIT License) + * Fork Awesome 1.1.0, originaly by Dave Gandy - http://forkawesome.github.io/Fork-Awesome/ + * License - http://forkawesome.github.io/Fork-Awesome//license (Font: SIL OFL 1.1, CSS: MIT License) */ /* FONT PATH * -------------------------- */ @font-face { font-family: 'ForkAwesome'; - src: url('../fonts/forkawesome-webfont.eot?v=1.0.9'); - src: url('../fonts/forkawesome-webfont.eot?#iefix&v=1.0.9') format('embedded-opentype'), url('../fonts/forkawesome-webfont.woff2?v=1.0.9') format('woff2'), url('../fonts/forkawesome-webfont.woff?v=1.0.9') format('woff'), url('../fonts/forkawesome-webfont.ttf?v=1.0.9') format('truetype'), url('../fonts/forkawesome-webfont.svg?v=1.0.9#forkawesomeregular') format('svg'); + src: url('../fonts/forkawesome-webfont.eot?v=1.1.0'); + src: url('../fonts/forkawesome-webfont.eot?#iefix&v=1.1.0') format('embedded-opentype'), url('../fonts/forkawesome-webfont.woff2?v=1.1.0') format('woff2'), url('../fonts/forkawesome-webfont.woff?v=1.1.0') format('woff'), url('../fonts/forkawesome-webfont.ttf?v=1.1.0') format('truetype'), url('../fonts/forkawesome-webfont.svg?v=1.1.0#forkawesomeregular') format('svg'); font-weight: normal; font-style: normal; } @@ -683,6 +683,12 @@ .fa-globe:before { content: "\f0ac"; } +.fa-globe-e:before { + content: "\f304"; +} +.fa-globe-w:before { + content: "\f305"; +} .fa-wrench:before { content: "\f0ad"; } @@ -2389,6 +2395,60 @@ .fa-archive-org:before { content: "\f2fc"; } +.fa-freedombox:before { + content: "\f2fd"; +} +.fa-facebook-messenger:before { + content: "\f2fe"; +} +.fa-debian:before { + content: "\f2ff"; +} +.fa-mastodon-square:before { + content: "\f300"; +} +.fa-tipeee:before { + content: "\f301"; +} +.fa-react:before { + content: "\f302"; +} +.fa-dogmazic:before { + content: "\f303"; +} +.fa-zotero:before { + content: "\f309"; +} +.fa-nodejs:before { + content: "\f308"; +} +.fa-nextcloud:before { + content: "\f306"; +} +.fa-nextcloud-square:before { + content: "\f307"; +} +.fa-hackaday:before { + content: "\f30a"; +} +.fa-laravel:before { + content: "\f30b"; +} +.fa-signalapp:before { + content: "\f30c"; +} +.fa-gnupg:before { + content: "\f30d"; +} +.fa-php:before { + content: "\f30e"; +} +.fa-ffmpeg:before { + content: "\f30f"; +} +.fa-joplin:before { + content: "\f310"; +} .sr-only { position: absolute; width: 1px; diff --git a/library/fork-awesome/css/fork-awesome.min.css b/library/fork-awesome/css/fork-awesome.min.css index f01cbc7d8..5c2262588 100644 --- a/library/fork-awesome/css/fork-awesome.min.css +++ b/library/fork-awesome/css/fork-awesome.min.css @@ -1,4 +1,4 @@ /*! - * Fork Awesome 1.0.9, originaly by Dave Gandy - http://forkawesome.github.com/Fork-Awesome/ - * License - http://forkawesome.github.com/Fork-Awesome//license (Font: SIL OFL 1.1, CSS: MIT License) - */@font-face{font-family:ForkAwesome;src:url(../fonts/forkawesome-webfont.eot?v=1.0.9);src:url(../fonts/forkawesome-webfont.eot?#iefix&v=1.0.9) format('embedded-opentype'),url(../fonts/forkawesome-webfont.woff2?v=1.0.9) format('woff2'),url(../fonts/forkawesome-webfont.woff?v=1.0.9) format('woff'),url(../fonts/forkawesome-webfont.ttf?v=1.0.9) format('truetype'),url(../fonts/forkawesome-webfont.svg?v=1.0.9#forkawesomeregular) format('svg');font-weight:400;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 ForkAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1,1);-ms-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1,-1);-ms-transform:scale(1,-1);transform:scale(1,-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-rotate-90{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-close:before,.fa-remove:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-cog:before,.fa-gear:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-repeat:before,.fa-rotate-right:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-image:before,.fa-photo:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-exclamation-triangle:before,.fa-warning:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-cogs:before,.fa-gears:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-community:before,.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-floppy-o:before,.fa-save:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-bars:before,.fa-navicon:before,.fa-reorder:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-sort:before,.fa-unsorted:before{content:"\f0dc"}.fa-sort-desc:before,.fa-sort-down:before{content:"\f0dd"}.fa-sort-asc:before,.fa-sort-up:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-gavel:before,.fa-legal:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-bolt:before,.fa-flash:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-clipboard:before,.fa-paste:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-chain-broken:before,.fa-unlink:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-caret-square-o-down:before,.fa-toggle-down:before{content:"\f150"}.fa-caret-square-o-up:before,.fa-toggle-up:before{content:"\f151"}.fa-caret-square-o-right:before,.fa-toggle-right:before{content:"\f152"}.fa-eur:before,.fa-euro:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-inr:before,.fa-rupee:before{content:"\f156"}.fa-cny:before,.fa-jpy:before,.fa-rmb:before,.fa-yen:before{content:"\f157"}.fa-rouble:before,.fa-rub:before,.fa-ruble:before{content:"\f158"}.fa-krw:before,.fa-won:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-caret-square-o-left:before,.fa-toggle-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-try:before,.fa-turkish-lira:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-bank:before,.fa-institution:before,.fa-university:before{content:"\f19c"}.fa-graduation-cap:before,.fa-mortar-board:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-image-o:before,.fa-file-photo-o:before,.fa-file-picture-o:before{content:"\f1c5"}.fa-file-archive-o:before,.fa-file-zip-o:before{content:"\f1c6"}.fa-file-audio-o:before,.fa-file-sound-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-ring:before,.fa-life-saver:before,.fa-support:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before,.fa-resistance:before{content:"\f1d0"}.fa-empire:before,.fa-ge:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before,.fa-y-combinator-square:before,.fa-yc-square:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-paper-plane:before,.fa-send:before{content:"\f1d8"}.fa-paper-plane-o:before,.fa-send-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-futbol-o:before,.fa-soccer-ball-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-ils:before,.fa-shekel:before,.fa-sheqel:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-bed:before,.fa-hotel:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-medium-square:before{content:"\f2f8"}.fa-y-combinator:before,.fa-yc:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before,.fa-battery:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-paper-o:before,.fa-hand-stop-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-television:before,.fa-tv:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-american-sign-language-interpreting:before,.fa-asl-interpreting:before{content:"\f2a3"}.fa-deaf:before,.fa-deafness:before,.fa-hard-of-hearing:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-sign-language:before,.fa-signing:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-address-card:before,.fa-vcard:before{content:"\f2bb"}.fa-address-card-o:before,.fa-vcard-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer-full:before,.fa-thermometer:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bath:before,.fa-bathtub:before,.fa-s15:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.fa-mastodon:before{content:"\f2e1"}.fa-mastodon-alt:before{content:"\f2e2"}.fa-fork-awesome:before,.fa-fork-circle:before{content:"\f2e3"}.fa-peertube:before{content:"\f2e4"}.fa-diaspora:before{content:"\f2e5"}.fa-friendica:before{content:"\f2e6"}.fa-gnu-social:before{content:"\f2e7"}.fa-liberapay-square:before{content:"\f2e8"}.fa-liberapay:before{content:"\f2e9"}.fa-scuttlebutt:before,.fa-ssb:before{content:"\f2ea"}.fa-hubzilla:before{content:"\f2eb"}.fa-social-home:before{content:"\f2ec"}.fa-artstation:before{content:"\f2ed"}.fa-discord:before{content:"\f2ee"}.fa-discord-alt:before{content:"\f2ef"}.fa-patreon:before{content:"\f2f0"}.fa-snowdrift:before{content:"\f2f1"}.fa-activitypub:before{content:"\f2f2"}.fa-ethereum:before{content:"\f2f3"}.fa-keybase:before{content:"\f2f4"}.fa-shaarli:before{content:"\f2f5"}.fa-shaarli-o:before{content:"\f2f6"}.fa-cut-key:before,.fa-key-modern:before{content:"\f2f7"}.fa-xmpp:before{content:"\f2f9"}.fa-archive-org:before{content:"\f2fc"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}/*# sourceMappingURL=fork-awesome.min.css.map */ \ No newline at end of file + * Fork Awesome 1.1.0, originaly by Dave Gandy - http://forkawesome.github.io/Fork-Awesome/ + * License - http://forkawesome.github.io/Fork-Awesome//license (Font: SIL OFL 1.1, CSS: MIT License) + */@font-face{font-family:ForkAwesome;src:url(../fonts/forkawesome-webfont.eot?v=1.1.0);src:url(../fonts/forkawesome-webfont.eot?#iefix&v=1.1.0) format('embedded-opentype'),url(../fonts/forkawesome-webfont.woff2?v=1.1.0) format('woff2'),url(../fonts/forkawesome-webfont.woff?v=1.1.0) format('woff'),url(../fonts/forkawesome-webfont.ttf?v=1.1.0) format('truetype'),url(../fonts/forkawesome-webfont.svg?v=1.1.0#forkawesomeregular) format('svg');font-weight:400;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 ForkAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1,1);-ms-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1,-1);-ms-transform:scale(1,-1);transform:scale(1,-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-rotate-90{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-close:before,.fa-remove:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-cog:before,.fa-gear:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-repeat:before,.fa-rotate-right:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-image:before,.fa-photo:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-exclamation-triangle:before,.fa-warning:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-cogs:before,.fa-gears:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-globe-e:before{content:"\f304"}.fa-globe-w:before{content:"\f305"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-community:before,.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-floppy-o:before,.fa-save:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-bars:before,.fa-navicon:before,.fa-reorder:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-sort:before,.fa-unsorted:before{content:"\f0dc"}.fa-sort-desc:before,.fa-sort-down:before{content:"\f0dd"}.fa-sort-asc:before,.fa-sort-up:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-gavel:before,.fa-legal:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-bolt:before,.fa-flash:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-clipboard:before,.fa-paste:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-chain-broken:before,.fa-unlink:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-caret-square-o-down:before,.fa-toggle-down:before{content:"\f150"}.fa-caret-square-o-up:before,.fa-toggle-up:before{content:"\f151"}.fa-caret-square-o-right:before,.fa-toggle-right:before{content:"\f152"}.fa-eur:before,.fa-euro:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-inr:before,.fa-rupee:before{content:"\f156"}.fa-cny:before,.fa-jpy:before,.fa-rmb:before,.fa-yen:before{content:"\f157"}.fa-rouble:before,.fa-rub:before,.fa-ruble:before{content:"\f158"}.fa-krw:before,.fa-won:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-caret-square-o-left:before,.fa-toggle-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-try:before,.fa-turkish-lira:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-bank:before,.fa-institution:before,.fa-university:before{content:"\f19c"}.fa-graduation-cap:before,.fa-mortar-board:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-image-o:before,.fa-file-photo-o:before,.fa-file-picture-o:before{content:"\f1c5"}.fa-file-archive-o:before,.fa-file-zip-o:before{content:"\f1c6"}.fa-file-audio-o:before,.fa-file-sound-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-ring:before,.fa-life-saver:before,.fa-support:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before,.fa-resistance:before{content:"\f1d0"}.fa-empire:before,.fa-ge:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before,.fa-y-combinator-square:before,.fa-yc-square:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-paper-plane:before,.fa-send:before{content:"\f1d8"}.fa-paper-plane-o:before,.fa-send-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-futbol-o:before,.fa-soccer-ball-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-ils:before,.fa-shekel:before,.fa-sheqel:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-bed:before,.fa-hotel:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-medium-square:before{content:"\f2f8"}.fa-y-combinator:before,.fa-yc:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before,.fa-battery:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-paper-o:before,.fa-hand-stop-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-television:before,.fa-tv:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-american-sign-language-interpreting:before,.fa-asl-interpreting:before{content:"\f2a3"}.fa-deaf:before,.fa-deafness:before,.fa-hard-of-hearing:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-sign-language:before,.fa-signing:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-address-card:before,.fa-vcard:before{content:"\f2bb"}.fa-address-card-o:before,.fa-vcard-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer-full:before,.fa-thermometer:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bath:before,.fa-bathtub:before,.fa-s15:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.fa-mastodon:before{content:"\f2e1"}.fa-mastodon-alt:before{content:"\f2e2"}.fa-fork-awesome:before,.fa-fork-circle:before{content:"\f2e3"}.fa-peertube:before{content:"\f2e4"}.fa-diaspora:before{content:"\f2e5"}.fa-friendica:before{content:"\f2e6"}.fa-gnu-social:before{content:"\f2e7"}.fa-liberapay-square:before{content:"\f2e8"}.fa-liberapay:before{content:"\f2e9"}.fa-scuttlebutt:before,.fa-ssb:before{content:"\f2ea"}.fa-hubzilla:before{content:"\f2eb"}.fa-social-home:before{content:"\f2ec"}.fa-artstation:before{content:"\f2ed"}.fa-discord:before{content:"\f2ee"}.fa-discord-alt:before{content:"\f2ef"}.fa-patreon:before{content:"\f2f0"}.fa-snowdrift:before{content:"\f2f1"}.fa-activitypub:before{content:"\f2f2"}.fa-ethereum:before{content:"\f2f3"}.fa-keybase:before{content:"\f2f4"}.fa-shaarli:before{content:"\f2f5"}.fa-shaarli-o:before{content:"\f2f6"}.fa-cut-key:before,.fa-key-modern:before{content:"\f2f7"}.fa-xmpp:before{content:"\f2f9"}.fa-archive-org:before{content:"\f2fc"}.fa-freedombox:before{content:"\f2fd"}.fa-facebook-messenger:before{content:"\f2fe"}.fa-debian:before{content:"\f2ff"}.fa-mastodon-square:before{content:"\f300"}.fa-tipeee:before{content:"\f301"}.fa-react:before{content:"\f302"}.fa-dogmazic:before{content:"\f303"}.fa-zotero:before{content:"\f309"}.fa-nodejs:before{content:"\f308"}.fa-nextcloud:before{content:"\f306"}.fa-nextcloud-square:before{content:"\f307"}.fa-hackaday:before{content:"\f30a"}.fa-laravel:before{content:"\f30b"}.fa-signalapp:before{content:"\f30c"}.fa-gnupg:before{content:"\f30d"}.fa-php:before{content:"\f30e"}.fa-ffmpeg:before{content:"\f30f"}.fa-joplin:before{content:"\f310"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}/*# sourceMappingURL=fork-awesome.min.css.map */ \ No newline at end of file diff --git a/library/fork-awesome/css/fork-awesome.min.css.map b/library/fork-awesome/css/fork-awesome.min.css.map index e3e919849..14e800fde 100644 --- a/library/fork-awesome/css/fork-awesome.min.css.map +++ b/library/fork-awesome/css/fork-awesome.min.css.map @@ -1 +1 @@ -{"version":3,"sources":["fork-awesome.css"],"names":[],"mappings":";;;AAMA,WACE,YAAA,YACA,IAAS,8CACT,IAAS,qDAAoF,4BAAA,gDAAmE,gBAAA,+CAAiE,eAAA,8CAAoE,mBAAA,iEAArS,cACA,YAAA,IACA,WAAA,OAEF,IACE,QAAA,aACA,KAAA,OAAA,OAAA,OAAA,KAAA,EAAA,YACA,UAAA,QACA,eAAA,KACA,uBAAA,YACA,wBAAA,UAGF,OACE,UAAA,aACA,YAAA,MACA,eAAA,KAEF,OACE,UAAA,IAEF,OACE,UAAA,IAEF,OACE,UAAA,IAEF,OACE,UAAA,IAEF,OACE,MAAA,aACA,WAAA,OAEF,OACE,aAAA,EACA,YAAA,aACA,gBAAA,KAEK,UACL,SAAA,SAEF,OACE,SAAA,SACA,KAAA,cACA,MAAA,aACA,IAAA,YACA,WAAA,OAEI,aACJ,KAAA,cAEF,WACE,QAAA,KAAA,MAAA,MACA,OAAA,MAAA,MAAA,KACA,cAAA,KAEF,cACE,MAAA,KAEF,eACE,MAAA,MAEC,iBACD,aAAA,KAEC,kBACD,YAAA,KAGF,YACE,MAAA,MAEF,WACE,MAAA,KAEC,cACD,aAAA,KAEC,eACD,YAAA,KAEF,SACE,kBAAA,QAAA,GAAA,SAAA,OACA,UAAA,QAAA,GAAA,SAAA,OAEF,UACE,kBAAA,QAAA,GAAA,SAAuC,SACvC,UAAA,QAAA,GAAA,SAA+B,SAEjC,2BACE,GACE,kBAAmB,UACnB,UAAW,UAEb,KACE,kBAAmB,eACnB,UAAW,gBAGf,mBACE,GACE,kBAAmB,UACnB,UAAW,UAEb,KACE,kBAAmB,eACnB,UAAW,gBAGf,cACE,WAAY,2DACZ,kBAAmB,cACnB,cAAe,cACf,UAAW,cAEb,eACE,WAAY,2DACZ,kBAAmB,eACnB,cAAe,eACf,UAAW,eAEb,eACE,WAAY,2DACZ,kBAAmB,eACnB,cAAe,eACf,UAAW,eAEb,oBACE,WAAY,qEACZ,kBAAmB,YACnB,cAAe,YACf,UAAW,YAEb,kBACE,WAAY,qEACZ,kBAAmB,YACnB,cAAe,YACf,UAAW,YAKP,0BACA,wBAHA,qBACA,qBAFA,oBAKJ,OAAA,KAEF,UACE,SAAA,SACA,QAAA,aACA,MAAA,IACA,OAAA,IACA,YAAA,IACA,eAAA,OAEF,aACA,aACE,SAAA,SACA,KAAA,EACA,MAAA,KACA,WAAA,OAEF,aACE,YAAA,QAEF,aACE,UAAA,IAEF,YACE,MAAA,KAIO,iBACP,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAEO,iBACP,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACR,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEU,oBACV,QAAA,QAEI,cACJ,QAAA,QAES,mBACT,QAAA,QAEO,iBACP,QAAA,QAGO,iBADC,kBAED,iBACP,QAAA,QAEa,uBACb,QAAA,QAEc,wBACd,QAAA,QAEW,qBACX,QAAA,QAEQ,kBACR,QAAA,QAGK,eADC,gBAEN,QAAA,QAES,mBACT,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEM,gBACN,QAAA,QAEU,oBACV,QAAA,QAEqB,+BACrB,QAAA,QAEmB,6BACnB,QAAA,QAEO,iBACP,QAAA,QAEe,yBACf,QAAA,QAGQ,kBADM,wBAEd,QAAA,QAES,mBACT,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEY,sBACZ,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEW,qBACX,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEK,eACL,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEU,oBACV,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACR,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACC,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACd,QAAA,QAGO,iBADA,iBAEI,qBACX,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEM,gBACN,QAAA,QAEM,gBACW,2BACjB,QAAA,QAEgB,0BAChB,QAAA,QAEgB,0BAChB,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAEe,yBACf,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEO,iBACP,QAAA,QAEM,gBACN,QAAA,QAES,mBACT,QAAA,QAEc,wBACd,QAAA,QAEc,wBACd,QAAA,QAEO,iBACP,QAAA,QAEc,wBACd,QAAA,QAEe,yBACf,QAAA,QAEa,uBACb,QAAA,QAEc,wBACd,QAAA,QAEc,wBACd,QAAA,QAEc,wBACd,QAAA,QAEiB,2BACjB,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEgB,0BAChB,QAAA,QAEgB,0BAChB,QAAA,QAEK,eACL,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACP,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEO,iBACP,QAAA,QAEU,oBACV,QAAA,QAEoB,8BACpB,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEK,eACL,QAAA,QAEW,qBACX,QAAA,QAGsB,gCADb,mBAET,QAAA,QAEO,iBACP,QAAA,QAEU,oBACV,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAES,mBACT,QAAA,QAEe,yBACf,QAAA,QAEQ,kBACR,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEU,oBACV,QAAA,QAEa,uBACF,qBACX,QAAA,QAEgB,0BAChB,QAAA,QAEiB,2BACjB,QAAA,QAEc,wBACd,QAAA,QAEK,eACL,QAAA,QAGM,gBADC,iBAEP,QAAA,QAEU,oBACV,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEW,qBACX,QAAA,QAES,mBACT,QAAA,QAEU,oBACV,QAAA,QAEiB,2BACjB,QAAA,QAEY,sBACZ,QAAA,QAEe,yBACf,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEO,iBACP,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAES,mBACT,QAAA,QAEY,sBACF,oBACV,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEa,uBACb,QAAA,QAEM,gBACD,eACL,QAAA,QAEO,iBACP,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEa,uBACb,QAAA,QAEc,wBACd,QAAA,QAEa,uBACb,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAEmB,6BACnB,QAAA,QAEoB,8BACpB,QAAA,QAEiB,2BACjB,QAAA,QAEmB,6BACnB,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAEW,qBACJ,iBACA,iBACP,QAAA,QAEO,iBACD,gBACN,QAAA,QAEO,iBACP,QAAA,QAEO,iBACP,QAAA,QAEK,eACK,oBACV,QAAA,QAEM,gBACG,mBACT,QAAA,QAEW,qBACX,QAAA,QAGU,oBADJ,gBAEN,QAAA,QAEQ,kBACR,QAAA,QAIM,gBAFG,mBACA,mBAET,QAAA,QAES,mBACT,QAAA,QAES,mBACT,QAAA,QAEe,yBACf,QAAA,QAEW,qBACX,QAAA,QAEO,iBACP,QAAA,QAEO,iBACP,QAAA,QAEO,iBACP,QAAA,QAEW,qBACX,QAAA,QAEkB,4BAClB,QAAA,QAEoB,8BACpB,QAAA,QAEa,uBACb,QAAA,QAEO,iBACP,QAAA,QAEY,sBACZ,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAES,mBACT,QAAA,QAGM,gBADI,oBAEV,QAAA,QAGW,qBADA,qBAEX,QAAA,QAGU,oBADD,mBAET,QAAA,QAEU,oBACV,QAAA,QAEU,oBACV,QAAA,QAEa,uBACP,gBACN,QAAA,QAGO,iBADA,iBAEP,QAAA,QAEW,qBACC,sBACZ,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAGM,gBADC,iBAEP,QAAA,QAES,mBACT,QAAA,QAEU,oBACV,QAAA,QAGW,qBADJ,iBAEP,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEgB,0BAChB,QAAA,QAEc,wBACd,QAAA,QAES,mBACT,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEY,sBACZ,QAAA,QAEW,qBACX,QAAA,QAEQ,kBACR,QAAA,QAEa,uBACb,QAAA,QAEM,gBACN,QAAA,QAEU,oBACV,QAAA,QAEa,uBACb,QAAA,QAEmB,6BACnB,QAAA,QAEoB,8BACpB,QAAA,QAEiB,2BACjB,QAAA,QAEmB,6BACnB,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACN,kBACR,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACL,iBACP,QAAA,QAEY,sBACZ,QAAA,QAEU,oBACV,QAAA,QAEe,yBACf,QAAA,QAES,mBACT,QAAA,QAES,mBACT,QAAA,QAEO,iBACP,QAAA,QAES,mBACT,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEgB,0BAChB,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEgB,0BACL,qBACX,QAAA,QAEiB,2BACD,0BACH,uBACb,QAAA,QAEgB,0BAChB,QAAA,QAEM,gBACN,QAAA,QAEW,qBACX,QAAA,QAGc,wBADN,kBAER,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEa,uBACb,QAAA,QAEa,uBACb,QAAA,QAEW,qBACX,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACd,QAAA,QAEY,sBACZ,QAAA,QAEkB,4BAClB,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAEmB,6BACnB,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEqB,+BACrB,QAAA,QAEsB,gCACtB,QAAA,QAEmB,6BACnB,QAAA,QAEqB,+BACrB,QAAA,QAEO,iBACP,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEY,sBACZ,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACd,QAAA,QAEgB,0BAChB,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAEe,yBACf,QAAA,QAEsB,gCACtB,QAAA,QAEc,wBACd,QAAA,QAES,mBACT,QAAA,QAGqB,+BADR,uBAEb,QAAA,QAGmB,6BADR,qBAEX,QAAA,QAGsB,gCADR,wBAEd,QAAA,QAGK,eADC,gBAEN,QAAA,QAEK,eACL,QAAA,QAEQ,kBACH,eACL,QAAA,QAGK,eADE,iBAEP,QAAA,QAEK,eAGA,eAFA,eACA,eAEL,QAAA,QAGQ,kBACH,eAFE,iBAGP,QAAA,QAGK,eADA,eAEL,QAAA,QAES,mBACJ,eACL,QAAA,QAEM,gBACN,QAAA,QAEW,qBACX,QAAA,QAEgB,0BAChB,QAAA,QAEiB,2BACjB,QAAA,QAEiB,2BACjB,QAAA,QAEkB,4BAClB,QAAA,QAEkB,4BAClB,QAAA,QAEmB,6BACnB,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAEgB,0BAChB,QAAA,QAES,mBACT,QAAA,QAEM,gBACN,QAAA,QAEa,uBACb,QAAA,QAEc,wBACd,QAAA,QAES,mBACT,QAAA,QAEgB,0BAChB,QAAA,QAEW,qBACX,QAAA,QAEQ,kBACR,QAAA,QAEK,eACL,QAAA,QAEW,qBACX,QAAA,QAEkB,4BAClB,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAEiB,2BACjB,QAAA,QAEe,yBACf,QAAA,QAEiB,2BACjB,QAAA,QAEkB,4BAClB,QAAA,QAEO,iBACP,QAAA,QAES,mBACT,QAAA,QAES,mBACT,QAAA,QAEO,iBACP,QAAA,QAEU,oBACV,QAAA,QAEO,iBACP,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACE,oBACV,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEK,eACL,QAAA,QAEI,cACJ,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEW,qBACX,QAAA,QAEgB,0BAChB,QAAA,QAEsB,gCACtB,QAAA,QAEqB,+BACrB,QAAA,QAGqB,+BADR,uBAEb,QAAA,QAEc,wBACd,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAGK,eADS,wBAEd,QAAA,QAEe,yBACf,QAAA,QAEe,yBACf,QAAA,QAEO,iBACP,QAAA,QAEiB,2BACjB,QAAA,QAEW,qBACX,QAAA,QAEQ,kBACR,QAAA,QAGM,gBADO,uBAED,sBACZ,QAAA,QAGgB,0BADF,wBAEd,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAEoB,8BACpB,QAAA,QAEa,uBACb,QAAA,QAEW,qBACX,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEU,oBACV,QAAA,QAEK,eACL,QAAA,QAEU,oBACV,QAAA,QAEO,iBACP,QAAA,QAEK,eACL,QAAA,QAEO,iBACP,QAAA,QAEM,gBACN,QAAA,QAEO,iBACP,QAAA,QAES,mBACT,QAAA,QAEgB,0BAChB,QAAA,QAEO,iBACP,QAAA,QAEc,wBACd,QAAA,QAES,mBACT,QAAA,QAEY,sBACP,eACL,QAAA,QAEK,eACC,gBACN,QAAA,QAEM,gBACN,QAAA,QAES,mBACT,QAAA,QAEY,sBACZ,QAAA,QAEY,sBACZ,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEc,wBACd,QAAA,QAEmB,6BACnB,QAAA,QAIc,wBAFA,wBACE,0BAEhB,QAAA,QAGgB,0BADJ,sBAEZ,QAAA,QAGc,wBADA,wBAEd,QAAA,QAEc,wBACA,wBACd,QAAA,QAEa,uBACb,QAAA,QAEM,gBACN,QAAA,QAES,mBACT,QAAA,QAEU,oBACV,QAAA,QAEW,qBACA,qBAGA,qBAFC,sBACH,mBAET,QAAA,QAEgB,0BAChB,QAAA,QAEI,cAEG,iBADK,sBAEZ,QAAA,QAGQ,kBADJ,cAEJ,QAAA,QAEY,sBACZ,QAAA,QAEK,eACL,QAAA,QAIa,uBAFQ,+BACV,qBAEX,QAAA,QAEe,yBACf,QAAA,QAEI,cACJ,QAAA,QAEQ,kBACA,kBACR,QAAA,QAGa,uBADP,gBAEN,QAAA,QAGe,yBADP,kBAER,QAAA,QAES,mBACT,QAAA,QAEa,uBACb,QAAA,QAEQ,kBACR,QAAA,QAEW,qBACX,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEkB,4BAClB,QAAA,QAEM,gBACN,QAAA,QAGU,oBADK,yBAEf,QAAA,QAEK,eACL,QAAA,QAEY,sBACZ,QAAA,QAEM,gBACN,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEM,gBACN,QAAA,QAEa,uBACb,QAAA,QAEM,gBACN,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAES,mBACT,QAAA,QAEe,yBACf,QAAA,QAEa,uBACb,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAEO,iBACP,QAAA,QAEW,qBACX,QAAA,QAEI,cACJ,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEY,sBACZ,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAEY,sBACZ,QAAA,QAEW,qBACX,QAAA,QAES,mBACT,QAAA,QAEK,eACL,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEI,cACJ,QAAA,QAIK,eAFG,kBACA,kBAER,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEgB,0BAChB,QAAA,QAEU,oBACV,QAAA,QAEU,oBACV,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACd,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEW,qBACX,QAAA,QAEiB,2BACjB,QAAA,QAES,mBACT,QAAA,QAEM,gBACN,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEW,qBACX,QAAA,QAEO,iBACP,QAAA,QAEM,gBACN,QAAA,QAES,mBACT,QAAA,QAEU,oBACG,uBACb,QAAA,QAEiB,2BACjB,QAAA,QAEc,wBACd,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEe,yBACf,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAEmB,6BACnB,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEQ,kBACR,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAGK,eADE,iBAEP,QAAA,QAES,mBACT,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAGc,wBADV,cAEJ,QAAA,QAEe,yBACf,QAAA,QAEU,oBACV,QAAA,QAEc,wBACd,QAAA,QAEW,qBAEG,wBADL,mBAET,QAAA,QAEW,qBACa,kCACxB,QAAA,QAEW,qBACG,wBACd,QAAA,QAEW,qBACM,2BACjB,QAAA,QAEW,qBACI,yBACf,QAAA,QAEe,yBACf,QAAA,QAEU,oBACV,QAAA,QAEc,wBACd,QAAA,QAEgB,0BAChB,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEQ,kBACR,QAAA,QAEgB,0BAChB,QAAA,QAEO,iBACP,QAAA,QAEe,yBACf,QAAA,QAEa,uBACb,QAAA,QAEa,uBACI,2BACjB,QAAA,QAEa,uBACG,0BAChB,QAAA,QAEa,uBACE,yBACf,QAAA,QAEW,qBACX,QAAA,QAEa,uBACA,uBACb,QAAA,QAGc,wBADD,uBAEb,QAAA,QAEiB,2BACjB,QAAA,QAEe,yBACf,QAAA,QAEc,wBACd,QAAA,QAEgB,0BAChB,QAAA,QAEc,wBACd,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAEkB,4BAClB,QAAA,QAEI,cACJ,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEsB,gCACtB,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEO,iBACP,QAAA,QAEmB,6BACnB,QAAA,QAGY,sBADR,cAEJ,QAAA,QAEQ,kBACR,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEiB,2BACjB,QAAA,QAEkB,4BAClB,QAAA,QAEkB,4BAClB,QAAA,QAEkB,4BAClB,QAAA,QAEU,oBACV,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEO,iBACP,QAAA,QAEK,eACL,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAEO,iBACP,QAAA,QAEO,iBACP,QAAA,QAEW,qBACX,QAAA,QAEW,qBACX,QAAA,QAEc,wBACd,QAAA,QAEM,gBACN,QAAA,QAEiB,2BACjB,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEc,wBACd,QAAA,QAEK,eACL,QAAA,QAEc,wBACd,QAAA,QAEU,oBACV,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACd,QAAA,QAEgB,0BAChB,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEc,wBACd,QAAA,QAEiB,2BACjB,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEkB,4BAClB,QAAA,QAEgB,0BAChB,QAAA,QAEmB,6BACnB,QAAA,QAEO,iBACP,QAAA,QAEmB,6BACnB,QAAA,QAEsB,gCACtB,QAAA,QAES,mBACT,QAAA,QAE6B,uCAC7B,QAAA,QAGqC,+CADnB,4BAElB,QAAA,QAIM,gBAFI,oBACO,2BAEjB,QAAA,QAEO,iBACP,QAAA,QAES,mBACT,QAAA,QAGe,yBADN,mBAET,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAEU,oBACV,QAAA,QAEgB,0BAChB,QAAA,QAEiB,2BACjB,QAAA,QAEa,uBACb,QAAA,QAEO,iBACP,QAAA,QAEW,qBACX,QAAA,QAEoB,8BACE,gCACtB,QAAA,QAEI,cACU,wBACd,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEiB,2BACjB,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACd,QAAA,QAEgB,0BAChB,QAAA,QAGc,wBADP,iBAEP,QAAA,QAGgB,0BADP,mBAET,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEQ,kBACR,QAAA,QAEU,oBACV,QAAA,QAEiB,2BACR,mBACT,QAAA,QAEmB,6BACR,qBACX,QAAA,QAEO,iBACP,QAAA,QAEgB,0BAChB,QAAA,QAEU,oBACV,QAAA,QAEe,yBAEG,4BADL,uBAEb,QAAA,QAEe,yBACa,sCAC5B,QAAA,QAEe,yBACG,4BAClB,QAAA,QAEe,yBACM,+BACrB,QAAA,QAEe,yBACI,6BACnB,QAAA,QAEQ,kBACR,QAAA,QAIM,gBAFG,mBACJ,eAEL,QAAA,QAES,mBACT,QAAA,QAEiB,2BACjB,QAAA,QAEiB,2BACjB,QAAA,QAEgB,0BAChB,QAAA,QAEiB,2BACH,wBACd,QAAA,QAEmB,6BACH,0BAChB,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAES,mBACT,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEU,oBACV,QAAA,QAEc,wBACd,QAAA,QAGc,wBADD,uBAEb,QAAA,QAEU,oBACV,QAAA,QAEU,oBACV,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAEkB,4BAClB,QAAA,QAEW,qBACX,QAAA,QAGa,uBADR,eAEL,QAAA,QAEU,oBACV,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAES,mBACT,QAAA,QAEa,uBACb,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAES,mBACT,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAES,mBACG,sBACZ,QAAA,QAEM,gBACN,QAAA,QAEa,uBACb,QAAA,QAEF,SACE,SAAA,SACA,MAAA,IACA,OAAA,IACA,QAAA,EACA,OAAA,KACA,SAAA,OACA,KAAM,cACN,OAAA,EAEgB,0BACA,yBAChB,SAAA,OACA,MAAA,KACA,OAAA,KACA,OAAA,EACA,SAAA,QACA,KAAA"} \ No newline at end of file +{"version":3,"sources":["fork-awesome.css"],"names":[],"mappings":";;;AAMA,WACE,YAAA,YACA,IAAS,8CACT,IAAS,qDAAoF,4BAAA,gDAAmE,gBAAA,+CAAiE,eAAA,8CAAoE,mBAAA,iEAArS,cACA,YAAA,IACA,WAAA,OAEF,IACE,QAAA,aACA,KAAA,OAAA,OAAA,OAAA,KAAA,EAAA,YACA,UAAA,QACA,eAAA,KACA,uBAAA,YACA,wBAAA,UAGF,OACE,UAAA,aACA,YAAA,MACA,eAAA,KAEF,OACE,UAAA,IAEF,OACE,UAAA,IAEF,OACE,UAAA,IAEF,OACE,UAAA,IAEF,OACE,MAAA,aACA,WAAA,OAEF,OACE,aAAA,EACA,YAAA,aACA,gBAAA,KAEK,UACL,SAAA,SAEF,OACE,SAAA,SACA,KAAA,cACA,MAAA,aACA,IAAA,YACA,WAAA,OAEI,aACJ,KAAA,cAEF,WACE,QAAA,KAAA,MAAA,MACA,OAAA,MAAA,MAAA,KACA,cAAA,KAEF,cACE,MAAA,KAEF,eACE,MAAA,MAEC,iBACD,aAAA,KAEC,kBACD,YAAA,KAGF,YACE,MAAA,MAEF,WACE,MAAA,KAEC,cACD,aAAA,KAEC,eACD,YAAA,KAEF,SACE,kBAAA,QAAA,GAAA,SAAA,OACA,UAAA,QAAA,GAAA,SAAA,OAEF,UACE,kBAAA,QAAA,GAAA,SAAuC,SACvC,UAAA,QAAA,GAAA,SAA+B,SAEjC,2BACE,GACE,kBAAmB,UACnB,UAAW,UAEb,KACE,kBAAmB,eACnB,UAAW,gBAGf,mBACE,GACE,kBAAmB,UACnB,UAAW,UAEb,KACE,kBAAmB,eACnB,UAAW,gBAGf,cACE,WAAY,2DACZ,kBAAmB,cACnB,cAAe,cACf,UAAW,cAEb,eACE,WAAY,2DACZ,kBAAmB,eACnB,cAAe,eACf,UAAW,eAEb,eACE,WAAY,2DACZ,kBAAmB,eACnB,cAAe,eACf,UAAW,eAEb,oBACE,WAAY,qEACZ,kBAAmB,YACnB,cAAe,YACf,UAAW,YAEb,kBACE,WAAY,qEACZ,kBAAmB,YACnB,cAAe,YACf,UAAW,YAKP,0BACA,wBAHA,qBACA,qBAFA,oBAKJ,OAAA,KAEF,UACE,SAAA,SACA,QAAA,aACA,MAAA,IACA,OAAA,IACA,YAAA,IACA,eAAA,OAEF,aACA,aACE,SAAA,SACA,KAAA,EACA,MAAA,KACA,WAAA,OAEF,aACE,YAAA,QAEF,aACE,UAAA,IAEF,YACE,MAAA,KAIO,iBACP,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAEO,iBACP,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACR,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEU,oBACV,QAAA,QAEI,cACJ,QAAA,QAES,mBACT,QAAA,QAEO,iBACP,QAAA,QAGO,iBADC,kBAED,iBACP,QAAA,QAEa,uBACb,QAAA,QAEc,wBACd,QAAA,QAEW,qBACX,QAAA,QAEQ,kBACR,QAAA,QAGK,eADC,gBAEN,QAAA,QAES,mBACT,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEM,gBACN,QAAA,QAEU,oBACV,QAAA,QAEqB,+BACrB,QAAA,QAEmB,6BACnB,QAAA,QAEO,iBACP,QAAA,QAEe,yBACf,QAAA,QAGQ,kBADM,wBAEd,QAAA,QAES,mBACT,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEY,sBACZ,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEW,qBACX,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEK,eACL,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEU,oBACV,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACR,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACC,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACd,QAAA,QAGO,iBADA,iBAEI,qBACX,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEM,gBACN,QAAA,QAEM,gBACW,2BACjB,QAAA,QAEgB,0BAChB,QAAA,QAEgB,0BAChB,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAEe,yBACf,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEO,iBACP,QAAA,QAEM,gBACN,QAAA,QAES,mBACT,QAAA,QAEc,wBACd,QAAA,QAEc,wBACd,QAAA,QAEO,iBACP,QAAA,QAEc,wBACd,QAAA,QAEe,yBACf,QAAA,QAEa,uBACb,QAAA,QAEc,wBACd,QAAA,QAEc,wBACd,QAAA,QAEc,wBACd,QAAA,QAEiB,2BACjB,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEgB,0BAChB,QAAA,QAEgB,0BAChB,QAAA,QAEK,eACL,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACP,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEO,iBACP,QAAA,QAEU,oBACV,QAAA,QAEoB,8BACpB,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEK,eACL,QAAA,QAEW,qBACX,QAAA,QAGsB,gCADb,mBAET,QAAA,QAEO,iBACP,QAAA,QAEU,oBACV,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAES,mBACT,QAAA,QAEe,yBACf,QAAA,QAEQ,kBACR,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEU,oBACV,QAAA,QAEa,uBACF,qBACX,QAAA,QAEgB,0BAChB,QAAA,QAEiB,2BACjB,QAAA,QAEc,wBACd,QAAA,QAEK,eACL,QAAA,QAGM,gBADC,iBAEP,QAAA,QAEU,oBACV,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEW,qBACX,QAAA,QAES,mBACT,QAAA,QAEU,oBACV,QAAA,QAEiB,2BACjB,QAAA,QAEY,sBACZ,QAAA,QAEe,yBACf,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEO,iBACP,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAES,mBACT,QAAA,QAEY,sBACF,oBACV,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEa,uBACb,QAAA,QAEM,gBACD,eACL,QAAA,QAEO,iBACP,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEa,uBACb,QAAA,QAEc,wBACd,QAAA,QAEa,uBACb,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAEmB,6BACnB,QAAA,QAEoB,8BACpB,QAAA,QAEiB,2BACjB,QAAA,QAEmB,6BACnB,QAAA,QAEO,iBACP,QAAA,QAES,mBACT,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAEW,qBACJ,iBACA,iBACP,QAAA,QAEO,iBACD,gBACN,QAAA,QAEO,iBACP,QAAA,QAEO,iBACP,QAAA,QAEK,eACK,oBACV,QAAA,QAEM,gBACG,mBACT,QAAA,QAEW,qBACX,QAAA,QAGU,oBADJ,gBAEN,QAAA,QAEQ,kBACR,QAAA,QAIM,gBAFG,mBACA,mBAET,QAAA,QAES,mBACT,QAAA,QAES,mBACT,QAAA,QAEe,yBACf,QAAA,QAEW,qBACX,QAAA,QAEO,iBACP,QAAA,QAEO,iBACP,QAAA,QAEO,iBACP,QAAA,QAEW,qBACX,QAAA,QAEkB,4BAClB,QAAA,QAEoB,8BACpB,QAAA,QAEa,uBACb,QAAA,QAEO,iBACP,QAAA,QAEY,sBACZ,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAES,mBACT,QAAA,QAGM,gBADI,oBAEV,QAAA,QAGW,qBADA,qBAEX,QAAA,QAGU,oBADD,mBAET,QAAA,QAEU,oBACV,QAAA,QAEU,oBACV,QAAA,QAEa,uBACP,gBACN,QAAA,QAGO,iBADA,iBAEP,QAAA,QAEW,qBACC,sBACZ,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAGM,gBADC,iBAEP,QAAA,QAES,mBACT,QAAA,QAEU,oBACV,QAAA,QAGW,qBADJ,iBAEP,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEgB,0BAChB,QAAA,QAEc,wBACd,QAAA,QAES,mBACT,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEY,sBACZ,QAAA,QAEW,qBACX,QAAA,QAEQ,kBACR,QAAA,QAEa,uBACb,QAAA,QAEM,gBACN,QAAA,QAEU,oBACV,QAAA,QAEa,uBACb,QAAA,QAEmB,6BACnB,QAAA,QAEoB,8BACpB,QAAA,QAEiB,2BACjB,QAAA,QAEmB,6BACnB,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACN,kBACR,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACL,iBACP,QAAA,QAEY,sBACZ,QAAA,QAEU,oBACV,QAAA,QAEe,yBACf,QAAA,QAES,mBACT,QAAA,QAES,mBACT,QAAA,QAEO,iBACP,QAAA,QAES,mBACT,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEgB,0BAChB,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEgB,0BACL,qBACX,QAAA,QAEiB,2BACD,0BACH,uBACb,QAAA,QAEgB,0BAChB,QAAA,QAEM,gBACN,QAAA,QAEW,qBACX,QAAA,QAGc,wBADN,kBAER,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEa,uBACb,QAAA,QAEa,uBACb,QAAA,QAEW,qBACX,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACd,QAAA,QAEY,sBACZ,QAAA,QAEkB,4BAClB,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAEmB,6BACnB,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEqB,+BACrB,QAAA,QAEsB,gCACtB,QAAA,QAEmB,6BACnB,QAAA,QAEqB,+BACrB,QAAA,QAEO,iBACP,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEY,sBACZ,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACd,QAAA,QAEgB,0BAChB,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAEe,yBACf,QAAA,QAEsB,gCACtB,QAAA,QAEc,wBACd,QAAA,QAES,mBACT,QAAA,QAGqB,+BADR,uBAEb,QAAA,QAGmB,6BADR,qBAEX,QAAA,QAGsB,gCADR,wBAEd,QAAA,QAGK,eADC,gBAEN,QAAA,QAEK,eACL,QAAA,QAEQ,kBACH,eACL,QAAA,QAGK,eADE,iBAEP,QAAA,QAEK,eAGA,eAFA,eACA,eAEL,QAAA,QAGQ,kBACH,eAFE,iBAGP,QAAA,QAGK,eADA,eAEL,QAAA,QAES,mBACJ,eACL,QAAA,QAEM,gBACN,QAAA,QAEW,qBACX,QAAA,QAEgB,0BAChB,QAAA,QAEiB,2BACjB,QAAA,QAEiB,2BACjB,QAAA,QAEkB,4BAClB,QAAA,QAEkB,4BAClB,QAAA,QAEmB,6BACnB,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAEgB,0BAChB,QAAA,QAES,mBACT,QAAA,QAEM,gBACN,QAAA,QAEa,uBACb,QAAA,QAEc,wBACd,QAAA,QAES,mBACT,QAAA,QAEgB,0BAChB,QAAA,QAEW,qBACX,QAAA,QAEQ,kBACR,QAAA,QAEK,eACL,QAAA,QAEW,qBACX,QAAA,QAEkB,4BAClB,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAEiB,2BACjB,QAAA,QAEe,yBACf,QAAA,QAEiB,2BACjB,QAAA,QAEkB,4BAClB,QAAA,QAEO,iBACP,QAAA,QAES,mBACT,QAAA,QAES,mBACT,QAAA,QAEO,iBACP,QAAA,QAEU,oBACV,QAAA,QAEO,iBACP,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACE,oBACV,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEK,eACL,QAAA,QAEI,cACJ,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEW,qBACX,QAAA,QAEgB,0BAChB,QAAA,QAEsB,gCACtB,QAAA,QAEqB,+BACrB,QAAA,QAGqB,+BADR,uBAEb,QAAA,QAEc,wBACd,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAGK,eADS,wBAEd,QAAA,QAEe,yBACf,QAAA,QAEe,yBACf,QAAA,QAEO,iBACP,QAAA,QAEiB,2BACjB,QAAA,QAEW,qBACX,QAAA,QAEQ,kBACR,QAAA,QAGM,gBADO,uBAED,sBACZ,QAAA,QAGgB,0BADF,wBAEd,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAEoB,8BACpB,QAAA,QAEa,uBACb,QAAA,QAEW,qBACX,QAAA,QAEM,gBACN,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEU,oBACV,QAAA,QAEK,eACL,QAAA,QAEU,oBACV,QAAA,QAEO,iBACP,QAAA,QAEK,eACL,QAAA,QAEO,iBACP,QAAA,QAEM,gBACN,QAAA,QAEO,iBACP,QAAA,QAES,mBACT,QAAA,QAEgB,0BAChB,QAAA,QAEO,iBACP,QAAA,QAEc,wBACd,QAAA,QAES,mBACT,QAAA,QAEY,sBACP,eACL,QAAA,QAEK,eACC,gBACN,QAAA,QAEM,gBACN,QAAA,QAES,mBACT,QAAA,QAEY,sBACZ,QAAA,QAEY,sBACZ,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEc,wBACd,QAAA,QAEmB,6BACnB,QAAA,QAIc,wBAFA,wBACE,0BAEhB,QAAA,QAGgB,0BADJ,sBAEZ,QAAA,QAGc,wBADA,wBAEd,QAAA,QAEc,wBACA,wBACd,QAAA,QAEa,uBACb,QAAA,QAEM,gBACN,QAAA,QAES,mBACT,QAAA,QAEU,oBACV,QAAA,QAEW,qBACA,qBAGA,qBAFC,sBACH,mBAET,QAAA,QAEgB,0BAChB,QAAA,QAEI,cAEG,iBADK,sBAEZ,QAAA,QAGQ,kBADJ,cAEJ,QAAA,QAEY,sBACZ,QAAA,QAEK,eACL,QAAA,QAIa,uBAFQ,+BACV,qBAEX,QAAA,QAEe,yBACf,QAAA,QAEI,cACJ,QAAA,QAEQ,kBACA,kBACR,QAAA,QAGa,uBADP,gBAEN,QAAA,QAGe,yBADP,kBAER,QAAA,QAES,mBACT,QAAA,QAEa,uBACb,QAAA,QAEQ,kBACR,QAAA,QAEW,qBACX,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEkB,4BAClB,QAAA,QAEM,gBACN,QAAA,QAGU,oBADK,yBAEf,QAAA,QAEK,eACL,QAAA,QAEY,sBACZ,QAAA,QAEM,gBACN,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEM,gBACN,QAAA,QAEa,uBACb,QAAA,QAEM,gBACN,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAES,mBACT,QAAA,QAEe,yBACf,QAAA,QAEa,uBACb,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAEO,iBACP,QAAA,QAEW,qBACX,QAAA,QAEI,cACJ,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEY,sBACZ,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAEY,sBACZ,QAAA,QAEW,qBACX,QAAA,QAES,mBACT,QAAA,QAEK,eACL,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEI,cACJ,QAAA,QAIK,eAFG,kBACA,kBAER,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEgB,0BAChB,QAAA,QAEU,oBACV,QAAA,QAEU,oBACV,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACd,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEW,qBACX,QAAA,QAEiB,2BACjB,QAAA,QAES,mBACT,QAAA,QAEM,gBACN,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEW,qBACX,QAAA,QAEO,iBACP,QAAA,QAEM,gBACN,QAAA,QAES,mBACT,QAAA,QAEU,oBACG,uBACb,QAAA,QAEiB,2BACjB,QAAA,QAEc,wBACd,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEe,yBACf,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAEmB,6BACnB,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAEQ,kBACR,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAGK,eADE,iBAEP,QAAA,QAES,mBACT,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAGc,wBADV,cAEJ,QAAA,QAEe,yBACf,QAAA,QAEU,oBACV,QAAA,QAEc,wBACd,QAAA,QAEW,qBAEG,wBADL,mBAET,QAAA,QAEW,qBACa,kCACxB,QAAA,QAEW,qBACG,wBACd,QAAA,QAEW,qBACM,2BACjB,QAAA,QAEW,qBACI,yBACf,QAAA,QAEe,yBACf,QAAA,QAEU,oBACV,QAAA,QAEc,wBACd,QAAA,QAEgB,0BAChB,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEQ,kBACR,QAAA,QAEgB,0BAChB,QAAA,QAEO,iBACP,QAAA,QAEe,yBACf,QAAA,QAEa,uBACb,QAAA,QAEa,uBACI,2BACjB,QAAA,QAEa,uBACG,0BAChB,QAAA,QAEa,uBACE,yBACf,QAAA,QAEW,qBACX,QAAA,QAEa,uBACA,uBACb,QAAA,QAGc,wBADD,uBAEb,QAAA,QAEiB,2BACjB,QAAA,QAEe,yBACf,QAAA,QAEc,wBACd,QAAA,QAEgB,0BAChB,QAAA,QAEc,wBACd,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAEkB,4BAClB,QAAA,QAEI,cACJ,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEsB,gCACtB,QAAA,QAEY,sBACZ,QAAA,QAEa,uBACb,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAES,mBACT,QAAA,QAEO,iBACP,QAAA,QAEmB,6BACnB,QAAA,QAGY,sBADR,cAEJ,QAAA,QAEQ,kBACR,QAAA,QAEO,iBACP,QAAA,QAEQ,kBACR,QAAA,QAEiB,2BACjB,QAAA,QAEkB,4BAClB,QAAA,QAEkB,4BAClB,QAAA,QAEkB,4BAClB,QAAA,QAEU,oBACV,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEO,iBACP,QAAA,QAEK,eACL,QAAA,QAEY,sBACZ,QAAA,QAEc,wBACd,QAAA,QAEO,iBACP,QAAA,QAEO,iBACP,QAAA,QAEW,qBACX,QAAA,QAEW,qBACX,QAAA,QAEc,wBACd,QAAA,QAEM,gBACN,QAAA,QAEiB,2BACjB,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEc,wBACd,QAAA,QAEK,eACL,QAAA,QAEc,wBACd,QAAA,QAEU,oBACV,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACd,QAAA,QAEgB,0BAChB,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEc,wBACd,QAAA,QAEiB,2BACjB,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEY,sBACZ,QAAA,QAES,mBACT,QAAA,QAEQ,kBACR,QAAA,QAEkB,4BAClB,QAAA,QAEgB,0BAChB,QAAA,QAEmB,6BACnB,QAAA,QAEO,iBACP,QAAA,QAEmB,6BACnB,QAAA,QAEsB,gCACtB,QAAA,QAES,mBACT,QAAA,QAE6B,uCAC7B,QAAA,QAGqC,+CADnB,4BAElB,QAAA,QAIM,gBAFI,oBACO,2BAEjB,QAAA,QAEO,iBACP,QAAA,QAES,mBACT,QAAA,QAGe,yBADN,mBAET,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEe,yBACf,QAAA,QAEU,oBACV,QAAA,QAEgB,0BAChB,QAAA,QAEiB,2BACjB,QAAA,QAEa,uBACb,QAAA,QAEO,iBACP,QAAA,QAEW,qBACX,QAAA,QAEoB,8BACE,gCACtB,QAAA,QAEI,cACU,wBACd,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEiB,2BACjB,QAAA,QAEQ,kBACR,QAAA,QAEc,wBACd,QAAA,QAEgB,0BAChB,QAAA,QAGc,wBADP,iBAEP,QAAA,QAGgB,0BADP,mBAET,QAAA,QAEa,uBACb,QAAA,QAEe,yBACf,QAAA,QAEQ,kBACR,QAAA,QAEU,oBACV,QAAA,QAEiB,2BACR,mBACT,QAAA,QAEmB,6BACR,qBACX,QAAA,QAEO,iBACP,QAAA,QAEgB,0BAChB,QAAA,QAEU,oBACV,QAAA,QAEe,yBAEG,4BADL,uBAEb,QAAA,QAEe,yBACa,sCAC5B,QAAA,QAEe,yBACG,4BAClB,QAAA,QAEe,yBACM,+BACrB,QAAA,QAEe,yBACI,6BACnB,QAAA,QAEQ,kBACR,QAAA,QAIM,gBAFG,mBACJ,eAEL,QAAA,QAES,mBACT,QAAA,QAEiB,2BACjB,QAAA,QAEiB,2BACjB,QAAA,QAEgB,0BAChB,QAAA,QAEiB,2BACH,wBACd,QAAA,QAEmB,6BACH,0BAChB,QAAA,QAEU,oBACV,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAEM,gBACN,QAAA,QAES,mBACT,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEQ,kBACR,QAAA,QAEU,oBACV,QAAA,QAEc,wBACd,QAAA,QAGc,wBADD,uBAEb,QAAA,QAEU,oBACV,QAAA,QAEU,oBACV,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAEkB,4BAClB,QAAA,QAEW,qBACX,QAAA,QAGa,uBADR,eAEL,QAAA,QAEU,oBACV,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAES,mBACT,QAAA,QAEa,uBACb,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAEU,oBACV,QAAA,QAES,mBACT,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAES,mBACG,sBACZ,QAAA,QAEM,gBACN,QAAA,QAEa,uBACb,QAAA,QAEY,sBACZ,QAAA,QAEoB,8BACpB,QAAA,QAEQ,kBACR,QAAA,QAEiB,2BACjB,QAAA,QAEQ,kBACR,QAAA,QAEO,iBACP,QAAA,QAEU,oBACV,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEW,qBACX,QAAA,QAEkB,4BAClB,QAAA,QAEU,oBACV,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEO,iBACP,QAAA,QAEK,eACL,QAAA,QAEQ,kBACR,QAAA,QAEQ,kBACR,QAAA,QAEF,SACE,SAAA,SACA,MAAA,IACA,OAAA,IACA,QAAA,EACA,OAAA,KACA,SAAA,OACA,KAAM,cACN,OAAA,EAEgB,0BACA,yBAChB,SAAA,OACA,MAAA,KACA,OAAA,KACA,OAAA,EACA,SAAA,QACA,KAAA"} \ No newline at end of file diff --git a/library/fork-awesome/fonts/forkawesome-webfont.eot b/library/fork-awesome/fonts/forkawesome-webfont.eot index 1c76c9895..bd6eae7e5 100644 Binary files a/library/fork-awesome/fonts/forkawesome-webfont.eot and b/library/fork-awesome/fonts/forkawesome-webfont.eot differ diff --git a/library/fork-awesome/fonts/forkawesome-webfont.svg b/library/fork-awesome/fonts/forkawesome-webfont.svg index 5fbcf00ae..18a090301 100644 --- a/library/fork-awesome/fonts/forkawesome-webfont.svg +++ b/library/fork-awesome/fonts/forkawesome-webfont.svg @@ -1,11 +1,11 @@ -Created by FontForge 20170925 at Mon Feb 26 00:19:18 2018 +Created by FontForge 20180321 at Sat May 12 14:32:04 2018 By Julien Deswaef The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/OFL). Fork Awesome is a fork based of off Font Awesome 4.7.0 by Dave Gandy. More info on licenses at https://forkawesome.github.io @@ -22,7 +22,7 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/ bbox="-0.653061 -264 2304.01 1536.25" underline-thickness="89.6" underline-position="-179.2" - unicode-range="U+0020-F2FC" + unicode-range="U+0020-F310" /> + @@ -687,6 +691,8 @@ s768 -344 768 -768z" /> + + @@ -792,19 +801,12 @@ d="M707 1231c0 53 -5 99 -69 99c-27 0 -54 -9 -78 -23c-151 -83 -213 -298 -213 -460 c-14 -7 -17 -13 -21 -27c-18 -68 -30 -138 -47 -206c-60 -233 -255 -514 -522 -514c-182 0 -294 124 -294 303c0 97 63 286 180 286c41 0 202 -53 203 -95c-2 -8 -157 -88 -157 -223c0 -41 20 -73 65 -73c159 0 232 290 248 412v9c0 8 -32 4 -38 4c-301 0 -477 168 -477 471 c0 286 186 635 491 688c35 6 70 9 106 9c242 0 374 -113 374 -360c0 -167 -57 -321 -81 -484l3 -3c108 61 222 119 350 119c13 0 41 -8 53 -13c26 -10 141 -191 141 -219z" /> +d="M768 1404c424 0 768 -344 768 -768s-344 -768 -768 -768s-768 344 -768 768s344 768 768 768zM737 1186v0c-18 0 -40 -7 -58 -7c-27 0 -61 12 -81 0s-18 -37 -27 -55s-28 -34 -28 -54s19 -36 28 -54s2 -47 27 -54s54 36 81 54s69 32 81 54s0 36 0 54s16 39 0 55 +c-5 5 -14 7 -23 7zM491 1178h-6s-44 -8 -76 -13c-136 -92 -261 -300 -278 -464c23 -12 46 -22 60 -36c27 -27 83 -27 88 -56s-24 -62 -33 -80s-31 -31 -27 -54s36 -36 54 -54s37 -22 54 -54s20 -98 27 -135c9 -47 23 -85 44 -118c27 -19 72 -44 102 -58c10 28 10 93 16 122 +c7 37 13 109 27 135s19 19 28 28s18 15 28 28s17 34 26 52s30 31 26 53s-36 37 -54 55s-29 39 -55 54s-73 18 -101 25s-127 12 -129 13c-2 0 -1 -6 -7 2s-2 39 -2 57s11 34 24 66c13 18 5 10 25 24c10 9 43 -44 57 -44s-3 91 6 100c36 36 128 98 128 136s-37 36 -55 54 +s-46 -30 -111 -30s76 103 85 112s23 17 27 27s0 18 0 27s12 22 8 25c-2 1 -4 1 -6 1zM1212 1096c-62 -8 -139 -10 -182 -26c-45 -17 -54 -36 -81 -54s-67 -28 -81 -54s0 -54 0 -81s-26 -68 0 -82s55 37 82 55s63 64 81 54s6 -7 0 -27s-51 -41 -52 -81s102 -73 68 -126 +s-188 46 -232 17s-19 -54 -28 -81s-37 -52 -27 -81s52 -34 81 -54s81 -56 82 -58s20 -99 27 -135c14 -73 -27 -199 76 -231c31 14 78 41 106 60c13 34 24 72 35 94c22 44 71 123 80 161s0 37 0 55s7 30 0 54s-36 54 -54 81s-34 64 -54 81s-46 18 -54 27s-4 8 -4 13 +s-4 7 5 14s34 8 54 0s36 -36 54 -54s25 -51 54 -54s54 36 81 54c25 17 52 56 76 55c-12 131 -98 312 -193 404z" /> + + @@ -911,11 +922,14 @@ c-1 -9 -8 -16 -16 -16s-15 7 -15 16l-20 246l20 234c0 8 7 15 15 15s15 -7 16 -15zM7 c-11 0 -19 8 -20 19l-16 244l16 468c1 11 9 19 20 19c10 0 19 -8 19 -19zM687 911l18 -506l-18 -242c-1 -12 -10 -21 -22 -21c-11 0 -20 9 -21 21l-16 242l16 506c0 12 10 22 21 22c12 0 21 -10 22 -22zM1079 169zM881 915l15 -510l-15 -239c0 -14 -11 -25 -25 -25 s-24 11 -25 25l-14 239l14 510c0 14 11 25 25 25s25 -11 25 -25zM980 896l14 -492l-14 -236c0 -15 -12 -27 -27 -27s-27 12 -28 27l-12 236l12 492c1 16 13 28 28 28s26 -12 27 -28zM1192 404l-14 -231c0 -17 -14 -31 -31 -31s-31 14 -32 31l-6 114l-6 117l12 636v3 c1 9 5 18 12 24c5 4 12 7 20 7c5 0 11 -2 15 -5c9 -5 15 -15 16 -26zM2304 423c0 -156 -127 -282 -283 -282h-786c-17 2 -31 15 -31 33v899c0 17 6 25 28 33c55 22 117 34 181 34c261 0 475 -200 498 -455c34 14 71 22 110 22c156 0 283 -127 283 -284z" /> - + + + @@ -1075,10 +1098,8 @@ c249 -248 396 -577 414 -927z" /> - + @@ -1100,6 +1121,11 @@ d="M1764 1525c21 -15 31 -39 27 -64l-256 -1536c-3 -19 -15 -35 -32 -45c-9 -5 -20 - c21 13 48 12 68 -2zM1422 26l221 1323l-1434 -827l336 -137l863 639l-478 -797z" /> + @@ -1169,8 +1195,11 @@ d="M896 324c0 132 -32 284 -164 284c-40 -40 -95 -64 -156 -64s-116 24 -156 64c-132 c0 18 -14 32 -32 32h-704c-18 0 -32 -14 -32 -32v-64c0 -18 14 -32 32 -32h704c18 0 32 14 32 32zM1408 544v64c0 18 -14 32 -32 32h-320c-18 0 -32 -14 -32 -32v-64c0 -18 14 -32 32 -32h320c18 0 32 14 32 32zM1792 544v64c0 18 -14 32 -32 32h-192c-18 0 -32 -14 -32 -32 v-64c0 -18 14 -32 32 -32h192c18 0 32 14 32 32zM1792 800v64c0 18 -14 32 -32 32h-704c-18 0 -32 -14 -32 -32v-64c0 -18 14 -32 32 -32h704c18 0 32 14 32 32zM128 1152h1792v96c0 18 -14 32 -32 32h-1728c-18 0 -32 -14 -32 -32v-96zM2048 1248v-1216 c0 -88 -72 -160 -160 -160h-1728c-88 0 -160 72 -160 160v1216c0 88 72 160 160 160h1728c88 0 160 -72 160 -160z" /> - + d="M1536 640c0 -424 -344 -768 -768 -768s-768 344 -768 768s344 768 768 768s768 -344 768 -768z" /> + @@ -1354,6 +1385,10 @@ c0 -17 -15 -32 -32 -32h-1216c-18 0 -32 15 -32 32v192c0 17 14 32 32 32h1216c17 0 + + + + - + + + - + + - + + + @@ -2342,6 +2426,14 @@ c10 -27 16 -55 16 -84c0 -169 -104 -298 -270 -329c-50 -10 -79 -31 -79 -85c0 -153 c0 187 145 324 330 324c62 0 124 -16 178 -47c75 0 149 20 218 47zM1055 220h-222c4 45 4 89 4 134v609c0 43 1 86 -4 128h222c-5 -41 -4 -83 -4 -124v-613c0 -45 0 -89 4 -134zM1656 442v-196c-53 -29 -114 -39 -174 -39c-214 0 -239 169 -239 343v351h2v4 c-13 0 -25 2 -37 2c-20 0 -40 -3 -59 -6v190h96v76c0 30 -1 60 -6 89h227c-8 -55 -6 -110 -6 -165h171v-190c-29 0 -58 4 -86 4h-85v-365c0 -59 13 -131 87 -131c39 0 77 11 109 33zM1080 1389c0 -75 -58 -145 -135 -145c-79 0 -138 69 -138 145c0 77 58 147 138 147 c79 0 135 -72 135 -147z" /> + @@ -2488,6 +2580,11 @@ c0 -23 -14 -44 -24 -64h920c35 0 64 -29 64 -64s-29 -64 -64 -64h-1024c-35 0 -64 29 + @@ -2576,10 +2673,17 @@ c0 -71 -57 -128 -128 -128s-128 57 -128 128s57 128 128 128s128 -57 128 -128zM1536 c35 0 64 -29 64 -64s-29 -64 -64 -64h-1024c-35 0 -64 29 -64 64c0 31 47 108 61 137l-177 823h-204c-35 0 -64 29 -64 64s29 64 64 64h256c68 0 69 -80 79 -128h1201c35 0 64 -29 64 -64z" /> - + diff --git a/library/fork-awesome/fonts/forkawesome-webfont.ttf b/library/fork-awesome/fonts/forkawesome-webfont.ttf index 0c06f96cb..e5af28e35 100644 Binary files a/library/fork-awesome/fonts/forkawesome-webfont.ttf and b/library/fork-awesome/fonts/forkawesome-webfont.ttf differ diff --git a/library/fork-awesome/fonts/forkawesome-webfont.woff b/library/fork-awesome/fonts/forkawesome-webfont.woff index ee6a89acb..e1a9264a8 100644 Binary files a/library/fork-awesome/fonts/forkawesome-webfont.woff and b/library/fork-awesome/fonts/forkawesome-webfont.woff differ diff --git a/library/fork-awesome/fonts/forkawesome-webfont.woff2 b/library/fork-awesome/fonts/forkawesome-webfont.woff2 index de312f8f2..cf2270fd2 100644 Binary files a/library/fork-awesome/fonts/forkawesome-webfont.woff2 and b/library/fork-awesome/fonts/forkawesome-webfont.woff2 differ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0bb523457..9f78f06c5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1583,7 +1583,7 @@ dl.bb-dl > dd > li { .bootstrap-tagsinput .tag:before { /* Copied from fa-asterisk, is there a better way to do it? */ - font-family: FontAwesome; + font-family: ForkAwesome; font-weight: normal; font-style: normal; text-decoration: inherit; -- cgit v1.2.3 From 7e99931733c75ded40c5c6bdd12a42213ccb7a2e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 20 May 2018 09:23:44 +0200 Subject: implement jot reset button --- Zotlabs/Module/Network.php | 3 ++- boot.php | 2 +- include/conversation.php | 6 +++++- view/css/conversation.css | 11 +++++++++++ view/tpl/jot-header.tpl | 15 ++++++++++++--- view/tpl/jot.tpl | 6 ++++++ 6 files changed, 37 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 2d6307eb1..82c88e565 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -185,7 +185,8 @@ class Network extends \Zotlabs\Web\Controller { 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', 'bbcode' => true, - 'jotnets' => true + 'jotnets' => true, + 'reset' => t('Reset form') ); if($deftag) $x['pretext'] = $deftag; diff --git a/boot.php b/boot.php index 48b32d45b..36f50533b 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.5.5' ); +define ( 'STD_VERSION', '3.5.6' ); define ( 'ZOT_REVISION', '6.0a' ); diff --git a/include/conversation.php b/include/conversation.php index 3041d2e21..4a1cdc7da 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1304,6 +1304,8 @@ function status_editor($a, $x, $popup = false) { $id_select = ''; $webpage = ((x($x,'webpage')) ? $x['webpage'] : ''); + + $reset = ((x($x,'reset')) ? $x['reset'] : ''); $feature_auto_save_draft = ((feature_enabled($x['profile_uid'], 'auto_save_draft')) ? "true" : "false"); @@ -1329,6 +1331,7 @@ function status_editor($a, $x, $popup = false) { '$nocomment_enabled' => t('Comments enabled'), '$nocomment_disabled' => t('Comments disabled'), '$auto_save_draft' => $feature_auto_save_draft, + '$reset' => $reset )); $tpl = get_markup_template('jot.tpl'); @@ -1441,7 +1444,8 @@ function status_editor($a, $x, $popup = false) { '$expiryModalCANCEL' => t('Cancel'), '$expanded' => ((x($x, 'expanded')) ? $x['expanded'] : false), '$bbcode' => ((x($x, 'bbcode')) ? $x['bbcode'] : false), - '$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0) + '$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0), + '$reset' => $reset )); if ($popup === true) { diff --git a/view/css/conversation.css b/view/css/conversation.css index cff59aecb..81792b48e 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -27,6 +27,16 @@ padding: 0.5rem; } +#jot-text-wrap { + position: relative; +} + +#profile-jot-reset { + position: absolute; + top: 0px; + right: 0px; +} + #profile-jot-text { resize: none; border-width: 0px; @@ -39,6 +49,7 @@ #profile-jot-text.jot-expanded { resize: vertical; + height: 200px; } #profile-jot-text.hover { diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index f2b68ece0..39aa9d9c4 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -7,10 +7,11 @@ var pretext = '{{$pretext}}'; function initEditor(cb){ if (editor==false){ $("#profile-jot-text-loading").show(); + $("#profile-jot-reset").removeClass('d-none'); {{$geotag}} if(plaintext == 'none') { $("#profile-jot-text-loading").hide(); - $("#profile-jot-text").css({ 'height': 200 }); + //$("#profile-jot-text").css({ 'height': 200 }); {{if $bbco_autocomplete}} $("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode {{/if}} @@ -361,8 +362,16 @@ var activeCommentText = ''; $("#jot-title").val(''); $("#profile-jot-text").val(''); $("#jot-category").val(''); - postSaveChanges('clean',''); + postSaveChanges('clean'); + + {{if $reset}} + $(".jothidden").hide(); + $("#profile-jot-text").removeClass('jot-expanded'); + $("#profile-jot-reset").addClass('d-none'); + editor = false; + {{else}} window.history.back(); + {{/if}} } function itemFiler(id) { @@ -573,7 +582,7 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del
    {{/if}}
    + {{if $parent}} {{/if}} @@ -41,6 +42,11 @@
    {{/if}}
    + {{if $reset}} + + {{/if}}
    {{if $attachment}} -- cgit v1.2.3 From 6d7e364a0dbbd15aba8d09f1c584a59ecef0702d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 20 May 2018 11:02:18 +0200 Subject: remove some cruft from initEditor(); --- view/tpl/jot-header.tpl | 80 +++++++------------------------------------------ 1 file changed, 10 insertions(+), 70 deletions(-) diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 39aa9d9c4..fd1c8263a 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -5,13 +5,14 @@ var plaintext = '{{$editselect}}'; var pretext = '{{$pretext}}'; function initEditor(cb){ - if (editor==false){ + if(editor == false){ $("#profile-jot-text-loading").show(); $("#profile-jot-reset").removeClass('d-none'); {{$geotag}} if(plaintext == 'none') { $("#profile-jot-text-loading").hide(); - //$("#profile-jot-text").css({ 'height': 200 }); + $(".jothidden").show(); + $("#profile-jot-text").addClass('jot-expanded'); {{if $bbco_autocomplete}} $("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode {{/if}} @@ -22,82 +23,21 @@ function initEditor(cb){ $("#profile-jot-text").editor_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections {{/if}} editor = true; - $("a#jot-perms-icon").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - }); - $(".jothidden").show(); - $("#profile-jot-text").addClass('jot-expanded'); if (typeof cb!="undefined") cb(); if(pretext.length) addeditortext(pretext); return; } - tinyMCE.init({ - theme : "advanced", - mode : "specific_textareas", - editor_selector: {{$editselect}}, - auto_focus: "profile-jot-text", - plugins : "bbcode,paste,autoresize, inlinepopups", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "center", - theme_advanced_blockformats : "blockquote,code", - gecko_spellcheck : true, - paste_text_sticky : true, - entity_encoding : "raw", - add_unload_trigger : false, - remove_linebreaks : false, - force_p_newlines : false, - force_br_newlines : true, - forced_root_block : '', - convert_urls: false, - content_css: "{{$baseurl}}/view/custom_tinymce.css", - theme_advanced_path : false, - file_browser_callback : "fcFileBrowser", - setup : function(ed) { - cPopup = null; - ed.onKeyDown.add(function(ed,e) { - if(cPopup !== null) - cPopup.onkey(e); - }); - - ed.onKeyUp.add(function(ed, e) { - var txt = tinyMCE.activeEditor.getContent(); - match = txt.match(/@([^ \n]+)$/); - if(match!==null) { - if(cPopup === null) { - cPopup = new ACPopup(this,baseurl+"/acl"); - } - if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]); - if(! cPopup.ready) cPopup = null; - } - else { - if(cPopup !== null) { cPopup.close(); cPopup = null; } - } - }); - - ed.onInit.add(function(ed) { - ed.pasteAsPlainText = true; - $("#profile-jot-text-loading").hide(); - $(".jothidden").show(); - if (typeof cb!="undefined") cb(); - }); - - } - }); - - editor = true; + editor = true; } else { if (typeof cb!="undefined") cb(); } } function enableOnUser(){ - if (editor) return; - $(this).val(""); + if(editor) + return; + initEditor(); } @@ -111,8 +51,7 @@ var activeCommentID = 0; var activeCommentText = ''; $(document).ready(function() { - - /* enable tinymce on focus and click */ + $("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").click(enableOnUser); @@ -361,7 +300,8 @@ var activeCommentText = ''; function itemCancel() { $("#jot-title").val(''); $("#profile-jot-text").val(''); - $("#jot-category").val(''); + $("#jot-category").tagsinput('removeAll'); + postSaveChanges('clean'); {{if $reset}} -- cgit v1.2.3 From b11db26edf963aaa59c5f34346be4480360ba773 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 20 May 2018 11:12:39 +0200 Subject: do not update #acl-list-content on every click in jot. we just need this updated when in cutom mode (which is rarely the case). jot interaction was getting sluggish due to this when having lots of contacts. --- view/js/acl.js | 100 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/view/js/acl.js b/view/js/acl.js index 29652acb5..730b515a0 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -326,59 +326,61 @@ ACL.prototype.update_view = function(value) { } } - $("#acl-list-content .acl-list-item").each(function() { - $(this).removeClass("groupshow grouphide"); - }); + if(value === 'custom') { + $("#acl-list-content .acl-list-item").each(function() { + $(this).removeClass("groupshow grouphide"); + }); - $("#acl-list-content .acl-list-item").each(function() { - itemid = $(this).attr('id'); - type = itemid[0]; - id = itemid.substr(1); - - btshow = $(this).children(".acl-button-show").removeClass("btn-success").addClass("btn-outline-success"); - bthide = $(this).children(".acl-button-hide").removeClass("btn-danger").addClass("btn-outline-danger"); - - switch(type) { - case "g": - var uclass = ""; - if (that.allow_gid.indexOf(id)>=0) { - btshow.removeClass("btn-outline-success").addClass("btn-success"); - bthide.removeClass("btn-danger").addClass("btn-outline-danger"); - uclass="groupshow"; - } - if (that.deny_gid.indexOf(id)>=0) { - btshow.removeClass("btn-success").addClass("btn-outline-success"); - bthide.removeClass("btn-outline-danger").addClass("btn-danger"); - uclass = "grouphide"; - } - $(that.group_uids[id]).each(function(i, v) { - if(uclass == "grouphide") - // we need attr selection here because the id can include an @ (diaspora/friendica xchans) - $('[id="c' + v + '"]').removeClass("groupshow"); - if(uclass !== "") { - var cls = $('[id="c' + v + '"]').attr('class'); - if( cls === undefined) - return true; - var hiding = cls.indexOf('grouphide'); - if(hiding == -1) - $('[id="c' + v + '"]').addClass(uclass); - } - }); - break; - case "c": - if (that.allow_cid.indexOf(id)>=0){ - if(!$(this).hasClass("grouphide") ) { + $("#acl-list-content .acl-list-item").each(function() { + itemid = $(this).attr('id'); + type = itemid[0]; + id = itemid.substr(1); + + btshow = $(this).children(".acl-button-show").removeClass("btn-success").addClass("btn-outline-success"); + bthide = $(this).children(".acl-button-hide").removeClass("btn-danger").addClass("btn-outline-danger"); + + switch(type) { + case "g": + var uclass = ""; + if (that.allow_gid.indexOf(id)>=0) { btshow.removeClass("btn-outline-success").addClass("btn-success"); bthide.removeClass("btn-danger").addClass("btn-outline-danger"); + uclass="groupshow"; } - } - if (that.deny_cid.indexOf(id)>=0){ - btshow.removeClass("btn-success").addClass("btn-outline-success"); - bthide.removeClass("btn-outline-danger").addClass("btn-danger"); - $(this).removeClass("groupshow"); - } - } - }); + if (that.deny_gid.indexOf(id)>=0) { + btshow.removeClass("btn-success").addClass("btn-outline-success"); + bthide.removeClass("btn-outline-danger").addClass("btn-danger"); + uclass = "grouphide"; + } + $(that.group_uids[id]).each(function(i, v) { + if(uclass == "grouphide") + // we need attr selection here because the id can include an @ (diaspora/friendica xchans) + $('[id="c' + v + '"]').removeClass("groupshow"); + if(uclass !== "") { + var cls = $('[id="c' + v + '"]').attr('class'); + if( cls === undefined) + return true; + var hiding = cls.indexOf('grouphide'); + if(hiding == -1) + $('[id="c' + v + '"]').addClass(uclass); + } + }); + break; + case "c": + if (that.allow_cid.indexOf(id)>=0){ + if(!$(this).hasClass("grouphide") ) { + btshow.removeClass("btn-outline-success").addClass("btn-success"); + bthide.removeClass("btn-danger").addClass("btn-outline-danger"); + } + } + if (that.deny_cid.indexOf(id)>=0){ + btshow.removeClass("btn-success").addClass("btn-outline-success"); + bthide.removeClass("btn-outline-danger").addClass("btn-danger"); + $(this).removeClass("groupshow"); + } + } + }); + } }; ACL.prototype.get = function(start, count, search) { -- cgit v1.2.3 From 63f84ece6ef96c61ba9b877e0cd3aa675da760ad Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 20 May 2018 11:39:59 +0200 Subject: backport waitmans changes #1170 from master --- util/add_addon_repo | 2 +- util/add_theme_repo | 2 +- util/add_widget_repo | 2 +- util/hz | 2 +- util/run_xgettext.sh | 2 +- util/shredder/JSON.sh | 2 +- util/shredder/OAuth.sh | 2 +- util/shredder/ShredOAuth.sh | 2 +- util/shredder/shredder | 2 +- util/udall | 2 +- util/update_addon_repo | 2 +- util/update_theme_repo | 2 +- util/update_widget_repo | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/util/add_addon_repo b/util/add_addon_repo index de19bebfe..6bd9686a1 100755 --- a/util/add_addon_repo +++ b/util/add_addon_repo @@ -1,4 +1,4 @@ -#!/bin/bash -f +#!/usr/bin/env bash -f if [ $# -lt 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/add_theme_repo b/util/add_theme_repo index 1f8e7c1dd..30898dc01 100755 --- a/util/add_theme_repo +++ b/util/add_theme_repo @@ -1,4 +1,4 @@ -#!/bin/bash -f +#!/usr/bin/env bash -f if [ $# -lt 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/add_widget_repo b/util/add_widget_repo index 4cfd6a170..a8e888cdc 100755 --- a/util/add_widget_repo +++ b/util/add_widget_repo @@ -1,4 +1,4 @@ -#!/bin/bash -f +#!/usr/bin/env bash -f if [ $# -lt 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/hz b/util/hz index 8a432c30d..c9dc8654f 100755 --- a/util/hz +++ b/util/hz @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Simple, minimalist command line tool to post status to hubzilla via the API. Requires curl. # Put it in your path, and sneeze your statuses to the zot network from your shell. diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh index 918597882..12556868e 100755 --- a/util/run_xgettext.sh +++ b/util/run_xgettext.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash FULLPATH=$(dirname $(readlink -f "$0")) diff --git a/util/shredder/JSON.sh b/util/shredder/JSON.sh index 20c4d282e..9d110a6fe 100755 --- a/util/shredder/JSON.sh +++ b/util/shredder/JSON.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # The MIT License # # Copyright (c) 2011 Dominic Tarr diff --git a/util/shredder/OAuth.sh b/util/shredder/OAuth.sh index 4be4ed35b..07b2b9e1a 100755 --- a/util/shredder/OAuth.sh +++ b/util/shredder/OAuth.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Copyright (c) 2010, 2012 Yu-Jie Lin # # Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/util/shredder/ShredOAuth.sh b/util/shredder/ShredOAuth.sh index e21bea353..56fd3f722 100755 --- a/util/shredder/ShredOAuth.sh +++ b/util/shredder/ShredOAuth.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Copyright (c) 2012 Fabio Comuni # Copyright (c) 2012 Michael Nowack # Copyright (c) 2010, 2012 Yu-Jie Lin diff --git a/util/shredder/shredder b/util/shredder/shredder index 61e6b1fd4..6f5736259 100755 --- a/util/shredder/shredder +++ b/util/shredder/shredder @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Copyright (c) 2012 Fabio Comuni # Copyright (c) 2010, 2012 Yu-Jie Lin # diff --git a/util/udall b/util/udall index d1ff1c482..f1d52a1d1 100755 --- a/util/udall +++ b/util/udall @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ ! -d .git ]; then echo Unable to update `pwd` exit diff --git a/util/update_addon_repo b/util/update_addon_repo index ba1862f4b..efa46c668 100755 --- a/util/update_addon_repo +++ b/util/update_addon_repo @@ -1,4 +1,4 @@ -#!/bin/bash -f +#!/usr/bin/env bash -f if [ $# -ne 1 ]; then echo usage: $0 repository diff --git a/util/update_theme_repo b/util/update_theme_repo index cd71531d0..609e0cde0 100755 --- a/util/update_theme_repo +++ b/util/update_theme_repo @@ -1,4 +1,4 @@ -#!/bin/bash -f +#!/usr/bin/env bash -f if [ $# -ne 1 ]; then diff --git a/util/update_widget_repo b/util/update_widget_repo index 8ef5eba27..c88a1e637 100755 --- a/util/update_widget_repo +++ b/util/update_widget_repo @@ -1,4 +1,4 @@ -#!/bin/bash -f +#!/usr/bin/env bash -f if [ $# -ne 1 ]; then echo usage: $0 repository -- cgit v1.2.3 From a256195767786956011901c14f9813f7326b2576 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 20 May 2018 12:30:08 +0200 Subject: remove preview on jot reset --- view/tpl/jot-header.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index fd1c8263a..22413f350 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -308,6 +308,7 @@ var activeCommentText = ''; $(".jothidden").hide(); $("#profile-jot-text").removeClass('jot-expanded'); $("#profile-jot-reset").addClass('d-none'); + $("#jot-preview-content").html('').hide(); editor = false; {{else}} window.history.back(); -- cgit v1.2.3 From 6ba77ce0e282659f9616f6cdaf85f5fbcb9776bb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 20 May 2018 13:47:05 +0200 Subject: css fix --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9f78f06c5..4488dcddd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1627,7 +1627,7 @@ dl.bb-dl > dd > li { .form-group.checkbox > div label { display: block; overflow: hidden; cursor: pointer; border: 1px solid #ccc; - border-radius: $radius; + border-radius: 12px; margin:0px; -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; -- cgit v1.2.3 From 4eb40528a9d615b9498c64b4a308596ba632119a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 20 May 2018 14:07:30 +0200 Subject: local_channel() is not string --- Zotlabs/Module/Settings/Oauth2.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Module/Settings/Oauth2.php b/Zotlabs/Module/Settings/Oauth2.php index 88bbea3b8..66eb95f81 100644 --- a/Zotlabs/Module/Settings/Oauth2.php +++ b/Zotlabs/Module/Settings/Oauth2.php @@ -132,10 +132,10 @@ class Oauth2 { } - $r = q("SELECT oauth_clients.*, oauth_access_tokens.access_token as oauth_token, (oauth_clients.user_id = '%s') AS my + $r = q("SELECT oauth_clients.*, oauth_access_tokens.access_token as oauth_token, (oauth_clients.user_id = %d) AS my FROM oauth_clients LEFT JOIN oauth_access_tokens ON oauth_clients.client_id=oauth_access_tokens.client_id - WHERE oauth_clients.user_id IN ('%s',0)", + WHERE oauth_clients.user_id IN (%d,0)", dbesc(local_channel()), dbesc(local_channel()) ); @@ -157,4 +157,4 @@ class Oauth2 { } -} \ No newline at end of file +} -- cgit v1.2.3 From 9e1af2492ff30f65e678ca1b885350069583ade0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 20 May 2018 14:15:46 +0200 Subject: more local_channel() is not string --- Zotlabs/Module/Settings/Oauth2.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Zotlabs/Module/Settings/Oauth2.php b/Zotlabs/Module/Settings/Oauth2.php index 66eb95f81..8db5c14aa 100644 --- a/Zotlabs/Module/Settings/Oauth2.php +++ b/Zotlabs/Module/Settings/Oauth2.php @@ -43,24 +43,24 @@ class Oauth2 { redirect_uri = '%s', grant_types = '%s', scope = '%s', - user_id = '%s' + user_id = %d WHERE client_id='%s'", dbesc($name), dbesc($secret), dbesc($redirect), dbesc($grant), dbesc($scope), - dbesc(local_channel()), + intval(local_channel()), dbesc($name)); } else { $r = q("INSERT INTO oauth_clients (client_id, client_secret, redirect_uri, grant_types, scope, user_id) - VALUES ('%s','%s','%s','%s','%s','%s')", + VALUES ('%s','%s','%s','%s','%s',%d)", dbesc($name), dbesc($secret), dbesc($redirect), dbesc($grant), dbesc($scope), - dbesc(local_channel()) + intval(local_channel()) ); $r = q("INSERT INTO xperm (xp_client, xp_channel, xp_perm) VALUES ('%s', %d, '%s') ", dbesc($name), @@ -93,9 +93,9 @@ class Oauth2 { } if((argc() > 3) && (argv(2) === 'edit')) { - $r = q("SELECT * FROM oauth_clients WHERE client_id='%s' AND user_id= '%s'", + $r = q("SELECT * FROM oauth_clients WHERE client_id='%s' AND user_id= %d", dbesc(argv(3)), - dbesc(local_channel()) + intval(local_channel()) ); if (! $r){ @@ -123,9 +123,9 @@ class Oauth2 { if((argc() > 3) && (argv(2) === 'delete')) { check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2', 't'); - $r = q("DELETE FROM oauth_clients WHERE client_id = '%s' AND user_id = '%s'", + $r = q("DELETE FROM oauth_clients WHERE client_id = '%s' AND user_id = %d", dbesc(argv(3)), - dbesc(local_channel()) + intval(local_channel()) ); goaway(z_root()."/settings/oauth2/"); return; @@ -136,8 +136,8 @@ class Oauth2 { FROM oauth_clients LEFT JOIN oauth_access_tokens ON oauth_clients.client_id=oauth_access_tokens.client_id WHERE oauth_clients.user_id IN (%d,0)", - dbesc(local_channel()), - dbesc(local_channel()) + intval(local_channel()), + intval(local_channel()) ); $tpl = get_markup_template("settings_oauth2.tpl"); -- cgit v1.2.3 From 55e1026c986f1c2c7e2a0376579b01111a93ab5d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 20 May 2018 20:48:52 +0200 Subject: improve abconfig queries --- Zotlabs/Update/_1213.php | 28 ++++++++++++++++++++++++++++ boot.php | 2 +- install/schema_mysql.sql | 3 +-- 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 Zotlabs/Update/_1213.php diff --git a/Zotlabs/Update/_1213.php b/Zotlabs/Update/_1213.php new file mode 100644 index 000000000..d396829a6 --- /dev/null +++ b/Zotlabs/Update/_1213.php @@ -0,0 +1,28 @@ + Date: Sun, 20 May 2018 13:29:48 -0700 Subject: remove unused mindate parameter in the network/stream API method --- include/api_zot.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/api_zot.php b/include/api_zot.php index 1d30a0845..921242152 100644 --- a/include/api_zot.php +++ b/include/api_zot.php @@ -96,9 +96,10 @@ // json_return_and_die(post_activity_item($_REQUEST)); } else { - $mindate = (($_REQUEST['mindate']) ? datetime_convert('UTC','UTC',$_REQUEST['mindate']) : ''); - if(! $mindate) - $mindate = datetime_convert('UTC','UTC', 'now - 14 days'); + if(array_key_exists('dbegin',$_REQUEST)) + $_REQUEST['datequery2'] = $_REQUEST['dbegin']; + if(array_key_exists('dend',$_REQUEST)) + $_REQUEST['datequery'] = $_REQUEST['dend']; $arr = $_REQUEST; $ret = []; -- cgit v1.2.3 From 469809183d232761b8984848c133f9f11f5e7cea Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 20 May 2018 22:42:47 +0200 Subject: update oauth related tables to use bigint/int(10) for user_id column. this is to be more consistent with the rest of the tables and fixes issue #1180 --- Zotlabs/Module/Settings/Oauth2.php | 3 +- Zotlabs/Update/_1214.php | 57 ++++++++++++++++++++++++++++++++++++++ boot.php | 2 +- install/schema_mysql.sql | 8 +++--- install/schema_postgres.sql | 8 +++--- 5 files changed, 68 insertions(+), 10 deletions(-) create mode 100644 Zotlabs/Update/_1214.php diff --git a/Zotlabs/Module/Settings/Oauth2.php b/Zotlabs/Module/Settings/Oauth2.php index 8db5c14aa..985095115 100644 --- a/Zotlabs/Module/Settings/Oauth2.php +++ b/Zotlabs/Module/Settings/Oauth2.php @@ -14,7 +14,8 @@ class Oauth2 { $key = $_POST['remove']; q("DELETE FROM tokens WHERE id='%s' AND uid=%d", dbesc($key), - local_channel()); + intval(local_channel()) + ); goaway(z_root()."/settings/oauth2/"); return; } diff --git a/Zotlabs/Update/_1214.php b/Zotlabs/Update/_1214.php new file mode 100644 index 000000000..06e5d96ed --- /dev/null +++ b/Zotlabs/Update/_1214.php @@ -0,0 +1,57 @@ + Date: Sun, 20 May 2018 19:18:39 -0700 Subject: pleroma does not return a valid JRD when given an accept header of application/jrd+json - it only returns a JRD when passed an accept header of application/json (ahead of anything else because XRD is served at the same endpoint) --- include/network.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/network.php b/include/network.php index ceba56e06..7e8f823a3 100644 --- a/include/network.php +++ b/include/network.php @@ -1216,7 +1216,7 @@ function webfinger_rfc7033($webbie, $zot = false) { if(strpos($webbie,'@')) { $lhs = substr($webbie,0,strpos($webbie,'@')); $rhs = substr($webbie,strpos($webbie,'@')+1); - $resource = 'acct:' . $webbie; + $resource = urlencode('acct:' . $webbie); } else { $m = parse_url($webbie); @@ -1234,7 +1234,7 @@ function webfinger_rfc7033($webbie, $zot = false) { $counter = 0; $s = z_fetch_url('https://' . $rhs . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=1' : ''), - false, $counter, [ 'headers' => [ 'Accept: application/jrd+json, */*' ] ]); + false, $counter, [ 'headers' => [ 'Accept: application/jrd+json, application/json, */*' ] ]); if($s['success']) { $j = json_decode($s['body'], true); -- cgit v1.2.3 From 49f7d63290b3520f3758617952b3b59d43abeca1 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 20 May 2018 23:40:10 -0700 Subject: first cut at a general purpose gdpr document. What we would like to do is use a conditional expression so that a site document will be loaded if it exists, and fallback to a project boiler plate document if it does not. This is an exercise for the community. --- doc/TermsOfService.md | 6 +++ doc/gdpr1.md | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 doc/gdpr1.md diff --git a/doc/TermsOfService.md b/doc/TermsOfService.md index 97e9881aa..1e085559e 100644 --- a/doc/TermsOfService.md +++ b/doc/TermsOfService.md @@ -1,3 +1,9 @@ +Privacy Policy +============== + +#include doc/gdpr1.md; + + Terms of Service ================ diff --git a/doc/gdpr1.md b/doc/gdpr1.md new file mode 100644 index 000000000..daa401a3d --- /dev/null +++ b/doc/gdpr1.md @@ -0,0 +1,114 @@ + +Privacy Notice May 2018 + +How your information will be used +================================= + +Information you provide to this website may be stored and used to provide services to you. + +We require an email address to idenitfy the account holder. This will not be shared with +any other website or service. It is used to send you notifications about your account and +perform administrative tasks such as resetting your password. You have the option to +opt-out of all email notifications through your settings. + +Communication channels created on this website require a name and a photo or avatar. A +default avatar will be chosen if you do not supply one. The name, avatar, and a link to +the channel webpage will be shared with other servers and services in order to refer to +this identity. The name does not need to be your real name and the photo or avatar does +not need to resemble you. + +All other information you supply to this website is optional. + +As a social communication and cloud storage service, you will usually be using this website +to share information with others. We provide a range of privacy options to allow you to +restrict this sharing to only those you choose. + + +Processing of your information +============================== + +Our processing of your information is limited to storing it for you to use. We MAY keep logs +of activity to help diagnose software issues and to maintain security of the system against +intrusion. These logs are routinely deleted after a few days. + +We MAY (if you have provided this permission) try to suggest frendships or connections based +on analysing publicly available information about your connections. This is currently the most +advanced data "processing" performed at this website. You may restrict access to this information +if this processing is undesired. + +If supplied, we MAY use your gender to formulate text messages in your native language, for +instance "Bob commented on HIS post." + +In all other cases, your data is stored under your desired privacy policy and to the best +of our ability is only shared with those who you have elected to share it with. + +We do not share your private information with third parties or analyse your behaviour or personal +characteristics. We have no advertisements or business relationships with advertisers. + +We MAY be asked or forced to divulge information provided by you in response to legitimate +criminal and legal proceedings. Where possible we will notify you if this happens. + + +Access to your information +========================== + +Some communications are shared with other websites. Those using the same software will usually +have similar privacy policies. + + +You may be shown embedded videos and provided links to visit other websites as part of your +day-to-day activities using this website. This MAY expose you to monitoring by external services, such +as (but not limited to) Facebook, Twitter, and Google. Each website operator is allowed to configure +whether or not embedded content is permitted. + +Further access to your personal data and stored files is under your control. + +Our storage of your data is provided under your implied consent through your continued use of +the service. You may withdraw this consent at any time and on account deletion we will remove +all data which belongs to you. The process of deletion may take several days as we also make a good faith +effort to delete it from any internetworked websites that have been provided a copy. + + +All data and files stored for a communications channel are available for you to +download for either archival puposes or to transfer to another compatible website. + + + +Your rights +=========== + +Under the General Data Protection Regulation +(GDPR) and The Data Protection Act 2018 +(DPA) you have a number of rights with regard to your personal data. +You have the right to request from us access to and rectification or erasure of your personal data, +the right to restrict processing, object to processing as well as in certain circumstances the right +to data portability. + +If you have provided consent for the processing of your data you have the right (in certain +circumstances) to withdraw that consent at any time which will not affect the lawfulness of +the processing before your consent was withdrawn. + +You have the right to lodge a complaint to the Information Commissioners’ Office if you +believe that we have not complied with the requirements of the GDPR or DPA 18 with regard +to your personal data. + +Identity and contact details of controller and data protection officer + +[NAME OF COMPANY] +is the controller +[and processor] +of data for the purposes of the DPA 18 and GDPR. 3 + +If you have any concerns as to how your data is processed you can contact: + +[ +[NAME] +Data Protection Offer at +[EMAIL ADDRESS] +] +[NAME] [JOB TITLE] +at +[EMAIL ADDRESS] +or you can write to these +individuals using the address of +[] -- cgit v1.2.3 From 7dadbbbac722697ad71130c43b2c9ca6c5e9539a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 21 May 2018 09:13:14 +0200 Subject: bring jot reset to some more places --- Zotlabs/Module/Channel.php | 3 ++- Zotlabs/Module/Display.php | 3 ++- Zotlabs/Module/Hq.php | 3 ++- Zotlabs/Module/Pubstream.php | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 9ce57d6eb..327ca53db 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -152,7 +152,8 @@ class Channel extends \Zotlabs\Web\Controller { 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', 'bbcode' => true, - 'jotnets' => true + 'jotnets' => true, + 'reset' => t('Reset form') ); $o .= status_editor($a,$x); diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 06c9479b2..83f05a625 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -78,7 +78,8 @@ class Display extends \Zotlabs\Web\Controller { 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', 'bbcode' => true, - 'jotnets' => true + 'jotnets' => true, + 'reset' => t('Reset form') ); $o = '
    '; diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index baeba82e8..33c9cca4d 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -131,7 +131,8 @@ class Hq extends \Zotlabs\Web\Controller { 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', 'bbcode' => true, - 'jotnets' => true + 'jotnets' => true, + 'reset' => t('Reset form') ]; $o = replace_macros(get_markup_template("hq.tpl"), diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 571118201..f0ce4749b 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -77,7 +77,8 @@ class Pubstream extends \Zotlabs\Web\Controller { 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', 'bbcode' => true, - 'jotnets' => true + 'jotnets' => true, + 'reset' => t('Reset form') ); $o = '
    '; -- cgit v1.2.3 From a8274bbfb3c5ac315f3dcf470f45262c03d48e06 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 21 May 2018 09:25:57 +0200 Subject: missing permission description --- Zotlabs/Module/Display.php | 3 +-- Zotlabs/Module/Hq.php | 3 +-- Zotlabs/Module/Pubstream.php | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 83f05a625..a127ab196 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -67,8 +67,7 @@ class Display extends \Zotlabs\Web\Controller { 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - - 'acl' => populate_acl($channel_acl), + 'acl' => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), 'permissions' => $channel_acl, 'bang' => '', 'visitor' => true, diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index 33c9cca4d..fee4246c0 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -120,8 +120,7 @@ class Hq extends \Zotlabs\Web\Controller { 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - - 'acl' => populate_acl($channel_acl), + 'acl' => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), 'permissions' => $channel_acl, 'bang' => '', 'visitor' => true, diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index f0ce4749b..f0e87f468 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -66,8 +66,7 @@ class Pubstream extends \Zotlabs\Web\Controller { 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - - 'acl' => populate_acl($channel_acl), + 'acl' => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), 'permissions' => $channel_acl, 'bang' => '', 'visitor' => true, -- cgit v1.2.3 From 355a9ac7ee50398104ee8885d74475597aa3c107 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 21 May 2018 10:05:17 +0200 Subject: Create gdpr1.md --- doc/fr/gdpr1.md | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 doc/fr/gdpr1.md diff --git a/doc/fr/gdpr1.md b/doc/fr/gdpr1.md new file mode 100644 index 000000000..5d82a6614 --- /dev/null +++ b/doc/fr/gdpr1.md @@ -0,0 +1,101 @@ +Avis de confidentialité Mai 2018 + +Comment vos informations seront utilisées +================================= + +Les informations que vous fournissez à ce site Web peuvent être stockées et utilisées pour vous fournir des services. + +Nous avons besoin d'une adresse e-mail pour identifier le titulaire du compte. Ceci ne sera pas partagé avec +tout autre site Web ou service. Il est utilisé pour vous envoyer des notifications concernant votre compte et +effectuer des tâches administratives telles que la réinitialisation de votre mot de passe. Vous avez la possibilité de +vous pouvez choisir de ne pas recevoir toutes les notifications par courriel par le biais de vos paramètres. + +Les canaux de communication créés sur ce site web nécessitent un nom et une photo ou un avatar. A +avatar par défaut sera choisi si vous n'en fournissez pas. Le nom, l'avatar, et un lien vers +la page web du canal sera partagée avec d'autres serveurs et services afin de se référer à +cette identité. Le nom n'a pas besoin d'être votre vrai nom et la photo ou l'avatar le fait. +pas besoin de te ressembler. + +Toutes les autres informations que vous fournissez à ce site Web sont facultatives. + +En tant que service de communication sociale et de stockage dans les nuages, vous utiliserez généralement ce site Web. +de partager l'information avec d'autres. Nous offrons une gamme d'options de confidentialité pour vous permettre de +limiter ce partage à ceux que vous choisissez. + +Traitement de vos informations +============================== + +Notre traitement de vos informations est limité à leur stockage pour que vous puissiez les utiliser. Nous POUVONS tenir des registres +d'activité pour aider à diagnostiquer les problèmes de logiciel et à maintenir la sécurité du système contre +intrusion. Ces journaux sont régulièrement effacés après quelques jours. + +Nous PEUVONS (si vous avez fourni cette permission) essayer de suggérer des amitiés ou des connexions basées sur des amitiés +sur l'analyse des informations accessibles au public concernant vos connexions. C'est actuellement le plus grand nombre d'entre eux. +le "traitement" avancé des données effectué sur ce site Web. Vous pouvez restreindre l'accès à ces informations. +si ce traitement n'est pas souhaité. + +S'il est fourni, nous PEUVONS utiliser votre sexe pour formuler des messages texte dans votre langue maternelle. + +Dans tous les autres cas, vos données sont stockées dans le cadre de la politique de confidentialité de votre choix et au mieux. +de notre capacité n'est partagée qu'avec ceux avec qui vous avez choisi de la partager. + +Nous ne partageons pas vos informations personnelles avec des tiers et n'analysons pas votre comportement ou vos informations personnelles. +Nous n'avons pas de publicité ou de relations d'affaires avec les annonceurs. + +Nous PEUVONS être invités ou forcés de divulguer les informations que vous nous avez fournies en réponse à des demandes légitimes. +les procédures pénales et judiciaires. Dans la mesure du possible, nous vous en aviserons si cela se produit. + +Accès à vos informations +========================== + +Certaines communications sont partagées avec d'autres sites Web. Ceux qui utilisent le même logiciel vont généralement +ont des politiques similaires en matière de protection de la vie privée. + +Il se peut que l'on vous montre des vidéos intégrées et des liens fournis pour visiter d'autres sites Web dans le cadre de votre site Web. +activités quotidiennes à l'aide de ce site Web. Cela peut vous exposer à une surveillance par des services externes, tels que +(mais sans s'y limiter) Facebook, Twitter et Google. Chaque opérateur de site web est autorisé à configurer si le contenu incorporé est autorisé ou non. + +L'accès à vos données personnelles et aux fichiers stockés est sous votre contrôle. + +Notre stockage de vos données est fourni sous votre consentement implicite par le biais de votre utilisation continue de +le service. Vous pouvez retirer ce consentement à tout moment et, en cas de suppression de compte, nous supprimerons les informations suivantes +toutes les données qui vous appartiennent. Le processus de suppression peut prendre plusieurs jours, car nous faisons également tout notre possible pour le supprimer de tous les sites Internet qui ont reçu une copie. + +Toutes les données et tous les fichiers stockés pour un canal de communication sont à votre disposition pour +télécharger pour les pupilles d'archives ou pour les transférer sur un autre site Web compatible. + +Vos droits +=========== + +En vertu du règlement général sur la protection des données +(GDPR) et la Loi sur la protection des données 2018 (DPA) +vous disposez d'un certain nombre de droits en ce qui concerne vos données personnelles. +Vous avez le droit de nous demander l'accès et la rectification ou l'effacement de vos données personnelles, +le droit de restreindre le traitement, de s'opposer au traitement ainsi que, dans certaines circonstances, le droit à la transformation. +à la portabilité des données. + +Si vous avez donné votre consentement pour le traitement de vos données, vous avez le droit (dans certains cas, vous pouvez le faire). +circonstances) de retirer ce consentement à tout moment, ce qui n'affectera pas la légalité de l'utilisation de la +le traitement avant le retrait de votre consentement. + +Vous avez le droit de déposer une plainte auprès du Commissariat à l'information si vous remplissez les conditions suivantes +nous estimons que nous n'avons pas respecté les exigences du GDPR ou de la DPA 18 en ce qui concerne +à vos données personnelles. + +Identité et coordonnées du responsable du traitement et du délégué à la protection des données + +[NOM DE L'ENTREPRISE] +est le contrôleur [et le processeur] +des données aux fins de la LPD 18 et du RDPPIB. 3 + +Si vous avez des questions sur la manière dont vos données sont traitées, vous pouvez nous contacter : + +[NOM] +Offre de protection des données à +[COURRIEL] + +[NOM] [TITRE] +à +[COURRIEL] + +ou vous pouvez écrire à l'adresse suivante [] -- cgit v1.2.3 From a8def37dcf02a19758305f2d1c8d9980d771d03d Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 21 May 2018 10:08:00 +0200 Subject: Create TermsOfService.md --- doc/fr/TermsOfService.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/fr/TermsOfService.md diff --git a/doc/fr/TermsOfService.md b/doc/fr/TermsOfService.md new file mode 100644 index 000000000..c51224e14 --- /dev/null +++ b/doc/fr/TermsOfService.md @@ -0,0 +1,10 @@ +Politique de confidentialité +============== + +#include doc/gdpr1.md; + + +Conditions d'utilisation +================ + +#include doc/SiteTOS.md; -- cgit v1.2.3 From cc1453a8de80b1cdac187a862336db3a59401507 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 21 May 2018 10:16:39 +0200 Subject: Update gdpr1.md --- doc/fr/gdpr1.md | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/doc/fr/gdpr1.md b/doc/fr/gdpr1.md index 5d82a6614..e617a7a3d 100644 --- a/doc/fr/gdpr1.md +++ b/doc/fr/gdpr1.md @@ -5,34 +5,22 @@ Comment vos informations seront utilisées Les informations que vous fournissez à ce site Web peuvent être stockées et utilisées pour vous fournir des services. -Nous avons besoin d'une adresse e-mail pour identifier le titulaire du compte. Ceci ne sera pas partagé avec -tout autre site Web ou service. Il est utilisé pour vous envoyer des notifications concernant votre compte et -effectuer des tâches administratives telles que la réinitialisation de votre mot de passe. Vous avez la possibilité de -vous pouvez choisir de ne pas recevoir toutes les notifications par courriel par le biais de vos paramètres. +Nous avons besoin d'une adresse e-mail pour identifier le titulaire du compte. Ceci ne sera pas partagé avec tout autre site Web ou service. Il est utilisé pour vous envoyer des notifications concernant votre compte et effectuer des tâches administratives telles que la réinitialisation de votre mot de passe. Vous avez la possibilité de refuser toutes les notifications par courriel par le biais de vos paramètres. -Les canaux de communication créés sur ce site web nécessitent un nom et une photo ou un avatar. A -avatar par défaut sera choisi si vous n'en fournissez pas. Le nom, l'avatar, et un lien vers -la page web du canal sera partagée avec d'autres serveurs et services afin de se référer à -cette identité. Le nom n'a pas besoin d'être votre vrai nom et la photo ou l'avatar le fait. -pas besoin de te ressembler. +Les canaux de communication créés sur ce site web nécessitent un nom et une photo ou un avatar. Un avatar par défaut sera choisi si vous n'en fournissez pas. Le nom, l'avatar, et un lien vers la page web du canal sera partagée avec d'autres serveurs et services afin de se référer à cette identité. Le nom n'a pas besoin d'être votre vrai nom et la photo ou l'avatar n'a pas besoin de vous ressembler. Toutes les autres informations que vous fournissez à ce site Web sont facultatives. -En tant que service de communication sociale et de stockage dans les nuages, vous utiliserez généralement ce site Web. -de partager l'information avec d'autres. Nous offrons une gamme d'options de confidentialité pour vous permettre de -limiter ce partage à ceux que vous choisissez. +En tant que service de communication sociale et de stockage dans les nuages, vous utiliserez généralement ce site Web pour partager des informations avec d'autres personnes. Nous fournissons une gamme d'options de confidentialité pour vous permettre de limiter ce partage à ceux que vous choisissez. Traitement de vos informations ============================== -Notre traitement de vos informations est limité à leur stockage pour que vous puissiez les utiliser. Nous POUVONS tenir des registres -d'activité pour aider à diagnostiquer les problèmes de logiciel et à maintenir la sécurité du système contre +Notre traitement de vos informations est limité à leur stockage pour que vous puissiez les utiliser. Nous POUVONS tenir des registres d'activité pour aider à diagnostiquer les problèmes de logiciel et à maintenir la sécurité du système contre intrusion. Ces journaux sont régulièrement effacés après quelques jours. Nous PEUVONS (si vous avez fourni cette permission) essayer de suggérer des amitiés ou des connexions basées sur des amitiés -sur l'analyse des informations accessibles au public concernant vos connexions. C'est actuellement le plus grand nombre d'entre eux. -le "traitement" avancé des données effectué sur ce site Web. Vous pouvez restreindre l'accès à ces informations. -si ce traitement n'est pas souhaité. +sur l'analyse des informations accessibles au public concernant vos connexions. Il s'agit actuellement du "traitement" de données le plus avancé effectué sur ce site Web. Vous pouvez restreindre l'accès à ces informations si ce traitement n'est pas souhaité. S'il est fourni, nous PEUVONS utiliser votre sexe pour formuler des messages texte dans votre langue maternelle. -- cgit v1.2.3 From 1dbf89362f0634a672ac3ca9cc865fd82a608889 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 21 May 2018 10:22:19 +0200 Subject: Update gdpr1.md --- doc/fr/gdpr1.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/doc/fr/gdpr1.md b/doc/fr/gdpr1.md index e617a7a3d..86fb8bc01 100644 --- a/doc/fr/gdpr1.md +++ b/doc/fr/gdpr1.md @@ -30,8 +30,7 @@ de notre capacité n'est partagée qu'avec ceux avec qui vous avez choisi de la Nous ne partageons pas vos informations personnelles avec des tiers et n'analysons pas votre comportement ou vos informations personnelles. Nous n'avons pas de publicité ou de relations d'affaires avec les annonceurs. -Nous PEUVONS être invités ou forcés de divulguer les informations que vous nous avez fournies en réponse à des demandes légitimes. -les procédures pénales et judiciaires. Dans la mesure du possible, nous vous en aviserons si cela se produit. +Nous PEUVONS être invités ou forcés de divulguer les informations que vous nous avez fournies en réponse à des procédures pénales et judiciaires légitimes. Dans la mesure du possible, nous vous en aviserons si cela se produit. Accès à vos informations ========================== @@ -39,15 +38,11 @@ Accès à vos informations Certaines communications sont partagées avec d'autres sites Web. Ceux qui utilisent le même logiciel vont généralement ont des politiques similaires en matière de protection de la vie privée. -Il se peut que l'on vous montre des vidéos intégrées et des liens fournis pour visiter d'autres sites Web dans le cadre de votre site Web. -activités quotidiennes à l'aide de ce site Web. Cela peut vous exposer à une surveillance par des services externes, tels que -(mais sans s'y limiter) Facebook, Twitter et Google. Chaque opérateur de site web est autorisé à configurer si le contenu incorporé est autorisé ou non. +Il se peut que l'on vous montre des vidéos intégrées et des liens fournis pour visiter d'autres sites Web dans le cadre de vos activités quotidiennes à l'aide de ce site Web. Cette mai vous exposer à la surveillance par des services externes, tels que (mais non limité à) Facebook, Twitter et Google. Chaque opérateur de site Web est autorisé à configurer si le contenu intégré est autorisé ou non. L'accès à vos données personnelles et aux fichiers stockés est sous votre contrôle. -Notre stockage de vos données est fourni sous votre consentement implicite par le biais de votre utilisation continue de -le service. Vous pouvez retirer ce consentement à tout moment et, en cas de suppression de compte, nous supprimerons les informations suivantes -toutes les données qui vous appartiennent. Le processus de suppression peut prendre plusieurs jours, car nous faisons également tout notre possible pour le supprimer de tous les sites Internet qui ont reçu une copie. +Notre stockage de vos données est fourni sous votre consentement implicite par le biais de votre utilisation continue du service. Vous pouvez retirer ce consentement à tout moment et, en cas de suppression de compte, nous supprimerons toutes les toutes les données qui vous appartiennent. Le processus de suppression peut prendre plusieurs jours, car nous faisons également tout notre possible pour le supprimer de tous les sites Internet qui ont reçu une copie. Toutes les données et tous les fichiers stockés pour un canal de communication sont à votre disposition pour télécharger pour les pupilles d'archives ou pour les transférer sur un autre site Web compatible. -- cgit v1.2.3 From 7e262005101a4686a82d3f04a7548edc270e19de Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Mon, 21 May 2018 10:25:03 +0200 Subject: Update gdpr1.md --- doc/fr/gdpr1.md | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/doc/fr/gdpr1.md b/doc/fr/gdpr1.md index 86fb8bc01..bc0dfe056 100644 --- a/doc/fr/gdpr1.md +++ b/doc/fr/gdpr1.md @@ -51,19 +51,12 @@ Vos droits =========== En vertu du règlement général sur la protection des données -(GDPR) et la Loi sur la protection des données 2018 (DPA) -vous disposez d'un certain nombre de droits en ce qui concerne vos données personnelles. -Vous avez le droit de nous demander l'accès et la rectification ou l'effacement de vos données personnelles, -le droit de restreindre le traitement, de s'opposer au traitement ainsi que, dans certaines circonstances, le droit à la transformation. -à la portabilité des données. - -Si vous avez donné votre consentement pour le traitement de vos données, vous avez le droit (dans certains cas, vous pouvez le faire). -circonstances) de retirer ce consentement à tout moment, ce qui n'affectera pas la légalité de l'utilisation de la -le traitement avant le retrait de votre consentement. - -Vous avez le droit de déposer une plainte auprès du Commissariat à l'information si vous remplissez les conditions suivantes -nous estimons que nous n'avons pas respecté les exigences du GDPR ou de la DPA 18 en ce qui concerne -à vos données personnelles. +(GDPR) et la Loi sur la protection des données 2018 (DPA) , vous disposez d'un certain nombre de droits en ce qui concerne vos données personnelles. +Vous avez le droit de nous demander l'accès et la rectification ou l'effacement de vos données personnelles, le droit de restreindre le traitement, de s'opposer au traitement ainsi que, dans certaines circonstances, le droit à la portabilité des données. + +Si vous avez donné votre consentement au traitement de vos données, vous avez le droit (dans certaines circonstances) de retirer ce consentement à tout moment, ce qui n'affectera pas la licéité du traitement avant le retrait de votre consentement. + +Vous avez le droit de déposer une plainte auprès du Commissariat à l'information si vous estimez que nous n'avons pas respecté les exigences du GDPR ou de la DPA 18 en ce qui concerne vos données personnelles. Identité et coordonnées du responsable du traitement et du délégué à la protection des données -- cgit v1.2.3 From fff720c00d8581bf8c56a178580d7eab68af6061 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 21 May 2018 20:01:03 +0200 Subject: address globbing issue in #1170 --- util/add_addon_repo | 4 +++- util/add_theme_repo | 4 +++- util/add_widget_repo | 4 +++- util/update_addon_repo | 4 +++- util/update_theme_repo | 4 +++- util/update_widget_repo | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/util/add_addon_repo b/util/add_addon_repo index 6bd9686a1..d82081470 100755 --- a/util/add_addon_repo +++ b/util/add_addon_repo @@ -1,4 +1,6 @@ -#!/usr/bin/env bash -f +#!/usr/bin/env bash + +set -f if [ $# -lt 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/add_theme_repo b/util/add_theme_repo index 30898dc01..7ae9cdb02 100755 --- a/util/add_theme_repo +++ b/util/add_theme_repo @@ -1,4 +1,6 @@ -#!/usr/bin/env bash -f +#!/usr/bin/env bash + +set -f if [ $# -lt 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/add_widget_repo b/util/add_widget_repo index a8e888cdc..77774587c 100755 --- a/util/add_widget_repo +++ b/util/add_widget_repo @@ -1,4 +1,6 @@ -#!/usr/bin/env bash -f +#!/usr/bin/env bash + +set -f if [ $# -lt 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/update_addon_repo b/util/update_addon_repo index efa46c668..0e471eb4f 100755 --- a/util/update_addon_repo +++ b/util/update_addon_repo @@ -1,4 +1,6 @@ -#!/usr/bin/env bash -f +#!/usr/bin/env bash + +set -f if [ $# -ne 1 ]; then echo usage: $0 repository diff --git a/util/update_theme_repo b/util/update_theme_repo index 609e0cde0..b4de55568 100755 --- a/util/update_theme_repo +++ b/util/update_theme_repo @@ -1,4 +1,6 @@ -#!/usr/bin/env bash -f +#!/usr/bin/env bash + +set -f if [ $# -ne 1 ]; then diff --git a/util/update_widget_repo b/util/update_widget_repo index c88a1e637..70d09f959 100755 --- a/util/update_widget_repo +++ b/util/update_widget_repo @@ -1,4 +1,6 @@ -#!/usr/bin/env bash -f +#!/usr/bin/env bash + +set -f if [ $# -ne 1 ]; then echo usage: $0 repository -- cgit v1.2.3 From d9066ef26b5c44eddd4150f280e039a41bdbc1f0 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 21 May 2018 13:37:55 -0700 Subject: not null violation oauth1 --- include/oauth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/oauth.php b/include/oauth.php index a3c52bf27..845ec4558 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -79,7 +79,7 @@ class ZotOAuth1DataStore extends OAuth1DataStore { $k = $consumer; } - $r = q("INSERT INTO tokens (id, secret, client_id, auth_scope, expires) VALUES ('%s','%s','%s','%s', %d)", + $r = q("INSERT INTO tokens (id, secret, client_id, auth_scope, expires, uid) VALUES ('%s','%s','%s','%s', %d, 0)", dbesc($key), dbesc($sec), dbesc($k), -- cgit v1.2.3 From 9bf26cee6de1015aab3eec87e335c3b90827cd33 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 21 May 2018 16:19:17 -0700 Subject: add hook 'get_system_apps' --- Zotlabs/Lib/Apps.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 24cb4a626..2dded1aaa 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -45,6 +45,8 @@ class Apps { } } + call_hooks('get_system_apps',$ret); + return $ret; } -- cgit v1.2.3 From 2b3f931c859b0e5b3a561c445b29035b00b4dc20 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 21 May 2018 19:25:03 -0700 Subject: oauth2 discovery per draft-ietf-oauth-discovery-10 --- Zotlabs/Module/Oauthinfo.php | 23 +++++++++++++++++++++++ Zotlabs/Module/Well_known.php | 10 +++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 Zotlabs/Module/Oauthinfo.php diff --git a/Zotlabs/Module/Oauthinfo.php b/Zotlabs/Module/Oauthinfo.php new file mode 100644 index 000000000..6eea2e02b --- /dev/null +++ b/Zotlabs/Module/Oauthinfo.php @@ -0,0 +1,23 @@ + z_root(), + 'authorization_endpoint' => z_root() . '/authorize', + 'token_endpoint' => z_root() . '/token', + 'response_types_supported' => [ 'code', 'code token' ] + ]; + + + json_return_and_die($ret); + } + + +} \ No newline at end of file diff --git a/Zotlabs/Module/Well_known.php b/Zotlabs/Module/Well_known.php index 177de2323..442994b54 100644 --- a/Zotlabs/Module/Well_known.php +++ b/Zotlabs/Module/Well_known.php @@ -50,7 +50,15 @@ class Well_known extends \Zotlabs\Web\Controller { $module = new \Zotlabs\Module\Hostxrd(); $module->init(); break; - + + case 'oauth-authorization-server': + \App::$argc -= 1; + array_shift(\App::$argv); + \App::$argv[0] = 'oauthinfo'; + $module = new \Zotlabs\Module\Oauthinfo(); + $module->init(); + break; + case 'dnt-policy.txt': echo file_get_contents('doc/dnt-policy.txt'); killme(); -- cgit v1.2.3 From a403611ac9d3c1f50a9c93e982dda693a26624f7 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 21 May 2018 19:34:03 -0700 Subject: update response types --- Zotlabs/Module/Oauthinfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Oauthinfo.php b/Zotlabs/Module/Oauthinfo.php index 6eea2e02b..2d10913c4 100644 --- a/Zotlabs/Module/Oauthinfo.php +++ b/Zotlabs/Module/Oauthinfo.php @@ -12,7 +12,7 @@ class Oauthinfo extends \Zotlabs\Web\Controller { 'issuer' => z_root(), 'authorization_endpoint' => z_root() . '/authorize', 'token_endpoint' => z_root() . '/token', - 'response_types_supported' => [ 'code', 'code token' ] + 'response_types_supported' => [ 'code', 'token', 'id_token', 'code id_token', 'token id_token' ] ]; -- cgit v1.2.3 From 1061027071fac2eedd85d795445fb0b72aa942d6 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 21 May 2018 20:17:17 -0700 Subject: new_channel - make text strings translatable and use the name as a base for the nick if you try to create without entering a nick --- Zotlabs/Module/New_channel.php | 20 +++++++++++++++++--- include/js_strings.php | 10 ++++++++++ view/js/mod_new_channel.js | 13 +++++++------ view/tpl/js_strings.tpl | 12 ++++++++++++ 4 files changed, 46 insertions(+), 9 deletions(-) diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php index c946961bc..97a46a43e 100644 --- a/Zotlabs/Module/New_channel.php +++ b/Zotlabs/Module/New_channel.php @@ -41,7 +41,7 @@ class New_channel extends \Zotlabs\Web\Controller { $test[] = legal_webbie($x); // fullname plus random number $test[] = legal_webbie($x) . mt_rand(1000,9999); - + json_return_and_die(check_webbie($test)); } @@ -49,7 +49,10 @@ class New_channel extends \Zotlabs\Web\Controller { require_once('library/urlify/URLify.php'); $result = array('error' => false, 'message' => ''); $n = trim($_REQUEST['nick']); - + if(! $n) { + $n = trim($_REQUEST['name']); + } + $x = false; if(get_config('system','unicode_usernames')) { @@ -58,9 +61,20 @@ class New_channel extends \Zotlabs\Web\Controller { if((! $x) || strlen($x) > 64) $x = strtolower(\URLify::transliterate($n)); - + + $test = array(); + // first name + if(strpos($x,' ')) + $test[] = legal_webbie(substr($x,0,strpos($x,' '))); + if($test[0]) { + // first name plus first initial of last + $test[] = ((strpos($x,' ')) ? $test[0] . legal_webbie(trim(substr($x,strpos($x,' '),2))) : ''); + // first name plus random number + $test[] = $test[0] . mt_rand(1000,9999); + } + $n = legal_webbie($x); if(strlen($n)) { $test[] = $n; diff --git a/include/js_strings.php b/include/js_strings.php index 936594291..d9038e838 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -23,6 +23,16 @@ function js_strings() { '$linkurl' => t('Please enter a link URL'), '$leavethispage' => t('Unsaved changes. Are you sure you wish to leave this page?'), '$location' => t('Location'), + '$lovely' => t('lovely'), + '$wonderful' => t('wonderful'), + '$fantastic' => t('fantastic'), + '$great' => t('great'), + '$nick_invld1' => t('Your chosen nickname was either already taken or not valid. Please use our suggestion ('), + '$nick_invld2' => t(') or enter a new one.'), + '$nick_valid' => t('Thank you, this nickname is valid.'), + '$name_empty' => t('A channel name is required.'), + '$name_ok1' => t('This is a '), + '$name_ok2' => t(' channel name'), // translatable prefix and suffix strings for jquery.timeago - // using the defaults set below if left untranslated, empty strings if diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js index c01029046..10a94796c 100644 --- a/view/js/mod_new_channel.js +++ b/view/js/mod_new_channel.js @@ -43,19 +43,20 @@ $("#nick_help_loading").show(); $("#nick_help_text").hide(); + var zreg_name = $("#id_name").val(); var zreg_nick = $("#id_nickname").val(); - $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) { + $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick) + '&name=' + encodeURIComponent(zreg_name),function(data) { $("#id_nickname").val(data); if(data !== zreg_nick) { $("#id_nickname").addClass('is-validated'); $("#help_nickname").addClass('text-danger').removeClass('text-muted'); - $("#help_nickname").html('Your chosen nickname was either already taken or not valid. Please use our suggestion (' + data + ') or enter a new one.'); + $("#help_nickname").html(aStr['nick_invld1'] + data + aStr['nick_invld2']); $("#id_nickname").focus(); } else { $("#id_nickname").addClass('is-validated'); $("#help_nickname").addClass('text-success').removeClass('text-muted').removeClass('text-danger'); - $("#help_nickname").html("Thank you, this nickname is valid."); + $("#help_nickname").html(aStr['nick_valid']); } $("#nick_help_loading").hide(); $("#nick_help_text").show(); @@ -69,18 +70,18 @@ if($("#id_name").hasClass('is-validated')) return true; - var verbs = ['lovely', 'wonderful', 'gorgeous', 'great']; + var verbs = [ aStr['lovely'], aStr['wonderful'], aStr['fantastic'], aStr['great'] ]; var verb = verbs[Math.floor((Math.random() * 4) + 0)]; if(! $("#id_name").val()) { $("#id_name").focus(); $("#help_name").addClass('text-danger').removeClass('text-muted'); - $("#help_name").html("A channel name is required."); + $("#help_name").html(aStr['name_empty']); return false; } else { $("#help_name").addClass('text-success').removeClass('text-muted').removeClass('text-danger'); - $("#help_name").html('This is a ' + verb + ' channel name.'); + $("#help_name").html(aStr['name_ok1'] + verb + aStr['name_ok2']); $("#id_name").addClass('is-validated'); return true; } diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 4243c2ea5..01fc3f993 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -23,6 +23,18 @@ 'linkurl' : "{{$linkurl}}", 'leavethispage' : "{{$leavethispage}}", 'location' : "{{$location}}", + 'lovely' : "{{$lovely}}", + 'wonderful' : "{{$wonderful}}", + 'fantastic' : "{{$fantastic}}", + 'great' : "{{$great}}", + 'nick_invld1' : "{{$nick_invld1}}", + 'nick_invld2' : "{{$nick_invld2}}", + 'nick_valid' : "{{$nick_valid}}", + 'name_empty' : "{{$name_empty}}", + 'name_ok1' : "{{$name_ok1}}", + 'name_ok2' : "{{$name_ok2}}", + + 't01' : "{{$t01}}", 't02' : "{{$t02}}", -- cgit v1.2.3 From afb29176a4e301d4e4b247e0d28084e2936c8899 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 May 2018 02:33:46 -0700 Subject: deal with db failure gracefully --- include/text.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index aafba2168..34063cdd7 100644 --- a/include/text.php +++ b/include/text.php @@ -572,7 +572,7 @@ function item_message_id() { $r = q("SELECT id FROM item WHERE mid = '%s' LIMIT 1", dbesc($mid)); - if(count($r)) + if($r) $dups = true; } while($dups == true); @@ -593,7 +593,7 @@ function photo_new_resource() { $r = q("SELECT id FROM photo WHERE resource_id = '%s' LIMIT 1", dbesc($resource)); - if(count($r)) + if($r) $found = true; } while($found === true); -- cgit v1.2.3 From 9cf8931136c703c66d0bf83e4c6b8fb7f4d2cf0b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 23 May 2018 22:11:13 +0200 Subject: paint the locks on private activitypub items red. their privacy model is "slightly" different from ours --- Zotlabs/Lib/ThreadItem.php | 4 ++++ view/tpl/conv_item.tpl | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index c7a2c9373..0fed78158 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -102,6 +102,9 @@ class ThreadItem { if($item['author']['xchan_network'] === 'rss') $shareable = true; + $privacy_warning = false; + if($item['owner']['xchan_network'] === 'activitypub') + $privacy_warning = true; $mode = $conv->get_mode(); @@ -370,6 +373,7 @@ class ThreadItem { 'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''), 'expiretime' => (($item['expires'] > NULL_DATE) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), 'lock' => $lock, + 'privacy_warning' => $privacy_warning, 'verified' => $verified, 'unverified' => $unverified, 'forged' => $forged, diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index f72737d82..6baf06dda 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -43,7 +43,7 @@
    {{if $item.lock}}
    -   +  
    {{/if}} -- cgit v1.2.3 From ea17b46e9415162cc47679345b61a4aaa178272f Mon Sep 17 00:00:00 2001 From: fadelkon Date: Thu, 24 May 2018 03:59:01 +0200 Subject: Update catalan translation (both po and php) for sources changes up to Apr 23rd 2018, 07:35. --- view/ca/hmessages.po | 3163 +++++++++++++++++++---------------- view/ca/hstrings.php | 4519 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 4444 insertions(+), 3238 deletions(-) diff --git a/view/ca/hmessages.po b/view/ca/hmessages.po index 6aa91b16d..24c740752 100644 --- a/view/ca/hmessages.po +++ b/view/ca/hmessages.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-01 08:51+0100\n" -"PO-Revision-Date: 2018-03-17 02:23+0000\n" +"POT-Creation-Date: 2018-04-23 11:34+0200\n" +"PO-Revision-Date: 2018-05-20 02:06+0000\n" "Last-Translator: fadelkon \n" "Language-Team: Catalan (Spain) (http://www.transifex.com/Friendica/red-matrix/language/ca_ES/)\n" "MIME-Version: 1.0\n" @@ -94,75 +94,79 @@ msgstr "Pot fer servir les meves entrades per publicar automàticament en altres msgid "Can administer my channel" msgstr "Pot administrar el meu canal" -#: ../../Zotlabs/Access/PermissionRoles.php:265 +#: ../../Zotlabs/Access/PermissionRoles.php:283 msgid "Social Networking" msgstr "Xarxes Socials" -#: ../../Zotlabs/Access/PermissionRoles.php:266 +#: ../../Zotlabs/Access/PermissionRoles.php:284 +msgid "Social - Federation" +msgstr "Social - Federació" + +#: ../../Zotlabs/Access/PermissionRoles.php:285 msgid "Social - Mostly Public" msgstr "Social - Principalment públic" -#: ../../Zotlabs/Access/PermissionRoles.php:267 +#: ../../Zotlabs/Access/PermissionRoles.php:286 msgid "Social - Restricted" msgstr "Social - Restingit" -#: ../../Zotlabs/Access/PermissionRoles.php:268 +#: ../../Zotlabs/Access/PermissionRoles.php:287 msgid "Social - Private" msgstr "Social - Privat" -#: ../../Zotlabs/Access/PermissionRoles.php:271 +#: ../../Zotlabs/Access/PermissionRoles.php:290 msgid "Community Forum" msgstr "Fòrum comunitari" -#: ../../Zotlabs/Access/PermissionRoles.php:272 +#: ../../Zotlabs/Access/PermissionRoles.php:291 msgid "Forum - Mostly Public" msgstr "Fòrum - Principalment públic" -#: ../../Zotlabs/Access/PermissionRoles.php:273 +#: ../../Zotlabs/Access/PermissionRoles.php:292 msgid "Forum - Restricted" msgstr "Fòrum - Restringit" -#: ../../Zotlabs/Access/PermissionRoles.php:274 +#: ../../Zotlabs/Access/PermissionRoles.php:293 msgid "Forum - Private" msgstr "Fòrum - Privat" -#: ../../Zotlabs/Access/PermissionRoles.php:277 +#: ../../Zotlabs/Access/PermissionRoles.php:296 msgid "Feed Republish" msgstr "Republicador" -#: ../../Zotlabs/Access/PermissionRoles.php:278 +#: ../../Zotlabs/Access/PermissionRoles.php:297 msgid "Feed - Mostly Public" msgstr "Republicador - Principalment públic" -#: ../../Zotlabs/Access/PermissionRoles.php:279 +#: ../../Zotlabs/Access/PermissionRoles.php:298 msgid "Feed - Restricted" msgstr "Republicador - Restringit" -#: ../../Zotlabs/Access/PermissionRoles.php:282 +#: ../../Zotlabs/Access/PermissionRoles.php:301 msgid "Special Purpose" msgstr "Objectiu Especial" -#: ../../Zotlabs/Access/PermissionRoles.php:283 +#: ../../Zotlabs/Access/PermissionRoles.php:302 msgid "Special - Celebrity/Soapbox" msgstr "Especial - Personatge públic / Plataforma" -#: ../../Zotlabs/Access/PermissionRoles.php:284 +#: ../../Zotlabs/Access/PermissionRoles.php:303 msgid "Special - Group Repository" msgstr "Especial - Repositori d'un Grup" -#: ../../Zotlabs/Access/PermissionRoles.php:287 -#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:130 -#: ../../Zotlabs/Module/Settings/Channel.php:473 -#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Access/PermissionRoles.php:306 +#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:144 +#: ../../Zotlabs/Module/Settings/Channel.php:479 +#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795 #: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 #: ../../include/selectors.php:140 ../../include/event.php:1315 -#: ../../include/event.php:1322 ../../include/connections.php:689 -#: ../../include/connections.php:696 +#: ../../include/event.php:1322 ../../include/connections.php:697 +#: ../../include/connections.php:704 msgid "Other" msgstr "Altres" -#: ../../Zotlabs/Access/PermissionRoles.php:288 +#: ../../Zotlabs/Access/PermissionRoles.php:307 msgid "Custom/Expert Mode" msgstr "Personalitzat, mode expert" @@ -172,7 +176,7 @@ msgstr "Personalitzat, mode expert" #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32 #: ../../Zotlabs/Module/Cards.php:33 ../../Zotlabs/Module/Webpages.php:33 -#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1198 +#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1197 msgid "Requested profile is not available." msgstr "El perfil demanat no està disponible." @@ -183,26 +187,27 @@ msgstr "El perfil demanat no està disponible." #: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271 -#: ../../Zotlabs/Module/Appman.php:86 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:21 #: ../../Zotlabs/Module/Article_edit.php:51 -#: ../../Zotlabs/Module/New_channel.php:77 -#: ../../Zotlabs/Module/New_channel.php:102 +#: ../../Zotlabs/Module/New_channel.php:91 +#: ../../Zotlabs/Module/New_channel.php:116 #: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 #: ../../Zotlabs/Module/Moderate.php:13 -#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:275 -#: ../../Zotlabs/Module/Thing.php:295 ../../Zotlabs/Module/Thing.php:336 +#: ../../Zotlabs/Module/Settings/Features.php:38 +#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280 +#: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67 #: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101 #: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50 -#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:400 +#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404 #: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149 #: ../../Zotlabs/Module/Profile_photo.php:302 #: ../../Zotlabs/Module/Profile_photo.php:315 #: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229 #: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256 -#: ../../Zotlabs/Module/Item.php:1099 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Item.php:1106 ../../Zotlabs/Module/Page.php:34 #: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389 #: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 #: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71 @@ -221,7 +226,7 @@ msgstr "El perfil demanat no està disponible." #: ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:281 #: ../../Zotlabs/Module/Cover_photo.php:294 -#: ../../Zotlabs/Module/Display.php:406 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 #: ../../Zotlabs/Module/Filestorage.php:85 @@ -233,15 +238,14 @@ msgstr "El perfil demanat no està disponible." #: ../../Zotlabs/Module/Notifications.php:11 #: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:123 #: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53 -#: ../../addon/gitwiki/Mod_Gitwiki.php:196 -#: ../../addon/gitwiki/Mod_Gitwiki.php:292 ../../addon/pumpio/pumpio.php:40 -#: ../../include/attach.php:150 ../../include/attach.php:197 -#: ../../include/attach.php:270 ../../include/attach.php:284 -#: ../../include/attach.php:293 ../../include/attach.php:366 -#: ../../include/attach.php:380 ../../include/attach.php:387 -#: ../../include/attach.php:469 ../../include/attach.php:1019 -#: ../../include/attach.php:1093 ../../include/attach.php:1258 -#: ../../include/items.php:3656 ../../include/photos.php:27 +#: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:150 +#: ../../include/attach.php:197 ../../include/attach.php:270 +#: ../../include/attach.php:284 ../../include/attach.php:293 +#: ../../include/attach.php:366 ../../include/attach.php:380 +#: ../../include/attach.php:387 ../../include/attach.php:469 +#: ../../include/attach.php:1029 ../../include/attach.php:1103 +#: ../../include/attach.php:1268 ../../include/items.php:3706 +#: ../../include/photos.php:27 msgid "Permission denied." msgstr "S'ha denegat el permís." @@ -250,7 +254,7 @@ msgstr "S'ha denegat el permís." msgid "Block Name" msgstr "Nom del bloc" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2402 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2422 msgid "Blocks" msgstr "Blocs" @@ -269,9 +273,9 @@ msgid "Edited" msgstr "Editat" #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96 -#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:146 +#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:160 #: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:118 -#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801 +#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239 #: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:382 #: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165 @@ -280,43 +284,44 @@ msgstr "Crea" #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Article_edit.php:99 -#: ../../Zotlabs/Module/Admin/Profs.php:154 -#: ../../Zotlabs/Module/Settings/Oauth.php:149 -#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:114 -#: ../../Zotlabs/Module/Connections.php:265 -#: ../../Zotlabs/Module/Connections.php:303 -#: ../../Zotlabs/Module/Connections.php:323 ../../Zotlabs/Module/Wiki.php:202 -#: ../../Zotlabs/Module/Wiki.php:358 ../../Zotlabs/Module/Menu.php:112 +#: ../../Zotlabs/Module/Admin/Profs.php:175 +#: ../../Zotlabs/Module/Settings/Oauth2.php:149 +#: ../../Zotlabs/Module/Settings/Oauth.php:150 +#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114 +#: ../../Zotlabs/Module/Connections.php:281 +#: ../../Zotlabs/Module/Connections.php:319 +#: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202 +#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:112 #: ../../Zotlabs/Module/Layouts.php:193 #: ../../Zotlabs/Module/Editwebpage.php:142 -#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Editpost.php:85 -#: ../../Zotlabs/Module/Card_edit.php:99 ../../Zotlabs/Lib/Apps.php:409 -#: ../../Zotlabs/Lib/ThreadItem.php:121 ../../Zotlabs/Storage/Browser.php:288 -#: ../../Zotlabs/Widget/Cdav.php:126 ../../Zotlabs/Widget/Cdav.php:162 -#: ../../addon/gitwiki/Mod_Gitwiki.php:151 -#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1297 -#: ../../include/channel.php:1301 ../../include/menu.php:113 +#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99 +#: ../../Zotlabs/Lib/Apps.php:409 ../../Zotlabs/Lib/ThreadItem.php:121 +#: ../../Zotlabs/Storage/Browser.php:288 ../../Zotlabs/Widget/Cdav.php:126 +#: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296 +#: ../../include/channel.php:1300 ../../include/menu.php:113 msgid "Edit" msgstr "Edita" #: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102 -#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:241 -#: ../../Zotlabs/Widget/Cdav.php:124 ../../include/conversation.php:1363 +#: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124 +#: ../../include/conversation.php:1366 msgid "Share" msgstr "Compartir" #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 #: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187 #: ../../Zotlabs/Module/Article_edit.php:129 -#: ../../Zotlabs/Module/Admin/Accounts.php:174 +#: ../../Zotlabs/Module/Admin/Accounts.php:175 #: ../../Zotlabs/Module/Admin/Channels.php:149 -#: ../../Zotlabs/Module/Admin/Profs.php:155 -#: ../../Zotlabs/Module/Settings/Oauth.php:150 -#: ../../Zotlabs/Module/Thing.php:262 ../../Zotlabs/Module/Editblock.php:139 -#: ../../Zotlabs/Module/Connections.php:273 +#: ../../Zotlabs/Module/Admin/Profs.php:176 +#: ../../Zotlabs/Module/Settings/Oauth2.php:150 +#: ../../Zotlabs/Module/Settings/Oauth.php:151 +#: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139 +#: ../../Zotlabs/Module/Connections.php:289 #: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654 #: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Group.php:179 -#: ../../Zotlabs/Module/Profiles.php:803 +#: ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/Editwebpage.php:167 #: ../../Zotlabs/Module/Webpages.php:242 #: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:410 @@ -328,7 +333,6 @@ msgstr "Esborra" #: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694 #: ../../Zotlabs/Module/Wiki.php:204 ../../Zotlabs/Module/Layouts.php:198 #: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:60 -#: ../../addon/gitwiki/Mod_Gitwiki.php:153 msgid "View" msgstr "Mostra" @@ -405,30 +409,31 @@ msgstr "3. Clica [connecta]" #: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121 #: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493 -#: ../../Zotlabs/Module/Appman.php:152 +#: ../../Zotlabs/Module/Appman.php:153 #: ../../Zotlabs/Module/Import_items.php:129 #: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349 #: ../../Zotlabs/Module/Connect.php:98 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Plugins.php:438 -#: ../../Zotlabs/Module/Admin/Accounts.php:167 +#: ../../Zotlabs/Module/Admin/Accounts.php:168 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:289 -#: ../../Zotlabs/Module/Admin/Profs.php:157 +#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Account_edit.php:74 #: ../../Zotlabs/Module/Admin/Security.php:104 -#: ../../Zotlabs/Module/Settings/Permcats.php:110 -#: ../../Zotlabs/Module/Settings/Channel.php:488 -#: ../../Zotlabs/Module/Settings/Features.php:47 +#: ../../Zotlabs/Module/Settings/Permcats.php:115 +#: ../../Zotlabs/Module/Settings/Channel.php:495 +#: ../../Zotlabs/Module/Settings/Features.php:79 #: ../../Zotlabs/Module/Settings/Tokens.php:168 +#: ../../Zotlabs/Module/Settings/Oauth2.php:84 #: ../../Zotlabs/Module/Settings/Account.php:118 #: ../../Zotlabs/Module/Settings/Featured.php:54 #: ../../Zotlabs/Module/Settings/Display.php:192 -#: ../../Zotlabs/Module/Settings/Oauth.php:87 -#: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374 -#: ../../Zotlabs/Module/Import.php:529 ../../Zotlabs/Module/Cal.php:345 +#: ../../Zotlabs/Module/Settings/Oauth.php:88 +#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379 +#: ../../Zotlabs/Module/Import.php:530 ../../Zotlabs/Module/Cal.php:345 #: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082 #: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240 #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98 @@ -436,17 +441,17 @@ msgstr "3. Clica [connecta]" #: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242 #: ../../Zotlabs/Module/Email_validation.php:40 #: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249 -#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726 -#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 -#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431 -#: ../../Zotlabs/Module/Filestorage.php:160 ../../Zotlabs/Module/Rate.php:166 -#: ../../Zotlabs/Lib/ThreadItem.php:750 +#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:723 +#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Sources.php:114 +#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15 +#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Lib/ThreadItem.php:752 #: ../../Zotlabs/Widget/Eventstools.php:16 #: ../../Zotlabs/Widget/Wiki_pages.php:40 #: ../../Zotlabs/Widget/Wiki_pages.php:97 #: ../../view/theme/redbasic_c/php/config.php:95 #: ../../view/theme/redbasic/php/config.php:93 -#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:273 +#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:275 #: ../../addon/planets/planets.php:153 #: ../../addon/openclipatar/openclipatar.php:53 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 @@ -454,16 +459,16 @@ msgstr "3. Clica [connecta]" #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:822 -#: ../../addon/gitwiki/Mod_Gitwiki.php:155 +#: ../../addon/diaspora/diaspora.php:825 #: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84 #: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161 #: ../../addon/mailtest/mailtest.php:100 #: ../../addon/openstreetmap/openstreetmap.php:168 -#: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371 +#: ../../addon/fuzzloc/fuzzloc.php:191 ../../addon/rtof/rtof.php:101 +#: ../../addon/jappixmini/jappixmini.php:371 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1053 +#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1072 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 @@ -472,15 +477,16 @@ msgstr "3. Clica [connecta]" #: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:218 #: ../../addon/twitter/twitter.php:265 #: ../../addon/smileybutton/smileybutton.php:219 -#: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48 +#: ../../addon/cart/cart.php:1104 ../../addon/piwik/piwik.php:95 +#: ../../addon/pageheader/pageheader.php:48 #: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69 #: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124 #: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22 msgid "Submit" msgstr "Envia" -#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:179 -#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:124 +#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191 +#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:133 #: ../../include/nav.php:469 msgid "Articles" msgstr "Articles" @@ -515,11 +521,11 @@ msgstr "Edita el disseny" #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86 #: ../../Zotlabs/Module/Import_items.php:120 -#: ../../Zotlabs/Module/Cloud.php:111 ../../Zotlabs/Module/Group.php:74 +#: ../../Zotlabs/Module/Cloud.php:117 ../../Zotlabs/Module/Group.php:74 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68 #: ../../Zotlabs/Module/Like.php:296 ../../Zotlabs/Web/WebServer.php:122 #: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73 -#: ../../addon/frphotos/frphotos.php:81 ../../addon/redfiles/redfiles.php:109 +#: ../../addon/frphotos/frphotos.php:82 ../../addon/redfiles/redfiles.php:109 #: ../../include/items.php:358 msgid "Permission denied" msgstr "S'ha denegat el permís" @@ -532,7 +538,7 @@ msgstr "L'identificador de perfil no és vàlid." msgid "Profile Visibility Editor" msgstr "Editor de la visibilitat del perfil" -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1634 +#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1644 msgid "Profile" msgstr "Perfil" @@ -545,7 +551,7 @@ msgid "Visible To" msgstr "Visible per" #: ../../Zotlabs/Module/Profperm.php:140 -#: ../../Zotlabs/Module/Connections.php:140 +#: ../../Zotlabs/Module/Connections.php:200 msgid "All Connections" msgstr "Totes les connexions" @@ -560,9 +566,9 @@ msgstr "Resum:" #: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787 #: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146 #: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273 -#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:832 +#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:853 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891 #: ../../include/conversation.php:1160 msgid "Unknown" msgstr "Desconegut" @@ -600,14 +606,14 @@ msgid "End date and time" msgstr "Data i hora de fi" #: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473 -#: ../../Zotlabs/Module/Appman.php:142 ../../Zotlabs/Module/Rbmark.php:101 +#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101 #: ../../addon/rendezvous/rendezvous.php:173 msgid "Description" msgstr "Descripció" #: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Locs.php:117 #: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509 -#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Module/Pubsites.php:52 +#: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52 #: ../../include/js_strings.php:25 msgid "Location" msgstr "Ubicació" @@ -672,17 +678,17 @@ msgstr "Esborra'ls tots" #: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188 #: ../../Zotlabs/Module/Admin/Plugins.php:423 -#: ../../Zotlabs/Module/Settings/Oauth.php:88 -#: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Wiki.php:345 ../../Zotlabs/Module/Wiki.php:375 +#: ../../Zotlabs/Module/Settings/Oauth2.php:85 +#: ../../Zotlabs/Module/Settings/Oauth2.php:113 +#: ../../Zotlabs/Module/Settings/Oauth.php:89 +#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Wiki.php:347 ../../Zotlabs/Module/Wiki.php:379 #: ../../Zotlabs/Module/Profile_photo.php:464 #: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66 -#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804 -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:365 +#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:366 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 -#: ../../addon/gitwiki/Mod_Gitwiki.php:244 -#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1386 -#: ../../include/conversation.php:1435 +#: ../../include/conversation.php:1389 ../../include/conversation.php:1438 msgid "Cancel" msgstr "Cancel·la" @@ -693,14 +699,15 @@ msgstr "Malauradament encara no es poden editar esdeveniments periòdics." #: ../../Zotlabs/Module/Cdav.php:1170 #: ../../Zotlabs/Module/Sharedwithme.php:105 #: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Settings/Oauth2.php:86 +#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth.php:90 +#: ../../Zotlabs/Module/Settings/Oauth.php:116 #: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906 #: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558 #: ../../Zotlabs/Storage/Browser.php:283 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 -#: ../../addon/gitwiki/Mod_Gitwiki.php:158 msgid "Name" msgstr "Nom" @@ -713,76 +720,78 @@ msgid "Title" msgstr "Títol" #: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909 -#: ../../Zotlabs/Module/Profiles.php:789 +#: ../../Zotlabs/Module/Profiles.php:786 msgid "Phone" msgstr "Telèfon" #: ../../Zotlabs/Module/Cdav.php:1174 -#: ../../Zotlabs/Module/Admin/Accounts.php:170 -#: ../../Zotlabs/Module/Admin/Accounts.php:182 -#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Admin/Accounts.php:171 +#: ../../Zotlabs/Module/Admin/Accounts.php:183 +#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1775 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1770 msgid "Email" msgstr "Correu electrònic" #: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911 -#: ../../Zotlabs/Module/Profiles.php:791 +#: ../../Zotlabs/Module/Profiles.php:788 msgid "Instant messenger" msgstr "Missatgeria instantània" #: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912 -#: ../../Zotlabs/Module/Profiles.php:792 +#: ../../Zotlabs/Module/Profiles.php:789 msgid "Website" msgstr "Lloc web" #: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118 #: ../../Zotlabs/Module/Admin/Channels.php:160 #: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:502 -#: ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Profiles.php:790 msgid "Address" msgstr "Adreça" #: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914 -#: ../../Zotlabs/Module/Profiles.php:794 +#: ../../Zotlabs/Module/Profiles.php:791 msgid "Note" msgstr "Nota" #: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915 -#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1308 -#: ../../include/connections.php:682 +#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308 +#: ../../include/connections.php:690 msgid "Mobile" msgstr "Mòbil" #: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916 -#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1309 -#: ../../include/connections.php:683 +#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309 +#: ../../include/connections.php:691 msgid "Home" msgstr "Inici" #: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917 -#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1312 -#: ../../include/connections.php:686 +#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312 +#: ../../include/connections.php:694 msgid "Work" msgstr "Feina" #: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919 -#: ../../Zotlabs/Module/Profiles.php:799 +#: ../../Zotlabs/Module/Profiles.php:796 #: ../../addon/jappixmini/jappixmini.php:368 msgid "Add Contact" msgstr "Afegeix un contacte" #: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920 -#: ../../Zotlabs/Module/Profiles.php:800 +#: ../../Zotlabs/Module/Profiles.php:797 msgid "Add Field" msgstr "Afegeix un camp" #: ../../Zotlabs/Module/Cdav.php:1186 #: ../../Zotlabs/Module/Admin/Plugins.php:453 -#: ../../Zotlabs/Module/Settings/Oauth.php:42 -#: ../../Zotlabs/Module/Settings/Oauth.php:113 -#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:802 +#: ../../Zotlabs/Module/Settings/Oauth2.php:39 +#: ../../Zotlabs/Module/Settings/Oauth2.php:112 +#: ../../Zotlabs/Module/Settings/Oauth.php:43 +#: ../../Zotlabs/Module/Settings/Oauth.php:114 +#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799 #: ../../Zotlabs/Lib/Apps.php:393 msgid "Update" msgstr "Actualitza" @@ -812,7 +821,7 @@ msgid "ZIP Code" msgstr "Codi postal" #: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931 -#: ../../Zotlabs/Module/Profiles.php:760 +#: ../../Zotlabs/Module/Profiles.php:757 msgid "Country" msgstr "País" @@ -828,8 +837,8 @@ msgstr "Llibreta d'adreces per defecte" msgid "This site is not a directory server" msgstr "Aquest hub no és un servidor de directori" -#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25 -#: ../../addon/gitwiki/Mod_Gitwiki.php:28 ../../addon/chess/chess.php:508 +#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Ochannel.php:32 +#: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508 msgid "You must be logged in to see this page." msgstr "Has de tenir una sessió iniciada per a veure aquesta pàgina." @@ -920,24 +929,24 @@ msgstr "No tens entrades pendents de veure..." msgid "Public access denied." msgstr "L'accés públic no està permès." -#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:319 +#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335 #: ../../Zotlabs/Lib/Apps.php:256 ../../Zotlabs/Widget/Sitesearch.php:31 #: ../../include/text.php:1051 ../../include/text.php:1063 #: ../../include/acl_selectors.php:118 ../../include/nav.php:179 msgid "Search" msgstr "Cerca" -#: ../../Zotlabs/Module/Search.php:226 +#: ../../Zotlabs/Module/Search.php:230 #, php-format msgid "Items tagged with: %s" msgstr "Elements etiquetats amb: %s" -#: ../../Zotlabs/Module/Search.php:228 +#: ../../Zotlabs/Module/Search.php:232 #, php-format msgid "Search results for: %s" msgstr "Resultats de cerca per: %s" -#: ../../Zotlabs/Module/Pubstream.php:93 +#: ../../Zotlabs/Module/Pubstream.php:95 #: ../../Zotlabs/Widget/Notifications.php:131 msgid "Public Stream" msgstr "Flux públic" @@ -1038,7 +1047,7 @@ msgid "Menu Item Permissions" msgstr "Permisos dels ítems de menú" #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "(click to open/close)" msgstr "(clica per obrir/tancar)" @@ -1062,8 +1071,8 @@ msgstr "Empra la magic-auth si està disponible" #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 #: ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Admin/Site.php:252 -#: ../../Zotlabs/Module/Settings/Channel.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:259 +#: ../../Zotlabs/Module/Settings/Channel.php:307 #: ../../Zotlabs/Module/Settings/Display.php:100 #: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:697 #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 @@ -1072,7 +1081,7 @@ msgstr "Empra la magic-auth si està disponible" #: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681 #: ../../Zotlabs/Module/Filestorage.php:155 #: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1587 +#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1081,9 +1090,9 @@ msgstr "Empra la magic-auth si està disponible" #: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 -#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166 -#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166 -#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81 +#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 +#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 #: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 @@ -1101,11 +1110,12 @@ msgstr "Empra la magic-auth si està disponible" #: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 #: ../../addon/smileybutton/smileybutton.php:211 #: ../../addon/smileybutton/smileybutton.php:215 -#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 -#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 -#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 +#: ../../addon/cart/cart.php:1075 ../../addon/cart/cart.php:1082 +#: ../../addon/cart/cart.php:1090 ../../addon/authchoose/authchoose.php:67 +#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 +#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 +#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 msgid "No" msgstr "No" @@ -1113,8 +1123,8 @@ msgstr "No" #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 #: ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Admin/Site.php:254 -#: ../../Zotlabs/Module/Settings/Channel.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Settings/Channel.php:307 #: ../../Zotlabs/Module/Settings/Display.php:100 #: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:697 #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 @@ -1123,7 +1133,7 @@ msgstr "No" #: ../../Zotlabs/Module/Profiles.php:681 #: ../../Zotlabs/Module/Filestorage.php:155 #: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1587 +#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1132,9 +1142,9 @@ msgstr "No" #: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 -#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166 -#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166 -#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81 +#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 +#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 #: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 @@ -1152,11 +1162,12 @@ msgstr "No" #: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 #: ../../addon/smileybutton/smileybutton.php:211 #: ../../addon/smileybutton/smileybutton.php:215 -#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 -#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 -#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 +#: ../../addon/cart/cart.php:1075 ../../addon/cart/cart.php:1082 +#: ../../addon/cart/cart.php:1090 ../../addon/authchoose/authchoose.php:67 +#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 +#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 +#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 msgid "Yes" msgstr "Sí" @@ -1266,8 +1277,8 @@ msgid "Event not found." msgstr "No s'ha trobat l'esdeveniment." #: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73 -#: ../../Zotlabs/Module/Like.php:385 ../../include/conversation.php:119 -#: ../../include/text.php:2007 ../../include/event.php:1153 +#: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119 +#: ../../include/text.php:2008 ../../include/event.php:1153 msgid "event" msgstr "esdeveniment" @@ -1276,9 +1287,9 @@ msgid "Edit event title" msgstr "Edita el títol de l'esdeveniment" #: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465 -#: ../../Zotlabs/Module/Appman.php:140 ../../Zotlabs/Module/Appman.php:141 -#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752 -#: ../../include/datetime.php:205 +#: ../../Zotlabs/Module/Appman.php:141 ../../Zotlabs/Module/Appman.php:142 +#: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749 +#: ../../include/datetime.php:211 msgid "Required" msgstr "Obligatori" @@ -1329,12 +1340,12 @@ msgid "Edit Location" msgstr "Edita la ubicació" #: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:760 -#: ../../include/conversation.php:1330 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:762 +#: ../../include/conversation.php:1333 msgid "Preview" msgstr "Vista prèvia" -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1402 +#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1405 msgid "Permission settings" msgstr "Configuració de permisos" @@ -1359,7 +1370,7 @@ msgid "Delete event" msgstr "Esborra l'esdeveniment" #: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315 -#: ../../include/text.php:1826 +#: ../../include/text.php:1827 msgid "Link to Source" msgstr "Enllaç a la font" @@ -1376,7 +1387,7 @@ msgid "Create Event" msgstr "Crear un esdeveniment nou" #: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341 -#: ../../include/channel.php:1637 +#: ../../include/channel.php:1647 msgid "Export" msgstr "Exporta" @@ -1388,55 +1399,55 @@ msgstr "S'ha eliminat l'esdeveniment" msgid "Failed to remove event" msgstr "No s'ha pogut esborrar l'esdeveniment" -#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55 +#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56 msgid "App installed." msgstr "S'ha instaŀlat l'aplicació." -#: ../../Zotlabs/Module/Appman.php:48 +#: ../../Zotlabs/Module/Appman.php:49 msgid "Malformed app." msgstr "L'aplicació conté errors." -#: ../../Zotlabs/Module/Appman.php:129 +#: ../../Zotlabs/Module/Appman.php:130 msgid "Embed code" msgstr "Codi embegut" -#: ../../Zotlabs/Module/Appman.php:135 +#: ../../Zotlabs/Module/Appman.php:136 msgid "Edit App" msgstr "Edita una aplicació" -#: ../../Zotlabs/Module/Appman.php:135 +#: ../../Zotlabs/Module/Appman.php:136 msgid "Create App" msgstr "Crea una aplicació" -#: ../../Zotlabs/Module/Appman.php:140 +#: ../../Zotlabs/Module/Appman.php:141 msgid "Name of app" msgstr "Nom de l'aplicació" -#: ../../Zotlabs/Module/Appman.php:141 +#: ../../Zotlabs/Module/Appman.php:142 msgid "Location (URL) of app" msgstr "Adreça URL de l'aplicació" -#: ../../Zotlabs/Module/Appman.php:143 +#: ../../Zotlabs/Module/Appman.php:144 msgid "Photo icon URL" msgstr "Adreça URL de la icona de l'aplicació" -#: ../../Zotlabs/Module/Appman.php:143 +#: ../../Zotlabs/Module/Appman.php:144 msgid "80 x 80 pixels - optional" msgstr "80x80 píxels (opcional)" -#: ../../Zotlabs/Module/Appman.php:144 +#: ../../Zotlabs/Module/Appman.php:145 msgid "Categories (optional, comma separated list)" msgstr "Categories (opcional, llista separada per comes)" -#: ../../Zotlabs/Module/Appman.php:145 +#: ../../Zotlabs/Module/Appman.php:146 msgid "Version ID" msgstr "Identificador o número de versió" -#: ../../Zotlabs/Module/Appman.php:146 +#: ../../Zotlabs/Module/Appman.php:147 msgid "Price of app" msgstr "Preu de l'aplicació" -#: ../../Zotlabs/Module/Appman.php:147 +#: ../../Zotlabs/Module/Appman.php:148 msgid "Location (URL) to purchase app" msgstr "Adreça URL de compra de l'aplicació" @@ -1449,16 +1460,16 @@ msgid "Hub not found." msgstr "No s'ha trobat el hub." #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 -#: ../../Zotlabs/Module/Like.php:383 +#: ../../Zotlabs/Module/Like.php:384 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1518 ../../addon/pubcrawl/as.php:1359 -#: ../../include/conversation.php:116 ../../include/text.php:2004 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 +#: ../../include/conversation.php:116 ../../include/text.php:2005 msgid "photo" msgstr "foto" -#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:383 -#: ../../addon/diaspora/Receiver.php:1518 ../../addon/pubcrawl/as.php:1359 -#: ../../include/conversation.php:144 ../../include/text.php:2010 +#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 +#: ../../include/conversation.php:144 ../../include/text.php:2011 msgid "status" msgstr "estat" @@ -1488,8 +1499,9 @@ msgid "Insert web link" msgstr "Insereix un enllaç web" #: ../../Zotlabs/Module/Article_edit.php:117 -#: ../../Zotlabs/Module/Editblock.php:129 -#: ../../Zotlabs/Module/Card_edit.php:117 ../../include/conversation.php:1398 +#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:698 +#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Card_edit.php:117 +#: ../../include/conversation.php:1401 msgid "Title (optional)" msgstr "Títol (opcional)" @@ -1512,7 +1524,6 @@ msgid "Imported file is empty." msgstr "El fitxer importat està buit." #: ../../Zotlabs/Module/Import_items.php:93 -#: ../../Zotlabs/Module/Import.php:121 #, php-format msgid "Warning: Database versions differ by %1$d updates." msgstr "Atenció: Les versions de les bases de dades difereixen de %1$d actualitzacions." @@ -1531,32 +1542,32 @@ msgid "" msgstr "Empra aquest formulari per importar entrades existents i contingut d'un arxiu d'exportació." #: ../../Zotlabs/Module/Import_items.php:127 -#: ../../Zotlabs/Module/Import.php:516 +#: ../../Zotlabs/Module/Import.php:517 msgid "File to Upload" msgstr "Fitxer per pujar" -#: ../../Zotlabs/Module/New_channel.php:119 +#: ../../Zotlabs/Module/New_channel.php:133 #: ../../Zotlabs/Module/Manage.php:138 #, php-format msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "Has creat %1$.0f canals dels %2$.0f totals permesos." -#: ../../Zotlabs/Module/New_channel.php:132 +#: ../../Zotlabs/Module/New_channel.php:146 #: ../../Zotlabs/Module/Register.php:254 msgid "Name or caption" msgstr "Nom o llegenda" -#: ../../Zotlabs/Module/New_channel.php:132 +#: ../../Zotlabs/Module/New_channel.php:146 #: ../../Zotlabs/Module/Register.php:254 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\"" msgstr "Exemples: \"Paula Gomila\", \"Manel i els seus cavalls\", \"Assemblea de veïnes del barri\", \"Filosofia\"" -#: ../../Zotlabs/Module/New_channel.php:134 +#: ../../Zotlabs/Module/New_channel.php:148 #: ../../Zotlabs/Module/Register.php:256 msgid "Choose a short nickname" msgstr "Tria un àlies curt" -#: ../../Zotlabs/Module/New_channel.php:134 +#: ../../Zotlabs/Module/New_channel.php:148 #: ../../Zotlabs/Module/Register.php:256 #, php-format msgid "" @@ -1564,38 +1575,47 @@ msgid "" "e.g. nickname%s" msgstr "El teu àlies servirà per crear un nom fàcil per recordar l'adreça del canal. Per exemple, àlies%s" -#: ../../Zotlabs/Module/New_channel.php:135 +#: ../../Zotlabs/Module/New_channel.php:149 +#: ../../Zotlabs/Module/Settings/Channel.php:539 #: ../../Zotlabs/Module/Register.php:257 msgid "Channel role and privacy" msgstr "Rol i privacitat del canal" -#: ../../Zotlabs/Module/New_channel.php:135 +#: ../../Zotlabs/Module/New_channel.php:149 #: ../../Zotlabs/Module/Register.php:257 msgid "Select a channel role with your privacy requirements." msgstr "Tria un rol pel canal segons les teves necessitats de privacitat." -#: ../../Zotlabs/Module/New_channel.php:135 +#: ../../Zotlabs/Module/New_channel.php:149 #: ../../Zotlabs/Module/Register.php:257 msgid "Read more about roles" msgstr "Llegix més sobre els rols" -#: ../../Zotlabs/Module/New_channel.php:138 +#: ../../Zotlabs/Module/New_channel.php:152 msgid "Create Channel" msgstr "Crea un canal" -#: ../../Zotlabs/Module/New_channel.php:139 +#: ../../Zotlabs/Module/New_channel.php:153 +msgid "" +"A channel is a unique network identity. It can represent a person (social " +"network profile), a forum (group), a business or celebrity page, a newsfeed," +" and many other things. Channels can make connections with other channels to" +" share information with each other." +msgstr "Cada canal és una identitat de xarxa única. Tant pot representar una persona (el seu perfil social), com un fòrum (un grup), una associació o la pàgina d'algun personatge públic, una font de notícies, i moltes més coses. Els canals poden connectar-se entre ells per a compartir informació." + +#: ../../Zotlabs/Module/New_channel.php:153 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 "El canal és la teva identitat en aquesta xarxa. Pot representar una persona, un bloc, o un fòrum, entre molts altres. Els canals poden connectar-se amb altres canals per compartir informació amb permisos molt detallats." +"The type of channel you create affects the basic privacy settings, the " +"permissions that are granted to connections/friends, and also the channel's " +"visibility across the network." +msgstr "El tipus de canal que creïs determinarà els permisos de privacitat bàsics, els atorgats a les connexions i a la visibilitat del canal a la xarxa." -#: ../../Zotlabs/Module/New_channel.php:140 +#: ../../Zotlabs/Module/New_channel.php:154 msgid "" "or import an existing channel from another location." msgstr "o bé importa un canal existent des d'una altra ubicació." -#: ../../Zotlabs/Module/New_channel.php:145 +#: ../../Zotlabs/Module/New_channel.php:159 msgid "Validate" msgstr "Valida-ho" @@ -1641,7 +1661,7 @@ msgid "" msgstr "Per defecte, només es pot esborrar la instància del canal ubicada en aquest hub." #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:600 msgid "Remove Channel" msgstr "Elimina el canal" @@ -1700,7 +1720,7 @@ msgid "" msgstr "Podria ser necessari importar el fitxer \"install / schema_xxx.sql\" manualment utilitzant un client de base de dades." #: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262 -#: ../../Zotlabs/Module/Setup.php:745 +#: ../../Zotlabs/Module/Setup.php:749 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "Consulta el fitxer \"install/INSTALL.txt\"." @@ -1961,115 +1981,107 @@ msgstr "Error: es necessita el mòdul PHP \"xml\" per al DAV, però no està ins msgid "Error: zip PHP module required but not installed." msgstr "Error: no s'ha trobat el mòdul PHP per als fitxers zip. Cal instaŀlar-lo." -#: ../../Zotlabs/Module/Setup.php:569 +#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579 +msgid ".htconfig.php is writable" +msgstr "L'arxiu «.htconfig.php» es pot modificar" + +#: ../../Zotlabs/Module/Setup.php:575 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\"" " in the top folder of your web server and it is unable to do so." msgstr "L'instaŀlador ha de poder crear i modificar un fitxer anomenat «.htconfig.php» a la carpeta arrel del servidor, però sembla que no ho pot fer." -#: ../../Zotlabs/Module/Setup.php:570 +#: ../../Zotlabs/Module/Setup.php:576 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "Això sol ser un problema de permisos. Per molt que el teu usuari pugui modificar-lo, és el del servidor web qui necessita els permisos de modificació." -#: ../../Zotlabs/Module/Setup.php:571 -msgid "" -"At the end of this procedure, we will give you a text to save in a file " -"named .htconfig.php in your Red top folder." -msgstr "Aquest procés generarà un text que hauràs de desar en un arxiu. Ha de quedar en la carpeta arrel del servidor i, amb el nom «.htconfig.php»." - -#: ../../Zotlabs/Module/Setup.php:572 -msgid "" -"You can alternatively skip this procedure and perform a manual installation." -" Please see the file \"install/INSTALL.txt\" for instructions." -msgstr "No obstant això, aquest procés és opcional. Per a fer una instaŀlació manual consulta les instruccions a «install/INSTALL.txt\"." - -#: ../../Zotlabs/Module/Setup.php:575 -msgid ".htconfig.php is writable" -msgstr "L'arxiu «.htconfig.php» es pot modificar" +#: ../../Zotlabs/Module/Setup.php:577 +msgid "Please see install/INSTALL.txt for additional information." +msgstr "Consulta install/INSTALL.txt per a més informació." -#: ../../Zotlabs/Module/Setup.php:589 +#: ../../Zotlabs/Module/Setup.php:593 msgid "" "This software uses the Smarty3 template engine to render its web views. " "Smarty3 compiles templates to PHP to speed up rendering." msgstr "Aquest software fa servir el motor de plantilles Smarty3 per a renderitzar les vistes web. Smarty3 compila plantilles a PHP per a agilitzar-ne el renderitzat." -#: ../../Zotlabs/Module/Setup.php:590 +#: ../../Zotlabs/Module/Setup.php:594 #, php-format msgid "" "In order to store these compiled templates, the web server needs to have " "write access to the directory %s under the top level web folder." msgstr "Per tal de guardar aquestes plantilles compilades, el servidor web necessita tenir permís d'escriptura en el directori %s sota la carpeta principal." -#: ../../Zotlabs/Module/Setup.php:591 ../../Zotlabs/Module/Setup.php:612 +#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616 msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has" " write access to this folder." msgstr "Comprova que l'usuari que executa el servidor (www-data en Apache) té permisos d'escriptura en aquesta carpeta." -#: ../../Zotlabs/Module/Setup.php:592 +#: ../../Zotlabs/Module/Setup.php:596 #, php-format msgid "" "Note: as a security measure, you should give the web server write access to " "%s only--not the template files (.tpl) that it contains." msgstr "Nota: com a mesura de seguretat, l'usuari del servidor web ha de tenir accés d'escriptura només a %s, i no a les plantilles (.tpl) que conté." -#: ../../Zotlabs/Module/Setup.php:595 +#: ../../Zotlabs/Module/Setup.php:599 #, php-format msgid "%s is writable" msgstr "Es pot escriure a %s" -#: ../../Zotlabs/Module/Setup.php:611 +#: ../../Zotlabs/Module/Setup.php:615 msgid "" "This software uses the store directory to save uploaded files. The web " "server needs to have write access to the store directory under the top level" " web folder" msgstr "Aquest software fa servir la carpeta \"store\" per a desar els arxius pujats. El servidor web necessita permís d'escriptura per a accedir-hi. Es troba a la carpeta arrel del servidor web." -#: ../../Zotlabs/Module/Setup.php:615 +#: ../../Zotlabs/Module/Setup.php:619 msgid "store is writable" msgstr "Es pot escriure al magatzem (store)" -#: ../../Zotlabs/Module/Setup.php:647 +#: ../../Zotlabs/Module/Setup.php:651 msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access" " to this site." msgstr "No s'ha pogut validar el certificat TLS. Arregla-ho o deshabilita l'accés https a aquest lloc." -#: ../../Zotlabs/Module/Setup.php:648 +#: ../../Zotlabs/Module/Setup.php:652 msgid "" "If you have https access to your website or allow connections to TCP port " "443 (the https: port), you MUST use a browser-valid certificate. You MUST " "NOT use self-signed certificates!" msgstr "Si tens accés per https al teu lloc web o permets connexions pel port TCP 443 (port https), has d'emprar un certificat VÀLID. NO es poden emprar certificats AUTO-SIGNATS!" -#: ../../Zotlabs/Module/Setup.php:649 +#: ../../Zotlabs/Module/Setup.php:653 msgid "" "This restriction is incorporated because public posts from you may for " "example contain references to images on your own hub." msgstr "El motiu d'aquesta restricció és que les teves entrades públiques poden contenir referències a imatges del teu propi node." -#: ../../Zotlabs/Module/Setup.php:650 +#: ../../Zotlabs/Module/Setup.php:654 msgid "" "If your certificate is not recognized, members of other sites (who may " "themselves have valid certificates) will get a warning message on their own " "site complaining about security issues." msgstr "Si el teu certificat no és vàlid, llavors el membres d'altres hubs, encara que tinguin certificats vàlids, rebran una advertència de seguretat en carregar contingut teu." -#: ../../Zotlabs/Module/Setup.php:651 +#: ../../Zotlabs/Module/Setup.php:655 msgid "" "This can cause usability issues elsewhere (not just on your own site) so we " "must insist on this requirement." msgstr "Per tant, com que perjudica la usabilitat més enllà del teu lloc, la restricció de tenir un certificat vàlid és molt important." -#: ../../Zotlabs/Module/Setup.php:652 +#: ../../Zotlabs/Module/Setup.php:656 msgid "" "Providers are available that issue free certificates which are browser-" "valid." msgstr "Hi ha autoritats de certificació reconegudes que ofereixen certificats gratuïts." -#: ../../Zotlabs/Module/Setup.php:654 +#: ../../Zotlabs/Module/Setup.php:658 msgid "" "If you are confident that the certificate is valid and signed by a trusted " "authority, check to see if you have failed to install an intermediate cert. " @@ -2077,37 +2089,37 @@ msgid "" "server communications." msgstr "Si no tens cap dubte que el certificat és vàlid i signat per una autoritat de confiança, comprova si has instaŀlat malament un certificat intermedi. Tot i que els navegadors no en demanen, són necessaris per les connexions entre servidors." -#: ../../Zotlabs/Module/Setup.php:656 +#: ../../Zotlabs/Module/Setup.php:660 msgid "SSL certificate validation" msgstr "Validació del certificat TLS" -#: ../../Zotlabs/Module/Setup.php:662 +#: ../../Zotlabs/Module/Setup.php:666 msgid "" "Url rewrite in .htaccess is not working. Check your server " "configuration.Test: " msgstr "No es poden reescriure les URL a «.htaccess». Comprova la configuració del servidor:" -#: ../../Zotlabs/Module/Setup.php:665 +#: ../../Zotlabs/Module/Setup.php:669 msgid "Url rewrite is working" msgstr "Es poden reescriure les URL a «.htaccess»" -#: ../../Zotlabs/Module/Setup.php:679 +#: ../../Zotlabs/Module/Setup.php:683 msgid "" "The database configuration file \".htconfig.php\" could not be written. " "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "L'arxiu de configuracio de la base de dades «.htconfig.php» no s'ha pogut modificar. L'hauràs de modificar manualment amb el text de la caixa de text, i desar-lo a l'arrel del servidor web." -#: ../../Zotlabs/Module/Setup.php:703 +#: ../../Zotlabs/Module/Setup.php:707 #: ../../addon/rendezvous/rendezvous.php:401 msgid "Errors encountered creating database tables." msgstr "S'han produït errors en crear taules a la base de dades." -#: ../../Zotlabs/Module/Setup.php:743 +#: ../../Zotlabs/Module/Setup.php:747 msgid "

    What next?

    " msgstr "

    I ara què

    " -#: ../../Zotlabs/Module/Setup.php:744 +#: ../../Zotlabs/Module/Setup.php:748 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the " "poller." @@ -2186,13 +2198,13 @@ msgstr "Últim contacte conegut" #: ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:38 +#: ../../Zotlabs/Module/Settings/Features.php:65 msgid "Off" msgstr "No" #: ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:38 +#: ../../Zotlabs/Module/Settings/Features.php:65 msgid "On" msgstr "Sí" @@ -2246,11 +2258,11 @@ msgid "No failed updates." msgstr "No hi ha actualitzacions fallides." #: ../../Zotlabs/Module/Admin/Plugins.php:259 -#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89 +#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 -#: ../../Zotlabs/Module/Display.php:410 +#: ../../Zotlabs/Module/Display.php:453 #: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62 -#: ../../include/items.php:3569 +#: ../../include/items.php:3619 msgid "Item not found." msgstr "No s'ha trobat l'element." @@ -2276,12 +2288,12 @@ msgstr "Activa" #: ../../Zotlabs/Module/Admin/Plugins.php:341 #: ../../Zotlabs/Module/Admin/Plugins.php:436 -#: ../../Zotlabs/Module/Admin/Accounts.php:165 +#: ../../Zotlabs/Module/Admin/Accounts.php:166 #: ../../Zotlabs/Module/Admin/Logs.php:82 #: ../../Zotlabs/Module/Admin/Channels.php:145 #: ../../Zotlabs/Module/Admin/Themes.php:122 #: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:294 #: ../../Zotlabs/Module/Admin/Security.php:86 #: ../../Zotlabs/Module/Admin.php:136 msgid "Administration" @@ -2300,8 +2312,8 @@ msgstr "Commuta'n l'estat" #: ../../Zotlabs/Module/Admin/Plugins.php:344 #: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242 -#: ../../Zotlabs/Widget/Newmember.php:55 -#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:105 +#: ../../Zotlabs/Widget/Newmember.php:46 +#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:105 #: ../../include/nav.php:192 msgid "Settings" msgstr "Configuració" @@ -2409,7 +2421,7 @@ msgstr[1] "S'han esborrat %s comptes" msgid "Account not found" msgstr "No s'ha trobat el compte" -#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2462 +#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2473 #, php-format msgid "Account '%s' deleted" msgstr "S'ha esborrat el compte '%s'" @@ -2424,79 +2436,80 @@ msgstr "S'ha bloquejat el compte '%s'" msgid "Account '%s' unblocked" msgstr "S'ha desbloquejat el compte '%s'" -#: ../../Zotlabs/Module/Admin/Accounts.php:166 -#: ../../Zotlabs/Module/Admin/Accounts.php:179 +#: ../../Zotlabs/Module/Admin/Accounts.php:167 +#: ../../Zotlabs/Module/Admin/Accounts.php:180 #: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23 msgid "Accounts" msgstr "Comptes" -#: ../../Zotlabs/Module/Admin/Accounts.php:168 +#: ../../Zotlabs/Module/Admin/Accounts.php:169 #: ../../Zotlabs/Module/Admin/Channels.php:148 msgid "select all" msgstr "sel·leciona-ho tot" -#: ../../Zotlabs/Module/Admin/Accounts.php:169 +#: ../../Zotlabs/Module/Admin/Accounts.php:170 msgid "Registrations waiting for confirm" msgstr "Inscripcions esperant confirmació" -#: ../../Zotlabs/Module/Admin/Accounts.php:170 +#: ../../Zotlabs/Module/Admin/Accounts.php:171 msgid "Request date" msgstr "Data de la petició" -#: ../../Zotlabs/Module/Admin/Accounts.php:171 +#: ../../Zotlabs/Module/Admin/Accounts.php:172 msgid "No registrations." msgstr "Sense inscripcions." -#: ../../Zotlabs/Module/Admin/Accounts.php:172 -#: ../../Zotlabs/Module/Connections.php:287 ../../include/conversation.php:732 +#: ../../Zotlabs/Module/Admin/Accounts.php:173 +#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:732 msgid "Approve" msgstr "Aprova" -#: ../../Zotlabs/Module/Admin/Accounts.php:173 +#: ../../Zotlabs/Module/Admin/Accounts.php:174 +#: ../../Zotlabs/Module/Authorize.php:26 msgid "Deny" msgstr "Denega" -#: ../../Zotlabs/Module/Admin/Accounts.php:175 +#: ../../Zotlabs/Module/Admin/Accounts.php:176 #: ../../Zotlabs/Module/Connedit.php:622 msgid "Block" msgstr "Bloqueja" -#: ../../Zotlabs/Module/Admin/Accounts.php:176 +#: ../../Zotlabs/Module/Admin/Accounts.php:177 #: ../../Zotlabs/Module/Connedit.php:622 msgid "Unblock" msgstr "Desbloqueja" -#: ../../Zotlabs/Module/Admin/Accounts.php:181 +#: ../../Zotlabs/Module/Admin/Accounts.php:182 msgid "ID" msgstr "Identificador" -#: ../../Zotlabs/Module/Admin/Accounts.php:183 ../../include/group.php:284 +#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/group.php:284 msgid "All Channels" msgstr "Tots els canals" -#: ../../Zotlabs/Module/Admin/Accounts.php:184 +#: ../../Zotlabs/Module/Admin/Accounts.php:185 msgid "Register date" msgstr "Data d'inscripció" -#: ../../Zotlabs/Module/Admin/Accounts.php:185 +#: ../../Zotlabs/Module/Admin/Accounts.php:186 msgid "Last login" msgstr "Últim inici de sessió" -#: ../../Zotlabs/Module/Admin/Accounts.php:186 +#: ../../Zotlabs/Module/Admin/Accounts.php:187 msgid "Expires" msgstr "Caduca" -#: ../../Zotlabs/Module/Admin/Accounts.php:187 +#: ../../Zotlabs/Module/Admin/Accounts.php:188 msgid "Service Class" msgstr "Classe de servei" -#: ../../Zotlabs/Module/Admin/Accounts.php:189 +#: ../../Zotlabs/Module/Admin/Accounts.php:190 msgid "" "Selected accounts will be deleted!\\n\\nEverything these accounts had posted" " on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "S'esborraran tots els comptes seleccionats!\\n\\nTot el que hagin publicat en aquest lloc també serà esborrat permanentment!\\n\\nN'estàs segur/a de continuar?" -#: ../../Zotlabs/Module/Admin/Accounts.php:190 +#: ../../Zotlabs/Module/Admin/Accounts.php:191 msgid "" "The account {0} will be deleted!\\n\\nEverything this account has posted on " "this site will be permanently deleted!\\n\\nAre you sure?" @@ -2605,7 +2618,7 @@ msgid "Disallow Code" msgstr "Desactiva el codi" #: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1808 ../../include/nav.php:378 +#: ../../include/conversation.php:1811 ../../include/nav.php:378 msgid "Channel" msgstr "Canal" @@ -2650,552 +2663,549 @@ msgstr "[Experimental]" msgid "[Unsupported]" msgstr "[Incompatible]" -#: ../../Zotlabs/Module/Admin/Site.php:158 +#: ../../Zotlabs/Module/Admin/Site.php:165 msgid "Site settings updated." msgstr "S'ha actualitzat la configuració del lloc" -#: ../../Zotlabs/Module/Admin/Site.php:184 +#: ../../Zotlabs/Module/Admin/Site.php:191 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3082 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3106 msgid "Default" msgstr "Predeterminat" -#: ../../Zotlabs/Module/Admin/Site.php:195 +#: ../../Zotlabs/Module/Admin/Site.php:202 #: ../../Zotlabs/Module/Settings/Display.php:130 #, php-format msgid "%s - (Incompatible)" msgstr "%s - (Incompatible)" -#: ../../Zotlabs/Module/Admin/Site.php:202 +#: ../../Zotlabs/Module/Admin/Site.php:209 msgid "mobile" msgstr "mòbil" -#: ../../Zotlabs/Module/Admin/Site.php:204 +#: ../../Zotlabs/Module/Admin/Site.php:211 msgid "experimental" msgstr "experimental" -#: ../../Zotlabs/Module/Admin/Site.php:206 +#: ../../Zotlabs/Module/Admin/Site.php:213 msgid "unsupported" msgstr "incompatible" -#: ../../Zotlabs/Module/Admin/Site.php:253 +#: ../../Zotlabs/Module/Admin/Site.php:260 msgid "Yes - with approval" msgstr "Sí - amb aprovació" -#: ../../Zotlabs/Module/Admin/Site.php:259 +#: ../../Zotlabs/Module/Admin/Site.php:266 msgid "My site is not a public server" msgstr "El meu node no es un servidor públic" -#: ../../Zotlabs/Module/Admin/Site.php:260 +#: ../../Zotlabs/Module/Admin/Site.php:267 msgid "My site has paid access only" msgstr "El meu node només ofereix accés de pagament" -#: ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Admin/Site.php:268 msgid "My site has free access only" msgstr "El meu node només ofereix accés gratuït" -#: ../../Zotlabs/Module/Admin/Site.php:262 +#: ../../Zotlabs/Module/Admin/Site.php:269 msgid "My site offers free accounts with optional paid upgrades" msgstr "El meu node ofereix comptes gratuïts i millores de pagament" -#: ../../Zotlabs/Module/Admin/Site.php:274 +#: ../../Zotlabs/Module/Admin/Site.php:281 msgid "Beginner/Basic" msgstr "Principiant/bàsica" -#: ../../Zotlabs/Module/Admin/Site.php:275 +#: ../../Zotlabs/Module/Admin/Site.php:282 msgid "Novice - not skilled but willing to learn" msgstr "Aprenent - amb poca experiència però amb ganes d'aprendre" -#: ../../Zotlabs/Module/Admin/Site.php:276 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "Intermediate - somewhat comfortable" msgstr "Intermedi - còmode en entorns informàtics" -#: ../../Zotlabs/Module/Admin/Site.php:277 +#: ../../Zotlabs/Module/Admin/Site.php:284 msgid "Advanced - very comfortable" msgstr "Avançat - molt còmode en entorns informàtics" -#: ../../Zotlabs/Module/Admin/Site.php:278 +#: ../../Zotlabs/Module/Admin/Site.php:285 msgid "Expert - I can write computer code" msgstr "Expert - Sé programar" -#: ../../Zotlabs/Module/Admin/Site.php:279 +#: ../../Zotlabs/Module/Admin/Site.php:286 msgid "Wizard - I probably know more than you do" msgstr "Bruixot - Segurament en sé més que tu" -#: ../../Zotlabs/Module/Admin/Site.php:288 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:295 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "Node" -#: ../../Zotlabs/Module/Admin/Site.php:290 +#: ../../Zotlabs/Module/Admin/Site.php:297 #: ../../Zotlabs/Module/Register.php:269 msgid "Registration" msgstr "Inscripcions" -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "File upload" msgstr "Pujada d'arxius" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "Policies" msgstr "Polítiques" -#: ../../Zotlabs/Module/Admin/Site.php:293 +#: ../../Zotlabs/Module/Admin/Site.php:300 #: ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "Avançat" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:304 #: ../../addon/statusnet/statusnet.php:891 msgid "Site name" msgstr "Nom del node" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Site default technical skill level" msgstr "Nivell per defecte del lloc de competències tècniques" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Used to provide a member experience matched to technical comfort level" msgstr "Es fa servir per oferir una experiència ajustada al nivell tècnic de cadascú" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Lock the technical skill level setting" msgstr "Bloqueja el paràmetre de nivell tècnic" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Members can set their own technical comfort level by default" msgstr "Per defecte, els/les membres poden modificar el paràmetre de nivell tècnic" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Banner/Logo" msgstr "Cartell i logotip" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "Es permet contingut HTML, CSS i JS, sense filtrar" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "Administrator Information" msgstr "Informació de l'administració" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Informació per contactar amb les persones administradores del node. Es mostra a la pàgina d'informació del node. S'hi pot emprar BBCode." -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:312 #: ../../Zotlabs/Module/Siteinfo.php:21 msgid "Site Information" msgstr "Informació del node" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Descripció del node visible públicament. Es mostra a la pàgina d'informació del node. S'hi pot emprar BBCode." -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "System language" msgstr "Llengua del sistema" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "System theme" msgstr "Tema del sistema" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Tema del sistema per defecte. Les persones usuàries poden sobreescriure'l a la configuració de perfil: canvia la configuració de tema" -#: ../../Zotlabs/Module/Admin/Site.php:308 -msgid "Mobile system theme" -msgstr "Tema del sistema per a mòbils" - -#: ../../Zotlabs/Module/Admin/Site.php:308 -msgid "Theme for mobile devices" -msgstr "Tema per a aparells mòbils" - -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "Allow Feeds as Connections" msgstr "Permet connectar-se a fluxos RSS" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "(Heavy system resource usage)" msgstr "(Demana molts recursos de sistema)" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Maximum image size" msgstr "Mida màxima d'imatge" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Mida màxima total per les imatges pujades, en bytes. Per defecte és 0, que vol dir iŀlimitada." -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Does this site allow new member registration?" msgstr "Aquest node està obert a la inscripció de nous membres?" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Invitation only" msgstr "Només per invitació" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "Només permet nous membres només a través d'invitacions. Perquè tingui efecte, les inscripcions han d'estar obertes a nous membres." -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Minimum age" msgstr "Edat mínima" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Minimum age (in years) for who may register on this site." msgstr "Edat mínima en anys per a poder crear un compte en aquest lloc." -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Which best describes the types of account offered by this hub?" msgstr "Quina descripció s'acosta més al tipus de comptes oferts en aquest node?" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Register text" msgstr "Text d'inscripció" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Will be displayed prominently on the registration page." msgstr "Es mostrarà en gran a la pàgina d'inscripció" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Site homepage to show visitors (default: login box)" msgstr "Pàgina d'inici a mostrar als visitants (per defecte: la pàgina d'inici de sessió)" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "exemple: 'public' per a mostrar el flux públic, 'page/sys/home' per a mostrar una pàgina web de sistema de nom 'home', o 'include:home.html' per a incloure un arxiu." -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "Preserve site homepage URL" msgstr "Preserva l'adreça URL de la pàgina d'inici" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "Presenta la pàgina d'inici del node en un marc en el lloc original enlloc de redirigir-hi" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "Accounts abandoned after x days" msgstr "Els comptes es consideren abandonats després de X dies" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Estalviarà recursos del sistema en no sondejar nodes externs per a comptes abandonats. Un 0 vol dir \"mai\"." -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "Allowed friend domains" msgstr "Dominis amb permisos de connexió" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Llista separada per comes de dominis en els quals està permès establir relacions d'amistat amb aquest node. S'accepten comodins (*). Deixa-ho buit per a acceptar qualsevol domini" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "Verify Email Addresses" msgstr "Verifica les adreces de correu electrònic" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "Activa per a comprovar l'adreça de correu emprada durant la inscripció d'un nou compte (recomanat)." -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "Force publish" msgstr "Força la publicació" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Activa per a forçar que tots el perfils en aquest node siguin llistats en el directori del lloc." -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "Import Public Streams" msgstr "Importar fluxos públics" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "Importa i permet l'accés a contingut públic sondejat d'altres llocs. Avís: aquest contingut no estarà moderat." -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "Site only Public Streams" msgstr "Fluxos públics només locals" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "" "Allow access to public content originating only from this site if Imported " "Public Streams are disabled." msgstr "Permet accedir a aquell contingut públic que s'hagi originat en aquest lloc, suposant que no s'estan important fluxos públics d'altres nodes." -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Allow anybody on the internet to access the Public streams" msgstr "Permet a qualsevol persona d'internet d'accedir els fluxos públics" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "" "Disable to require authentication before viewing. Warning: this content is " "unmoderated." msgstr "Desabilita-ho per a demanar iniciar sessió per poder-ho veure. Alerta: el contingut no estarà moderat." -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "Login on Homepage" msgstr "Accés a la Pàgina d'inici" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "Presenta una casella d'identificació a la pàgina d'inici als visitants si no s'ha configurat altre contingut." -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Enable context help" msgstr "Activar l'ajuda contextual" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "" "Display contextual help for the current page when the help button is " "pressed." msgstr "Mostra l'ajuda contextual per la pàgina actual quan el botó d'ajuda es pressionat." -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Reply-to email address for system generated email." msgstr "Adreça de correu de resposta per als correus generats." -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:337 msgid "Sender (From) email address for system generated email." msgstr "Adreça de correu de remitent per als correus generats." -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Name of email sender for system generated email." msgstr "Nom visible de remitent per als correus generats." -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Directory Server URL" msgstr "URL del Servidor de Directoris" -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Default directory server" msgstr "Servidor de directori per defecte" -#: ../../Zotlabs/Module/Admin/Site.php:335 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "Proxy user" msgstr "Usuari Proxy" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "Proxy URL" msgstr "URL del Proxy" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Network timeout" msgstr "Temps d'espera de la xarxa" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Valor en segons. Ajusta a 0 per a sense límits (no recomanat)" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "Delivery interval" msgstr "Interval de lliurament" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Retarda en segon plà l'interval de lliurament per aquests segons per reduir la càrrega del sistema. Recomanat: 4-5 per a hostes compartits, 2-3 per a servidors privats virtuals. 0-1 per a servidors dedicats." -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "Deliveries per process" msgstr "Entregues per processar" -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust" " if necessary to tune system performance. Recommend: 1-5." msgstr "Nombre de entregues a intentar processar en un únic procèss del sistema operatiu. Ajustar si es necessari per millorar el rendiment. Es recomana: 1-5." -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "Queue Threshold" msgstr "Llindar de la cua" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "" "Always defer immediate delivery if queue contains more than this number of " "entries." msgstr "Posposa el lliurament immediat si la cua conté més d'aquest nombre d'entrades." -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "Poll interval" msgstr "interval de sondeig" -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "Retarda en segon pla el sondeig en aquesta quantitat de segons per a reduir la càrrega dels sistema. Si es 0 , empra l'interval de lliurament." -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "Path to ImageMagick convert program" msgstr "Ruta al programa de conversió d'imatges ImageMagick" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "" "If set, use this program to generate photo thumbnails for huge images ( > " "4000 pixels in either dimension), otherwise memory exhaustion may occur. " "Example: /usr/bin/convert" msgstr "Si se n'indica la ruta, es farà servir aquest programa per a generar miniatures per a imatges enormes (més de 4000 píxels d'ample o alt). En cas contrari es pot esgotar la memòria del servidor. Ruta d'exemple: /usr/bin/convert" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:350 msgid "Allow SVG thumbnails in file browser" msgstr "Permet miniatures en SVG a l'explorador de fitxers" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:350 msgid "WARNING: SVG images may contain malicious code." msgstr "Alerta: Les imatges SVG poden contenir codi maliciós." -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "Maximum Load Average" msgstr "Càrrega Mitja Màxima" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Càrrega màxima del sistema, abans que els processos de lliurament i sondeig es difereixin - 50 per defecte." -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "Expiration period in days for imported (grid/network) content" msgstr "Període d'expiració en dies per contingut importat (malla/xarxa)" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "0 for no expiration of imported content" msgstr "0 vol dir sense temps d'expiració pel contingut importat" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:353 +msgid "" +"Do not expire any posts which have comments less than this many days ago" +msgstr "No facis caducar les entrades que tinguin comentaris més nous que aquest nombre de dies" + +#: ../../Zotlabs/Module/Admin/Site.php:355 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "Servidors públics: Pàgina d'arribada promocional per a nous usuaris o usuàries." -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:355 #, php-format msgid "Create this page first. Default is %s/register" msgstr "Crea primer aquesta pàgina. Per defecte és %s/register" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:356 msgid "Page to display after creating a new channel" msgstr "Pàgina que es mostrarà després d'haver creat un canal nou" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:356 msgid "Recommend: profiles, go, or settings" msgstr "Recomanat: profiles (perfils), go (mostra diverses opcions), settings (configuració)" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Optional: site location" msgstr "Opcional: ubicació del node" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Region or country" msgstr "Regió o país" -#: ../../Zotlabs/Module/Admin/Profs.php:69 +#: ../../Zotlabs/Module/Admin/Profs.php:89 msgid "New Profile Field" msgstr "Camp de Perfil Nou" -#: ../../Zotlabs/Module/Admin/Profs.php:70 #: ../../Zotlabs/Module/Admin/Profs.php:90 +#: ../../Zotlabs/Module/Admin/Profs.php:110 msgid "Field nickname" msgstr "Àlies de Camp" -#: ../../Zotlabs/Module/Admin/Profs.php:70 #: ../../Zotlabs/Module/Admin/Profs.php:90 +#: ../../Zotlabs/Module/Admin/Profs.php:110 msgid "System name of field" msgstr "nOM DEL SISTEMA DEL CAMP" -#: ../../Zotlabs/Module/Admin/Profs.php:71 #: ../../Zotlabs/Module/Admin/Profs.php:91 +#: ../../Zotlabs/Module/Admin/Profs.php:111 msgid "Input type" msgstr "Tipus d'entrada" -#: ../../Zotlabs/Module/Admin/Profs.php:72 #: ../../Zotlabs/Module/Admin/Profs.php:92 +#: ../../Zotlabs/Module/Admin/Profs.php:112 msgid "Field Name" msgstr "Nom de Camp" -#: ../../Zotlabs/Module/Admin/Profs.php:72 #: ../../Zotlabs/Module/Admin/Profs.php:92 +#: ../../Zotlabs/Module/Admin/Profs.php:112 msgid "Label on profile pages" msgstr "Etiqueta a les pàgines de perfil" -#: ../../Zotlabs/Module/Admin/Profs.php:73 #: ../../Zotlabs/Module/Admin/Profs.php:93 +#: ../../Zotlabs/Module/Admin/Profs.php:113 msgid "Help text" msgstr "Text d'ajuda" -#: ../../Zotlabs/Module/Admin/Profs.php:73 #: ../../Zotlabs/Module/Admin/Profs.php:93 +#: ../../Zotlabs/Module/Admin/Profs.php:113 msgid "Additional info (optional)" msgstr "Informació adicional (opcional)" -#: ../../Zotlabs/Module/Admin/Profs.php:74 -#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32 +#: ../../Zotlabs/Module/Admin/Profs.php:94 +#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 #: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1052 #: ../../include/text.php:1064 msgid "Save" msgstr "Guardar" -#: ../../Zotlabs/Module/Admin/Profs.php:83 +#: ../../Zotlabs/Module/Admin/Profs.php:103 msgid "Field definition not found" msgstr "No es troba la definició del camp" -#: ../../Zotlabs/Module/Admin/Profs.php:89 +#: ../../Zotlabs/Module/Admin/Profs.php:109 msgid "Edit Profile Field" msgstr "Camp d'Edició del Perfil" -#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30 +#: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:30 msgid "Profile Fields" msgstr "Camps del Perfil" -#: ../../Zotlabs/Module/Admin/Profs.php:148 +#: ../../Zotlabs/Module/Admin/Profs.php:169 msgid "Basic Profile Fields" msgstr "Camps Bàsics del Perfil" -#: ../../Zotlabs/Module/Admin/Profs.php:149 +#: ../../Zotlabs/Module/Admin/Profs.php:170 msgid "Advanced Profile Fields" msgstr "Camps Avançats del Perfil" -#: ../../Zotlabs/Module/Admin/Profs.php:149 +#: ../../Zotlabs/Module/Admin/Profs.php:170 msgid "(In addition to basic fields)" msgstr "( addicionalment als camps bàsics)" -#: ../../Zotlabs/Module/Admin/Profs.php:151 +#: ../../Zotlabs/Module/Admin/Profs.php:172 msgid "All available fields" msgstr "Tots els camps disponibles" -#: ../../Zotlabs/Module/Admin/Profs.php:152 +#: ../../Zotlabs/Module/Admin/Profs.php:173 msgid "Custom Fields" msgstr "Camps Personalitzats" -#: ../../Zotlabs/Module/Admin/Profs.php:156 +#: ../../Zotlabs/Module/Admin/Profs.php:177 msgid "Create Custom Field" msgstr "Crear un Camp Personalitzat" @@ -3363,51 +3373,55 @@ msgctxt "acl" msgid "Profile" msgstr "Perfil" -#: ../../Zotlabs/Module/Moderate.php:55 +#: ../../Zotlabs/Module/Moderate.php:65 msgid "Comment approved" msgstr "S'ha aprovat el comentari" -#: ../../Zotlabs/Module/Moderate.php:59 +#: ../../Zotlabs/Module/Moderate.php:69 msgid "Comment deleted" msgstr "S'ha esborrat el comentari" -#: ../../Zotlabs/Module/Settings/Permcats.php:37 +#: ../../Zotlabs/Module/Settings/Permcats.php:23 +msgid "Permission Name is required." +msgstr "Es necessita el nom del perfil." + +#: ../../Zotlabs/Module/Settings/Permcats.php:42 msgid "Permission category saved." msgstr "S'ha desat la categoria de permisos." -#: ../../Zotlabs/Module/Settings/Permcats.php:61 +#: ../../Zotlabs/Module/Settings/Permcats.php:66 msgid "" "Use this form to create permission rules for various classes of people or " "connections." msgstr "Pots crear regles de permisos segons classe de persona o de connexió." -#: ../../Zotlabs/Module/Settings/Permcats.php:94 +#: ../../Zotlabs/Module/Settings/Permcats.php:99 msgid "Permission Categories" msgstr "Categories de permisos" -#: ../../Zotlabs/Module/Settings/Permcats.php:102 +#: ../../Zotlabs/Module/Settings/Permcats.php:107 msgid "Permission Name" msgstr "Nom de permís" -#: ../../Zotlabs/Module/Settings/Permcats.php:103 +#: ../../Zotlabs/Module/Settings/Permcats.php:108 #: ../../Zotlabs/Module/Settings/Tokens.php:161 #: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250 msgid "My Settings" msgstr "Els Meus Ajustos" -#: ../../Zotlabs/Module/Settings/Permcats.php:105 +#: ../../Zotlabs/Module/Settings/Permcats.php:110 #: ../../Zotlabs/Module/Settings/Tokens.php:163 #: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248 msgid "inherited" msgstr "heretat" -#: ../../Zotlabs/Module/Settings/Permcats.php:108 +#: ../../Zotlabs/Module/Settings/Permcats.php:113 #: ../../Zotlabs/Module/Settings/Tokens.php:166 #: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253 msgid "Individual Permissions" msgstr "Permisos Individuals" -#: ../../Zotlabs/Module/Settings/Permcats.php:109 +#: ../../Zotlabs/Module/Settings/Permcats.php:114 #: ../../Zotlabs/Module/Settings/Tokens.php:167 #: ../../Zotlabs/Module/Connedit.php:894 msgid "" @@ -3428,7 +3442,7 @@ msgstr "Alguns permisos poden ser heretats dels teus canals extremely permissive (should be used with caution)" msgstr "Molt públic - extremadament permissiu (s'ha d'anar en compte)" -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "Normal - públic per defecte, privat quan es desitgi (similar als permisos de xarxa social, però amb millor privacitat)" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:518 msgid "Private - default private, never open or public" msgstr "Privat - privat per defecte, mai públic o obert" -#: ../../Zotlabs/Module/Settings/Channel.php:512 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "Blocked - default blocked to/from everybody" msgstr "Bloquejat - tothom bloquejat per defecte" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Allow others to tag your posts" msgstr "Permet a altres etiquetar les teves entrades" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "Sovint emprat per la comunitat per marcar retroactivament contingut inapropiat" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "Channel Permission Limits" msgstr "Límits dels permisos del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Expire other channel content after this many days" msgstr "El contingut d'altes canals caduca després d'aquests dies" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "0 or blank to use the website limit." msgstr "0 o en blanc per emprar el limit del lloc web." -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 #, php-format msgid "This website expires after %d days." msgstr "Aquest lloc web expira després de %d dies." -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "This website does not expire imported content." msgstr "A aquest lloc web no expira el contingut importat" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "The website limit takes precedence if lower than your limit." msgstr "El límit del lloc web pren la preferència si es inferior al teu límit." -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "Maximum Friend Requests/Day:" msgstr "Nombre màxim de peticions d'amistat per dia" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "May reduce spam activity" msgstr "Pot reduir l'SPAM" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "Default Privacy Group" msgstr "Grup de privacitat per defecte" -#: ../../Zotlabs/Module/Settings/Channel.php:522 +#: ../../Zotlabs/Module/Settings/Channel.php:529 msgid "Use my default audience setting for the type of object published" msgstr "Empra els meus ajustos per defecte segons el tipus de entrada publicada" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:530 msgid "Profile to assign new connections" msgstr "Perfil al qual assignar les connexions noves" -#: ../../Zotlabs/Module/Settings/Channel.php:532 -msgid "Channel permissions category:" -msgstr "Categoria de permisos de canal:" - -#: ../../Zotlabs/Module/Settings/Channel.php:533 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Default Permissions Group" msgstr "Grup de permisos per defecte" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "Maximum private messages per day from unknown people:" msgstr "Nombre màxim de missatges privats de desconeguts al dia:" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "Useful to reduce spamming" msgstr "Útil per a reduir l'spam" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:549 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "Ajustos de notificacions" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "By default post a status message when:" msgstr "Per defecte envia un missatge d'estat quan:" -#: ../../Zotlabs/Module/Settings/Channel.php:544 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "accepting a friend request" msgstr "S'accepta una sol·licitud d'amistat" -#: ../../Zotlabs/Module/Settings/Channel.php:545 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "joining a forum/community" msgstr "Apuntar-se a un fòrum o comunitat" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "making an interesting profile change" msgstr "Faci un canvi interesant al perfil" -#: ../../Zotlabs/Module/Settings/Channel.php:547 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "Send a notification email when:" msgstr "Notifica per correu quan:" -#: ../../Zotlabs/Module/Settings/Channel.php:548 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "You receive a connection request" msgstr "Rebi una petició de connexió" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "Your connections are confirmed" msgstr "Es confirma una connexió" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "Someone writes on your profile wall" msgstr "Algú ha escrit al mur del teu perfil" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "Someone writes a followup comment" msgstr "Algú ha escrit un comentari de resposta" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:559 msgid "You receive a private message" msgstr "Rebi un missatge privat" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "You receive a friend suggestion" msgstr "Rebi una suggerència d'amistat" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:561 msgid "You are tagged in a post" msgstr "Estàs etiquetat a l'entrada" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:562 msgid "You are poked/prodded/etc. in a post" msgstr "S'enfoten/te piquen/etc. en una entrada" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:564 msgid "Someone likes your post/comment" msgstr "A algú li ha agradat la teva entrada o comentari" -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Show visual notifications including:" msgstr "Mostra notificacion visuals, com ara:" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "Unseen grid activity" msgstr "Activitat de malla no vista" -#: ../../Zotlabs/Module/Settings/Channel.php:563 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Unseen channel activity" msgstr "Activitat no vista del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:564 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "Unseen private messages" msgstr "Missatges privats no llegits" -#: ../../Zotlabs/Module/Settings/Channel.php:564 -#: ../../Zotlabs/Module/Settings/Channel.php:569 -#: ../../Zotlabs/Module/Settings/Channel.php:570 #: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:578 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "Recomanat" -#: ../../Zotlabs/Module/Settings/Channel.php:565 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "Upcoming events" msgstr "Esdeveniments propers" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "Events today" msgstr "Esdeveniments d'avui" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "Upcoming birthdays" msgstr "Aniversaris propers" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "Not available in all themes" msgstr "No està disponible en tots els temes" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "System (personal) notifications" msgstr "Notificacions (personals) del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "System info messages" msgstr "Missatges d'informació del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "System critical alerts" msgstr "Alertes crítiques del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "New connections" msgstr "Noves connexions" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "System Registrations" msgstr "Inscripcions del Sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Unseen shared files" msgstr "Fitxers compartits nous" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "Unseen public activity" msgstr "Activitat pública nova" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:582 +msgid "Unseen likes and dislikes" +msgstr "\"M'agrada\" i \"no m'agrada\" pendents" + +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Email notification hub (hostname)" msgstr "Hub per a notificacions per correu (nom de domini)" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:583 #, php-format msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" msgstr "En cas que el teu canal estigui repicat en diversos hubs, habilita aquesta opció al teu hub preferit. Això evita notificacions duplicades. Exemple: %s" -#: ../../Zotlabs/Module/Settings/Channel.php:576 -msgid "" -"Also show new wall posts, private messages and connections under Notices" -msgstr "Mostra també les entrades de mur noves, les entrades privades i les connexions a \"Notícies\"" +#: ../../Zotlabs/Module/Settings/Channel.php:584 +msgid "Show new wall posts, private messages and connections under Notices" +msgstr "Mostra totes les novetats d'entrades de mur, missatges privats i connexions a Notícies" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Notify me of events this many days in advance" msgstr "Notifica'm dels esdeveniments amb aquests dies d'antelació" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Must be greater than 0" msgstr "Ha de ser més gran que 0" -#: ../../Zotlabs/Module/Settings/Channel.php:584 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Advanced Account/Page Type Settings" msgstr "Ajustos avançats de compte i tipus de pàgina" -#: ../../Zotlabs/Module/Settings/Channel.php:585 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Change the behaviour of this account for special situations" msgstr "Modifica el comportament d'aquest compte en situacions especials" -#: ../../Zotlabs/Module/Settings/Channel.php:587 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Miscellaneous Settings" msgstr "Ajustos diversos" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "Default photo upload folder" msgstr "Carpeta per defecte de fotos pujades" -#: ../../Zotlabs/Module/Settings/Channel.php:588 -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "%Y - current year, %m - current month" msgstr "%Y - any en curs, %m - mes corrent" -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "Default file upload folder" msgstr "Carpeta per defecte d'arxius pujats" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:599 msgid "Personal menu to display in your channel pages" msgstr "Menú personal per mostrar en les teves pàgines de canal" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:601 msgid "Remove this channel." msgstr "Elimina aquest canal." -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:602 msgid "Firefox Share $Projectname provider" msgstr "Firefox Share $Projectname provider" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:603 msgid "Start calendar week on Monday" msgstr "Comença la setmana en dilluns" -#: ../../Zotlabs/Module/Settings/Features.php:45 +#: ../../Zotlabs/Module/Settings/Features.php:73 msgid "Additional Features" msgstr "Característiques Addicionals" +#: ../../Zotlabs/Module/Settings/Features.php:74 +#: ../../Zotlabs/Module/Settings/Account.php:116 +msgid "Your technical skill level" +msgstr "El teu nivell tècnic" + +#: ../../Zotlabs/Module/Settings/Features.php:74 +#: ../../Zotlabs/Module/Settings/Account.php:116 +msgid "" +"Used to provide a member experience and additional features consistent with " +"your comfort level" +msgstr "Es fa servir per a oferir-te una experiència i un seguit de funcionalitats addicionals d'acord amb la complexitat que desitgis." + #: ../../Zotlabs/Module/Settings/Tokens.php:31 #, php-format msgid "This channel is limited to %d tokens" @@ -3869,7 +3894,7 @@ msgid "" msgstr "Si vols donar enllaços que no requereixin dos passos, pots afegir la contrasenya d'accés a la URL per compartir. Per exemple:" #: ../../Zotlabs/Module/Settings/Tokens.php:150 -#: ../../Zotlabs/Widget/Settings_menu.php:92 +#: ../../Zotlabs/Widget/Settings_menu.php:100 msgid "Guest Access Tokens" msgstr "Tokens d'accés de convidat" @@ -3890,6 +3915,98 @@ msgstr "Data de caducitat (aaaa-mm-dd)" msgid "Their Settings" msgstr "Els seus Ajustos" +#: ../../Zotlabs/Module/Settings/Oauth2.php:35 +msgid "Name and Secret are required" +msgstr "Es necessiten el nom i el secret" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:83 +msgid "Add OAuth2 application" +msgstr "Afegeix una aplicació OAuth2" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:86 +#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth.php:90 +msgid "Name of application" +msgstr "Nom de l'aplicatiu" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth.php:92 +#: ../../Zotlabs/Module/Settings/Oauth.php:118 +#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782 +msgid "Consumer Secret" +msgstr "Consumer Secret" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth.php:91 +#: ../../Zotlabs/Module/Settings/Oauth.php:92 +msgid "Automatically generated - change if desired. Max length 20" +msgstr "Generat automàticament- Canvia-ho si ho vols. Max. longitud 20" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth.php:93 +#: ../../Zotlabs/Module/Settings/Oauth.php:119 +msgid "Redirect" +msgstr "Redirecciona" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth.php:93 +msgid "" +"Redirect URI - leave blank unless your application specifically requires " +"this" +msgstr "URI redirigida - No canviar excepte perquè el teu aplicatiu ho requereixi." + +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +msgid "Grant Types" +msgstr "Tipus de permís" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +msgid "leave blank unless your application sepcifically requires this" +msgstr "deixa-ho en blanc si no és que la teva aplicació ho demana explícitament" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +msgid "Authorization scope" +msgstr "Àmbit d'autorització" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:102 +msgid "OAuth2 Application not found." +msgstr "No s'ha trobat l'aplicació OAuth2." + +#: ../../Zotlabs/Module/Settings/Oauth2.php:111 +#: ../../Zotlabs/Module/Settings/Oauth2.php:148 +#: ../../Zotlabs/Module/Settings/Oauth.php:87 +#: ../../Zotlabs/Module/Settings/Oauth.php:113 +#: ../../Zotlabs/Module/Settings/Oauth.php:149 +msgid "Add application" +msgstr "Afegir aplicatiu" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:147 +msgid "Connected OAuth2 Apps" +msgstr "Aplicacions OAuth2 connectades" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:151 +#: ../../Zotlabs/Module/Settings/Oauth.php:152 +msgid "Client key starts with" +msgstr "La clau del client comença amb" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:152 +#: ../../Zotlabs/Module/Settings/Oauth.php:153 +msgid "No name" +msgstr "Sin nombre" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:153 +#: ../../Zotlabs/Module/Settings/Oauth.php:154 +msgid "Remove authorization" +msgstr "Elimina autorització" + #: ../../Zotlabs/Module/Settings/Account.php:20 msgid "Not valid email." msgstr "E-correu no vàlid." @@ -3946,16 +4063,6 @@ msgstr "Confirma la Nova Contrasenya" msgid "Leave password fields blank unless changing" msgstr "Deixa els camps de contrasenya en blanc llevat que la vulguis canviar" -#: ../../Zotlabs/Module/Settings/Account.php:116 -msgid "Your technical skill level" -msgstr "El teu nivell tècnic" - -#: ../../Zotlabs/Module/Settings/Account.php:116 -msgid "" -"Used to provide a member experience and additional features consistent with " -"your comfort level" -msgstr "Es fa servir per a oferir-te una experiència i un seguit de funcionalitats addicionals d'acord amb la complexitat que desitgis." - #: ../../Zotlabs/Module/Settings/Account.php:120 #: ../../Zotlabs/Module/Removeaccount.php:61 msgid "Remove Account" @@ -3993,11 +4100,11 @@ msgstr "0-99 (per defecte 0)" msgid "Affinity Slider Settings" msgstr "Configuració de la barra d'afinitat" -#: ../../Zotlabs/Module/Settings/Featured.php:64 +#: ../../Zotlabs/Module/Settings/Featured.php:67 msgid "Addon Settings" msgstr "Configuració de les extensions" -#: ../../Zotlabs/Module/Settings/Featured.php:65 +#: ../../Zotlabs/Module/Settings/Featured.php:68 msgid "Please save/submit changes to any panel before opening another." msgstr "Desa els canvis en un panell abans d'obrir-ne un altre." @@ -4114,82 +4221,38 @@ msgstr "Clic per expandir el contingut que excedeixi aquesta alçada" msgid "Grid page max height of content (in pixels)" msgstr "Alçada màxima dels continguts (en píxels) de la Pàgina de Malla " -#: ../../Zotlabs/Module/Settings/Oauth.php:34 +#: ../../Zotlabs/Module/Settings/Oauth.php:35 msgid "Name is required" msgstr "Es requereix un Nom" -#: ../../Zotlabs/Module/Settings/Oauth.php:38 +#: ../../Zotlabs/Module/Settings/Oauth.php:39 msgid "Key and Secret are required" msgstr "Es requereix Clau (Key) i el Secret (Secret)" -#: ../../Zotlabs/Module/Settings/Oauth.php:86 -#: ../../Zotlabs/Module/Settings/Oauth.php:112 -#: ../../Zotlabs/Module/Settings/Oauth.php:148 -msgid "Add application" -msgstr "Afegir aplicatiu" - -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -msgid "Name of application" -msgstr "Nom de l'aplicatiu" - -#: ../../Zotlabs/Module/Settings/Oauth.php:90 -#: ../../Zotlabs/Module/Settings/Oauth.php:116 +#: ../../Zotlabs/Module/Settings/Oauth.php:91 +#: ../../Zotlabs/Module/Settings/Oauth.php:117 #: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../Zotlabs/Module/Settings/Oauth.php:90 -#: ../../Zotlabs/Module/Settings/Oauth.php:91 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "Generat automàticament- Canvia-ho si ho vols. Max. longitud 20" - -#: ../../Zotlabs/Module/Settings/Oauth.php:91 -#: ../../Zotlabs/Module/Settings/Oauth.php:117 -#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782 -msgid "Consumer Secret" -msgstr "Consumer Secret" - -#: ../../Zotlabs/Module/Settings/Oauth.php:92 -#: ../../Zotlabs/Module/Settings/Oauth.php:118 -msgid "Redirect" -msgstr "Redirecciona" - -#: ../../Zotlabs/Module/Settings/Oauth.php:92 -msgid "" -"Redirect URI - leave blank unless your application specifically requires " -"this" -msgstr "URI redirigida - No canviar excepte perquè el teu aplicatiu ho requereixi." - -#: ../../Zotlabs/Module/Settings/Oauth.php:93 -#: ../../Zotlabs/Module/Settings/Oauth.php:119 +#: ../../Zotlabs/Module/Settings/Oauth.php:94 +#: ../../Zotlabs/Module/Settings/Oauth.php:120 msgid "Icon url" msgstr "Icona de url" -#: ../../Zotlabs/Module/Settings/Oauth.php:93 +#: ../../Zotlabs/Module/Settings/Oauth.php:94 #: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 msgid "Optional" msgstr "Opcional" -#: ../../Zotlabs/Module/Settings/Oauth.php:104 +#: ../../Zotlabs/Module/Settings/Oauth.php:105 msgid "Application not found." msgstr "Aplicatiu no trobat." -#: ../../Zotlabs/Module/Settings/Oauth.php:147 +#: ../../Zotlabs/Module/Settings/Oauth.php:148 msgid "Connected Apps" msgstr "Aplicatius Conectats" -#: ../../Zotlabs/Module/Settings/Oauth.php:151 -msgid "Client key starts with" -msgstr "La clau del client comença amb" - -#: ../../Zotlabs/Module/Settings/Oauth.php:152 -msgid "No name" -msgstr "Sin nombre" - -#: ../../Zotlabs/Module/Settings/Oauth.php:153 -msgid "Remove authorization" -msgstr "Elimina autorització" - #: ../../Zotlabs/Module/Embedphotos.php:140 #: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1350 #: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78 @@ -4203,13 +4266,12 @@ msgid "Edit Album" msgstr "Modifica l'àlbum" #: ../../Zotlabs/Module/Embedphotos.php:158 -#: ../../Zotlabs/Module/Photos.php:712 ../../Zotlabs/Module/Photos.php:844 -#: ../../Zotlabs/Module/Photos.php:1381 +#: ../../Zotlabs/Module/Photos.php:712 #: ../../Zotlabs/Module/Profile_photo.php:458 -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Storage/Browser.php:277 ../../Zotlabs/Storage/Browser.php:384 -#: ../../Zotlabs/Widget/Cdav.php:133 ../../Zotlabs/Widget/Cdav.php:169 -#: ../../Zotlabs/Widget/Portfolio.php:110 ../../Zotlabs/Widget/Album.php:97 +#: ../../Zotlabs/Module/Cover_photo.php:362 +#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Widget/Cdav.php:133 +#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110 +#: ../../Zotlabs/Widget/Album.php:97 msgid "Upload" msgstr "Pujar" @@ -4217,60 +4279,60 @@ msgstr "Pujar" msgid "Some blurb about what to do when you're new here" msgstr "Algunes propostes sobre el que cal fer quan ets nou aquí" -#: ../../Zotlabs/Module/Thing.php:115 +#: ../../Zotlabs/Module/Thing.php:120 msgid "Thing updated" msgstr "S'ha actualitzat la cosa" -#: ../../Zotlabs/Module/Thing.php:167 +#: ../../Zotlabs/Module/Thing.php:172 msgid "Object store: failed" msgstr "No s'ha pogut emmagatzemar l'objecte" -#: ../../Zotlabs/Module/Thing.php:171 +#: ../../Zotlabs/Module/Thing.php:176 msgid "Thing added" msgstr "S'ha afegit la cosa" -#: ../../Zotlabs/Module/Thing.php:197 +#: ../../Zotlabs/Module/Thing.php:202 #, php-format msgid "OBJ: %1$s %2$s %3$s" msgstr "OBJ: %1$s %2$s %3$s" -#: ../../Zotlabs/Module/Thing.php:260 +#: ../../Zotlabs/Module/Thing.php:265 msgid "Show Thing" msgstr "Mostra la cosa" -#: ../../Zotlabs/Module/Thing.php:267 +#: ../../Zotlabs/Module/Thing.php:272 msgid "item not found." msgstr "no s'ha trobat l'element." -#: ../../Zotlabs/Module/Thing.php:300 +#: ../../Zotlabs/Module/Thing.php:305 msgid "Edit Thing" msgstr "Edita la cosa" -#: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:359 +#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364 msgid "Select a profile" msgstr "Tria un perfil" -#: ../../Zotlabs/Module/Thing.php:306 ../../Zotlabs/Module/Thing.php:362 +#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 msgid "Post an activity" msgstr "Publica una activitat" -#: ../../Zotlabs/Module/Thing.php:306 ../../Zotlabs/Module/Thing.php:362 +#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 msgid "Only sends to viewers of the applicable profile" msgstr "S'envia només a visitants del perfil corresponent" -#: ../../Zotlabs/Module/Thing.php:308 ../../Zotlabs/Module/Thing.php:364 +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 msgid "Name of thing e.g. something" msgstr "Nom de la cosa. Exemple: patata" -#: ../../Zotlabs/Module/Thing.php:310 ../../Zotlabs/Module/Thing.php:365 +#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370 msgid "URL of thing (optional)" msgstr "Adreça URL de la cosa (opcional)" -#: ../../Zotlabs/Module/Thing.php:312 ../../Zotlabs/Module/Thing.php:366 +#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371 msgid "URL for photo of thing (optional)" msgstr "Adreça URL de la foto d'una cosa (opcional)" -#: ../../Zotlabs/Module/Thing.php:314 ../../Zotlabs/Module/Thing.php:367 +#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372 #: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071 #: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235 #: ../../Zotlabs/Module/Filestorage.php:147 @@ -4278,7 +4340,7 @@ msgstr "Adreça URL de la foto d'una cosa (opcional)" msgid "Permissions" msgstr "Permisos " -#: ../../Zotlabs/Module/Thing.php:357 +#: ../../Zotlabs/Module/Thing.php:362 msgid "Add Thing to your Profile" msgstr "Afegeix una cosa al teu perfil" @@ -4292,56 +4354,56 @@ msgstr "No hi ha més notificacions del sistema." msgid "System Notifications" msgstr "Notificacions del sistema" -#: ../../Zotlabs/Module/Follow.php:31 -msgid "Channel added." -msgstr "S'ha afegit el canal." +#: ../../Zotlabs/Module/Follow.php:36 +msgid "Connection added." +msgstr "S'ha afegit la connexió." -#: ../../Zotlabs/Module/Import.php:143 +#: ../../Zotlabs/Module/Import.php:144 #, php-format msgid "Your service plan only allows %d channels." msgstr "El teu paquet de serveis només admet %d canals." -#: ../../Zotlabs/Module/Import.php:157 +#: ../../Zotlabs/Module/Import.php:158 msgid "No channel. Import failed." msgstr "Sense canal. No s'ha pogut importar." -#: ../../Zotlabs/Module/Import.php:481 +#: ../../Zotlabs/Module/Import.php:482 #: ../../addon/diaspora/import_diaspora.php:139 msgid "Import completed." msgstr "S'ha completat la importació." -#: ../../Zotlabs/Module/Import.php:509 +#: ../../Zotlabs/Module/Import.php:510 msgid "You must be logged in to use this feature." msgstr "Has d'estar registrat per fer servir aquesta funcionalitat." -#: ../../Zotlabs/Module/Import.php:514 +#: ../../Zotlabs/Module/Import.php:515 msgid "Import Channel" msgstr "Importa un canal" -#: ../../Zotlabs/Module/Import.php:515 +#: ../../Zotlabs/Module/Import.php:516 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 "Empra aquest formulari per importar un canal existent en un altre servidor/concentrador. Pots recuperar el canal des de l'antic servidor/concentrador via la xarxa o mitjançant un fitxer d'exportació" -#: ../../Zotlabs/Module/Import.php:517 +#: ../../Zotlabs/Module/Import.php:518 msgid "Or provide the old server/hub details" msgstr "O proveeix els detalls de l'antic servidor/node" -#: ../../Zotlabs/Module/Import.php:518 +#: ../../Zotlabs/Module/Import.php:519 msgid "Your old identity address (xyz@example.com)" msgstr "La teva adreça de canal antiga. El format és canal@exemple.org" -#: ../../Zotlabs/Module/Import.php:519 +#: ../../Zotlabs/Module/Import.php:520 msgid "Your old login email address" msgstr "La teva adreça de correu electrònic antiga" -#: ../../Zotlabs/Module/Import.php:520 +#: ../../Zotlabs/Module/Import.php:521 msgid "Your old login password" msgstr "La teva contrasenya antiga" -#: ../../Zotlabs/Module/Import.php:521 +#: ../../Zotlabs/Module/Import.php:522 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" @@ -4349,19 +4411,19 @@ msgid "" "primary location for files, photos, and media." msgstr "Per a qualsevol de les opcions, escull si vols fer primària l'adreça d'aquest node o mantenir l'anterior com a primària. Podràs penjar entrades des de totes dues adreces, però per als fitxers, imatges i altres en cal una de primària." -#: ../../Zotlabs/Module/Import.php:522 +#: ../../Zotlabs/Module/Import.php:523 msgid "Make this hub my primary location" msgstr "Fes d'aquest node la meva ubicació primària" -#: ../../Zotlabs/Module/Import.php:523 +#: ../../Zotlabs/Module/Import.php:524 msgid "Move this channel (disable all previous locations)" msgstr "Moure aquest canal (desactiva totes les prèvies localitzacions)" -#: ../../Zotlabs/Module/Import.php:524 +#: ../../Zotlabs/Module/Import.php:525 msgid "Import a few months of posts if possible (limited by available memory" msgstr "Importa, si es possible, missatges de fa uns quants mesos (limitat per la memòria disponible) " -#: ../../Zotlabs/Module/Import.php:525 +#: ../../Zotlabs/Module/Import.php:526 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -4371,16 +4433,16 @@ msgstr "Aquest procès pot trigar minuts en completar. Si et plau envia el formu msgid "Authentication failed." msgstr "Ha fallat l'autentificació." -#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1583 -#: ../../include/channel.php:2307 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1590 +#: ../../include/channel.php:2318 msgid "Remote Authentication" msgstr "Autentificació Remota" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2308 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2319 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "Introdueix la teva adreça del canal (eg canal@exemple.com)" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2309 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2320 msgid "Authenticate" msgstr "Autentica't" @@ -4388,7 +4450,7 @@ msgstr "Autentica't" msgid "Permissions denied." msgstr "Permís denegat." -#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2426 +#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2446 msgid "Import" msgstr "Importar" @@ -4448,149 +4510,163 @@ msgstr "Ànim" msgid "Set your current mood and tell your friends" msgstr "Estableix el teu estat d'ànim actual i digues-li als teus amics" -#: ../../Zotlabs/Module/Connections.php:54 -#: ../../Zotlabs/Module/Connections.php:156 -#: ../../Zotlabs/Module/Connections.php:245 +#: ../../Zotlabs/Module/Connections.php:55 +#: ../../Zotlabs/Module/Connections.php:112 +#: ../../Zotlabs/Module/Connections.php:256 +msgid "Active" +msgstr "Actives" + +#: ../../Zotlabs/Module/Connections.php:60 +#: ../../Zotlabs/Module/Connections.php:164 +#: ../../Zotlabs/Module/Connections.php:261 msgid "Blocked" msgstr "Bloquejades" -#: ../../Zotlabs/Module/Connections.php:59 -#: ../../Zotlabs/Module/Connections.php:163 -#: ../../Zotlabs/Module/Connections.php:244 +#: ../../Zotlabs/Module/Connections.php:65 +#: ../../Zotlabs/Module/Connections.php:171 +#: ../../Zotlabs/Module/Connections.php:260 msgid "Ignored" msgstr "Ignorades" -#: ../../Zotlabs/Module/Connections.php:64 -#: ../../Zotlabs/Module/Connections.php:177 -#: ../../Zotlabs/Module/Connections.php:243 +#: ../../Zotlabs/Module/Connections.php:70 +#: ../../Zotlabs/Module/Connections.php:185 +#: ../../Zotlabs/Module/Connections.php:259 msgid "Hidden" msgstr "Amagades" -#: ../../Zotlabs/Module/Connections.php:69 -#: ../../Zotlabs/Module/Connections.php:170 +#: ../../Zotlabs/Module/Connections.php:75 +#: ../../Zotlabs/Module/Connections.php:178 msgid "Archived/Unreachable" msgstr "Arxivades o inaccessibles" -#: ../../Zotlabs/Module/Connections.php:74 -#: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116 +#: ../../Zotlabs/Module/Connections.php:80 +#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:116 #: ../../Zotlabs/Module/Notifications.php:52 -#: ../../include/conversation.php:1714 +#: ../../include/conversation.php:1717 msgid "New" msgstr "Nou" -#: ../../Zotlabs/Module/Connections.php:88 -#: ../../Zotlabs/Module/Connections.php:102 +#: ../../Zotlabs/Module/Connections.php:94 +#: ../../Zotlabs/Module/Connections.php:108 #: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26 msgid "All" msgstr "Tots" -#: ../../Zotlabs/Module/Connections.php:133 +#: ../../Zotlabs/Module/Connections.php:140 +msgid "Active Connections" +msgstr "Connexions actives" + +#: ../../Zotlabs/Module/Connections.php:143 +msgid "Show active connections" +msgstr "Mostra les connexions actives" + +#: ../../Zotlabs/Module/Connections.php:147 #: ../../Zotlabs/Widget/Notifications.php:84 msgid "New Connections" msgstr "Noves Connexions" -#: ../../Zotlabs/Module/Connections.php:136 +#: ../../Zotlabs/Module/Connections.php:150 msgid "Show pending (new) connections" msgstr "Mostra les connexions pendents (noves)" -#: ../../Zotlabs/Module/Connections.php:143 -msgid "Show all connections" -msgstr "Mostra totes les connexions" - -#: ../../Zotlabs/Module/Connections.php:159 +#: ../../Zotlabs/Module/Connections.php:167 msgid "Only show blocked connections" msgstr "Mostra només les connexions bloquejades" -#: ../../Zotlabs/Module/Connections.php:166 +#: ../../Zotlabs/Module/Connections.php:174 msgid "Only show ignored connections" msgstr "Mostra només les connexions ignorades" -#: ../../Zotlabs/Module/Connections.php:173 +#: ../../Zotlabs/Module/Connections.php:181 msgid "Only show archived/unreachable connections" msgstr "Mostra només les connexions arxivades o inaccessibles" -#: ../../Zotlabs/Module/Connections.php:180 +#: ../../Zotlabs/Module/Connections.php:188 msgid "Only show hidden connections" msgstr "Mostra només les connexions amagades" -#: ../../Zotlabs/Module/Connections.php:241 +#: ../../Zotlabs/Module/Connections.php:203 +msgid "Show all connections" +msgstr "Mostra totes les connexions" + +#: ../../Zotlabs/Module/Connections.php:257 msgid "Pending approval" msgstr "Pendent d'aprovació" -#: ../../Zotlabs/Module/Connections.php:242 +#: ../../Zotlabs/Module/Connections.php:258 msgid "Archived" msgstr "Arxivades" -#: ../../Zotlabs/Module/Connections.php:246 +#: ../../Zotlabs/Module/Connections.php:262 msgid "Not connected at this location" msgstr "No està connectada des d'aquest aquest hub" -#: ../../Zotlabs/Module/Connections.php:263 +#: ../../Zotlabs/Module/Connections.php:279 #, php-format msgid "%1$s [%2$s]" msgstr "%1$s [%2$s]" -#: ../../Zotlabs/Module/Connections.php:264 +#: ../../Zotlabs/Module/Connections.php:280 msgid "Edit connection" msgstr "Modifica la connexió" -#: ../../Zotlabs/Module/Connections.php:266 +#: ../../Zotlabs/Module/Connections.php:282 msgid "Delete connection" msgstr "Elimina la connexió" -#: ../../Zotlabs/Module/Connections.php:275 +#: ../../Zotlabs/Module/Connections.php:291 msgid "Channel address" msgstr "Adreça del canal" -#: ../../Zotlabs/Module/Connections.php:277 +#: ../../Zotlabs/Module/Connections.php:293 msgid "Network" msgstr "Xarxa" -#: ../../Zotlabs/Module/Connections.php:280 +#: ../../Zotlabs/Module/Connections.php:296 msgid "Call" msgstr "Crida" -#: ../../Zotlabs/Module/Connections.php:282 +#: ../../Zotlabs/Module/Connections.php:298 msgid "Status" msgstr "Estat" -#: ../../Zotlabs/Module/Connections.php:284 +#: ../../Zotlabs/Module/Connections.php:300 msgid "Connected" msgstr "Connectat" -#: ../../Zotlabs/Module/Connections.php:286 +#: ../../Zotlabs/Module/Connections.php:302 msgid "Approve connection" msgstr "Aprovar la Connexió " -#: ../../Zotlabs/Module/Connections.php:288 +#: ../../Zotlabs/Module/Connections.php:304 msgid "Ignore connection" msgstr "Ignorar connexió" -#: ../../Zotlabs/Module/Connections.php:289 +#: ../../Zotlabs/Module/Connections.php:305 #: ../../Zotlabs/Module/Connedit.php:630 msgid "Ignore" msgstr "Ignora" -#: ../../Zotlabs/Module/Connections.php:290 +#: ../../Zotlabs/Module/Connections.php:306 msgid "Recent activity" msgstr "Activitat recent" -#: ../../Zotlabs/Module/Connections.php:315 ../../Zotlabs/Lib/Apps.php:235 +#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:235 #: ../../include/text.php:973 msgid "Connections" msgstr "Connexions" -#: ../../Zotlabs/Module/Connections.php:320 +#: ../../Zotlabs/Module/Connections.php:336 msgid "Search your connections" msgstr "Cerca entre les teves connexions" -#: ../../Zotlabs/Module/Connections.php:321 +#: ../../Zotlabs/Module/Connections.php:337 msgid "Connections search" msgstr "Cerca connexions" -#: ../../Zotlabs/Module/Connections.php:322 -#: ../../Zotlabs/Module/Directory.php:396 -#: ../../Zotlabs/Module/Directory.php:401 ../../include/contact_widgets.php:23 +#: ../../Zotlabs/Module/Connections.php:338 +#: ../../Zotlabs/Module/Directory.php:401 +#: ../../Zotlabs/Module/Directory.php:406 ../../include/contact_widgets.php:23 msgid "Find" msgstr "Troba" @@ -4692,13 +4768,9 @@ msgstr "o bé fes doble clic a un d'existent" msgid "Create a status post for this upload" msgstr "Genera una entrada a partir de la pujada" -#: ../../Zotlabs/Module/Photos.php:698 -msgid "Caption (optional):" -msgstr "Subtítol (opcional):" - #: ../../Zotlabs/Module/Photos.php:699 -msgid "Description (optional):" -msgstr "Descripció (opcional):" +msgid "Description (optional)" +msgstr "Descripció (opcional)" #: ../../Zotlabs/Module/Photos.php:785 msgid "Show Newest First" @@ -4708,6 +4780,10 @@ msgstr "Ordena de més nou a més antic" msgid "Show Oldest First" msgstr "Ordena de més antic a més nou" +#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381 +msgid "Add Photos" +msgstr "Afegeix fotos" + #: ../../Zotlabs/Module/Photos.php:892 msgid "Permission denied. Access to this item may be restricted." msgstr "S'ha denegat el permís. Pot ser que l'accés estigui restringit." @@ -4756,10 +4832,6 @@ msgstr "Escriu el nom del nou àlbum" msgid "or select an existing one (doubleclick)" msgstr "o bé fes doble clic a un d'existent" -#: ../../Zotlabs/Module/Photos.php:1068 -msgid "Caption" -msgstr "Llegenda" - #: ../../Zotlabs/Module/Photos.php:1070 msgid "Add a Tag" msgstr "Afegeix una etiqueta" @@ -4786,12 +4858,12 @@ msgid "Please wait" msgstr "Si us plau, espera" #: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237 -#: ../../Zotlabs/Lib/ThreadItem.php:747 +#: ../../Zotlabs/Lib/ThreadItem.php:749 msgid "This is you" msgstr "Ets tú" #: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239 -#: ../../Zotlabs/Lib/ThreadItem.php:749 ../../include/js_strings.php:6 +#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/js_strings.php:6 msgid "Comment" msgstr "Comentari" @@ -4841,8 +4913,8 @@ msgid "View all" msgstr "Veure tot" #: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205 -#: ../../include/conversation.php:1978 ../../include/channel.php:1540 -#: ../../include/taxonomy.php:597 +#: ../../include/conversation.php:1981 ../../include/channel.php:1539 +#: ../../include/taxonomy.php:661 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -4850,7 +4922,7 @@ msgstr[0] "Agrada" msgstr[1] "Agraden" #: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210 -#: ../../include/conversation.php:1981 +#: ../../include/conversation.php:1984 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -4885,78 +4957,76 @@ msgid "Close" msgstr "Tanca" #: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378 -#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:656 +#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:667 msgid "Recent Photos" msgstr "Imatges recents" -#: ../../Zotlabs/Module/Wiki.php:30 +#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1135 msgid "Profile Unavailable." msgstr "El perfil no està disponible." -#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:108 -#: ../../addon/gitwiki/Mod_Gitwiki.php:42 +#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:114 msgid "Not found" msgstr "No s'ha trobat" -#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/gitwiki/Mod_Gitwiki.php:62 +#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:114 +#: ../../addon/cart/cart.php:1204 ../../addon/cart/manual_payments.php:58 msgid "Invalid channel" msgstr "El canal és invàlid" -#: ../../Zotlabs/Module/Wiki.php:124 ../../addon/gitwiki/Mod_Gitwiki.php:107 +#: ../../Zotlabs/Module/Wiki.php:124 msgid "Error retrieving wiki" msgstr "S'ha produït un error en carregar la wiki" -#: ../../Zotlabs/Module/Wiki.php:131 ../../addon/gitwiki/Mod_Gitwiki.php:114 +#: ../../Zotlabs/Module/Wiki.php:131 msgid "Error creating zip file export folder" msgstr "S'ha produït un error en crear la carpeta per al fitxer comprimit d'exportació" -#: ../../Zotlabs/Module/Wiki.php:182 ../../addon/gitwiki/Mod_Gitwiki.php:132 +#: ../../Zotlabs/Module/Wiki.php:182 msgid "Error downloading wiki: " msgstr "S'ha produït un error en descarregar la wiki:" -#: ../../Zotlabs/Module/Wiki.php:197 ../../addon/gitwiki/Mod_Gitwiki.php:146 -#: ../../include/conversation.php:1925 ../../include/nav.php:494 +#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1928 +#: ../../include/nav.php:494 msgid "Wikis" msgstr "Wikis" -#: ../../Zotlabs/Module/Wiki.php:203 ../../addon/gitwiki/Mod_Gitwiki.php:152 +#: ../../Zotlabs/Module/Wiki.php:203 msgid "Download" msgstr "Descarrega" #: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Chat.php:256 -#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:145 -#: ../../addon/gitwiki/Mod_Gitwiki.php:154 +#: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Manage.php:145 msgid "Create New" msgstr "Crear Nou" -#: ../../Zotlabs/Module/Wiki.php:207 ../../addon/gitwiki/Mod_Gitwiki.php:156 +#: ../../Zotlabs/Module/Wiki.php:207 msgid "Wiki name" msgstr "Nom de la wiki" -#: ../../Zotlabs/Module/Wiki.php:208 ../../addon/gitwiki/Mod_Gitwiki.php:157 +#: ../../Zotlabs/Module/Wiki.php:208 msgid "Content type" msgstr "Llenguatge de formatació" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 #: ../../Zotlabs/Widget/Wiki_pages.php:36 #: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40 -#: ../../include/text.php:1868 +#: ../../include/text.php:1869 msgid "Markdown" msgstr "Markdown" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 #: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1866 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1867 msgid "BBcode" msgstr "BBCode" #: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1869 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1870 msgid "Text" msgstr "Cap (text pla)" #: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:284 -#: ../../addon/gitwiki/Mod_Gitwiki.php:159 msgid "Type" msgstr "Tipus" @@ -4968,7 +5038,7 @@ msgstr "Qualsevol" msgid "Lock content type" msgstr "Bloca el llenguatge de formatació" -#: ../../Zotlabs/Module/Wiki.php:219 ../../addon/gitwiki/Mod_Gitwiki.php:166 +#: ../../Zotlabs/Module/Wiki.php:219 msgid "Create a status post for this wiki" msgstr "Crea una entrada d'estat per aquesta wiki" @@ -4976,138 +5046,147 @@ msgstr "Crea una entrada d'estat per aquesta wiki" msgid "Edit Wiki Name" msgstr "Canvia el nom de la wiki" -#: ../../Zotlabs/Module/Wiki.php:262 ../../addon/gitwiki/Mod_Gitwiki.php:185 +#: ../../Zotlabs/Module/Wiki.php:262 msgid "Wiki not found" msgstr "No s'ha trobat la wiki" -#: ../../Zotlabs/Module/Wiki.php:286 ../../addon/gitwiki/Mod_Gitwiki.php:210 +#: ../../Zotlabs/Module/Wiki.php:286 msgid "Rename page" msgstr "Canvia el nom de la pàgina" -#: ../../Zotlabs/Module/Wiki.php:305 ../../addon/gitwiki/Mod_Gitwiki.php:214 +#: ../../Zotlabs/Module/Wiki.php:307 msgid "Error retrieving page content" msgstr "S'ha produït un error en carregar el contingut de la pàgina" -#: ../../Zotlabs/Module/Wiki.php:313 ../../Zotlabs/Module/Wiki.php:315 +#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317 msgid "New page" msgstr "Crea una pàgina nova" -#: ../../Zotlabs/Module/Wiki.php:343 ../../addon/gitwiki/Mod_Gitwiki.php:242 +#: ../../Zotlabs/Module/Wiki.php:345 msgid "Revision Comparison" msgstr "Comparació de revisió" -#: ../../Zotlabs/Module/Wiki.php:344 ../../addon/gitwiki/Mod_Gitwiki.php:243 +#: ../../Zotlabs/Module/Wiki.php:346 msgid "Revert" msgstr "Reverteix" -#: ../../Zotlabs/Module/Wiki.php:351 +#: ../../Zotlabs/Module/Wiki.php:353 msgid "Short description of your changes (optional)" msgstr "Descripció curta dels canvis (opcional)" -#: ../../Zotlabs/Module/Wiki.php:358 ../../addon/gitwiki/Mod_Gitwiki.php:252 +#: ../../Zotlabs/Module/Wiki.php:362 msgid "Source" msgstr "Font" -#: ../../Zotlabs/Module/Wiki.php:368 ../../addon/gitwiki/Mod_Gitwiki.php:260 +#: ../../Zotlabs/Module/Wiki.php:372 msgid "New page name" msgstr "Nou nom de pàgina" -#: ../../Zotlabs/Module/Wiki.php:373 ../../addon/gitwiki/Mod_Gitwiki.php:265 -#: ../../include/conversation.php:1282 +#: ../../Zotlabs/Module/Wiki.php:377 ../../include/conversation.php:1282 msgid "Embed image from photo albums" msgstr "Embeu una imatge dels àlbums de fotos" -#: ../../Zotlabs/Module/Wiki.php:374 ../../addon/gitwiki/Mod_Gitwiki.php:266 -#: ../../include/conversation.php:1385 +#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1388 msgid "Embed an image from your albums" msgstr "Embeu una imatge dels teus àlbums" -#: ../../Zotlabs/Module/Wiki.php:376 +#: ../../Zotlabs/Module/Wiki.php:380 #: ../../Zotlabs/Module/Profile_photo.php:465 -#: ../../Zotlabs/Module/Cover_photo.php:366 -#: ../../addon/gitwiki/Mod_Gitwiki.php:268 ../../include/conversation.php:1387 -#: ../../include/conversation.php:1434 +#: ../../Zotlabs/Module/Cover_photo.php:367 +#: ../../include/conversation.php:1390 ../../include/conversation.php:1437 msgid "OK" msgstr "OK" -#: ../../Zotlabs/Module/Wiki.php:377 ../../addon/gitwiki/Mod_Gitwiki.php:269 -#: ../../include/conversation.php:1318 +#: ../../Zotlabs/Module/Wiki.php:381 +#: ../../Zotlabs/Module/Profile_photo.php:466 +#: ../../Zotlabs/Module/Cover_photo.php:368 +#: ../../include/conversation.php:1320 msgid "Choose images to embed" msgstr "Tria una imatge per a embeure-la" -#: ../../Zotlabs/Module/Wiki.php:378 ../../addon/gitwiki/Mod_Gitwiki.php:270 -#: ../../include/conversation.php:1319 +#: ../../Zotlabs/Module/Wiki.php:382 +#: ../../Zotlabs/Module/Profile_photo.php:467 +#: ../../Zotlabs/Module/Cover_photo.php:369 +#: ../../include/conversation.php:1321 msgid "Choose an album" msgstr "Tria un àlbum" -#: ../../Zotlabs/Module/Wiki.php:379 ../../addon/gitwiki/Mod_Gitwiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:383 +#: ../../Zotlabs/Module/Profile_photo.php:468 +#: ../../Zotlabs/Module/Cover_photo.php:370 msgid "Choose a different album" msgstr "Escull un àlbum diferent" -#: ../../Zotlabs/Module/Wiki.php:380 ../../addon/gitwiki/Mod_Gitwiki.php:272 -#: ../../include/conversation.php:1321 +#: ../../Zotlabs/Module/Wiki.php:384 +#: ../../Zotlabs/Module/Profile_photo.php:469 +#: ../../Zotlabs/Module/Cover_photo.php:371 +#: ../../include/conversation.php:1323 msgid "Error getting album list" msgstr "Ha ocorregut un error quan treia la llista de àlbums" -#: ../../Zotlabs/Module/Wiki.php:381 ../../addon/gitwiki/Mod_Gitwiki.php:273 -#: ../../include/conversation.php:1322 +#: ../../Zotlabs/Module/Wiki.php:385 +#: ../../Zotlabs/Module/Profile_photo.php:470 +#: ../../Zotlabs/Module/Cover_photo.php:372 +#: ../../include/conversation.php:1324 msgid "Error getting photo link" msgstr "Ha ocorregut un error quan treia l'enllaç a la foto" -#: ../../Zotlabs/Module/Wiki.php:382 ../../addon/gitwiki/Mod_Gitwiki.php:274 -#: ../../include/conversation.php:1323 +#: ../../Zotlabs/Module/Wiki.php:386 +#: ../../Zotlabs/Module/Profile_photo.php:471 +#: ../../Zotlabs/Module/Cover_photo.php:373 +#: ../../include/conversation.php:1325 msgid "Error getting album" msgstr "Ha ocorregut un error treient l'àlbum" -#: ../../Zotlabs/Module/Wiki.php:458 ../../addon/gitwiki/Mod_Gitwiki.php:337 +#: ../../Zotlabs/Module/Wiki.php:462 msgid "Error creating wiki. Invalid name." msgstr "S'ha produït un error en crear la wiki. El nom no és vàlid." -#: ../../Zotlabs/Module/Wiki.php:465 +#: ../../Zotlabs/Module/Wiki.php:469 msgid "A wiki with this name already exists." msgstr "Ja existeix una wiki amb aquest nom." -#: ../../Zotlabs/Module/Wiki.php:478 ../../addon/gitwiki/Mod_Gitwiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:482 msgid "Wiki created, but error creating Home page." msgstr "S'ha creat la wiki, però s'ha produït un error en crear-ne la pàgina principal." -#: ../../Zotlabs/Module/Wiki.php:485 ../../addon/gitwiki/Mod_Gitwiki.php:353 +#: ../../Zotlabs/Module/Wiki.php:489 msgid "Error creating wiki" msgstr "S'ha produït un error en crear la wiki" -#: ../../Zotlabs/Module/Wiki.php:508 +#: ../../Zotlabs/Module/Wiki.php:512 msgid "Error updating wiki. Invalid name." msgstr "S'ha produït un error en actualitzar la wiki. El nom no és vàlid." -#: ../../Zotlabs/Module/Wiki.php:528 +#: ../../Zotlabs/Module/Wiki.php:532 msgid "Error updating wiki" msgstr "S'ha produït un error en actualitzar la wiki" -#: ../../Zotlabs/Module/Wiki.php:543 +#: ../../Zotlabs/Module/Wiki.php:547 msgid "Wiki delete permission denied." msgstr "No tens permís per a eliminar la wiki" -#: ../../Zotlabs/Module/Wiki.php:553 +#: ../../Zotlabs/Module/Wiki.php:557 msgid "Error deleting wiki" msgstr "S'ha produït un error en eliminar la wiki" -#: ../../Zotlabs/Module/Wiki.php:586 ../../addon/gitwiki/Mod_Gitwiki.php:400 +#: ../../Zotlabs/Module/Wiki.php:590 msgid "New page created" msgstr "S'ha desat la nova pàgina" -#: ../../Zotlabs/Module/Wiki.php:707 +#: ../../Zotlabs/Module/Wiki.php:711 msgid "Cannot delete Home" msgstr "No es pot esborrar la pàgina principal" -#: ../../Zotlabs/Module/Wiki.php:771 +#: ../../Zotlabs/Module/Wiki.php:775 msgid "Current Revision" msgstr "Revisió actual" -#: ../../Zotlabs/Module/Wiki.php:771 +#: ../../Zotlabs/Module/Wiki.php:775 msgid "Selected Revision" msgstr "Revisió seleccionada" -#: ../../Zotlabs/Module/Wiki.php:821 +#: ../../Zotlabs/Module/Wiki.php:825 msgid "You must be authenticated." msgstr "Has d'estar autenticat." @@ -5191,7 +5270,7 @@ msgstr "S'ha pujat la imatge però no s'ha pogut retallar." #: ../../Zotlabs/Module/Profile_photo.php:120 #: ../../Zotlabs/Module/Profile_photo.php:248 -#: ../../include/photo/photo_driver.php:740 +#: ../../include/photo/photo_driver.php:741 msgid "Profile Photos" msgstr "Fotos del Perfil" @@ -5230,12 +5309,12 @@ msgid "Photo not available." msgstr "Foto no disponible." #: ../../Zotlabs/Module/Profile_photo.php:455 -#: ../../Zotlabs/Module/Cover_photo.php:358 +#: ../../Zotlabs/Module/Cover_photo.php:359 msgid "Upload File:" msgstr "Puja Arxiu:" #: ../../Zotlabs/Module/Profile_photo.php:456 -#: ../../Zotlabs/Module/Cover_photo.php:359 +#: ../../Zotlabs/Module/Cover_photo.php:360 msgid "Select a profile:" msgstr "Tria un perfil:" @@ -5253,28 +5332,28 @@ msgstr "Aplica" #: ../../Zotlabs/Module/Profile_photo.php:462 #: ../../Zotlabs/Module/Profile_photo.php:463 -#: ../../Zotlabs/Module/Cover_photo.php:363 #: ../../Zotlabs/Module/Cover_photo.php:364 +#: ../../Zotlabs/Module/Cover_photo.php:365 msgid "Use a photo from your albums" msgstr "Agafa una foto dels àlbums" -#: ../../Zotlabs/Module/Profile_photo.php:467 -#: ../../Zotlabs/Module/Cover_photo.php:369 +#: ../../Zotlabs/Module/Profile_photo.php:473 +#: ../../Zotlabs/Module/Cover_photo.php:376 msgid "Select existing photo" msgstr "Tria una foto existent" -#: ../../Zotlabs/Module/Profile_photo.php:486 -#: ../../Zotlabs/Module/Cover_photo.php:386 +#: ../../Zotlabs/Module/Profile_photo.php:492 +#: ../../Zotlabs/Module/Cover_photo.php:393 msgid "Crop Image" msgstr "Retalla Imatge" -#: ../../Zotlabs/Module/Profile_photo.php:487 -#: ../../Zotlabs/Module/Cover_photo.php:387 +#: ../../Zotlabs/Module/Profile_photo.php:493 +#: ../../Zotlabs/Module/Cover_photo.php:394 msgid "Please adjust the image cropping for optimum viewing." msgstr "Si us plau, retalla la imatge per a una optima visualització" -#: ../../Zotlabs/Module/Profile_photo.php:489 -#: ../../Zotlabs/Module/Cover_photo.php:389 +#: ../../Zotlabs/Module/Profile_photo.php:495 +#: ../../Zotlabs/Module/Cover_photo.php:396 msgid "Done Editing" msgstr "Edició Feta" @@ -5290,61 +5369,61 @@ msgstr "En connexió" msgid "Unable to locate original post." msgstr "No s'ha pogut trobar l'entrada original." -#: ../../Zotlabs/Module/Item.php:476 +#: ../../Zotlabs/Module/Item.php:477 msgid "Empty post discarded." msgstr "S'ha descartat l'entrada perquè no té contingut." -#: ../../Zotlabs/Module/Item.php:867 +#: ../../Zotlabs/Module/Item.php:874 msgid "Duplicate post suppressed." msgstr "Publicació duplicada s'ha suprimit." -#: ../../Zotlabs/Module/Item.php:1012 +#: ../../Zotlabs/Module/Item.php:1019 msgid "System error. Post not saved." msgstr "Hi ha hagut un error del sistema. L'entrada no s'ha desat." -#: ../../Zotlabs/Module/Item.php:1048 +#: ../../Zotlabs/Module/Item.php:1055 msgid "Your comment is awaiting approval." msgstr "El teu comentari encara no ha estat aprovat." -#: ../../Zotlabs/Module/Item.php:1153 +#: ../../Zotlabs/Module/Item.php:1160 msgid "Unable to obtain post information from database." msgstr "No s'ha pogut obtenir informació de l'entrada a la base de dades." -#: ../../Zotlabs/Module/Item.php:1182 +#: ../../Zotlabs/Module/Item.php:1189 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Has assolit el teu límit de %1$.0f entrades (descomptant comentaris)." -#: ../../Zotlabs/Module/Item.php:1189 +#: ../../Zotlabs/Module/Item.php:1196 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Has assolit el teu limit de %1$.0f pàgines web." -#: ../../Zotlabs/Module/Ping.php:320 +#: ../../Zotlabs/Module/Ping.php:330 msgid "sent you a private message" msgstr "Se t'ha enviat un missatge privat" -#: ../../Zotlabs/Module/Ping.php:372 +#: ../../Zotlabs/Module/Ping.php:383 msgid "added your channel" msgstr "el teu canal s'ha afegit" -#: ../../Zotlabs/Module/Ping.php:396 +#: ../../Zotlabs/Module/Ping.php:407 msgid "requires approval" msgstr "requereix aprovació" -#: ../../Zotlabs/Module/Ping.php:406 +#: ../../Zotlabs/Module/Ping.php:417 msgid "g A l F d" msgstr "g A l F d" -#: ../../Zotlabs/Module/Ping.php:424 +#: ../../Zotlabs/Module/Ping.php:435 msgid "[today]" msgstr "[avui]" -#: ../../Zotlabs/Module/Ping.php:433 +#: ../../Zotlabs/Module/Ping.php:444 msgid "posted an event" msgstr "enviat un esdeveniment" -#: ../../Zotlabs/Module/Ping.php:466 +#: ../../Zotlabs/Module/Ping.php:477 msgid "shared a file with you" msgstr "ha compartit un fitxer amb tu" @@ -5353,7 +5432,8 @@ msgid "Invalid item." msgstr "Article invàlid." #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 -#: ../../Zotlabs/Module/Display.php:133 +#: ../../Zotlabs/Module/Display.php:141 ../../Zotlabs/Module/Display.php:158 +#: ../../Zotlabs/Module/Display.php:175 #: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:167 #: ../../include/help.php:81 msgid "Page not found." @@ -5434,7 +5514,7 @@ msgstr "Recarrega la foto" msgid "Fetch updated photo" msgstr "Demana la nova foto al servidor" -#: ../../Zotlabs/Module/Connedit.php:615 +#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1042 msgid "Recent Activity" msgstr "Activitat Recent" @@ -5578,11 +5658,11 @@ msgid "" msgstr "Aquesta connexió no és accessible des d'aquest hub. La seva xarxa no és compatible amb la independència de hub." #: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238 -#: ../../Zotlabs/Widget/Settings_menu.php:109 +#: ../../Zotlabs/Widget/Settings_menu.php:117 msgid "Connection Default Permissions" msgstr "Permisos per Defecte de la Connexió" -#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4164 +#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4214 #, php-format msgid "Connection: %s" msgstr "Connexió: %s" @@ -5717,13 +5797,13 @@ msgid "Bookmark this room" msgstr "Fes favorit aquest xat" #: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 -#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1313 +#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1315 msgid "Please enter a link URL:" msgstr "Si us plau entra l'enllaç URL:" #: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294 -#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:764 -#: ../../include/conversation.php:1432 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:766 +#: ../../include/conversation.php:1435 msgid "Encrypt text" msgstr "Text encriptat" @@ -5757,12 +5837,12 @@ msgid "min" msgstr "min" #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:248 -#: ../../include/conversation.php:1831 ../../include/nav.php:401 +#: ../../include/conversation.php:1834 ../../include/nav.php:401 msgid "Photos" msgstr "Fotos" #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:243 -#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1839 +#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1842 #: ../../include/nav.php:409 msgid "Files" msgstr "Arxius" @@ -5803,7 +5883,7 @@ msgstr "El menú es pot emprar per a guardar marcadors" msgid "Submit and proceed" msgstr "Envia i procedeix" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2403 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2423 msgid "Menus" msgstr "Menús" @@ -5855,7 +5935,7 @@ msgstr "Títol del menú vist pels altres" msgid "Allow bookmarks" msgstr "Marcadors permesos" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2404 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2424 msgid "Layouts" msgstr "Dissenys" @@ -5877,11 +5957,11 @@ msgstr "Descripció del disseny pàgina" msgid "Download PDL file" msgstr "Descarrega l'arxiu PDL" -#: ../../Zotlabs/Module/Cloud.php:114 +#: ../../Zotlabs/Module/Cloud.php:120 msgid "Please refresh page" msgstr "Recarrega la pàgina" -#: ../../Zotlabs/Module/Cloud.php:117 +#: ../../Zotlabs/Module/Cloud.php:123 msgid "Unknown error" msgstr "S'ha produït un error desconegut" @@ -5915,16 +5995,16 @@ msgid "Post not found." msgstr "No s'ha trobat l'entrada" #: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160 -#: ../../include/bbcode.php:339 +#: ../../include/bbcode.php:352 msgid "post" msgstr "entrada" #: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146 -#: ../../include/text.php:2012 +#: ../../include/text.php:2013 msgid "comment" msgstr "comentari" -#: ../../Zotlabs/Module/Tagger.php:117 +#: ../../Zotlabs/Module/Tagger.php:119 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "%1$s ha etiquetat %3$s de %2$s amb %4$s" @@ -5959,6 +6039,23 @@ msgid "" "channel type and privacy settings." msgstr "El valor per defecte dels permisos individuals poden tenir valors per defecte segons el tipus de canal i les opcions de privacitat. Pot ser que no estiguis autoritzat/da a modificar-los." +#: ../../Zotlabs/Module/Authorize.php:17 +msgid "Unknown App" +msgstr "No es coneix l'aplicació" + +#: ../../Zotlabs/Module/Authorize.php:22 +msgid "Authorize" +msgstr "Autoritza" + +#: ../../Zotlabs/Module/Authorize.php:23 +#, php-format +msgid "Do you authorize the app %s to access your channel data?" +msgstr "Vols autoritzar l'aplicació %s a accedir a les dades del teu canal?" + +#: ../../Zotlabs/Module/Authorize.php:25 +msgid "Allow" +msgstr "Permet-ho" + #: ../../Zotlabs/Module/Group.php:24 msgid "Privacy group created." msgstr "Creat grup privat." @@ -5968,7 +6065,7 @@ msgid "Could not create privacy group." msgstr "No es pot crear el grup privat." #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143 -#: ../../include/items.php:4131 +#: ../../include/items.php:4181 msgid "Privacy group not found." msgstr "No es troben grups privats." @@ -6049,15 +6146,15 @@ msgstr "Estat Marital" msgid "Romantic Partner" msgstr "Company/a Romàntic" -#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775 +#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772 msgid "Likes" msgstr "Agrada" -#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776 +#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773 msgid "Dislikes" msgstr "Desagrada" -#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783 +#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780 msgid "Work/Employment" msgstr "Treball/Feina" @@ -6094,198 +6191,198 @@ msgstr "Perfil actualitzat." msgid "Hide your connections list from viewers of this profile" msgstr "Amaga dels curiosos la teva llista de connexions d'aquest perfil" -#: ../../Zotlabs/Module/Profiles.php:725 +#: ../../Zotlabs/Module/Profiles.php:722 msgid "Edit Profile Details" msgstr "Edita els Detalls del Perfil" -#: ../../Zotlabs/Module/Profiles.php:727 +#: ../../Zotlabs/Module/Profiles.php:724 msgid "View this profile" msgstr "Veure aquest perfil" -#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827 -#: ../../include/channel.php:1320 +#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824 +#: ../../include/channel.php:1319 msgid "Edit visibility" msgstr "Editar visibilitat" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:726 msgid "Profile Tools" msgstr "Eines per Perfils" -#: ../../Zotlabs/Module/Profiles.php:730 +#: ../../Zotlabs/Module/Profiles.php:727 msgid "Change cover photo" msgstr "Canviar la foto de portada" -#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1290 +#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1289 msgid "Change profile photo" msgstr "Canviar la foto del perfil" -#: ../../Zotlabs/Module/Profiles.php:732 +#: ../../Zotlabs/Module/Profiles.php:729 msgid "Create a new profile using these settings" msgstr "Crea un perfil nou amb aquests ajustos" -#: ../../Zotlabs/Module/Profiles.php:733 +#: ../../Zotlabs/Module/Profiles.php:730 msgid "Clone this profile" msgstr "Clonar aquest perfil" -#: ../../Zotlabs/Module/Profiles.php:734 +#: ../../Zotlabs/Module/Profiles.php:731 msgid "Delete this profile" msgstr "Elimina aquest perfil" -#: ../../Zotlabs/Module/Profiles.php:735 +#: ../../Zotlabs/Module/Profiles.php:732 msgid "Add profile things" msgstr "Afegeix coses al perfil" -#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1705 +#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1708 msgid "Personal" msgstr "Personal" -#: ../../Zotlabs/Module/Profiles.php:738 -msgid "Relation" +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Relationship" msgstr "Relació" -#: ../../Zotlabs/Module/Profiles.php:739 ../../Zotlabs/Widget/Newmember.php:53 +#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:44 #: ../../include/datetime.php:58 msgid "Miscellaneous" msgstr "Miscelania" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Import profile from file" msgstr "Importa perfil des d'un arxiu" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "Export profile to file" msgstr "Exporta perfil a un arxiu" -#: ../../Zotlabs/Module/Profiles.php:743 +#: ../../Zotlabs/Module/Profiles.php:740 msgid "Your gender" msgstr "El teu gènere" -#: ../../Zotlabs/Module/Profiles.php:744 +#: ../../Zotlabs/Module/Profiles.php:741 msgid "Marital status" msgstr "Estat marital" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Sexual preference" msgstr "Preferència sexual" -#: ../../Zotlabs/Module/Profiles.php:748 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "Profile name" msgstr "Nom del perfil" -#: ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "This is your default profile." msgstr "Aquest es el teu perfil per defecte" -#: ../../Zotlabs/Module/Profiles.php:752 +#: ../../Zotlabs/Module/Profiles.php:749 msgid "Your full name" msgstr "El teu nom complet" -#: ../../Zotlabs/Module/Profiles.php:753 +#: ../../Zotlabs/Module/Profiles.php:750 msgid "Title/Description" msgstr "Títol/Descripció" -#: ../../Zotlabs/Module/Profiles.php:756 +#: ../../Zotlabs/Module/Profiles.php:753 msgid "Street address" msgstr "Carrer" -#: ../../Zotlabs/Module/Profiles.php:757 +#: ../../Zotlabs/Module/Profiles.php:754 msgid "Locality/City" msgstr "Població/Ciutat" -#: ../../Zotlabs/Module/Profiles.php:758 +#: ../../Zotlabs/Module/Profiles.php:755 msgid "Region/State" msgstr "Regió/Estat" -#: ../../Zotlabs/Module/Profiles.php:759 +#: ../../Zotlabs/Module/Profiles.php:756 msgid "Postal/Zip code" msgstr "Codi Postal" -#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Profiles.php:762 msgid "Who (if applicable)" msgstr "Qui (si es aplicable)" -#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Profiles.php:762 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Examples: cathy123, Cathy Williams, cathy@example.com" -#: ../../Zotlabs/Module/Profiles.php:766 +#: ../../Zotlabs/Module/Profiles.php:763 msgid "Since (date)" msgstr "Des de (data)" -#: ../../Zotlabs/Module/Profiles.php:769 +#: ../../Zotlabs/Module/Profiles.php:766 msgid "Tell us about yourself" msgstr "Quelcom sobre tu" -#: ../../Zotlabs/Module/Profiles.php:770 +#: ../../Zotlabs/Module/Profiles.php:767 #: ../../addon/openid/MysqlProvider.php:68 msgid "Homepage URL" msgstr "URL de la pàgina d'inici" -#: ../../Zotlabs/Module/Profiles.php:771 +#: ../../Zotlabs/Module/Profiles.php:768 msgid "Hometown" msgstr "Ciutat Natal" -#: ../../Zotlabs/Module/Profiles.php:772 +#: ../../Zotlabs/Module/Profiles.php:769 msgid "Political views" msgstr "Idees polítiques" -#: ../../Zotlabs/Module/Profiles.php:773 +#: ../../Zotlabs/Module/Profiles.php:770 msgid "Religious views" msgstr "Creences religioses" -#: ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Keywords used in directory listings" msgstr "Paraules clau emprades en els llistats de directoris" -#: ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Example: fishing photography software" msgstr "Exemple: software de fotografia submarina" -#: ../../Zotlabs/Module/Profiles.php:777 +#: ../../Zotlabs/Module/Profiles.php:774 msgid "Musical interests" msgstr "Interessos Musicals" -#: ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Profiles.php:775 msgid "Books, literature" msgstr "Llibres, literatura" -#: ../../Zotlabs/Module/Profiles.php:779 +#: ../../Zotlabs/Module/Profiles.php:776 msgid "Television" msgstr "Televisió" -#: ../../Zotlabs/Module/Profiles.php:780 +#: ../../Zotlabs/Module/Profiles.php:777 msgid "Film/Dance/Culture/Entertainment" msgstr "Pel·lícules/Dansa/Cultura/Entreteniment" -#: ../../Zotlabs/Module/Profiles.php:781 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Hobbies/Interests" msgstr "Aficions/Interessos" -#: ../../Zotlabs/Module/Profiles.php:782 +#: ../../Zotlabs/Module/Profiles.php:779 msgid "Love/Romance" msgstr "Amor/Romace" -#: ../../Zotlabs/Module/Profiles.php:784 +#: ../../Zotlabs/Module/Profiles.php:781 msgid "School/Education" msgstr "Escola/Educació" -#: ../../Zotlabs/Module/Profiles.php:785 +#: ../../Zotlabs/Module/Profiles.php:782 msgid "Contact information and social networks" msgstr "Informació de contacte i xarxes socials" -#: ../../Zotlabs/Module/Profiles.php:786 +#: ../../Zotlabs/Module/Profiles.php:783 msgid "My other channels" msgstr "Els meus altres canals" -#: ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Profiles.php:785 msgid "Communications" msgstr "Comunicacions" -#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1316 +#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1315 msgid "Profile Image" msgstr "Imatge del Perfil" -#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1297 +#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296 #: ../../include/nav.php:117 msgid "Edit Profiles" msgstr "Editar Perfils" @@ -6319,11 +6416,11 @@ msgstr "Puja una imatge de portada" msgid "Edit your default profile" msgstr "Modifica el teu perfil" -#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:43 +#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:34 msgid "View friend suggestions" msgstr "Mostra suggerències de connexions" -#: ../../Zotlabs/Module/Go.php:39 ../../Zotlabs/Widget/Newmember.php:42 +#: ../../Zotlabs/Module/Go.php:39 msgid "View the channel directory" msgstr "Mostra el directori del canal" @@ -6400,9 +6497,9 @@ msgstr "%d noves presentacions" msgid "Delegated Channel" msgstr "Canal Delegat" -#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:181 -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1890 -#: ../../include/features.php:114 ../../include/nav.php:458 +#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194 +#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1893 +#: ../../include/features.php:123 ../../include/nav.php:458 msgid "Cards" msgstr "Targetes" @@ -6494,7 +6591,7 @@ msgid "Export selected" msgstr "Exporta la selecció" #: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:244 -#: ../../include/conversation.php:1912 ../../include/nav.php:481 +#: ../../include/conversation.php:1915 ../../include/nav.php:481 msgid "Webpages" msgstr "Pàgines web" @@ -6567,7 +6664,7 @@ msgstr "Canvia el nom del canal" msgid "Item is not editable" msgstr "Article no editable" -#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:178 +#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144 msgid "Edit post" msgstr "Modifica l'entrada" @@ -6654,7 +6751,7 @@ msgid "*" msgstr "*" #: ../../Zotlabs/Module/Sources.php:96 -#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:274 +#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292 msgid "Channel Sources" msgstr "Canal Origen" @@ -6745,165 +6842,169 @@ msgstr "El canal està inactiu." msgid "Previous action reversed." msgstr "S'ha desfet l'acció anterior." -#: ../../Zotlabs/Module/Like.php:436 ../../addon/diaspora/Receiver.php:1547 -#: ../../addon/pubcrawl/as.php:1394 ../../include/conversation.php:160 +#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529 +#: ../../addon/pubcrawl/as.php:1440 ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s agrada %2$s de %3$s" -#: ../../Zotlabs/Module/Like.php:438 ../../addon/pubcrawl/as.php:1396 +#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442 #: ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s no agrada %2$s de %3$s" -#: ../../Zotlabs/Module/Like.php:440 +#: ../../Zotlabs/Module/Like.php:442 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "%1$s està d'acord amb %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:442 +#: ../../Zotlabs/Module/Like.php:444 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "%1$s no està d'acord amb %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:444 +#: ../../Zotlabs/Module/Like.php:446 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "%1$s s'abstén en %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:446 ../../addon/diaspora/Receiver.php:2031 +#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%1$s assistirà a %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2033 +#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%1$s no assistirà a %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2035 +#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%1$s potser assistirà a %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:562 +#: ../../Zotlabs/Module/Like.php:564 msgid "Action completed." msgstr "S'ha completat l'acció." -#: ../../Zotlabs/Module/Like.php:563 +#: ../../Zotlabs/Module/Like.php:565 msgid "Thank you." msgstr "Gràcies." -#: ../../Zotlabs/Module/Directory.php:250 +#: ../../Zotlabs/Module/Directory.php:106 +msgid "No default suggestions were found." +msgstr "No s'han trobat suggerències predefinides." + +#: ../../Zotlabs/Module/Directory.php:255 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "%d valoració" msgstr[1] "%d valoracions" -#: ../../Zotlabs/Module/Directory.php:261 +#: ../../Zotlabs/Module/Directory.php:266 msgid "Gender: " msgstr "Gènere:" -#: ../../Zotlabs/Module/Directory.php:263 +#: ../../Zotlabs/Module/Directory.php:268 msgid "Status: " msgstr "Estatus:" -#: ../../Zotlabs/Module/Directory.php:265 +#: ../../Zotlabs/Module/Directory.php:270 msgid "Homepage: " msgstr "Pàgina Personal:" -#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1565 +#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1564 msgid "Age:" msgstr "Edat:" -#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1392 +#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1391 #: ../../include/event.php:54 ../../include/event.php:86 msgid "Location:" msgstr "Localització:" -#: ../../Zotlabs/Module/Directory.php:325 +#: ../../Zotlabs/Module/Directory.php:330 msgid "Description:" msgstr "Descripció:" -#: ../../Zotlabs/Module/Directory.php:330 ../../include/channel.php:1581 +#: ../../Zotlabs/Module/Directory.php:335 ../../include/channel.php:1593 msgid "Hometown:" msgstr "Ciutat Natal:" -#: ../../Zotlabs/Module/Directory.php:332 ../../include/channel.php:1589 +#: ../../Zotlabs/Module/Directory.php:337 ../../include/channel.php:1599 msgid "About:" msgstr "Sobre:" -#: ../../Zotlabs/Module/Directory.php:333 ../../Zotlabs/Module/Suggest.php:56 +#: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/conversation.php:1052 ../../include/channel.php:1377 -#: ../../include/connections.php:111 +#: ../../include/conversation.php:1052 ../../include/channel.php:1376 +#: ../../include/connections.php:110 msgid "Connect" msgstr "Connecta " -#: ../../Zotlabs/Module/Directory.php:334 +#: ../../Zotlabs/Module/Directory.php:339 msgid "Public Forum:" msgstr "Forum Públic:" -#: ../../Zotlabs/Module/Directory.php:337 +#: ../../Zotlabs/Module/Directory.php:342 msgid "Keywords: " msgstr "Paraules Clau:" -#: ../../Zotlabs/Module/Directory.php:340 +#: ../../Zotlabs/Module/Directory.php:345 msgid "Don't suggest" msgstr "No suggerir" -#: ../../Zotlabs/Module/Directory.php:342 +#: ../../Zotlabs/Module/Directory.php:347 msgid "Common connections (estimated):" msgstr "Connexions en comú (aproximades):" -#: ../../Zotlabs/Module/Directory.php:391 +#: ../../Zotlabs/Module/Directory.php:396 msgid "Global Directory" msgstr "Directori Global" -#: ../../Zotlabs/Module/Directory.php:391 +#: ../../Zotlabs/Module/Directory.php:396 msgid "Local Directory" msgstr "Directori Local" -#: ../../Zotlabs/Module/Directory.php:397 +#: ../../Zotlabs/Module/Directory.php:402 msgid "Finding:" msgstr "Cercant:" -#: ../../Zotlabs/Module/Directory.php:400 ../../Zotlabs/Module/Suggest.php:64 +#: ../../Zotlabs/Module/Directory.php:405 ../../Zotlabs/Module/Suggest.php:64 #: ../../include/contact_widgets.php:24 msgid "Channel Suggestions" msgstr "Canals Suggerits" -#: ../../Zotlabs/Module/Directory.php:402 +#: ../../Zotlabs/Module/Directory.php:407 msgid "next page" msgstr "pàgina següent" -#: ../../Zotlabs/Module/Directory.php:402 +#: ../../Zotlabs/Module/Directory.php:407 msgid "previous page" msgstr "pàgina anterior" -#: ../../Zotlabs/Module/Directory.php:403 +#: ../../Zotlabs/Module/Directory.php:408 msgid "Sort options" msgstr "Opcions per ordenar" -#: ../../Zotlabs/Module/Directory.php:404 +#: ../../Zotlabs/Module/Directory.php:409 msgid "Alphabetic" msgstr "Alfabètic" -#: ../../Zotlabs/Module/Directory.php:405 +#: ../../Zotlabs/Module/Directory.php:410 msgid "Reverse Alphabetic" msgstr "Alfabètic Invers" -#: ../../Zotlabs/Module/Directory.php:406 +#: ../../Zotlabs/Module/Directory.php:411 msgid "Newest to Oldest" msgstr "De més Nou a més Vell" -#: ../../Zotlabs/Module/Directory.php:407 +#: ../../Zotlabs/Module/Directory.php:412 msgid "Oldest to Newest" msgstr "De més Antic a més Nou" -#: ../../Zotlabs/Module/Directory.php:424 +#: ../../Zotlabs/Module/Directory.php:429 msgid "No entries (some entries may be hidden)." msgstr "Sense entrades (algunes podrien estar amagades)." @@ -6986,7 +7087,7 @@ msgid "Subject:" msgstr "Assumpte:" #: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 -#: ../../include/conversation.php:1382 +#: ../../include/conversation.php:1385 msgid "Attach file" msgstr "Adjunta arxiu" @@ -6995,7 +7096,7 @@ msgid "Send" msgstr "Envia" #: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 -#: ../../include/conversation.php:1427 +#: ../../include/conversation.php:1430 msgid "Set expiration date" msgstr "Ajusta la data d'expiració" @@ -7217,7 +7318,7 @@ msgstr "sí" msgid "Membership on this site is by invitation only." msgstr "La pertinença en aquest lloc es per invitació exclusivament." -#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1563 +#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1570 #: ../../include/nav.php:164 msgid "Register" msgstr "Inscripció" @@ -7233,34 +7334,34 @@ msgstr "Aquest node demana que es verifiquin els comptes de correu. Un cop compl msgid "Cover Photos" msgstr "Fotos de Portada" -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4508 +#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4558 msgid "female" msgstr "femení" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4509 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4559 #, php-format msgid "%1$s updated her %2$s" msgstr "%1$s actualitzà el seu %2$s" -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4510 +#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4560 msgid "male" msgstr "masculí" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4511 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4561 #, php-format msgid "%1$s updated his %2$s" msgstr "%1$s actualitzà el seu %2$s" -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4513 +#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4563 #, php-format msgid "%1$s updated their %2$s" msgstr "%1$s actualitzà els seus %2$s" -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2059 +#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2070 msgid "cover photo" msgstr "Foto de la portada" -#: ../../Zotlabs/Module/Cover_photo.php:360 +#: ../../Zotlabs/Module/Cover_photo.php:361 msgid "Change Cover Photo" msgstr "Canvia la foto de portada" @@ -7268,7 +7369,7 @@ msgstr "Canvia la foto de portada" msgid "Documentation Search" msgstr "Cerca de Documentació" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1821 +#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1824 #: ../../include/nav.php:391 msgid "About" msgstr "El Meu Perfil" @@ -7293,11 +7394,11 @@ msgstr "$Projectname Documentació" msgid "Contents" msgstr "Continguts" -#: ../../Zotlabs/Module/Display.php:351 +#: ../../Zotlabs/Module/Display.php:394 msgid "Article" msgstr "Article" -#: ../../Zotlabs/Module/Display.php:403 +#: ../../Zotlabs/Module/Display.php:446 msgid "Item has been removed." msgstr "S'ha esborrat l'element." @@ -7329,19 +7430,19 @@ msgstr "fòrum" msgid "Search Results For:" msgstr "Cerca resultats per:" -#: ../../Zotlabs/Module/Network.php:230 +#: ../../Zotlabs/Module/Network.php:229 msgid "Privacy group is empty" msgstr "el grup privat està vuit" -#: ../../Zotlabs/Module/Network.php:240 +#: ../../Zotlabs/Module/Network.php:238 msgid "Privacy group: " msgstr "Grup privat:" -#: ../../Zotlabs/Module/Network.php:268 +#: ../../Zotlabs/Module/Network.php:265 msgid "Invalid connection." msgstr "La connexió és invàlida." -#: ../../Zotlabs/Module/Network.php:289 ../../addon/redred/redred.php:65 +#: ../../Zotlabs/Module/Network.php:285 ../../addon/redred/redred.php:65 msgid "Invalid channel." msgstr "El canal no és vàlid." @@ -7479,7 +7580,7 @@ msgstr "Canals registrats" #: ../../Zotlabs/Module/Admin.php:143 msgid "Active plugins" -msgstr "Plugins actius" +msgstr "Extensions actives" #: ../../Zotlabs/Module/Admin.php:144 msgid "Version" @@ -7542,7 +7643,7 @@ msgid "" "Password reset failed." msgstr "Ha fallat el restabliment de contrasenya perquè la no s'ha pogut verificar soŀlicitud. Pot ser que ja ho hàgiu soŀlicitat abans." -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1591 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1598 msgid "Password Reset" msgstr "Restabliment de contrasenya" @@ -7640,11 +7741,11 @@ msgstr "Compartir amb Firefox" msgid "Remote Diagnostics" msgstr "Diagnòstics Remots" -#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:390 +#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:417 msgid "Suggest Channels" msgstr "Suggerir Canals" -#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1582 +#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1589 #: ../../include/nav.php:126 ../../include/nav.php:130 msgid "Login" msgstr "Identifica't" @@ -7653,8 +7754,8 @@ msgstr "Identifica't" msgid "Activity" msgstr "Activitat" -#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1928 -#: ../../include/features.php:87 ../../include/nav.php:497 +#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1931 +#: ../../include/features.php:96 ../../include/nav.php:497 msgid "Wiki" msgstr "Wiki" @@ -7662,8 +7763,8 @@ msgstr "Wiki" msgid "Channel Home" msgstr "Canal Personal" -#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1850 -#: ../../include/conversation.php:1853 +#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1853 +#: ../../include/conversation.php:1856 msgid "Events" msgstr "Esdeveniments" @@ -7820,9 +7921,8 @@ msgctxt "wiki_history" msgid "Message" msgstr "Missatge" -#: ../../Zotlabs/Lib/NativeWikiPage.php:597 -#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:706 -#: ../../include/bbcode.php:865 +#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:744 +#: ../../include/bbcode.php:914 msgid "Different viewers will see this text differently" msgstr "Diferents observadors veuran aquest text de diferents formes" @@ -7944,61 +8044,61 @@ msgstr "Per deixar de rebre aquests missatges, modifica la configuració de noti msgid "To stop receiving these messages, please adjust your %s." msgstr "Per deixar de rebre aquests missatges, modifica la teva %s." -#: ../../Zotlabs/Lib/Enotify.php:120 +#: ../../Zotlabs/Lib/Enotify.php:123 #, php-format msgid "%s " msgstr "%s " -#: ../../Zotlabs/Lib/Enotify.php:124 +#: ../../Zotlabs/Lib/Enotify.php:127 #, php-format msgid "[$Projectname:Notify] New mail received at %s" msgstr "[$Projectname:Avís] S'ha rebut correu nou a %s" -#: ../../Zotlabs/Lib/Enotify.php:126 +#: ../../Zotlabs/Lib/Enotify.php:129 #, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." -msgstr "%1$s, %2$s t'ha enviat un nou missatge privat a %3$s." +msgid "%1$s sent you a new private message at %2$s." +msgstr "%1$s t'ha enviat un missatge privat a %2$s." -#: ../../Zotlabs/Lib/Enotify.php:127 +#: ../../Zotlabs/Lib/Enotify.php:130 #, php-format msgid "%1$s sent you %2$s." msgstr "%1$s t'ha enviat %2$s." -#: ../../Zotlabs/Lib/Enotify.php:127 +#: ../../Zotlabs/Lib/Enotify.php:130 msgid "a private message" msgstr "un missatge privat" -#: ../../Zotlabs/Lib/Enotify.php:128 +#: ../../Zotlabs/Lib/Enotify.php:131 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "Per favor, visita %s per a veure i/o respondre els teus missatges privats." -#: ../../Zotlabs/Lib/Enotify.php:141 +#: ../../Zotlabs/Lib/Enotify.php:144 msgid "commented on" msgstr "ha comentat" -#: ../../Zotlabs/Lib/Enotify.php:152 +#: ../../Zotlabs/Lib/Enotify.php:155 msgid "liked" msgstr "li ha agradat" -#: ../../Zotlabs/Lib/Enotify.php:155 +#: ../../Zotlabs/Lib/Enotify.php:158 msgid "disliked" msgstr "no li ha agradat" -#: ../../Zotlabs/Lib/Enotify.php:198 +#: ../../Zotlabs/Lib/Enotify.php:201 #, php-format -msgid "%1$s, %2$s %3$s [zrl=%4$s]a %5$s[/zrl]" -msgstr "%1$s, %2$s %3$s [zrl=%4$s]una %5$s[/zrl]" +msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" +msgstr "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:207 +#: ../../Zotlabs/Lib/Enotify.php:209 #, php-format -msgid "%1$s, %2$s %3$s [zrl=%4$s]%5$s's %6$s[/zrl]" -msgstr "%1$s, %2$s %3$s [zrl=%4$s]%6$s de %5$s[/zrl]" +msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" +msgstr "%1$s %2$s [zrl=%3$s]%5$s de %4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:217 +#: ../../Zotlabs/Lib/Enotify.php:218 #, php-format -msgid "%1$s, %2$s %3$s [zrl=%4$s]your %5$s[/zrl]" -msgstr "%1$s, %2$s %3$s [zrl=%4$s]la teva %5$s[/zrl]" +msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" +msgstr "%1$s %2$s [zrl=%3$s]la teva %4$s[/zrl]" #: ../../Zotlabs/Lib/Enotify.php:230 #, php-format @@ -8012,12 +8112,12 @@ msgstr "[$Projectname:Avís] Comentari de %2$s a la conversa #%1$d" #: ../../Zotlabs/Lib/Enotify.php:233 #, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." -msgstr "%1$s, %2$s comentat en un article/conversa que havies estat seguint." +msgid "%1$s commented on an item/conversation you have been following." +msgstr "%1$s ha comentat en una conversa que estàs seguint." -#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:318 -#: ../../Zotlabs/Lib/Enotify.php:335 ../../Zotlabs/Lib/Enotify.php:361 -#: ../../Zotlabs/Lib/Enotify.php:379 ../../Zotlabs/Lib/Enotify.php:393 +#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:317 +#: ../../Zotlabs/Lib/Enotify.php:333 ../../Zotlabs/Lib/Enotify.php:358 +#: ../../Zotlabs/Lib/Enotify.php:375 ../../Zotlabs/Lib/Enotify.php:388 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Si us plau visita %s per veure i/o contestar a la conversa" @@ -8029,152 +8129,150 @@ msgstr "Vés a %s per a aprovar o rebutjar el comentari." #: ../../Zotlabs/Lib/Enotify.php:299 #, php-format -msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]" -msgstr "%1$s, a %2$s li ha agradat [zrl=%3$s]la teva %4$s[/zrl]" +msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]" +msgstr "A %1$s li ha agradat [zrl=%2$s]la teva %3$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:314 +#: ../../Zotlabs/Lib/Enotify.php:313 #, php-format msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s" msgstr "[$Projectname:Avís] Un \"m'agrada\" a la conversa #%1$d de %2$s" -#: ../../Zotlabs/Lib/Enotify.php:315 +#: ../../Zotlabs/Lib/Enotify.php:314 #, php-format -msgid "%1$s, %2$s liked an item/conversation you created." -msgstr "%1$s, a %2$s li ha agradat una conversa que has creat." +msgid "%1$s liked an item/conversation you created." +msgstr "A %1$s li ha agradat una conversa que has creat." -#: ../../Zotlabs/Lib/Enotify.php:326 +#: ../../Zotlabs/Lib/Enotify.php:325 #, php-format msgid "[$Projectname:Notify] %s posted to your profile wall" msgstr "[$Projectname:Avís] %s ha penjat una entrada al teu mur" -#: ../../Zotlabs/Lib/Enotify.php:328 +#: ../../Zotlabs/Lib/Enotify.php:327 #, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" -msgstr "%1$s, %2$s ha escrit una entrada al teu mur en %3$s" +msgid "%1$s posted to your profile wall at %2$s" +msgstr "%1$s ha publicat al mur del teu perfil a %2$s" -#: ../../Zotlabs/Lib/Enotify.php:330 +#: ../../Zotlabs/Lib/Enotify.php:329 #, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" -msgstr "%1$s, %2$s enviat correu a [zrl=%3$s]el teu mur[/zrl]" +msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" +msgstr "%1$s ha publicat al [zrl=%2$s]teu mur[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:354 +#: ../../Zotlabs/Lib/Enotify.php:352 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "[$Projectname:Avís] %s t'ha etiquetat" -#: ../../Zotlabs/Lib/Enotify.php:355 +#: ../../Zotlabs/Lib/Enotify.php:353 #, php-format -msgid "%1$s, %2$s tagged you at %3$s" -msgstr "%1$s, %2$s t'ha etiquetat a %3$s" +msgid "%1$s tagged you at %2$s" +msgstr "%1$s t'ha etiquetat a %2$s" -#: ../../Zotlabs/Lib/Enotify.php:356 +#: ../../Zotlabs/Lib/Enotify.php:354 #, php-format -msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." -msgstr "%1$s, %2$s [zrl=%3$s]t'ha etiquetat[/zrl]." +msgid "%1$s [zrl=%2$s]tagged you[/zrl]." +msgstr "%1$s [zrl=%2$s]t'ha etiquetat[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:368 +#: ../../Zotlabs/Lib/Enotify.php:365 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "[$Projectname:Avís] %1$s t'ha fet un toc" -#: ../../Zotlabs/Lib/Enotify.php:369 +#: ../../Zotlabs/Lib/Enotify.php:366 #, php-format -msgid "%1$s, %2$s poked you at %3$s" -msgstr "%1$s, %2$s s'en fot de tú a %3$s" +msgid "%1$s poked you at %2$s" +msgstr "%1$s t'ha fet un toc a %2$s" -#: ../../Zotlabs/Lib/Enotify.php:370 +#: ../../Zotlabs/Lib/Enotify.php:367 #, php-format -msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." -msgstr "%1$s, %2$s [zrl=%2$s]s'en fot de tú[/zrl]." +msgid "%1$s [zrl=%2$s]poked you[/zrl]." +msgstr "%1$s [zrl=%2$s]t'ha fet un toc[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:386 +#: ../../Zotlabs/Lib/Enotify.php:382 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "[$Projectname:Avís] %s t'ha etiquetat una entrada" -#: ../../Zotlabs/Lib/Enotify.php:387 +#: ../../Zotlabs/Lib/Enotify.php:383 #, php-format -msgid "%1$s, %2$s tagged your post at %3$s" -msgstr "%1$s, %2$s ha etiquetat la teva entrada a %3$s" +msgid "%1$s tagged your post at %2$s" +msgstr "%1$s ha etiquetat una entrada teva a %2$s" -#: ../../Zotlabs/Lib/Enotify.php:388 +#: ../../Zotlabs/Lib/Enotify.php:384 #, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" -msgstr "%1$s, %2$s etiquetat [zrl=%3$s]la teva entrada[/zrl]" +msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" +msgstr "%1$s ha etiquetat [zrl=%2$s]la teva entrada[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:400 +#: ../../Zotlabs/Lib/Enotify.php:395 msgid "[$Projectname:Notify] Introduction received" msgstr "[$Projectname:Avís] S'ha rebut una sol·licitud de connexió" -#: ../../Zotlabs/Lib/Enotify.php:401 +#: ../../Zotlabs/Lib/Enotify.php:396 #, php-format -msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" -msgstr "%1$s, has rebut una nova petició de connexió de '%2$s' a %3$s" +msgid "You've received an new connection request from '%1$s' at %2$s" +msgstr "Has rebut una soŀlicitud de connexió de '%1$s' a %2$s" -#: ../../Zotlabs/Lib/Enotify.php:402 +#: ../../Zotlabs/Lib/Enotify.php:397 #, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." -msgstr "%1$s, has rebut [zrl=%2$s]una nova petició de connexió[/zrl] de %3$s." +msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s." +msgstr "Has rebut [zrl=%1$s]una soŀlicitud de connexió[/zrl] de %2$s." -#: ../../Zotlabs/Lib/Enotify.php:406 ../../Zotlabs/Lib/Enotify.php:425 +#: ../../Zotlabs/Lib/Enotify.php:400 ../../Zotlabs/Lib/Enotify.php:418 #, php-format msgid "You may visit their profile at %s" msgstr "Pots visitar el seu perfil a %s" -#: ../../Zotlabs/Lib/Enotify.php:408 +#: ../../Zotlabs/Lib/Enotify.php:402 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "Si us plau, visita %s per aprovar o rebutjar la petició de connexió." -#: ../../Zotlabs/Lib/Enotify.php:415 +#: ../../Zotlabs/Lib/Enotify.php:409 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "[$Projectname:Avís] S'ha rebut una suggerència d'amistat" -#: ../../Zotlabs/Lib/Enotify.php:416 +#: ../../Zotlabs/Lib/Enotify.php:410 #, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" -msgstr "%1$s, has rebut una suggerència d'amistat de '%2$s' a %3$s" +msgid "You've received a friend suggestion from '%1$s' at %2$s" +msgstr "Has rebut una soŀlicitud d'amistat de '%1$s' a %2$s" -#: ../../Zotlabs/Lib/Enotify.php:417 +#: ../../Zotlabs/Lib/Enotify.php:411 #, php-format msgid "" -"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from " -"%4$s." -msgstr "%1$s, has rebut [zrl=%2$s]una suggerència d'amistat[/zrl] per %3$s de %4$s." +"You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." +msgstr "Has rebut [zrl=%1$s]una soŀlicitud d'amistat[/zrl] per a %2$s de part de %3$s." -#: ../../Zotlabs/Lib/Enotify.php:423 +#: ../../Zotlabs/Lib/Enotify.php:416 msgid "Name:" msgstr "Nom:" -#: ../../Zotlabs/Lib/Enotify.php:424 +#: ../../Zotlabs/Lib/Enotify.php:417 msgid "Photo:" msgstr "Foto:" -#: ../../Zotlabs/Lib/Enotify.php:427 +#: ../../Zotlabs/Lib/Enotify.php:420 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Per favor, visita %s per a aprovar o rebutjar la suggerencia." -#: ../../Zotlabs/Lib/Enotify.php:647 +#: ../../Zotlabs/Lib/Enotify.php:640 msgid "[$Projectname:Notify]" msgstr "[$Projectname:Avís]" -#: ../../Zotlabs/Lib/Enotify.php:815 +#: ../../Zotlabs/Lib/Enotify.php:808 msgid "created a new post" msgstr "Creada una nova entrada" -#: ../../Zotlabs/Lib/Enotify.php:816 +#: ../../Zotlabs/Lib/Enotify.php:809 #, php-format msgid "commented on %s's post" msgstr "comentat a l'entrada de %s" -#: ../../Zotlabs/Lib/Enotify.php:823 +#: ../../Zotlabs/Lib/Enotify.php:816 #, php-format msgid "edited a post dated %s" msgstr "ha editat una entrada amb data de %s" -#: ../../Zotlabs/Lib/Enotify.php:827 +#: ../../Zotlabs/Lib/Enotify.php:820 #, php-format msgid "edited a comment dated %s" msgstr "ha editat un comentari amb data de %s" @@ -8183,7 +8281,7 @@ msgstr "ha editat un comentari amb data de %s" msgid "Wiki updated successfully" msgstr "S'ha actualitzat la wiki amb èxit" -#: ../../Zotlabs/Lib/NativeWiki.php:198 +#: ../../Zotlabs/Lib/NativeWiki.php:205 msgid "Wiki files deleted successfully" msgstr "S'han esborrat els fitxers de la wiki amb èxit" @@ -8257,11 +8355,11 @@ msgstr "Signatura del missatge incorrecta" msgid "Add Tag" msgstr "Afegeix Etiqueta" -#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:510 +#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575 msgid "like" msgstr "agrada" -#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:511 +#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576 msgid "dislike" msgstr "desagrada" @@ -8354,51 +8452,51 @@ msgstr "Això només és una vista prèvia, no està desada" msgid "%s show all" msgstr "%s mostra-ho tot" -#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/conversation.php:1377 +#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1380 msgid "Bold" msgstr "Negreta" -#: ../../Zotlabs/Lib/ThreadItem.php:752 ../../include/conversation.php:1378 +#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1381 msgid "Italic" msgstr "Italica" -#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1379 +#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1382 msgid "Underline" msgstr "Subratllat" -#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1380 +#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1383 msgid "Quote" msgstr "Cometes" -#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1381 +#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1384 msgid "Code" msgstr "Codi" -#: ../../Zotlabs/Lib/ThreadItem.php:756 +#: ../../Zotlabs/Lib/ThreadItem.php:758 msgid "Image" msgstr "Imatge" -#: ../../Zotlabs/Lib/ThreadItem.php:757 +#: ../../Zotlabs/Lib/ThreadItem.php:759 msgid "Attach File" msgstr "Adjunta un fitxer" -#: ../../Zotlabs/Lib/ThreadItem.php:758 +#: ../../Zotlabs/Lib/ThreadItem.php:760 msgid "Insert Link" msgstr "Insereix Enllaç" -#: ../../Zotlabs/Lib/ThreadItem.php:759 +#: ../../Zotlabs/Lib/ThreadItem.php:761 msgid "Video" msgstr "Video" -#: ../../Zotlabs/Lib/ThreadItem.php:769 +#: ../../Zotlabs/Lib/ThreadItem.php:771 msgid "Your full name (required)" msgstr "Nom complet (obligatori)" -#: ../../Zotlabs/Lib/ThreadItem.php:770 +#: ../../Zotlabs/Lib/ThreadItem.php:772 msgid "Your email address (required)" msgstr "Adreça de correu (obligatòria)" -#: ../../Zotlabs/Lib/ThreadItem.php:771 +#: ../../Zotlabs/Lib/ThreadItem.php:773 msgid "Your website URL (optional)" msgstr "Adreça web (opcional)" @@ -8418,7 +8516,7 @@ msgstr "Benvingut %s. Autenticació remota reeixida." msgid "parent" msgstr "amunt" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2821 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2845 msgid "Collection" msgstr "Col·lecció" @@ -8451,6 +8549,10 @@ msgstr "Total" msgid "Shared" msgstr "Compartit" +#: ../../Zotlabs/Storage/Browser.php:277 +msgid "Add Files" +msgstr "Afegeix arxius" + #: ../../Zotlabs/Storage/Browser.php:353 #, php-format msgid "You are using %1$s of your available file storage." @@ -8558,10 +8660,10 @@ msgid "Select an addressbook to import to" msgstr "Escull la llibreta d'adreces a on importar" #: ../../Zotlabs/Widget/Appcategories.php:40 -#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:97 -#: ../../include/contact_widgets.php:141 ../../include/contact_widgets.php:186 -#: ../../include/taxonomy.php:344 ../../include/taxonomy.php:426 -#: ../../include/taxonomy.php:446 ../../include/taxonomy.php:467 +#: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141 +#: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:409 +#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 +#: ../../include/taxonomy.php:532 msgid "Categories" msgstr "Categories" @@ -8616,7 +8718,7 @@ msgid "New Message" msgstr "Nou Missatge" #: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1864 ../../include/conversation.php:1867 +#: ../../include/conversation.php:1867 ../../include/conversation.php:1870 #: ../../include/nav.php:434 ../../include/nav.php:437 msgid "Chatrooms" msgstr "Sala per Xerrar" @@ -8659,7 +8761,7 @@ msgstr "Introdueix l'adreça del canal" msgid "Examples: bob@example.com, https://example.com/barbara" msgstr "Exemples: bob@example.com, https://exemple.com/barbara" -#: ../../Zotlabs/Widget/Wiki_list.php:15 ../../addon/gitwiki/gitwiki.php:95 +#: ../../Zotlabs/Widget/Wiki_list.php:15 msgid "Wiki List" msgstr "Llista de Wikis" @@ -8699,7 +8801,7 @@ msgstr "foto/imatge" msgid "Remove term" msgstr "Plaç de remoció" -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:354 +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:381 msgid "Saved Searches" msgstr "Cerques Guardades" @@ -8712,15 +8814,15 @@ msgid "Notes" msgstr "Notes" #: ../../Zotlabs/Widget/Wiki_pages.php:32 -#: ../../Zotlabs/Widget/Wiki_pages.php:89 ../../addon/gitwiki/gitwiki.php:81 +#: ../../Zotlabs/Widget/Wiki_pages.php:89 msgid "Add new page" msgstr "Afegeix una pàgina nova" -#: ../../Zotlabs/Widget/Wiki_pages.php:83 ../../addon/gitwiki/gitwiki.php:76 +#: ../../Zotlabs/Widget/Wiki_pages.php:83 msgid "Wiki Pages" msgstr "Pàgines de Wikis" -#: ../../Zotlabs/Widget/Wiki_pages.php:94 ../../addon/gitwiki/gitwiki.php:82 +#: ../../Zotlabs/Widget/Wiki_pages.php:94 msgid "Page name" msgstr "Canvia el nom de la pàgina" @@ -8741,7 +8843,7 @@ msgid "See more..." msgstr "Veure més....." #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:443 +#: ../../include/features.php:470 msgid "Saved Folders" msgstr "Carpetes Guardades" @@ -8749,51 +8851,60 @@ msgstr "Carpetes Guardades" msgid "Click to show more" msgstr "Fes clic per veure més" -#: ../../Zotlabs/Widget/Newmember.php:33 +#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320 +#: ../../include/taxonomy.php:449 ../../include/taxonomy.php:470 +msgid "Tags" +msgstr "Etiquetes" + +#: ../../Zotlabs/Widget/Newmember.php:24 msgid "Profile Creation" msgstr "Creació de perfils" -#: ../../Zotlabs/Widget/Newmember.php:35 +#: ../../Zotlabs/Widget/Newmember.php:26 msgid "Upload profile photo" msgstr "Puja una foto de perfil" -#: ../../Zotlabs/Widget/Newmember.php:36 +#: ../../Zotlabs/Widget/Newmember.php:27 msgid "Upload cover photo" msgstr "Puja una foto de portada" -#: ../../Zotlabs/Widget/Newmember.php:37 ../../include/nav.php:119 +#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:119 msgid "Edit your profile" msgstr "Edita el teu perfil" -#: ../../Zotlabs/Widget/Newmember.php:40 +#: ../../Zotlabs/Widget/Newmember.php:31 msgid "Find and Connect with others" msgstr "Cerca altres canals i connecta-t'hi" -#: ../../Zotlabs/Widget/Newmember.php:44 +#: ../../Zotlabs/Widget/Newmember.php:33 +msgid "View the directory" +msgstr "Mostra la carpeta" + +#: ../../Zotlabs/Widget/Newmember.php:35 msgid "Manage your connections" msgstr "Gestiona les teves conexions" -#: ../../Zotlabs/Widget/Newmember.php:47 +#: ../../Zotlabs/Widget/Newmember.php:38 msgid "Communicate" msgstr "Communica't" -#: ../../Zotlabs/Widget/Newmember.php:49 +#: ../../Zotlabs/Widget/Newmember.php:40 msgid "View your channel homepage" msgstr "Mostra el teu canal" -#: ../../Zotlabs/Widget/Newmember.php:50 +#: ../../Zotlabs/Widget/Newmember.php:41 msgid "View your network stream" msgstr "Mostra el teu flux de xarxa" -#: ../../Zotlabs/Widget/Newmember.php:56 +#: ../../Zotlabs/Widget/Newmember.php:47 msgid "Documentation" msgstr "Documentació" -#: ../../Zotlabs/Widget/Newmember.php:67 -msgid "View public stream. Warning: not moderated" -msgstr "Mostra el flux públic. Avís: no està moderat" +#: ../../Zotlabs/Widget/Newmember.php:58 +msgid "View public stream" +msgstr "Mostra el flux públic" -#: ../../Zotlabs/Widget/Newmember.php:71 +#: ../../Zotlabs/Widget/Newmember.php:62 ../../include/features.php:60 msgid "New Member Links" msgstr "Enllaços de membres nous" @@ -8815,7 +8926,7 @@ msgstr "Admin" #: ../../Zotlabs/Widget/Admin.php:56 msgid "Plugin Features" -msgstr "Característiques del Plugin" +msgstr "Extensions configurables" #: ../../Zotlabs/Widget/Settings_menu.php:35 msgid "Account settings" @@ -8846,14 +8957,18 @@ msgid "Export channel" msgstr "Exportat canal" #: ../../Zotlabs/Widget/Settings_menu.php:84 -msgid "Connected apps" -msgstr "Apps connectades" +msgid "OAuth1 apps" +msgstr "Aplicacions OAuth1" -#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:231 +#: ../../Zotlabs/Widget/Settings_menu.php:92 +msgid "OAuth2 apps" +msgstr "Aplicacions OAuth2" + +#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240 msgid "Permission Groups" msgstr "Grups de permisos" -#: ../../Zotlabs/Widget/Settings_menu.php:117 +#: ../../Zotlabs/Widget/Settings_menu.php:125 msgid "Premium Channel Settings" msgstr "Ajustos Premium de Canal" @@ -8991,53 +9106,57 @@ msgstr "No tens cap notificació" msgid "Source channel not found." msgstr "No s'ha trobat el canal font." -#: ../../boot.php:1562 +#: ../../boot.php:1569 msgid "Create an account to access services and applications" msgstr "Crea un compte per tal d'accedir a serveis i aplicacions" -#: ../../boot.php:1581 ../../include/nav.php:111 ../../include/nav.php:140 +#: ../../boot.php:1588 ../../include/nav.php:111 ../../include/nav.php:140 #: ../../include/nav.php:159 msgid "Logout" msgstr "Desconectar" -#: ../../boot.php:1585 +#: ../../boot.php:1592 msgid "Login/Email" msgstr "Correu d'usuari" -#: ../../boot.php:1586 +#: ../../boot.php:1593 msgid "Password" msgstr "Contrasenya" -#: ../../boot.php:1587 +#: ../../boot.php:1594 msgid "Remember me" msgstr "Recorda'm" -#: ../../boot.php:1590 +#: ../../boot.php:1597 msgid "Forgot your password?" msgstr "Has perdut la Contrasenya?" -#: ../../boot.php:2347 +#: ../../boot.php:2354 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "[$Projectname] Error de TLS per a %s" -#: ../../boot.php:2352 +#: ../../boot.php:2359 msgid "Website SSL certificate is not valid. Please correct." msgstr "El certificat SSL és invalid, soluciona-ho, si us plau." -#: ../../boot.php:2468 +#: ../../boot.php:2475 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "[$Projectname] Les tasques del cron tasks no s'estan executant a %s" -#: ../../boot.php:2473 +#: ../../boot.php:2480 msgid "Cron/Scheduled tasks not running." msgstr "No s'estan executant les tasques programades al cron." -#: ../../boot.php:2474 ../../include/datetime.php:232 +#: ../../boot.php:2481 ../../include/datetime.php:238 msgid "never" msgstr "mai" +#: ../../store/[data]/smarty3/compiled/a0a1289f91f53b2c12e4e0b45ffe8291540ba895_0.file.cover_photo.tpl.php:123 +msgid "Cover Photo" +msgstr "Foto de portada" + #: ../../view/theme/redbasic_c/php/config.php:16 #: ../../view/theme/redbasic_c/php/config.php:19 #: ../../view/theme/redbasic/php/config.php:16 @@ -9280,6 +9399,10 @@ msgid "" " share their own locations with the group." msgstr "Crea un rendezvous nou i comparteix-lo amb aquelles persones a qui vulguis convidar al grup. Qui obri l'enllaç es faran membres del rendezvous. Podran veure les ubicacions dels altres membres, afegir xinxetes al mapa i compartir les seves ubicacions amb el grup." +#: ../../addon/rendezvous/rendezvous.php:232 +msgid "You have no rendezvous. Press the button above to create a rendezvous!" +msgstr "No tens cap rendezvous. Pica el botó de sobre per a crear-ne un!" + #: ../../addon/skeleton/skeleton.php:59 msgid "Some setting" msgstr "Opció X" @@ -9292,30 +9415,30 @@ msgstr "Opció Y" msgid "Skeleton Settings" msgstr "Configuració del Skeleton" -#: ../../addon/gnusoc/gnusoc.php:247 +#: ../../addon/gnusoc/gnusoc.php:249 msgid "GNU-Social Protocol Settings updated." msgstr "S'ha actualitzat la configuració del Protocol GNU-Social" -#: ../../addon/gnusoc/gnusoc.php:266 +#: ../../addon/gnusoc/gnusoc.php:268 msgid "" "The GNU-Social protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "El Protocol GNU-Social és incompatible amb la independència de hub. Les connexions que facis en aquesta xarxa no seran accessibles des de hubs alternatius del teu canal." -#: ../../addon/gnusoc/gnusoc.php:269 +#: ../../addon/gnusoc/gnusoc.php:271 msgid "Enable the GNU-Social protocol for this channel" msgstr "Habilita el Protocol GNU-Social per a aquest canal" -#: ../../addon/gnusoc/gnusoc.php:273 +#: ../../addon/gnusoc/gnusoc.php:275 msgid "GNU-Social Protocol Settings" msgstr "Configuració del Protocol GNU-Social " -#: ../../addon/gnusoc/gnusoc.php:464 +#: ../../addon/gnusoc/gnusoc.php:471 msgid "Follow" msgstr "Segueix" -#: ../../addon/gnusoc/gnusoc.php:467 +#: ../../addon/gnusoc/gnusoc.php:474 #, php-format msgid "%1$s is now following %2$s" msgstr "%1$s ara segueix a %2$s" @@ -9361,7 +9484,7 @@ msgstr "Acaba després de" msgid "Page to load after image selection." msgstr "Pàgina per carregar després d'haver seleccionat una imatge." -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1301 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1300 #: ../../include/nav.php:119 msgid "Edit Profile" msgstr "Edita Perfil" @@ -9850,17 +9973,17 @@ msgstr "Aniversar" msgid "OpenID protocol error. No ID returned." msgstr "Error d'OpenID. No s'ha aconseguit cap ID." -#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:290 +#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:300 msgid "Login failed." msgstr "Identificació fallida." #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1481 +#: ../../include/selectors.php:66 ../../include/channel.php:1480 msgid "Male" msgstr "Masculí" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1479 +#: ../../include/selectors.php:66 ../../include/channel.php:1478 msgid "Female" msgstr "Femení" @@ -10047,39 +10170,39 @@ msgstr "declarar-li l'amor etern a" msgid "declared undying love for" msgstr "li ha declarar amor etern a" -#: ../../addon/diaspora/diaspora.php:778 +#: ../../addon/diaspora/diaspora.php:781 msgid "Diaspora Protocol Settings updated." msgstr "S'ha actualitzat la configuració del Protocol de Diàspora" -#: ../../addon/diaspora/diaspora.php:797 +#: ../../addon/diaspora/diaspora.php:800 msgid "" "The Diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "El Protocol de Diàspora és incompatible amb la independència de hub. Les connexions que facis en aquesta xarxa no seran accessibles des de hubs alternatius del teu canal." -#: ../../addon/diaspora/diaspora.php:800 +#: ../../addon/diaspora/diaspora.php:803 msgid "Enable the Diaspora protocol for this channel" msgstr "Activa el Protocol de Diàspora per aquest canal" -#: ../../addon/diaspora/diaspora.php:804 +#: ../../addon/diaspora/diaspora.php:807 msgid "Allow any Diaspora member to comment on your public posts" msgstr "Permet a qualsevol membre de Diàspora de comentar les teves entrades públiques" -#: ../../addon/diaspora/diaspora.php:808 +#: ../../addon/diaspora/diaspora.php:811 msgid "Prevent your hashtags from being redirected to other sites" msgstr "Evita que les teves etiquetes siguin redirigides a altres llocs web" -#: ../../addon/diaspora/diaspora.php:812 +#: ../../addon/diaspora/diaspora.php:815 msgid "" "Sign and forward posts and comments with no existing Diaspora signature" msgstr "Signa i reenvia entrades o comentaris encara que no tinguin una signatura de Diàspora vàlida." -#: ../../addon/diaspora/diaspora.php:817 +#: ../../addon/diaspora/diaspora.php:820 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "Etiquetes seguides (separades per comes i sense incloure #)" -#: ../../addon/diaspora/diaspora.php:822 +#: ../../addon/diaspora/diaspora.php:825 msgid "Diaspora Protocol Settings" msgstr "Configuració del Protocol de Diàspora" @@ -10087,7 +10210,7 @@ msgstr "Configuració del Protocol de Diàspora" msgid "No username found in import file." msgstr "No s'ha trobat el nom d'usuari en el fitxer d'importació." -#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:62 +#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:67 msgid "Unable to create a unique channel address. Import failed." msgstr "No s'ha pogut importar el canal perquè l'adreça única de canal no s'ha pogut crear." @@ -10322,6 +10445,32 @@ msgstr "Inclou una xinxeta al mapa." msgid "text to include in all outgoing posts from this site" msgstr "text per incloure en totes les entrades que s'enviïn des d'aquest lloc" +#: ../../addon/fuzzloc/fuzzloc.php:148 +msgid "Fuzzloc Settings updated." +msgstr "S'ha actualitzat la configuració de Fuzzloc." + +#: ../../addon/fuzzloc/fuzzloc.php:175 +msgid "" +"Fuzzloc allows you to blur your precise location if your channel uses " +"browser location mapping." +msgstr "El Fuzzloc permet difuminar la teva ubicació si el teu canal fa servir la ubicació precisa del navegador." + +#: ../../addon/fuzzloc/fuzzloc.php:178 +msgid "Enable Fuzzloc Plugin" +msgstr "Habilita l'extensió Fuzzloc" + +#: ../../addon/fuzzloc/fuzzloc.php:182 +msgid "Minimum offset in meters" +msgstr "Afegit mínim en metres" + +#: ../../addon/fuzzloc/fuzzloc.php:186 +msgid "Maximum offset in meters" +msgstr "Afegit màxim en metres" + +#: ../../addon/fuzzloc/fuzzloc.php:191 +msgid "Fuzzloc Settings" +msgstr "Configuració del Fuzzloc" + #: ../../addon/rtof/rtof.php:45 msgid "Post to Friendica" msgstr "Publica a Friendica" @@ -10358,8 +10507,8 @@ msgstr "Contrasenya a Friendica" msgid "Hubzilla to Friendica Post Settings" msgstr "Configuració de Publicació de Hubzilla cap a Friendica" -#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1397 -#: ../../include/channel.php:1568 +#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1396 +#: ../../include/channel.php:1567 msgid "Status:" msgstr "Estatus:" @@ -10421,7 +10570,7 @@ msgid "No channels currently blocked" msgstr "No hi ha canals bloquejats" #: ../../addon/superblock/superblock.php:120 -msgid "\"Superblock\" Settings" +msgid "Superblock Settings" msgstr "Configuració del Superblock" #: ../../addon/superblock/superblock.php:345 @@ -10504,55 +10653,55 @@ msgstr "Mida en Bytes del fitxer de registre abans de rotar" msgid "Number of logfiles to retain" msgstr "Número de fitxers de registre per a conservar" -#: ../../addon/frphotos/frphotos.php:91 +#: ../../addon/frphotos/frphotos.php:92 msgid "Friendica Photo Album Import" msgstr "Importa àlbums de fotos de Friendica" -#: ../../addon/frphotos/frphotos.php:92 +#: ../../addon/frphotos/frphotos.php:93 msgid "This will import all your Friendica photo albums to this Red channel." msgstr "Aquesta acció importarà tots els teus àlbums de fotos de Friendica a aquest canal." -#: ../../addon/frphotos/frphotos.php:93 +#: ../../addon/frphotos/frphotos.php:94 msgid "Friendica Server base URL" msgstr "URL base del servidor de Friendica" -#: ../../addon/frphotos/frphotos.php:94 +#: ../../addon/frphotos/frphotos.php:95 msgid "Friendica Login Username" msgstr "Nom de registre a Friendica" -#: ../../addon/frphotos/frphotos.php:95 +#: ../../addon/frphotos/frphotos.php:96 msgid "Friendica Login Password" msgstr "Contrasenya a Friendica" -#: ../../addon/pubcrawl/as.php:1101 ../../addon/pubcrawl/as.php:1228 -#: ../../addon/pubcrawl/as.php:1403 ../../include/network.php:1774 +#: ../../addon/pubcrawl/as.php:1146 ../../addon/pubcrawl/as.php:1273 +#: ../../addon/pubcrawl/as.php:1449 ../../include/network.php:1769 msgid "ActivityPub" msgstr "ActivityPub" -#: ../../addon/pubcrawl/pubcrawl.php:1034 +#: ../../addon/pubcrawl/pubcrawl.php:1053 msgid "ActivityPub Protocol Settings updated." msgstr "S'ha actualitzat la configuració del Protocol ActivityPub." -#: ../../addon/pubcrawl/pubcrawl.php:1043 +#: ../../addon/pubcrawl/pubcrawl.php:1062 msgid "" "The ActivityPub protocol does not support location independence. Connections" " you make within that network may be unreachable from alternate channel " "locations." msgstr "El Protocol ActivityPub és incompatible amb la independència de hub. Les connexions que facis en aquesta xarxa no seran accessibles des de hubs alternatius del teu canal." -#: ../../addon/pubcrawl/pubcrawl.php:1046 +#: ../../addon/pubcrawl/pubcrawl.php:1065 msgid "Enable the ActivityPub protocol for this channel" msgstr "Activa el Protocol ActivityPub en aquest canal" -#: ../../addon/pubcrawl/pubcrawl.php:1049 +#: ../../addon/pubcrawl/pubcrawl.php:1068 msgid "Send multi-media HTML articles" msgstr "Envia articles HTML multimèdia" -#: ../../addon/pubcrawl/pubcrawl.php:1049 +#: ../../addon/pubcrawl/pubcrawl.php:1068 msgid "Not supported by some microblog services such as Mastodon" msgstr "Incompatible amb alguns serveis de microbloguing com Mastodon" -#: ../../addon/pubcrawl/pubcrawl.php:1053 +#: ../../addon/pubcrawl/pubcrawl.php:1072 msgid "ActivityPub Protocol Settings" msgstr "Configuració del Protocol ActivityPub" @@ -10942,7 +11091,7 @@ msgstr "S'ha escollit un color aleatori." msgid "Error creating new game." msgstr "S'ha produït un error en crear la partida." -#: ../../addon/chess/chess.php:486 ../../include/channel.php:1152 +#: ../../addon/chess/chess.php:486 ../../include/channel.php:1151 msgid "Requested channel is not available." msgstr "El canal demanat no està disponible." @@ -11037,6 +11186,78 @@ msgstr "Amaga el botó i mostra les icones directament." msgid "Smileybutton Settings" msgstr "Configuració de Smileybutton" +#: ../../addon/cart/myshop.php:138 +msgid "Order Not Found" +msgstr "No s'ha trobat l'ordre" + +#: ../../addon/cart/cart.php:810 +msgid "Order cannot be checked out." +msgstr "No s'ha pogut confirmar l'ordre." + +#: ../../addon/cart/cart.php:1073 +msgid "Enable Shopping Cart" +msgstr "Habilita la cistella de la compra" + +#: ../../addon/cart/cart.php:1080 +msgid "Enable Test Catalog" +msgstr "Habilita un catàleg de prova" + +#: ../../addon/cart/cart.php:1088 +msgid "Enable Manual Payments" +msgstr "Habilita els pagaments manuals" + +#: ../../addon/cart/cart.php:1103 +msgid "Base Cart Settings" +msgstr "Configuració bàsica de la cistella" + +#: ../../addon/cart/cart.php:1151 +msgid "Add Item" +msgstr "Afegeix un element" + +#: ../../addon/cart/cart.php:1165 +msgid "Call cart_post_" +msgstr "Crida cart_post_" + +#: ../../addon/cart/cart.php:1195 +msgid "Cart Not Enabled (profile: " +msgstr "La cistella no està habilitada (perfil:" + +#: ../../addon/cart/cart.php:1226 ../../addon/cart/manual_payments.php:36 +msgid "Order not found." +msgstr "No s'ha trobat l'ordre." + +#: ../../addon/cart/cart.php:1262 ../../addon/cart/cart.php:1389 +msgid "No Order Found" +msgstr "No s'ha trobat cap ordre" + +#: ../../addon/cart/cart.php:1270 +msgid "call: " +msgstr "crida:" + +#: ../../addon/cart/cart.php:1273 +msgid "An unknown error has occurred Please start again." +msgstr "S'ha produït un error inesperat. Torna-ho a provar." + +#: ../../addon/cart/cart.php:1414 +msgid "Invalid Payment Type. Please start again." +msgstr "El tipus de pagament no és vàlid. Torna a començar." + +#: ../../addon/cart/cart.php:1421 +msgid "Order not found" +msgstr "No s'ha trobat l'ordre" + +#: ../../addon/cart/manual_payments.php:9 +msgid "Error: order mismatch. Please try again." +msgstr "Error: l'ordre no coincideix. Torna-ho a provar." + +#: ../../addon/cart/manual_payments.php:29 +msgid "Manual payments are not enabled." +msgstr "El pagament manual no està habilitat." + +#: ../../addon/cart/manual_payments.php:44 +msgid "Finished" +msgstr "Operació completa" + #: ../../addon/piwik/piwik.php:85 msgid "" "This website is tracked using the Piwik " @@ -11081,156 +11302,156 @@ msgstr "Activa el seguiment d'errors de Javascript al frontend " msgid "This feature requires Piwik >= 2.2.0" msgstr "Aquesta funcionalitat necessita una versió del Piwik >= 2.2.0" -#: ../../addon/tour/tour.php:75 +#: ../../addon/tour/tour.php:76 msgid "Edit your profile and change settings." msgstr "Modifica el teu perfil i canvia la configuració." -#: ../../addon/tour/tour.php:76 +#: ../../addon/tour/tour.php:77 msgid "Click here to see activity from your connections." msgstr "Clica aquí per a veure l'activitat de les teves connexions." -#: ../../addon/tour/tour.php:77 +#: ../../addon/tour/tour.php:78 msgid "Click here to see your channel home." msgstr "Clica aquí per a veure el mur del teu canal." -#: ../../addon/tour/tour.php:78 +#: ../../addon/tour/tour.php:79 msgid "You can access your private messages from here." msgstr "Pots accedir als teus missatges privats des d'aquí." -#: ../../addon/tour/tour.php:79 +#: ../../addon/tour/tour.php:80 msgid "Create new events here." msgstr "Pots crear esdeveniments des d'aquí." -#: ../../addon/tour/tour.php:80 +#: ../../addon/tour/tour.php:81 msgid "" "You can accept new connections and change permissions for existing ones " "here. You can also e.g. create groups of contacts." msgstr "Pots acceptar connexions noves des d'aquí i canviar els permisos de les existents. També pots crear grups de contactes, per exemple." -#: ../../addon/tour/tour.php:81 +#: ../../addon/tour/tour.php:82 msgid "System notifications will arrive here" msgstr "Les notificacions t'arriben per aquí" -#: ../../addon/tour/tour.php:82 +#: ../../addon/tour/tour.php:83 msgid "Search for content and users" msgstr "Cerca contingut i usuaris" -#: ../../addon/tour/tour.php:83 +#: ../../addon/tour/tour.php:84 msgid "Browse for new contacts" msgstr "Explora per trobar nous contactes" -#: ../../addon/tour/tour.php:84 +#: ../../addon/tour/tour.php:85 msgid "Launch installed apps" msgstr "Obre aplicacions instaŀlades" -#: ../../addon/tour/tour.php:85 +#: ../../addon/tour/tour.php:86 msgid "Looking for help? Click here." msgstr "Que busques ajuda? Clica aquí." -#: ../../addon/tour/tour.php:86 +#: ../../addon/tour/tour.php:87 msgid "" "New events have occurred in your network. Click here to see what has " "happened!" msgstr "Hi ha hagut activitat nova a la teva xarxa. Clica aquí a veure què ha passat!" -#: ../../addon/tour/tour.php:87 +#: ../../addon/tour/tour.php:88 msgid "You have received a new private message. Click here to see from who!" msgstr "Has rebut un missatge privat. A veure de qui és!" -#: ../../addon/tour/tour.php:88 +#: ../../addon/tour/tour.php:89 msgid "There are events this week. Click here too see which!" msgstr "Hi ha esdeveniments aquesta setmana. Clica per veure quins!" -#: ../../addon/tour/tour.php:89 +#: ../../addon/tour/tour.php:90 msgid "You have received a new introduction. Click here to see who!" msgstr "Has rebut una presentació. Clica per veure de qui és!" -#: ../../addon/tour/tour.php:90 +#: ../../addon/tour/tour.php:91 msgid "" "There is a new system notification. Click here to see what has happened!" msgstr "Tens una notificació de sistema. Clica per veure què ha passat!" -#: ../../addon/tour/tour.php:93 +#: ../../addon/tour/tour.php:94 msgid "Click here to share text, images, videos and sound." msgstr "Clica aquí per a compartir text, imatges, vídeos, i sons." -#: ../../addon/tour/tour.php:94 +#: ../../addon/tour/tour.php:95 msgid "You can write an optional title for your update (good for long posts)." msgstr "Si vols, pots posar un títol a les teves entrades. És una bona idea per a entrades llargues." -#: ../../addon/tour/tour.php:95 +#: ../../addon/tour/tour.php:96 msgid "Entering some categories here makes it easier to find your post later." msgstr "Si afegeixes categories serà més fàcil de trobar l'entrada més endavant." -#: ../../addon/tour/tour.php:96 +#: ../../addon/tour/tour.php:97 msgid "Share photos, links, location, etc." msgstr "Comparteix fotos, enllaços, la ubicació, etc." -#: ../../addon/tour/tour.php:97 +#: ../../addon/tour/tour.php:98 msgid "" "Only want to share content for a while? Make it expire at a certain date." msgstr "Vols compartir un contingut només durant una estona? Fes-lo caducar a un cert moment." -#: ../../addon/tour/tour.php:98 +#: ../../addon/tour/tour.php:99 msgid "You can password protect content." msgstr "Pots protegir el contingut per contrasenya." -#: ../../addon/tour/tour.php:99 +#: ../../addon/tour/tour.php:100 msgid "Choose who you share with." msgstr "Escull amb qui ho vols compartir." -#: ../../addon/tour/tour.php:101 +#: ../../addon/tour/tour.php:102 msgid "Click here when you are done." msgstr "I clica aquí quan acabis." -#: ../../addon/tour/tour.php:104 +#: ../../addon/tour/tour.php:105 msgid "Adjust from which channels posts should be displayed." msgstr "Tria des de quins canals s'haurien de mostrar les entrades." -#: ../../addon/tour/tour.php:105 +#: ../../addon/tour/tour.php:106 msgid "Only show posts from channels in the specified privacy group." msgstr "Mostra només entrades de canals especificats en el grup de privacitat." -#: ../../addon/tour/tour.php:109 +#: ../../addon/tour/tour.php:110 msgid "Easily find posts containing tags (keywords preceded by the \"#\" symbol)." msgstr "Pots trobar fàcilment entrades que continguin etiquetes (paraules clau precedides per un símbol \"#\")." -#: ../../addon/tour/tour.php:110 +#: ../../addon/tour/tour.php:111 msgid "Easily find posts in given category." msgstr "Troba fàcilment entrades en una certa categoria." -#: ../../addon/tour/tour.php:111 +#: ../../addon/tour/tour.php:112 msgid "Easily find posts by date." msgstr "Troba fàcilment entrades per data." -#: ../../addon/tour/tour.php:112 +#: ../../addon/tour/tour.php:113 msgid "" "Suggested users who have volounteered to be shown as suggestions, and who we" " think you might find interesting." msgstr "Els usuaris que et suggerim s'han mostrat voluntaris a ser suggerits perquè els puguis afegir. Que potser t'interessa connectar-t'hi?" -#: ../../addon/tour/tour.php:113 +#: ../../addon/tour/tour.php:114 msgid "Here you see channels you have connected to." msgstr "Aquí pots veure els canals als quals estàs connectat/da." -#: ../../addon/tour/tour.php:114 +#: ../../addon/tour/tour.php:115 msgid "Save your search so you can repeat it at a later date." msgstr "Si deses la teva cerca la podràs repetir més tard." -#: ../../addon/tour/tour.php:117 +#: ../../addon/tour/tour.php:118 msgid "" "If you see this icon you can be sure that the sender is who it say it is. It" " is normal that it is not always possible to verify the sender, so the icon " "will be missing sometimes. There is usually no need to worry about that." msgstr "Si veus aquesta icona, pots donar per fet que el/la remitent és qui diu ser. De tota manera, és habitual que no es pugui verificar, i per tant, que de vegades falti aquesta icona. Però és només una capa més de seguretat del sistema." -#: ../../addon/tour/tour.php:118 +#: ../../addon/tour/tour.php:119 msgid "" "Danger! It seems someone tried to forge a message! This message is not " "necessarily from who it says it is from!" msgstr "Alerta! Sembla que algú ha intentat falsificar un missatge! Pot ser que el remitent d'aquest missatge no sigui qui diu ser!" -#: ../../addon/tour/tour.php:125 +#: ../../addon/tour/tour.php:126 msgid "" "Welcome to Hubzilla! Would you like to see a tour of the UI?

    You can " "pause it at any time and continue where you left off by reloading the page, " @@ -11629,11 +11850,11 @@ msgstr "Transsexual" msgid "Hermaphrodite" msgstr "Hermafrodita" -#: ../../include/selectors.php:49 ../../include/channel.php:1485 +#: ../../include/selectors.php:49 ../../include/channel.php:1484 msgid "Neuter" msgstr "Neutre" -#: ../../include/selectors.php:49 ../../include/channel.php:1487 +#: ../../include/selectors.php:49 ../../include/channel.php:1486 msgid "Non-specific" msgstr "Indefinit" @@ -11879,10 +12100,6 @@ msgstr "Segueix el Fil" msgid "Unfollow Thread" msgstr "Fil Abandonat" -#: ../../include/conversation.php:1042 -msgid "Activity/Posts" -msgstr "Activitat/Entrades" - #: ../../include/conversation.php:1062 msgid "Edit Connection" msgstr "Modifica la Connexió" @@ -11944,175 +12161,175 @@ msgstr "Ajusta la teva ubicació" msgid "Clear browser location" msgstr "Treu la localització del navegador" -#: ../../include/conversation.php:1314 +#: ../../include/conversation.php:1316 msgid "Tag term:" msgstr "Paraula de l'Etiqueta:" -#: ../../include/conversation.php:1315 +#: ../../include/conversation.php:1317 msgid "Where are you right now?" msgstr "On ets ara?" -#: ../../include/conversation.php:1320 +#: ../../include/conversation.php:1322 msgid "Choose a different album..." msgstr "Tria un àlbum diferent..." -#: ../../include/conversation.php:1324 +#: ../../include/conversation.php:1326 msgid "Comments enabled" msgstr "S'han activat els comentaris" -#: ../../include/conversation.php:1325 +#: ../../include/conversation.php:1327 msgid "Comments disabled" msgstr "S'han activat els comentaris" -#: ../../include/conversation.php:1372 +#: ../../include/conversation.php:1375 msgid "Page link name" msgstr "Nom de la pàgina enllaçada" -#: ../../include/conversation.php:1375 +#: ../../include/conversation.php:1378 msgid "Post as" msgstr "Envia com" -#: ../../include/conversation.php:1389 +#: ../../include/conversation.php:1392 msgid "Toggle voting" msgstr "Commutar votació" -#: ../../include/conversation.php:1392 +#: ../../include/conversation.php:1395 msgid "Disable comments" msgstr "Desactiva els comentaris" -#: ../../include/conversation.php:1393 +#: ../../include/conversation.php:1396 msgid "Toggle comments" msgstr "Commuta l'estat dels comentaris" -#: ../../include/conversation.php:1401 +#: ../../include/conversation.php:1404 msgid "Categories (optional, comma-separated list)" msgstr "Categories (opcional, llista separada per comes)" -#: ../../include/conversation.php:1424 +#: ../../include/conversation.php:1427 msgid "Other networks and post services" msgstr "Altres xarxes i serveis de correu" -#: ../../include/conversation.php:1430 +#: ../../include/conversation.php:1433 msgid "Set publish date" msgstr "Ajusta la data de publicació" -#: ../../include/conversation.php:1690 +#: ../../include/conversation.php:1693 msgid "Commented Order" msgstr "Ordenar per Comentaris" -#: ../../include/conversation.php:1693 +#: ../../include/conversation.php:1696 msgid "Sort by Comment Date" msgstr "Ordenar per Data del Comentari" -#: ../../include/conversation.php:1697 +#: ../../include/conversation.php:1700 msgid "Posted Order" msgstr "Ordenar per Entrades" -#: ../../include/conversation.php:1700 +#: ../../include/conversation.php:1703 msgid "Sort by Post Date" msgstr "Ordenar per Data d' Entrada" -#: ../../include/conversation.php:1708 +#: ../../include/conversation.php:1711 msgid "Posts that mention or involve you" msgstr "Entrades que et mencionen o involucren" -#: ../../include/conversation.php:1717 +#: ../../include/conversation.php:1720 msgid "Activity Stream - by date" msgstr "Activitat del Flux - per data" -#: ../../include/conversation.php:1723 +#: ../../include/conversation.php:1726 msgid "Starred" msgstr "Preferit" -#: ../../include/conversation.php:1726 +#: ../../include/conversation.php:1729 msgid "Favourite Posts" msgstr "Entrades Favorites" -#: ../../include/conversation.php:1733 +#: ../../include/conversation.php:1736 msgid "Spam" msgstr "Spam" -#: ../../include/conversation.php:1736 +#: ../../include/conversation.php:1739 msgid "Posts flagged as SPAM" msgstr "Entrades marcades com a SPAM" -#: ../../include/conversation.php:1811 ../../include/nav.php:381 +#: ../../include/conversation.php:1814 ../../include/nav.php:381 msgid "Status Messages and Posts" msgstr "Estat dels Missatges i Entrades" -#: ../../include/conversation.php:1824 ../../include/nav.php:394 +#: ../../include/conversation.php:1827 ../../include/nav.php:394 msgid "Profile Details" msgstr "Detalls del Perfil" -#: ../../include/conversation.php:1834 ../../include/nav.php:404 -#: ../../include/photos.php:655 +#: ../../include/conversation.php:1837 ../../include/nav.php:404 +#: ../../include/photos.php:666 msgid "Photo Albums" msgstr "Albums de Fotos" -#: ../../include/conversation.php:1842 ../../include/nav.php:412 +#: ../../include/conversation.php:1845 ../../include/nav.php:412 msgid "Files and Storage" msgstr "Arxius i Emmagatzegament" -#: ../../include/conversation.php:1879 ../../include/nav.php:447 +#: ../../include/conversation.php:1882 ../../include/nav.php:447 msgid "Bookmarks" msgstr "Marcadors" -#: ../../include/conversation.php:1882 ../../include/nav.php:450 +#: ../../include/conversation.php:1885 ../../include/nav.php:450 msgid "Saved Bookmarks" msgstr "Marcadors Guardats" -#: ../../include/conversation.php:1893 ../../include/nav.php:461 +#: ../../include/conversation.php:1896 ../../include/nav.php:461 msgid "View Cards" msgstr "Mostra les targetes" -#: ../../include/conversation.php:1901 +#: ../../include/conversation.php:1904 msgid "articles" msgstr "articles" -#: ../../include/conversation.php:1904 ../../include/nav.php:472 +#: ../../include/conversation.php:1907 ../../include/nav.php:472 msgid "View Articles" msgstr "Mostra els articles" -#: ../../include/conversation.php:1915 ../../include/nav.php:484 +#: ../../include/conversation.php:1918 ../../include/nav.php:484 msgid "View Webpages" msgstr "Mostra les pàgines web" -#: ../../include/conversation.php:1984 +#: ../../include/conversation.php:1987 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "Assistint" msgstr[1] "Assistint" -#: ../../include/conversation.php:1987 +#: ../../include/conversation.php:1990 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "Desassistint" msgstr[1] "Desassistint" -#: ../../include/conversation.php:1990 +#: ../../include/conversation.php:1993 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "Indecís" msgstr[1] "Indecisos" -#: ../../include/conversation.php:1993 +#: ../../include/conversation.php:1996 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "Acord" msgstr[1] "Acords" -#: ../../include/conversation.php:1996 +#: ../../include/conversation.php:1999 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "Desacord" msgstr[1] "Desacords" -#: ../../include/conversation.php:1999 +#: ../../include/conversation.php:2002 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -12140,12 +12357,16 @@ msgstr "Només Aquest Lloc Web" msgid "%1$s's bookmarks" msgstr "%1$s de marcadors" -#: ../../include/import.php:41 +#: ../../include/import.php:25 +msgid "Unable to import a removed channel." +msgstr "No s'ha pogut importar un canal esborrat." + +#: ../../include/import.php:46 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "No s'ha pogut importar el canal perquè l'identificador del canal no s'ha pogut duplicar en aquest servidor." -#: ../../include/import.php:106 +#: ../../include/import.php:111 msgid "Cloned channel not found. Import failed." msgstr "No s'ha pogut importar el canal perquè el canal clonat no s'ha trobat." @@ -12390,7 +12611,7 @@ msgstr "Desembre" msgid "Unknown Attachment" msgstr "Adjunt Desconegut" -#: ../../include/text.php:1434 ../../include/feedutils.php:852 +#: ../../include/text.php:1434 ../../include/feedutils.php:860 msgid "unknown" msgstr "desconegut" @@ -12406,107 +12627,107 @@ msgstr "elimina del arxiu" msgid "Download binary/encrypted content" msgstr "Descarrega el binari o contingut xifrat" -#: ../../include/text.php:1848 ../../include/language.php:397 +#: ../../include/text.php:1849 ../../include/language.php:397 msgid "default" msgstr "per defecte" -#: ../../include/text.php:1856 +#: ../../include/text.php:1857 msgid "Page layout" msgstr "Disseny de pàgina" -#: ../../include/text.php:1856 +#: ../../include/text.php:1857 msgid "You can create your own with the layouts tool" msgstr "Pots crear el teu propi amb l'editor de dissenys de pàgina." -#: ../../include/text.php:1867 +#: ../../include/text.php:1868 msgid "HTML" msgstr "HTML" -#: ../../include/text.php:1870 +#: ../../include/text.php:1871 msgid "Comanche Layout" msgstr "Disseny Comanche" -#: ../../include/text.php:1875 +#: ../../include/text.php:1876 msgid "PHP" msgstr "PHP" -#: ../../include/text.php:1884 +#: ../../include/text.php:1885 msgid "Page content type" msgstr "Tipus de contingut de la pàgina" -#: ../../include/text.php:2017 +#: ../../include/text.php:2018 msgid "activity" msgstr "activitat" -#: ../../include/text.php:2099 +#: ../../include/text.php:2100 msgid "a-z, 0-9, -, and _ only" msgstr "només caràcters alfanumèrics en minúscula (a-z, 0-9), guió (-) i guió baix (_)" -#: ../../include/text.php:2399 +#: ../../include/text.php:2419 msgid "Design Tools" msgstr "Eines de disseny" -#: ../../include/text.php:2405 +#: ../../include/text.php:2425 msgid "Pages" msgstr "Pàgines" -#: ../../include/text.php:2427 +#: ../../include/text.php:2447 msgid "Import website..." msgstr "Importa un lloc web" -#: ../../include/text.php:2428 +#: ../../include/text.php:2448 msgid "Select folder to import" msgstr "Escull la carpeta a on importar" -#: ../../include/text.php:2429 +#: ../../include/text.php:2449 msgid "Import from a zipped folder:" msgstr "Importa des d'una carpeta comprimida:" -#: ../../include/text.php:2430 +#: ../../include/text.php:2450 msgid "Import from cloud files:" msgstr "Importa des de fitxers penjats a un núvol:" -#: ../../include/text.php:2431 +#: ../../include/text.php:2451 msgid "/cloud/channel/path/to/folder" msgstr "/núvol/canal/ruta/a/la/carpeta" -#: ../../include/text.php:2432 +#: ../../include/text.php:2452 msgid "Enter path to website files" msgstr "Introdueix la ruta als arxius de la web" -#: ../../include/text.php:2433 +#: ../../include/text.php:2453 msgid "Select folder" msgstr "Escull la carpeta" -#: ../../include/text.php:2434 +#: ../../include/text.php:2454 msgid "Export website..." msgstr "Exporta un lloc web" -#: ../../include/text.php:2435 +#: ../../include/text.php:2455 msgid "Export to a zip file" msgstr "Exporta a una carpeta comprimida" -#: ../../include/text.php:2436 +#: ../../include/text.php:2456 msgid "website.zip" msgstr "lloc-web.zip" -#: ../../include/text.php:2437 +#: ../../include/text.php:2457 msgid "Enter a name for the zip file." msgstr "Introdueix un nom per al fitxer comprimit." -#: ../../include/text.php:2438 +#: ../../include/text.php:2458 msgid "Export to cloud files" msgstr "Exporta a arxius de núvol" -#: ../../include/text.php:2439 +#: ../../include/text.php:2459 msgid "/path/to/export/folder" msgstr "/ruta/a/la/carpeta/exportació" -#: ../../include/text.php:2440 +#: ../../include/text.php:2460 msgid "Enter a path to a cloud files destination." msgstr "Introdueix la ruta dels fitxers de núvol de destí." -#: ../../include/text.php:2441 +#: ../../include/text.php:2461 msgid "Specify folder" msgstr "Escull una carpeta" @@ -12554,7 +12775,7 @@ msgstr "Connexions en comú" msgid "View all %d common connections" msgstr "Mostra totes les connexions en comú amb %d" -#: ../../include/markdown.php:158 ../../include/bbcode.php:343 +#: ../../include/markdown.php:158 ../../include/bbcode.php:356 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "%1$s va escriure el següent %2$s %3$s" @@ -12571,23 +12792,27 @@ msgstr "Ubicació del canal perduda." msgid "Response from remote channel was incomplete." msgstr "La resposta del canal remot fou incompleta." -#: ../../include/follow.php:101 +#: ../../include/follow.php:96 +msgid "Premium channel - please visit:" +msgstr "Canal prèmium - ves a:" + +#: ../../include/follow.php:110 msgid "Channel was deleted and no longer exists." msgstr "El canal fou esborrat i actualment no existeix." -#: ../../include/follow.php:156 +#: ../../include/follow.php:165 msgid "Remote channel or protocol unavailable." msgstr "El canal remot o el protocol no estan disponibles." -#: ../../include/follow.php:179 +#: ../../include/follow.php:188 msgid "Channel discovery failed." msgstr "Descobriment de canal fallit." -#: ../../include/follow.php:191 +#: ../../include/follow.php:200 msgid "Protocol disabled." msgstr "Protocol desactivat." -#: ../../include/follow.php:202 +#: ../../include/follow.php:211 msgid "Cannot connect to yourself." msgstr "No pots connectar amb tu mateix." @@ -12907,39 +13132,39 @@ msgstr "Has arribat al teu límit de %1$.0f Mbytes de emagatzematge d'adjunts." msgid "File upload failed. Possible system limit or action terminated." msgstr "Pujada del arxiu fallida. Possible límit del sistema o acció interrompuda." -#: ../../include/attach.php:959 +#: ../../include/attach.php:969 msgid "Stored file could not be verified. Upload failed." msgstr "L'arxiu guardat no es pot verificar. Pujada fallida." -#: ../../include/attach.php:1033 ../../include/attach.php:1049 +#: ../../include/attach.php:1043 ../../include/attach.php:1059 msgid "Path not available." msgstr "Trajectòria no disponible" -#: ../../include/attach.php:1098 ../../include/attach.php:1263 +#: ../../include/attach.php:1108 ../../include/attach.php:1273 msgid "Empty pathname" msgstr "Trajèctoria vuida." -#: ../../include/attach.php:1124 +#: ../../include/attach.php:1134 msgid "duplicate filename or path" msgstr "Nom o trajectòria duplicat" -#: ../../include/attach.php:1149 +#: ../../include/attach.php:1159 msgid "Path not found." msgstr "Trajectòria no trobada." -#: ../../include/attach.php:1217 +#: ../../include/attach.php:1227 msgid "mkdir failed." msgstr "mkdir va fracassar." -#: ../../include/attach.php:1221 +#: ../../include/attach.php:1231 msgid "database storage failed." msgstr "Arxiu de base de dades va fallar." -#: ../../include/attach.php:1269 +#: ../../include/attach.php:1279 msgid "Empty path" msgstr "Trajèctoria vuida" -#: ../../include/security.php:532 +#: ../../include/security.php:541 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." @@ -12949,67 +13174,67 @@ msgstr "El formulario de la cadena de seguridad no era correcto. Esto probableme msgid "(Unknown)" msgstr "(Desconegut)" -#: ../../include/items.php:1129 +#: ../../include/items.php:1133 msgid "Visible to anybody on the internet." msgstr "Visible per tothom a la Internet" -#: ../../include/items.php:1131 +#: ../../include/items.php:1135 msgid "Visible to you only." msgstr "Visible només per tú." -#: ../../include/items.php:1133 +#: ../../include/items.php:1137 msgid "Visible to anybody in this network." msgstr "Visible per tothom en aquesta xarxa." -#: ../../include/items.php:1135 +#: ../../include/items.php:1139 msgid "Visible to anybody authenticated." msgstr "Visible per tothom autenticat." -#: ../../include/items.php:1137 +#: ../../include/items.php:1141 #, php-format msgid "Visible to anybody on %s." msgstr "Visible per a tothom a %s." -#: ../../include/items.php:1139 +#: ../../include/items.php:1143 msgid "Visible to all connections." msgstr "Visible per a totes les connexions." -#: ../../include/items.php:1141 +#: ../../include/items.php:1145 msgid "Visible to approved connections." msgstr "Visible per a les connexions aprovades." -#: ../../include/items.php:1143 +#: ../../include/items.php:1147 msgid "Visible to specific connections." msgstr "Visible per a específiques connexions." -#: ../../include/items.php:4147 +#: ../../include/items.php:4197 msgid "Privacy group is empty." msgstr "El grup privat està vuit." -#: ../../include/items.php:4154 +#: ../../include/items.php:4204 #, php-format msgid "Privacy group: %s" msgstr "Grup privat: %s" -#: ../../include/items.php:4166 +#: ../../include/items.php:4216 msgid "Connection not found." msgstr "Connexió no trobada." -#: ../../include/items.php:4515 +#: ../../include/items.php:4565 msgid "profile photo" msgstr "foto del perfil" -#: ../../include/items.php:4706 +#: ../../include/items.php:4756 #, php-format msgid "[Edited %s]" msgstr "[S'ha editat %s]" -#: ../../include/items.php:4706 +#: ../../include/items.php:4756 msgctxt "edit_activity" msgid "Post" msgstr "Entrada" -#: ../../include/items.php:4706 +#: ../../include/items.php:4756 msgctxt "edit_activity" msgid "Comment" msgstr "Comentari" @@ -13046,120 +13271,120 @@ msgstr "Perfil per Defecte" msgid "Unable to retrieve modified identity" msgstr "No s'ha pogut carregar la identitat modificada" -#: ../../include/channel.php:1298 +#: ../../include/channel.php:1297 msgid "Create New Profile" msgstr "Crear un Perfil Nou" -#: ../../include/channel.php:1319 +#: ../../include/channel.php:1318 msgid "Visible to everybody" msgstr "Visible per tothom" -#: ../../include/channel.php:1396 ../../include/channel.php:1524 +#: ../../include/channel.php:1395 ../../include/channel.php:1523 msgid "Gender:" msgstr "Gènere:" -#: ../../include/channel.php:1398 ../../include/channel.php:1579 +#: ../../include/channel.php:1397 ../../include/channel.php:1591 msgid "Homepage:" msgstr "Pàgina Personal:" -#: ../../include/channel.php:1399 +#: ../../include/channel.php:1398 msgid "Online Now" msgstr "Ara en Linia" -#: ../../include/channel.php:1452 +#: ../../include/channel.php:1451 msgid "Change your profile photo" msgstr "Canvia la foto de peril" -#: ../../include/channel.php:1483 +#: ../../include/channel.php:1482 msgid "Trans" msgstr "Trans" -#: ../../include/channel.php:1529 +#: ../../include/channel.php:1528 msgid "Like this channel" msgstr "M'agrada aquest canal" -#: ../../include/channel.php:1553 +#: ../../include/channel.php:1552 msgid "j F, Y" msgstr "j F, Y" -#: ../../include/channel.php:1554 +#: ../../include/channel.php:1553 msgid "j F" msgstr "j F" -#: ../../include/channel.php:1561 +#: ../../include/channel.php:1560 msgid "Birthday:" msgstr "Aniversari:" -#: ../../include/channel.php:1574 +#: ../../include/channel.php:1573 #, php-format msgid "for %1$d %2$s" msgstr "per %1$d %2$s" -#: ../../include/channel.php:1577 -msgid "Sexual Preference:" -msgstr "Preferència Sexual:" - -#: ../../include/channel.php:1583 +#: ../../include/channel.php:1585 msgid "Tags:" msgstr "Etiquetes:" -#: ../../include/channel.php:1585 +#: ../../include/channel.php:1589 +msgid "Sexual Preference:" +msgstr "Preferència Sexual:" + +#: ../../include/channel.php:1595 msgid "Political Views:" msgstr "Idees Polítiques:" -#: ../../include/channel.php:1587 +#: ../../include/channel.php:1597 msgid "Religion:" msgstr "Religió:" -#: ../../include/channel.php:1591 +#: ../../include/channel.php:1601 msgid "Hobbies/Interests:" msgstr "Aficions/Interessos:" -#: ../../include/channel.php:1593 +#: ../../include/channel.php:1603 msgid "Likes:" msgstr "Agrada:" -#: ../../include/channel.php:1595 +#: ../../include/channel.php:1605 msgid "Dislikes:" msgstr "Desagrada:" -#: ../../include/channel.php:1597 +#: ../../include/channel.php:1607 msgid "Contact information and Social Networks:" msgstr "Informació de contacte i Xarxes Socials:" -#: ../../include/channel.php:1599 +#: ../../include/channel.php:1609 msgid "My other channels:" msgstr "Els meus altres canals:" -#: ../../include/channel.php:1601 +#: ../../include/channel.php:1611 msgid "Musical interests:" msgstr "Interessos Musicals:" -#: ../../include/channel.php:1603 +#: ../../include/channel.php:1613 msgid "Books, literature:" msgstr "Llibres, literatura:" -#: ../../include/channel.php:1605 +#: ../../include/channel.php:1615 msgid "Television:" msgstr "Televisió:" -#: ../../include/channel.php:1607 +#: ../../include/channel.php:1617 msgid "Film/dance/culture/entertainment:" msgstr "Películes/Dança/Cultura/Entreteniment:" -#: ../../include/channel.php:1609 +#: ../../include/channel.php:1619 msgid "Love/Romance:" msgstr "Amor/Romace:" -#: ../../include/channel.php:1611 +#: ../../include/channel.php:1621 msgid "Work/employment:" msgstr "Treball/feina:" -#: ../../include/channel.php:1613 +#: ../../include/channel.php:1623 msgid "School/education:" msgstr "Escola/educació:" -#: ../../include/channel.php:1636 +#: ../../include/channel.php:1646 msgid "Like this thing" msgstr "M'agrada això" @@ -13199,19 +13424,19 @@ msgstr "En Procès" msgid "Cancelled" msgstr "Cancel·lat" -#: ../../include/event.php:1310 ../../include/connections.php:684 +#: ../../include/event.php:1310 ../../include/connections.php:692 msgid "Home, Voice" msgstr "Casa, veu" -#: ../../include/event.php:1311 ../../include/connections.php:685 +#: ../../include/event.php:1311 ../../include/connections.php:693 msgid "Home, Fax" msgstr "Casa, fax" -#: ../../include/event.php:1313 ../../include/connections.php:687 +#: ../../include/event.php:1313 ../../include/connections.php:695 msgid "Work, Voice" msgstr "Feina, veu" -#: ../../include/event.php:1314 ../../include/connections.php:688 +#: ../../include/event.php:1314 ../../include/connections.php:696 msgid "Work, Fax" msgstr "Feina, fax" @@ -13219,43 +13444,43 @@ msgstr "Feina, fax" msgid "view full size" msgstr "Veure a mida competa" -#: ../../include/network.php:1769 ../../include/network.php:1770 +#: ../../include/network.php:1764 ../../include/network.php:1765 msgid "Friendica" msgstr "Friendica" -#: ../../include/network.php:1771 +#: ../../include/network.php:1766 msgid "OStatus" msgstr "OStatus" -#: ../../include/network.php:1772 +#: ../../include/network.php:1767 msgid "GNU-Social" msgstr "GNU-Social" -#: ../../include/network.php:1773 +#: ../../include/network.php:1768 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:1776 +#: ../../include/network.php:1771 msgid "Diaspora" msgstr "Diaspora" -#: ../../include/network.php:1777 +#: ../../include/network.php:1772 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:1778 +#: ../../include/network.php:1773 msgid "Zot" msgstr "Zot" -#: ../../include/network.php:1779 +#: ../../include/network.php:1774 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:1780 +#: ../../include/network.php:1775 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1781 +#: ../../include/network.php:1776 msgid "MySpace" msgstr "MySpace" @@ -13297,17 +13522,17 @@ msgstr "Els permisos d'entrada %s no poden esser canviats %s posteriorment a que msgid "Cannot locate DNS info for database server '%s'" msgstr "No s'ha trobat informació de DNS pel servidor de base de dades '%s'" -#: ../../include/bbcode.php:198 ../../include/bbcode.php:1151 -#: ../../include/bbcode.php:1154 ../../include/bbcode.php:1159 -#: ../../include/bbcode.php:1162 ../../include/bbcode.php:1165 -#: ../../include/bbcode.php:1168 ../../include/bbcode.php:1173 -#: ../../include/bbcode.php:1176 ../../include/bbcode.php:1181 -#: ../../include/bbcode.php:1184 ../../include/bbcode.php:1187 -#: ../../include/bbcode.php:1190 +#: ../../include/bbcode.php:198 ../../include/bbcode.php:1200 +#: ../../include/bbcode.php:1203 ../../include/bbcode.php:1208 +#: ../../include/bbcode.php:1211 ../../include/bbcode.php:1214 +#: ../../include/bbcode.php:1217 ../../include/bbcode.php:1222 +#: ../../include/bbcode.php:1225 ../../include/bbcode.php:1230 +#: ../../include/bbcode.php:1233 ../../include/bbcode.php:1236 +#: ../../include/bbcode.php:1239 msgid "Image/photo" msgstr "Imatge/foto" -#: ../../include/bbcode.php:237 ../../include/bbcode.php:1201 +#: ../../include/bbcode.php:237 ../../include/bbcode.php:1250 msgid "Encrypted content" msgstr "Contingut encriptat" @@ -13323,565 +13548,587 @@ msgid "" "to install it on this site." msgstr "Aquesta entrada contè un element %s instal·lable, potser manques de permissos per instal·lar-lo en aquest lloc." -#: ../../include/bbcode.php:335 +#: ../../include/bbcode.php:348 msgid "card" msgstr "targeta" -#: ../../include/bbcode.php:337 +#: ../../include/bbcode.php:350 msgid "article" msgstr "article" -#: ../../include/bbcode.php:420 ../../include/bbcode.php:428 +#: ../../include/bbcode.php:433 ../../include/bbcode.php:441 msgid "Click to open/close" msgstr "Clic per obrir/tancar" -#: ../../include/bbcode.php:428 +#: ../../include/bbcode.php:441 msgid "spoiler" msgstr "xafa guitarres" -#: ../../include/bbcode.php:441 +#: ../../include/bbcode.php:454 msgid "View article" msgstr "Mostra l'article" -#: ../../include/bbcode.php:441 +#: ../../include/bbcode.php:454 msgid "View summary" msgstr "Mostra'n un resum" -#: ../../include/bbcode.php:1139 +#: ../../include/bbcode.php:1188 msgid "$1 wrote:" msgstr "$1 va escriure:" -#: ../../include/oembed.php:328 +#: ../../include/oembed.php:329 msgid " by " msgstr "de" -#: ../../include/oembed.php:329 +#: ../../include/oembed.php:330 msgid " on " msgstr "a" -#: ../../include/oembed.php:358 +#: ../../include/oembed.php:359 msgid "Embedded content" msgstr "Contingut embegut" -#: ../../include/oembed.php:367 +#: ../../include/oembed.php:368 msgid "Embedding disabled" msgstr "Incorporació desactivada" -#: ../../include/zid.php:346 +#: ../../include/zid.php:347 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "OpenWebAuth: %1$s dóna la benvinguda a %2$s" -#: ../../include/features.php:54 +#: ../../include/features.php:56 msgid "General Features" msgstr "Característiques Generals" -#: ../../include/features.php:60 +#: ../../include/features.php:61 +msgid "Display new member quick links menu" +msgstr "Mostra el menú d'enllaços ràpids per a nous membres" + +#: ../../include/features.php:69 msgid "Advanced Profiles" msgstr "Perfils Avançats" -#: ../../include/features.php:61 +#: ../../include/features.php:70 msgid "Additional profile sections and selections" msgstr "Seccions i seleccions addicionals de perfils " -#: ../../include/features.php:69 +#: ../../include/features.php:78 msgid "Profile Import/Export" msgstr "Importar/Exportar Perfil" -#: ../../include/features.php:70 +#: ../../include/features.php:79 msgid "Save and load profile details across sites/channels" msgstr "Guarda i carrega els detalls del perfil al llarg dels llocs/canals" -#: ../../include/features.php:78 +#: ../../include/features.php:87 msgid "Web Pages" msgstr "Pàgines Web" -#: ../../include/features.php:79 +#: ../../include/features.php:88 msgid "Provide managed web pages on your channel" msgstr "Proporcionar pàgines web gestionades al seu canal" -#: ../../include/features.php:88 +#: ../../include/features.php:97 msgid "Provide a wiki for your channel" msgstr "Proporciona una wiki per al teu canal" -#: ../../include/features.php:105 +#: ../../include/features.php:114 msgid "Private Notes" msgstr "Notes Privades" -#: ../../include/features.php:106 +#: ../../include/features.php:115 msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "Activa l'eina per guardar notes i recordatoris (nota:no està encriptat)" -#: ../../include/features.php:115 +#: ../../include/features.php:124 msgid "Create personal planning cards" msgstr "Crea targetes de planificació personal" -#: ../../include/features.php:125 +#: ../../include/features.php:134 msgid "Create interactive articles" msgstr "Crea articles interactius" -#: ../../include/features.php:133 +#: ../../include/features.php:142 msgid "Navigation Channel Select" msgstr "Navegació pel Selector de Canals" -#: ../../include/features.php:134 +#: ../../include/features.php:143 msgid "Change channels directly from within the navigation dropdown menu" msgstr "Canvieu els canals directament des del menú desplegable de navegació" -#: ../../include/features.php:142 +#: ../../include/features.php:151 msgid "Photo Location" msgstr "Ubicació de la Foto" -#: ../../include/features.php:143 +#: ../../include/features.php:152 msgid "If location data is available on uploaded photos, link this to a map." msgstr "Si les dades d'ubicació estàn disponibles a les fotos pujades, vincular a un mapa." -#: ../../include/features.php:151 +#: ../../include/features.php:160 msgid "Access Controlled Chatrooms" msgstr "Accés Controlat a les Sales de Xat" -#: ../../include/features.php:152 +#: ../../include/features.php:161 msgid "Provide chatrooms and chat services with access control." msgstr "Proveeix sales de Xat i serveis de Xat amb control d'accés." -#: ../../include/features.php:161 +#: ../../include/features.php:170 msgid "Smart Birthdays" msgstr "Aniversaris Intel·ligents" -#: ../../include/features.php:162 +#: ../../include/features.php:171 msgid "" "Make birthday events timezone aware in case your friends are scattered " "across the planet." msgstr "Fes, conscients de la zona horària, els esdeveniments d'aniversari, en cas que els teus amics estiguin dispersos per tot el planeta." -#: ../../include/features.php:170 +#: ../../include/features.php:179 msgid "Event Timezone Selection" msgstr "Zona horària dels esdeveniments" -#: ../../include/features.php:171 +#: ../../include/features.php:180 msgid "Allow event creation in timezones other than your own." msgstr "Permet crear esdeveniments en zones horàries diferents a la teva." -#: ../../include/features.php:180 +#: ../../include/features.php:189 msgid "Premium Channel" msgstr "Privilegis del Canal" -#: ../../include/features.php:181 +#: ../../include/features.php:190 msgid "" "Allows you to set restrictions and terms on those that connect with your " "channel" msgstr "Li permet establir restriccions i els termes en els quals es connecten amb el seu canal" -#: ../../include/features.php:189 +#: ../../include/features.php:198 msgid "Advanced Directory Search" msgstr "Cerca de directori avançada" -#: ../../include/features.php:190 +#: ../../include/features.php:199 msgid "Allows creation of complex directory search queries" msgstr "Permet fer cerques de directori complexes" -#: ../../include/features.php:198 +#: ../../include/features.php:207 msgid "Advanced Theme and Layout Settings" msgstr "Configuració de disseny i de tema avançada" -#: ../../include/features.php:199 +#: ../../include/features.php:208 msgid "Allows fine tuning of themes and page layouts" msgstr "Permet configurar al detall els temes i els dissenys de pàgina" -#: ../../include/features.php:208 +#: ../../include/features.php:217 msgid "Access Control and Permissions" msgstr "Control d'accés i permisos" -#: ../../include/features.php:212 ../../include/group.php:328 +#: ../../include/features.php:221 ../../include/group.php:328 msgid "Privacy Groups" msgstr "Grup Privat" -#: ../../include/features.php:213 +#: ../../include/features.php:222 msgid "Enable management and selection of privacy groups" msgstr "Habilita gestió i selecció de grups privats" -#: ../../include/features.php:221 +#: ../../include/features.php:230 msgid "Multiple Profiles" msgstr "Multiples Perfils" -#: ../../include/features.php:222 +#: ../../include/features.php:231 msgid "Ability to create multiple profiles" msgstr "Capacitat per crear multiples perfils" -#: ../../include/features.php:232 +#: ../../include/features.php:241 msgid "Provide alternate connection permission roles." msgstr "Proporciona rols diferents per als permisos de connexió." -#: ../../include/features.php:240 -msgid "OAuth Clients" -msgstr "Clients d'OAuth" +#: ../../include/features.php:249 +msgid "OAuth1 Clients" +msgstr "Clients OAuth1" + +#: ../../include/features.php:250 +msgid "Manage OAuth1 authenticatication tokens for mobile and remote apps." +msgstr "Gestiona els tokens d'autenticació OAuth1 per al mòbil i aplicacions remotes." -#: ../../include/features.php:241 -msgid "Manage authenticatication tokens for mobile and remote apps." -msgstr "Gestiona els tokens d'autenticació per al mòbils i aplicacions remotes." +#: ../../include/features.php:258 +msgid "OAuth2 Clients" +msgstr "Clients OAuth2" -#: ../../include/features.php:249 +#: ../../include/features.php:259 +msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps." +msgstr "Gestiona els tokens d'autenticació OAuth2 per al mòbil i aplicacions remotes." + +#: ../../include/features.php:267 msgid "Access Tokens" msgstr "Tokens d'accés" -#: ../../include/features.php:250 +#: ../../include/features.php:268 msgid "Create access tokens so that non-members can access private content." msgstr "Crea tokens d'accés per tal que no-membres puguis accedir contingut privat." -#: ../../include/features.php:261 +#: ../../include/features.php:279 msgid "Post Composition Features" msgstr "Característiques de Composició d'Entrades" -#: ../../include/features.php:265 +#: ../../include/features.php:283 msgid "Large Photos" msgstr "Grans Fotos" -#: ../../include/features.php:266 +#: ../../include/features.php:284 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "Inclou gran (1024px) foto de miniatura a les entrades. Si no està activat, empra petita (640px) foto de miniatura." -#: ../../include/features.php:275 +#: ../../include/features.php:293 msgid "Automatically import channel content from other channels or feeds" msgstr "Importa automàticament el contingut del canal des de altres canals o feeds" -#: ../../include/features.php:283 +#: ../../include/features.php:301 msgid "Even More Encryption" msgstr "Encara Més Encriptació" -#: ../../include/features.php:284 +#: ../../include/features.php:302 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "Permet l'encripció opcional del contingut extrem-a-extrem amb clau secreta compartida" -#: ../../include/features.php:292 +#: ../../include/features.php:310 msgid "Enable Voting Tools" msgstr "Habilitar Eines de Votació" -#: ../../include/features.php:293 +#: ../../include/features.php:311 msgid "Provide a class of post which others can vote on" msgstr "Proporcionar una classe d'entrada que altres puguin votar" -#: ../../include/features.php:301 +#: ../../include/features.php:319 msgid "Disable Comments" msgstr "Deshabilita els comentaris" -#: ../../include/features.php:302 +#: ../../include/features.php:320 msgid "Provide the option to disable comments for a post" msgstr "Proporciona l'opció de deshabilitar els comentaris per a una entrada" -#: ../../include/features.php:310 +#: ../../include/features.php:328 msgid "Delayed Posting" msgstr "Retarda Publicació" -#: ../../include/features.php:311 +#: ../../include/features.php:329 msgid "Allow posts to be published at a later date" msgstr "Permet que les publicacions es publiquin en data posterior" -#: ../../include/features.php:319 +#: ../../include/features.php:337 msgid "Content Expiration" msgstr "Expiració del Contingut" -#: ../../include/features.php:320 +#: ../../include/features.php:338 msgid "Remove posts/comments and/or private messages at a future time" msgstr "eliminarà entrades/comentaris i/o missatges privats en un període determinat de temps." -#: ../../include/features.php:328 +#: ../../include/features.php:346 msgid "Suppress Duplicate Posts/Comments" msgstr "Suprimeix Duplicats de Publicacions/Comentaris" -#: ../../include/features.php:329 +#: ../../include/features.php:347 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "Evita que publicacions amb identic contingut siguin publicades amb menys de dos minuts entre entregues." -#: ../../include/features.php:340 +#: ../../include/features.php:355 +msgid "Auto-save drafts of posts and comments" +msgstr "Desa automàticament esborranys de les entrades i comentaris" + +#: ../../include/features.php:356 +msgid "" +"Automatically saves post and comment drafts in local browser storage to help" +" prevent accidental loss of compositions" +msgstr "Desa esborranys automàticament en l'emmagatzematge local del navegador per a evitar perdre escrits per a comentaris o entrades" + +#: ../../include/features.php:367 msgid "Network and Stream Filtering" msgstr "Filtrat de Xarxa i Flux" -#: ../../include/features.php:344 +#: ../../include/features.php:371 msgid "Search by Date" msgstr "Cerca per Data" -#: ../../include/features.php:345 +#: ../../include/features.php:372 msgid "Ability to select posts by date ranges" msgstr "Capacitat per seleccionar entrades per rang de dates" -#: ../../include/features.php:355 +#: ../../include/features.php:382 msgid "Save search terms for re-use" msgstr "Guardar els termin de la cerca per a re-usar" -#: ../../include/features.php:363 +#: ../../include/features.php:390 msgid "Network Personal Tab" msgstr "Pestanya Personal de Xarxa" -#: ../../include/features.php:364 +#: ../../include/features.php:391 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "Activa la pestanya per mostrar només les entrades de xarxa en les que has intervingut" -#: ../../include/features.php:372 +#: ../../include/features.php:399 msgid "Network New Tab" msgstr "Pestanya Nou a la Xarxa" -#: ../../include/features.php:373 +#: ../../include/features.php:400 msgid "Enable tab to display all new Network activity" msgstr "Activa pestanya per mostrar tota l'activitat nova de la Xarxa" -#: ../../include/features.php:381 +#: ../../include/features.php:408 msgid "Affinity Tool" msgstr "Eina d'Afinitat" -#: ../../include/features.php:382 +#: ../../include/features.php:409 msgid "Filter stream activity by depth of relationships" msgstr "Filtre d'activitat del flux per importància de la relació" -#: ../../include/features.php:391 +#: ../../include/features.php:418 msgid "Show friend and connection suggestions" msgstr "Suggereix connexions o amistats" -#: ../../include/features.php:399 +#: ../../include/features.php:426 msgid "Connection Filtering" msgstr "Filtre de Connexió" -#: ../../include/features.php:400 +#: ../../include/features.php:427 msgid "Filter incoming posts from connections based on keywords/content" msgstr "Filtre de missatges d'entrada de conexions, basat en paraules clau/contingut " -#: ../../include/features.php:412 +#: ../../include/features.php:439 msgid "Post/Comment Tools" msgstr "Eina d'Entrades/Comentaris" -#: ../../include/features.php:416 +#: ../../include/features.php:443 msgid "Community Tagging" msgstr "Etiquetat per la Comunitat" -#: ../../include/features.php:417 +#: ../../include/features.php:444 msgid "Ability to tag existing posts" msgstr "Capacitat d'etiquetar entrades existents" -#: ../../include/features.php:425 +#: ../../include/features.php:452 msgid "Post Categories" msgstr "Categories d'Entrades" -#: ../../include/features.php:426 +#: ../../include/features.php:453 msgid "Add categories to your posts" msgstr "Afegeix categoria a la teva entrada" -#: ../../include/features.php:434 +#: ../../include/features.php:461 msgid "Emoji Reactions" msgstr "Reaccions dels Emoji" -#: ../../include/features.php:435 +#: ../../include/features.php:462 msgid "Add emoji reaction ability to posts" msgstr "Afegeix un emoji habilitat per reaccionar a entrades" -#: ../../include/features.php:444 +#: ../../include/features.php:471 msgid "Ability to file posts under folders" msgstr "Capacitat de arxivar entrades en les carpetes" -#: ../../include/features.php:452 +#: ../../include/features.php:479 msgid "Dislike Posts" msgstr "No Agrada l'Entrada" -#: ../../include/features.php:453 +#: ../../include/features.php:480 msgid "Ability to dislike posts/comments" msgstr "Capacitat per marcar amb \"No Agrada\" les entrades/comentaris" -#: ../../include/features.php:461 +#: ../../include/features.php:488 msgid "Star Posts" msgstr "Entrades Excel·lents" -#: ../../include/features.php:462 +#: ../../include/features.php:489 msgid "Ability to mark special posts with a star indicator" msgstr "Capacitat per marcar entrades especials amb l'indicador d'excel·lencia" -#: ../../include/features.php:470 +#: ../../include/features.php:497 msgid "Tag Cloud" msgstr "Núvol d'Etiquetes." -#: ../../include/features.php:471 +#: ../../include/features.php:498 msgid "Provide a personal tag cloud on your channel page" msgstr "Proporcionar un núvol d'etiquetes personals a la teva pàgina de canal" -#: ../../include/taxonomy.php:384 ../../include/taxonomy.php:405 -msgid "Tags" -msgstr "Etiquetes" +#: ../../include/taxonomy.php:320 +msgid "Trending" +msgstr "Tema del moment" -#: ../../include/taxonomy.php:487 +#: ../../include/taxonomy.php:552 msgid "Keywords" msgstr "Paraules clau" -#: ../../include/taxonomy.php:508 +#: ../../include/taxonomy.php:573 msgid "have" msgstr "tinc" -#: ../../include/taxonomy.php:508 +#: ../../include/taxonomy.php:573 msgid "has" msgstr "tens" -#: ../../include/taxonomy.php:509 +#: ../../include/taxonomy.php:574 msgid "want" msgstr "vull" -#: ../../include/taxonomy.php:509 +#: ../../include/taxonomy.php:574 msgid "wants" msgstr "vols" -#: ../../include/taxonomy.php:510 +#: ../../include/taxonomy.php:575 msgid "likes" msgstr "agrada" -#: ../../include/taxonomy.php:511 +#: ../../include/taxonomy.php:576 msgid "dislikes" msgstr "desagrada" -#: ../../include/account.php:35 +#: ../../include/account.php:36 msgid "Not a valid email address" msgstr "Adreça de correu electrònic no vàlida" -#: ../../include/account.php:37 +#: ../../include/account.php:38 msgid "Your email domain is not among those allowed on this site" msgstr "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc" -#: ../../include/account.php:43 +#: ../../include/account.php:44 msgid "Your email address is already registered at this site." msgstr "La teva adreça de correu electrònic ja esta registrada en aquest lloc" -#: ../../include/account.php:75 +#: ../../include/account.php:76 msgid "An invitation is required." msgstr "Es requereix Invitació" -#: ../../include/account.php:79 +#: ../../include/account.php:80 msgid "Invitation could not be verified." msgstr "L'invitació no ha pogut ser verificada" -#: ../../include/account.php:157 +#: ../../include/account.php:158 msgid "Please enter the required information." msgstr "Entra la informació sol·licitada" -#: ../../include/account.php:224 +#: ../../include/account.php:225 msgid "Failed to store account information." msgstr "Ha fallat guardar la informació del compte" -#: ../../include/account.php:313 +#: ../../include/account.php:314 #, php-format msgid "Registration confirmation for %s" msgstr "Inscripció confirmada per %s" -#: ../../include/account.php:382 +#: ../../include/account.php:383 #, php-format msgid "Registration request at %s" msgstr "Sol·licitud d'inscripció a %s" -#: ../../include/account.php:404 +#: ../../include/account.php:405 msgid "your registration password" msgstr "la teva contrasenya registrada" -#: ../../include/account.php:410 ../../include/account.php:472 +#: ../../include/account.php:411 ../../include/account.php:473 #, php-format msgid "Registration details for %s" msgstr "Detalls de l'inscripció per %s" -#: ../../include/account.php:483 +#: ../../include/account.php:484 msgid "Account approved." msgstr "Compte aprovat." -#: ../../include/account.php:523 +#: ../../include/account.php:524 #, php-format msgid "Registration revoked for %s" msgstr "Inscripció revocada per %s" -#: ../../include/account.php:802 ../../include/account.php:804 +#: ../../include/account.php:803 ../../include/account.php:805 msgid "Click here to upgrade." msgstr "Feu clic aquí per actualitzar." -#: ../../include/account.php:810 +#: ../../include/account.php:811 msgid "This action exceeds the limits set by your subscription plan." msgstr "Aquesta acció és superior als límits establerts pel seu pla de subscripció." -#: ../../include/account.php:815 +#: ../../include/account.php:816 msgid "This action is not available under your subscription plan." msgstr "Aquesta acció no està disponible en el seu pla de subscripció." -#: ../../include/datetime.php:134 +#: ../../include/datetime.php:140 msgid "Birthday" msgstr "Aniversari" -#: ../../include/datetime.php:134 +#: ../../include/datetime.php:140 msgid "Age: " msgstr "Edat:" -#: ../../include/datetime.php:134 +#: ../../include/datetime.php:140 msgid "YYYY-MM-DD or MM-DD" msgstr "YYYY-MM-DD o MM-DD" -#: ../../include/datetime.php:238 +#: ../../include/datetime.php:244 msgid "less than a second ago" msgstr "fa menys d'un segon" -#: ../../include/datetime.php:256 +#: ../../include/datetime.php:262 #, php-format msgctxt "e.g. 22 hours ago, 1 minute ago" msgid "%1$d %2$s ago" msgstr "Fa %1$d %2$s" -#: ../../include/datetime.php:267 +#: ../../include/datetime.php:273 msgctxt "relative_date" msgid "year" msgid_plural "years" msgstr[0] "any" msgstr[1] "anys" -#: ../../include/datetime.php:270 +#: ../../include/datetime.php:276 msgctxt "relative_date" msgid "month" msgid_plural "months" msgstr[0] "mes" msgstr[1] "mesos " -#: ../../include/datetime.php:273 +#: ../../include/datetime.php:279 msgctxt "relative_date" msgid "week" msgid_plural "weeks" msgstr[0] "setmana" msgstr[1] "setmanes" -#: ../../include/datetime.php:276 +#: ../../include/datetime.php:282 msgctxt "relative_date" msgid "day" msgid_plural "days" msgstr[0] "dia" msgstr[1] "dies" -#: ../../include/datetime.php:279 +#: ../../include/datetime.php:285 msgctxt "relative_date" msgid "hour" msgid_plural "hours" msgstr[0] "hora" msgstr[1] "hores" -#: ../../include/datetime.php:282 +#: ../../include/datetime.php:288 msgctxt "relative_date" msgid "minute" msgid_plural "minutes" msgstr[0] "minut" msgstr[1] "minuts" -#: ../../include/datetime.php:285 +#: ../../include/datetime.php:291 msgctxt "relative_date" msgid "second" msgid_plural "seconds" msgstr[0] "segon" msgstr[1] "segons" -#: ../../include/datetime.php:514 +#: ../../include/datetime.php:520 #, php-format msgid "%1$s's birthday" msgstr "Aniversari de %1$s" -#: ../../include/datetime.php:515 +#: ../../include/datetime.php:521 #, php-format msgid "Happy Birthday %1$s" msgstr "Feliç Aniversari %1$s" @@ -13935,16 +14182,16 @@ msgid "Help and documentation" msgstr "Ajuda i documentació" #: ../../include/nav.php:179 -msgid "Search site @name, #tag, ?docs, content" -msgstr "Cerca pel lloc @name, #tag, ?docs, contingut" +msgid "Search site @name, !forum, #tag, ?docs, content" +msgstr "Cerca en el node @nom, !fòrum, #etiqueta, ?documentació, contingut" #: ../../include/nav.php:199 msgid "Site Setup and Configuration" msgstr "Ajustos i Configuració del Lloc" #: ../../include/nav.php:290 -msgid "@name, #tag, ?doc, content" -msgstr "@nom, #etiqueta, ?doc, contingut" +msgid "@name, !forum, #tag, ?doc, content" +msgstr "@nom, !fòrum, #etiqueta, ?documentació, contingut" #: ../../include/nav.php:291 msgid "Please wait..." @@ -13971,38 +14218,38 @@ msgstr "La imatge excedeix la mida limit pel lloc web en %lu bytes" msgid "Image file is empty." msgstr "El fitxer d'imatge esta buit." -#: ../../include/photos.php:322 +#: ../../include/photos.php:326 msgid "Photo storage failed." msgstr "Fracassà l'emmagatzematge de la Foto" -#: ../../include/photos.php:364 +#: ../../include/photos.php:375 msgid "a new photo" msgstr "Una foto nova" -#: ../../include/photos.php:368 +#: ../../include/photos.php:379 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "%1$s enviat %2$s a %3$s" -#: ../../include/photos.php:660 +#: ../../include/photos.php:671 msgid "Upload New Photos" msgstr "Puja Noves Fotos" -#: ../../include/zot.php:767 +#: ../../include/zot.php:772 msgid "Invalid data packet" msgstr "paquet de dades invàlid" -#: ../../include/zot.php:794 +#: ../../include/zot.php:799 msgid "Unable to verify channel signature" msgstr "No es pot verificar la signatura del canal" -#: ../../include/zot.php:2529 +#: ../../include/zot.php:2552 #, php-format msgid "Unable to verify site signature for %s" msgstr "No es pot verificar la signatura del lloc per %s" -#: ../../include/zot.php:4180 +#: ../../include/zot.php:4219 msgid "invalid target signature" msgstr "Signatura objectiu invàlida" @@ -14033,23 +14280,27 @@ msgstr "Afegir grup privat" msgid "Channels not in any privacy group" msgstr "Sense canals en grups privats" -#: ../../include/connections.php:128 +#: ../../include/connections.php:133 msgid "New window" msgstr "Nova finestra" -#: ../../include/connections.php:129 +#: ../../include/connections.php:134 msgid "Open the selected location in a different window or browser tab" msgstr "Obrir la localització seleccionada en un altre finestra o pestanya del navegador" -#: ../../include/auth.php:148 +#: ../../include/auth.php:152 +msgid "Delegation session ended." +msgstr "S'ha tancat la sessió de delegació." + +#: ../../include/auth.php:156 msgid "Logged out." msgstr "Sortir." -#: ../../include/auth.php:263 +#: ../../include/auth.php:273 msgid "Email validation is incomplete. Please check your email." msgstr "Encara no s'ha validat el teu correu. Comprova la safata d'entrada i la paperera." -#: ../../include/auth.php:279 +#: ../../include/auth.php:289 msgid "Failed authentication" msgstr "Autenticació fallida" diff --git a/view/ca/hstrings.php b/view/ca/hstrings.php index 7470f8c84..50ffaebeb 100644 --- a/view/ca/hstrings.php +++ b/view/ca/hstrings.php @@ -4,866 +4,591 @@ if(! function_exists("string_plural_select_ca")) { function string_plural_select_ca($n){ return ($n != 1);; }} -; -App::$strings["parent"] = "pare"; -App::$strings["Collection"] = "Col·lecció"; -App::$strings["Principal"] = "Principal"; -App::$strings["Addressbook"] = "Llista d'Adreçes"; -App::$strings["Calendar"] = "Calendari"; -App::$strings["Schedule Inbox"] = "Programació de la bústia d'entrada"; -App::$strings["Schedule Outbox"] = "Programació de la bústia de sortida"; -App::$strings["Unknown"] = "Desconegut"; -App::$strings["Files"] = "Arxius"; -App::$strings["Total"] = "Total"; -App::$strings["Shared"] = "Compartit"; -App::$strings["Create"] = "Crear"; -App::$strings["Upload"] = "Pujar"; -App::$strings["Name"] = "Nom"; -App::$strings["Type"] = "Tipus"; -App::$strings["Size"] = "Mida"; -App::$strings["Last Modified"] = "Últim Modificat"; -App::$strings["Edit"] = "Edita"; -App::$strings["Delete"] = "Esborra"; -App::$strings["You are using %1\$s of your available file storage."] = "Estàs emprant el %1\$s de l'espai d'emmagatzematge disponible"; -App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s%)"] = "Estàs emprant %1\$s de %2\$s d'emmagatzematge d'arxius disponible.\n(%3\$s%)"; -App::$strings["WARNING:"] = "ALERTA:"; -App::$strings["Create new folder"] = "Crea una nova carpeta"; -App::$strings["Upload file"] = "Puja arxiu"; -App::$strings["Permission denied"] = "Permís denegat"; -App::$strings["Permission denied."] = "Permís denegat."; -App::$strings["Not Found"] = "No s'ha pogut trobar la pàgina"; -App::$strings["Page not found."] = "Pàgina no trobada."; -App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Autenticació remota bloquejada. Ha iniciat sessió en aquest lloc a nivell local. Si us plau, tanca la sessió i torna-ho a intentar."; -App::$strings["Welcome %s. Remote authentication successful."] = "Benvingut %s. Autenticació remota reeixida."; +App::$rtl = 0; +App::$strings["Can view my channel stream and posts"] = "Pot veure el flux i entrades del meu canal"; +App::$strings["Can send me their channel stream and posts"] = "Pot enviar-me el flux i entrades del seu canal"; +App::$strings["Can view my default channel profile"] = "Pot veure el perfil del meu canal per defecte"; +App::$strings["Can view my connections"] = "Pot veure les meves connexions"; +App::$strings["Can view my file storage and photos"] = "Pot veure les meves fotos i arxius"; +App::$strings["Can upload/modify my file storage and photos"] = "Pot pujar i modificar els meus fitxers i fotos"; +App::$strings["Can view my channel webpages"] = "Pot veure les pàgines web del meu canal"; +App::$strings["Can view my wiki pages"] = "Por veure les meves pàgines wiki"; +App::$strings["Can create/edit my channel webpages"] = "Pot crear i modificar les pàgines web del meu canal"; +App::$strings["Can write to my wiki pages"] = "Pot escriure a les meves pàgines wiki"; +App::$strings["Can post on my channel (wall) page"] = "Pot penjar entrades al mur del meu canal"; +App::$strings["Can comment on or like my posts"] = "Pot comentar i fer \"m'agrada\" a les meves entrades"; +App::$strings["Can send me private mail messages"] = "Pot enviar-me missatges privats"; +App::$strings["Can like/dislike profiles and profile things"] = "Pot fer m'agrada i no m'agrada als perfils i coses del perfil"; +App::$strings["Can forward to all my channel connections via @+ mentions in posts"] = "Pot reenviar a totes les connexions del meu canal fent servir @+ per mencionar"; +App::$strings["Can chat with me"] = "Pot xatejar amb mi"; +App::$strings["Can source my public posts in derived channels"] = "Pot fer servir les meves entrades per publicar automàticament en altres canals"; +App::$strings["Can administer my channel"] = "Pot administrar el meu canal"; +App::$strings["Social Networking"] = "Xarxes Socials"; +App::$strings["Social - Federation"] = "Social - Federació"; +App::$strings["Social - Mostly Public"] = "Social - Principalment públic"; +App::$strings["Social - Restricted"] = "Social - Restingit"; +App::$strings["Social - Private"] = "Social - Privat"; +App::$strings["Community Forum"] = "Fòrum comunitari"; +App::$strings["Forum - Mostly Public"] = "Fòrum - Principalment públic"; +App::$strings["Forum - Restricted"] = "Fòrum - Restringit"; +App::$strings["Forum - Private"] = "Fòrum - Privat"; +App::$strings["Feed Republish"] = "Republicador"; +App::$strings["Feed - Mostly Public"] = "Republicador - Principalment públic"; +App::$strings["Feed - Restricted"] = "Republicador - Restringit"; +App::$strings["Special Purpose"] = "Objectiu Especial"; +App::$strings["Special - Celebrity/Soapbox"] = "Especial - Personatge públic / Plataforma"; +App::$strings["Special - Group Repository"] = "Especial - Repositori d'un Grup"; +App::$strings["Other"] = "Altres"; +App::$strings["Custom/Expert Mode"] = "Personalitzat, mode expert"; App::$strings["Requested profile is not available."] = "El perfil demanat no està disponible."; -App::$strings["Some blurb about what to do when you're new here"] = "Algunes propostes sobre el que cal fer quan ets nou aquí"; -App::$strings["Block Name"] = "Nom del Bloc"; -App::$strings["Blocks"] = "Bloc"; +App::$strings["Permission denied."] = "S'ha denegat el permís."; +App::$strings["Block Name"] = "Nom del bloc"; +App::$strings["Blocks"] = "Blocs"; App::$strings["Block Title"] = "Títol del bloc"; App::$strings["Created"] = "Creat"; App::$strings["Edited"] = "Editat"; +App::$strings["Create"] = "Crea"; +App::$strings["Edit"] = "Edita"; App::$strings["Share"] = "Compartir"; +App::$strings["Delete"] = "Esborra"; App::$strings["View"] = "Mostra"; -App::$strings["Channel not found."] = "Canal no trobat."; -App::$strings["Permissions denied."] = "Permís denegat."; -App::$strings["l, F j"] = "l, F j"; -App::$strings["Link to Source"] = "Enllaç a la Font"; -App::$strings["Edit Event"] = "Editar l'Esdeveniment"; -App::$strings["Create Event"] = "Crear Esdeveniment"; +App::$strings["Total invitation limit exceeded."] = "S'ha superat el límit total d'invitacions."; +App::$strings["%s : Not a valid email address."] = "L'adreça de correu %s no és vàlida."; +App::$strings["Please join us on \$Projectname"] = "Suma't a \$Projectname!"; +App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "S'ha superat el límit d'invitacions. Posa't en contacte amb l'administrador del lloc."; +App::$strings["%s : Message delivery failed."] = "No s'ha pogut lliurar la invitació a %s"; +App::$strings["%d message sent."] = array( + 0 => "S'ha enviat %d invitació.", + 1 => "S'han enviat %d invitacions.", +); +App::$strings["You have no more invitations available"] = "No pots enviar més invitacions"; +App::$strings["Send invitations"] = "Envia invitacions"; +App::$strings["Enter email addresses, one per line:"] = "Introdueix les adreces de correu electrònic, una per línia:"; +App::$strings["Your message:"] = "El teu missatge:"; +App::$strings["Please join my community on \$Projectname."] = "Vols sumar-te a la meva comunitat a \$Projectname?"; +App::$strings["You will need to supply this invitation code:"] = "Hauràs de facilitar aquest codi d'invitació:"; +App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Pots registrar-te a qualsevol node de \$Projectname (estan tots interconnectats)"; +App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Escriu a la barra de cerca la meva adreça de la xarxa \$Projectname."; +App::$strings["or visit"] = "o bé visita"; +App::$strings["3. Click [Connect]"] = "3. Clica [connecta]"; +App::$strings["Submit"] = "Envia"; +App::$strings["Articles"] = "Articles"; +App::$strings["Add Article"] = "Afegeix un article"; +App::$strings["Item not found"] = "No s'ha trobat l'element"; +App::$strings["Layout Name"] = "Nom del disseny"; +App::$strings["Layout Description (Optional)"] = "Descripció del disseny (opcional)"; +App::$strings["Edit Layout"] = "Edita el disseny"; +App::$strings["Permission denied"] = "S'ha denegat el permís"; +App::$strings["Invalid profile identifier."] = "L'identificador de perfil no és vàlid."; +App::$strings["Profile Visibility Editor"] = "Editor de la visibilitat del perfil"; +App::$strings["Profile"] = "Perfil"; +App::$strings["Click on a contact to add or remove."] = "Clica sobre un contacte per afegir-lo o esborrar-lo."; +App::$strings["Visible To"] = "Visible per"; +App::$strings["All Connections"] = "Totes les connexions"; +App::$strings["INVALID EVENT DISMISSED!"] = "S'HA DESCARTAT UN ESDEVENIMENT INVÀLID."; +App::$strings["Summary: "] = "Resum:"; +App::$strings["Unknown"] = "Desconegut"; +App::$strings["Date: "] = "Data:"; +App::$strings["Reason: "] = "Motiu:"; +App::$strings["INVALID CARD DISMISSED!"] = "S'HA DESCARTAT UNA TARGETA INVÀLIDA."; +App::$strings["Name: "] = "Nom:"; +App::$strings["Event title"] = "Títol de l'esdeveniment"; +App::$strings["Start date and time"] = "Data i hora d'inici"; +App::$strings["Example: YYYY-MM-DD HH:mm"] = "Exemple: AAAA-MM-DD HH:mm"; +App::$strings["End date and time"] = "Data i hora de fi"; +App::$strings["Description"] = "Descripció"; +App::$strings["Location"] = "Ubicació"; App::$strings["Previous"] = "Anterior"; -App::$strings["Next"] = "Pròxim"; -App::$strings["Export"] = "Exporta"; -App::$strings["Import"] = "Importar"; -App::$strings["Submit"] = "Enviar"; +App::$strings["Next"] = "Següent"; App::$strings["Today"] = "Avui"; -App::$strings["You must be logged in to see this page."] = "Has d'estar identificat per a veure aquesta pàgina."; +App::$strings["Month"] = "mes"; +App::$strings["Week"] = "setmana"; +App::$strings["Day"] = "dia"; +App::$strings["List month"] = "Mes en llista"; +App::$strings["List week"] = "Setmana en llista"; +App::$strings["List day"] = "Dia en llista"; +App::$strings["More"] = "Mostra més"; +App::$strings["Less"] = "Mostra menys"; +App::$strings["Select calendar"] = "Tria un calendari"; +App::$strings["Delete all"] = "Esborra'ls tots"; +App::$strings["Cancel"] = "Cancel·la"; +App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "Malauradament encara no es poden editar esdeveniments periòdics."; +App::$strings["Name"] = "Nom"; +App::$strings["Organisation"] = "Organització"; +App::$strings["Title"] = "Títol"; +App::$strings["Phone"] = "Telèfon"; +App::$strings["Email"] = "Correu electrònic"; +App::$strings["Instant messenger"] = "Missatgeria instantània"; +App::$strings["Website"] = "Lloc web"; +App::$strings["Address"] = "Adreça"; +App::$strings["Note"] = "Nota"; +App::$strings["Mobile"] = "Mòbil"; +App::$strings["Home"] = "Inici"; +App::$strings["Work"] = "Feina"; +App::$strings["Add Contact"] = "Afegeix un contacte"; +App::$strings["Add Field"] = "Afegeix un camp"; +App::$strings["Update"] = "Actualitza"; +App::$strings["P.O. Box"] = "Apartat de correus"; +App::$strings["Additional"] = "Addicional"; +App::$strings["Street"] = "Carrer"; +App::$strings["Locality"] = "Localitat"; +App::$strings["Region"] = "Regió"; +App::$strings["ZIP Code"] = "Codi postal"; +App::$strings["Country"] = "País"; +App::$strings["Default Calendar"] = "Calendari per defecte"; +App::$strings["Default Addressbook"] = "Llibreta d'adreces per defecte"; +App::$strings["This site is not a directory server"] = "Aquest hub no és un servidor de directori"; +App::$strings["You must be logged in to see this page."] = "Has de tenir una sessió iniciada per a veure aquesta pàgina."; App::$strings["Posts and comments"] = "Entrades i comentaris"; App::$strings["Only posts"] = "Només entrades"; -App::$strings["Insufficient permissions. Request redirected to profile page."] = "Permisos insuficients. Petició redirigida a la pàgina del perfil."; -App::$strings["Room not found"] = "No s'ha trobat la sala"; -App::$strings["Leave Room"] = "Abandona la sala"; -App::$strings["Delete Room"] = "Esborra Sala"; -App::$strings["I am away right now"] = "Absent"; -App::$strings["I am online"] = "Estic connectat/da"; -App::$strings["Bookmark this room"] = "Fes favorit aquest xat"; -App::$strings["Please enter a link URL:"] = "Si us plau entra l'enllaç URL:"; -App::$strings["Encrypt text"] = "Text encriptat"; -App::$strings["Insert web link"] = "Insereix enllaç web"; -App::$strings["Feature disabled."] = "Funcionalitat desactivada."; -App::$strings["New Chatroom"] = "Nova sala per a Xerrar"; -App::$strings["Chatroom name"] = "Nom de la sala de xat"; -App::$strings["Expiration of chats (minutes)"] = "Expiració dels chats (minuts)"; -App::$strings["Permissions"] = "Permisos "; -App::$strings["%1\$s's Chatrooms"] = "%1\$s de Xats"; -App::$strings["No chatrooms available"] = "No hi ha sales de xat disponibles"; -App::$strings["Create New"] = "Crear Nou"; -App::$strings["Expiration"] = "Expiració"; -App::$strings["min"] = "min"; -App::$strings["Away"] = "Absent"; -App::$strings["Online"] = "En connexió"; -App::$strings["Invalid item."] = "Article invàlid."; -App::$strings["Bookmark added"] = "Favorit afegit"; -App::$strings["My Bookmarks"] = "Els Meus Favorits"; -App::$strings["My Connections Bookmarks"] = "Les connexions dels meus Favorits"; -App::$strings["Continue"] = "Continua"; -App::$strings["Premium Channel Setup"] = "Configuració de Canals Premium"; -App::$strings["Enable premium channel connection restrictions"] = "Habilita les restriccions de connexió del canal premium"; -App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Si us plau, introdueixi les restriccions o condicions, com ara el rebut de PayPal, les pautes d'ús, etc."; -App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Aquest canal pot requerir passos addicionals o reconeixement de les següents condicions abans de connectar:"; -App::$strings["Potential connections will then see the following text before proceeding:"] = "Connexions potencials veuran el següent text abans de continuar:"; -App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "En continuar, certifico que he complert amb totes les instruccions proporcionades en aquesta pàgina."; -App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(No s'han proporcionat instruccions específiques pel propietari del canal.)"; -App::$strings["Restricted or Premium Channel"] = "Canal Restringit o Premium"; -App::$strings["Could not access contact record."] = "No s'ha pogut accedir al llibre de contactes."; -App::$strings["Could not locate selected profile."] = "No s'ha trobat el perfil indicat."; -App::$strings["Connection updated."] = "S'ha actualitzat la connexió."; -App::$strings["Failed to update connection record."] = "No s'ha pogut actualitzar el registre de connexió."; -App::$strings["is now connected to"] = "Ara està conectat amb"; +App::$strings["Insufficient permissions. Request redirected to profile page."] = "S'ha denegat el permís. La petició s'ha redirigit a la pàgina de perfil."; +App::$strings["Export Channel"] = "Exporta un canal"; +App::$strings["Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exporta la informació bàsica del canal a un arxiu. Això serveix com a còpia de seguretat de les teves connexions, permisos, perfil i dades bàsiques, i pots emprar-la per a importar aquestes dades des d'un altre hub. No conté el contingut del canal."; +App::$strings["Export Content"] = "Exporta'n el contingut"; +App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin."] = "Exporta la informació del canal i tot el contingut recent a una còpia de seguretat en format JSON. Pot ser restaurada o importada des d'un altre hub. Això desa totes les teves connexions, permisos, dades de perfil i diversos mesos de publicacions. L'arxiu pot ser MOLT gran. Si et plau, sigues pacient ja que la preparació de l'arxiu pot trigar una estona, abans que el puguis començar a baixar."; +App::$strings["Export your posts from a given year."] = "Exporta les entrades d'un any determinat."; +App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Pots també exportar les entrades i converses d'un any o un mes en particular. Ajusta la data a la barra d'adreces del navegador per seleccionar altres dates. Si l'exportació falla (possiblement degut a l'esgotament de la memòria RAM del servidor), prova de nou amb un interval de dates més petit."; +App::$strings["To select all posts for a given year, such as this year, visit %2\$s"] = "Per exemple, per seleccionar totes les entrades d'aquest any, ves a %2\$s"; +App::$strings["To select all posts for a given month, such as January of this year, visit %2\$s"] = "Per exemple, per seleccionar totes les entrades del mes de gener d'aquest any, ves a %2\$s"; +App::$strings["These content files may be imported or restored by visiting %2\$s on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Les còpies de seguretat amb contingut es poden importar o restaurar des d'aquesta adreça %2\$s. En aquest cas és aquest servidor, però també serviria en un altre hub que allotgés un clon del teu canal. Si vols restaurar més d'un arxiu de contingut, per evitar problemes importa'ls en ordre cronològic."; +App::$strings["Welcome to Hubzilla!"] = "Benvingut/da a Hubzilla!"; +App::$strings["You have got no unseen posts..."] = "No tens entrades pendents de veure..."; +App::$strings["Public access denied."] = "L'accés públic no està permès."; +App::$strings["Search"] = "Cerca"; +App::$strings["Items tagged with: %s"] = "Elements etiquetats amb: %s"; +App::$strings["Search results for: %s"] = "Resultats de cerca per: %s"; +App::$strings["Public Stream"] = "Flux públic"; +App::$strings["Location not found."] = "No s'ha trobat la ubicació."; +App::$strings["Location lookup failed."] = "Ha fallat la cerca d'ubicació."; +App::$strings["Please select another location to become primary before removing the primary location."] = "Abans d'esborrar la ubicació principal actual, fes-ne principal una altra."; +App::$strings["Syncing locations"] = "S'estan sincronitzant les ubicacions"; +App::$strings["No locations found."] = "No s'ha trobat cap ubicació."; +App::$strings["Manage Channel Locations"] = "Gestiona les ubicacions del canal"; +App::$strings["Primary"] = "Primària"; +App::$strings["Drop"] = "Esborra"; +App::$strings["Sync Now"] = "Sincronitza ara"; +App::$strings["Please wait several minutes between consecutive operations."] = "Espera uns minuts entre operacions consecutives."; +App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Si pots, és preferible esborrar la ubicació esborrant el canal des del servidor on està copiat."; +App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Fes servir aquest formulari per a esborrar la ubicació del lloc si el hub ja no està operatiu."; +App::$strings["Change Order of Pinned Navbar Apps"] = "Canvia l'ordre de les aplicacions fixades a la barra de navegació"; +App::$strings["Change Order of App Tray Apps"] = "Canvia l'ordre de les aplicacions de la safata d'aplicacions"; +App::$strings["Use arrows to move the corresponding app left (top) or right (bottom) in the navbar"] = "Fes servir les fletxes per moure l'aplicació cap a l'esquerra (amunt) o cap a la dreta (avall)"; +App::$strings["Use arrows to move the corresponding app up or down in the app tray"] = "Fes servir les fletxes per moure l'aplicació amunt o avall en la safata"; +App::$strings["Menu not found."] = "No s'ha trobat el menú."; +App::$strings["Unable to create element."] = "Incapaç de crear l'element."; +App::$strings["Unable to update menu element."] = "Incapaç d'actualitzar un element del menú."; +App::$strings["Unable to add menu element."] = "No s'ha pogut afegir l'element de menú."; +App::$strings["Not found."] = "No s'ha trobat."; +App::$strings["Menu Item Permissions"] = "Permisos dels ítems de menú"; +App::$strings["(click to open/close)"] = "(clica per obrir/tancar)"; +App::$strings["Link Name"] = "Nom de l'enllaç"; +App::$strings["Link or Submenu Target"] = "Destí de l'enllaç o del submenú"; +App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Introdueix la URL de l'enllaç o tria un nom de menú per crear un submenú"; +App::$strings["Use magic-auth if available"] = "Empra la magic-auth si està disponible"; App::$strings["No"] = "No"; App::$strings["Yes"] = "Sí"; -App::$strings["Could not access address book record."] = "No puc accedir al registre del contacte"; -App::$strings["Refresh failed - channel is currently unavailable."] = "Ha fallat la recàrrega - el canal es actualment inaccesible."; -App::$strings["Unable to set address book parameters."] = "No es poden ajustar els paràmetres dels contactes."; -App::$strings["Connection has been removed."] = "S'han eliminat les conexions."; -App::$strings["View Profile"] = "Veure Perfil"; -App::$strings["View %s's profile"] = "Mostra el perfil de %s"; -App::$strings["Refresh Permissions"] = "Recarrega els Permissos"; -App::$strings["Fetch updated permissions"] = "Obté els permisos actualitzats"; -App::$strings["Recent Activity"] = "Activitat Recent"; -App::$strings["View recent posts and comments"] = "Mostra les entrades i comentaris recents"; -App::$strings["Unblock"] = "Desbloquejat"; -App::$strings["Block"] = "Bloquejat"; -App::$strings["Block (or Unblock) all communications with this connection"] = "Boqueja (o Desbloqueja) les comunicacions amb aquesta connexió"; -App::$strings["This connection is blocked!"] = "Aquesta connexió està bloquejada!"; -App::$strings["Unignore"] = "Inhabilita"; -App::$strings["Ignore"] = "Ignora"; -App::$strings["Ignore (or Unignore) all inbound communications from this connection"] = "Ignora (o Considera) les communicacions entrants d'aquesta connexió"; -App::$strings["This connection is ignored!"] = "Aquesta connexió es ignorada!"; -App::$strings["Unarchive"] = "Desarxiva"; -App::$strings["Archive"] = "Arxiva"; -App::$strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Arxiva (o Desarxiva) aquesta connexió - Marca el canal com a mort pero manté el contingut "; -App::$strings["This connection is archived!"] = "Aquesta connexió està arxivada!"; -App::$strings["Unhide"] = "Mostra"; -App::$strings["Hide"] = "Amaga"; -App::$strings["Hide or Unhide this connection from your other connections"] = "Amaga (o Mostra) aquesta connexió de les altres connexions teves"; -App::$strings["This connection is hidden!"] = "Aquesta connexió està amagada!"; -App::$strings["Delete this connection"] = "Elimina aquesta connexió"; -App::$strings["Me"] = "Jo"; -App::$strings["Family"] = "Família"; -App::$strings["Friends"] = "Amics"; -App::$strings["Acquaintances"] = "Coneguts"; -App::$strings["All"] = "Tots"; -App::$strings["Approve this connection"] = "Apccepta aquesta connexió"; -App::$strings["Accept connection to allow communication"] = "Accepta la connexió per permetre la comunicació"; -App::$strings["Set Affinity"] = "Ajusta l'Afinitat"; -App::$strings["Set Profile"] = "Ajusta el Perfil"; -App::$strings["Set Affinity & Profile"] = "Ajusta Afinitat i Perfil"; -App::$strings["none"] = "res"; -App::$strings["Connection Default Permissions"] = "Permisos per Defecte de la Connexió"; -App::$strings["Connection: %s"] = "Connexió: %s"; -App::$strings["Apply these permissions automatically"] = "Aplica aquests permissos automaticament"; -App::$strings["Connection requests will be approved without your interaction"] = "Les peticions de connexió seran aprovades sense la teva interacció"; -App::$strings["This connection's primary address is"] = "La primera adreça d'aqueste connexió es"; -App::$strings["Available locations:"] = "Localització disponible:"; -App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Els permisos indicats en aquesta pàgina seran aplicats a totes les noves connexions."; -App::$strings["Connection Tools"] = "Eines de Connexió"; -App::$strings["Slide to adjust your degree of friendship"] = "Llisca per ajustar el nivell d'amistat"; -App::$strings["Rating"] = "Valora"; -App::$strings["Slide to adjust your rating"] = "Llisca per ajustar la valoració"; -App::$strings["Optionally explain your rating"] = "Opcionalment pots explicar la teva valoració"; -App::$strings["Custom Filter"] = "Filtre a mida"; -App::$strings["Only import posts with this text"] = "Importa exclusivament entrades amb aquest text"; -App::$strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "paraules una per línia o #etiquetes o /patrons/ o idioma=xx, deixar en blanc per importar totes les entrades"; -App::$strings["Do not import posts with this text"] = "No importar entrades amb aquest text"; -App::$strings["This information is public!"] = "Aquesta informació es pública!"; -App::$strings["Connection Pending Approval"] = "Connexió Pendent d'Aprovació"; -App::$strings["inherited"] = "heretat"; -App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Tria el perfil que vols mostrar a %s quan es vegi el perfil segur."; -App::$strings["Their Settings"] = "Els seus Ajustos"; -App::$strings["My Settings"] = "Els Meus Ajustos"; -App::$strings["Individual Permissions"] = "Permisos Individuals"; -App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can not change those settings here."] = "Alguns permisos poden ser heretats dels teus canals ajustos de privacitat, Els quals tenen més prioritat que els ajustos individuals. No pots canviar aquests ajustos aquí."; -App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Alguns permisos poden ser heretats dels teus canals ajustos de privacitat, Els quals tenen més prioritat que els ajustos individuals. Pots canviar aquests ajustos aquí pero no tindran cap impacte fins que no canviis els ajustos heretats."; -App::$strings["Last update:"] = "Darrera actualització:"; -App::$strings["Public access denied."] = "Accés públic denegat."; -App::$strings["%d rating"] = array( - 0 => "%d valoració", - 1 => "%d valoracions", -); -App::$strings["Gender: "] = "Gènere:"; -App::$strings["Status: "] = "Estatus:"; -App::$strings["Homepage: "] = "Pàgina Personal:"; -App::$strings["Age:"] = "Edat:"; -App::$strings["Location:"] = "Localització:"; -App::$strings["Description:"] = "Descripció:"; -App::$strings["Hometown:"] = "Ciutat Natal:"; -App::$strings["About:"] = "Sobre:"; -App::$strings["Connect"] = "Connecta "; -App::$strings["Public Forum:"] = "Forum Públic:"; -App::$strings["Keywords: "] = "Paraules Clau:"; -App::$strings["Don't suggest"] = "No suggerir"; -App::$strings["Common connections:"] = "Connexions en comú:"; -App::$strings["Global Directory"] = "Directori Global"; -App::$strings["Local Directory"] = "Directori Local"; -App::$strings["Find"] = "Troba"; -App::$strings["Finding:"] = "Cercant:"; -App::$strings["Channel Suggestions"] = "Canals Suggerits"; -App::$strings["next page"] = "pàgina següent"; -App::$strings["previous page"] = "pàgina anterior"; -App::$strings["Sort options"] = "Opcions per ordenar"; -App::$strings["Alphabetic"] = "Alfabètic"; -App::$strings["Reverse Alphabetic"] = "Alfabètic Invers"; -App::$strings["Newest to Oldest"] = "De més Nou a més Vell"; -App::$strings["Oldest to Newest"] = "De més Antic a més Nou"; -App::$strings["No entries (some entries may be hidden)."] = "Sense entrades (algunes podrien estar amagades)."; -App::$strings["Item not found."] = "Element no trobat."; -App::$strings["Item not found"] = "No s'ha trobat l'element"; -App::$strings["Title (optional)"] = "Títol (opcional)"; -App::$strings["Edit Block"] = "Editar Bloc"; -App::$strings["No channel."] = "No s'ha trobat el canal"; -App::$strings["Common connections"] = "Connexions en comú"; -App::$strings["No connections in common."] = "No hi ha connexions en comú."; -App::$strings["Blocked"] = "Bloquejades"; -App::$strings["Ignored"] = "Ignorades"; -App::$strings["Hidden"] = "Amagades"; -App::$strings["Archived"] = "Arxivades"; -App::$strings["New"] = "Nou"; -App::$strings["New Connections"] = "Noves Connexions"; -App::$strings["Show pending (new) connections"] = "Mostra les connexions pendents (noves)"; -App::$strings["All Connections"] = "Totes les Connexions"; -App::$strings["Show all connections"] = "Mostra totes les connexions"; -App::$strings["Only show blocked connections"] = "Mostra només les connexions bloquejades"; -App::$strings["Only show ignored connections"] = "Mostra només les connexions ignorades"; -App::$strings["Only show archived connections"] = "Mostra només les connexions arxivades"; -App::$strings["Only show hidden connections"] = "Mostra només les connexions amagades"; -App::$strings["Pending approval"] = "Pendent d'aprovació"; -App::$strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]"; -App::$strings["Edit connection"] = "Modifica la connexió"; -App::$strings["Delete connection"] = "Elimina la connexió"; -App::$strings["Channel address"] = "Adreça del canal"; -App::$strings["Network"] = "Xarxa"; -App::$strings["Status"] = "Estat"; -App::$strings["Connected"] = "Connectat"; -App::$strings["Approve connection"] = "Aprovar la Connexió "; -App::$strings["Approve"] = "Aprovat"; -App::$strings["Ignore connection"] = "Ignorar connexió"; -App::$strings["Recent activity"] = "Activitat recent"; -App::$strings["Connections"] = "Connexions"; -App::$strings["Search"] = "Cerca"; -App::$strings["Search your connections"] = "Cerca entre les teves connexions"; -App::$strings["Connections search"] = "Cerca connexions"; -App::$strings["Image uploaded but image cropping failed."] = "S'ha pujat la imatge però no s'ha pogut retallar."; -App::$strings["Cover Photos"] = "Fotos de Portada"; -App::$strings["Image resize failed."] = "No s'ha pogut escalar la imatge."; -App::$strings["Unable to process image"] = "incapaç de processar la imatge"; -App::$strings["Image upload failed."] = "La pujada de la imatge va fracassar."; -App::$strings["Unable to process image."] = "Incapaç de processar l'imatge."; -App::$strings["female"] = "femení"; -App::$strings["%1\$s updated her %2\$s"] = "%1\$s actualitzà el seu %2\$s"; -App::$strings["male"] = "masculí"; -App::$strings["%1\$s updated his %2\$s"] = "%1\$s actualitzà el seu %2\$s"; -App::$strings["%1\$s updated their %2\$s"] = "%1\$s actualitzà els seus %2\$s"; -App::$strings["cover photo"] = "Foto de la portada"; -App::$strings["Photo not available."] = "Foto no disponible."; -App::$strings["Upload File:"] = "Puja Arxiu:"; -App::$strings["Select a profile:"] = "Tria un perfil:"; -App::$strings["Upload Cover Photo"] = "Puja Foto de Portada"; -App::$strings["or"] = "o"; -App::$strings["skip this step"] = "salta aquest pas"; -App::$strings["select a photo from your photo albums"] = "tria una foto del teu àlbum de fotos"; -App::$strings["Crop Image"] = "Retalla Imatge"; -App::$strings["Please adjust the image cropping for optimum viewing."] = "Si us plau, retalla la imatge per a una optima visualització"; -App::$strings["Done Editing"] = "Edició Feta"; -App::$strings["Item is not editable"] = "Article no editable"; -App::$strings["Edit post"] = "Modifica l'entrada"; -App::$strings["Calendar entries imported."] = "Entrades de Calendari importades."; -App::$strings["No calendar entries found."] = "No es troben entrades decalendari."; -App::$strings["Event can not end before it has started."] = "L'esdeveniment ha de començar abans d'acabar."; +App::$strings["Open link in new window"] = "Obre l'enllaç en una nova finestra"; +App::$strings["Order in list"] = "Ordre de la llista"; +App::$strings["Higher numbers will sink to bottom of listing"] = "Els números més alts al final de la llista"; +App::$strings["Submit and finish"] = "Envia i acaba"; +App::$strings["Submit and continue"] = "Envia i continua"; +App::$strings["Menu:"] = "Menú:"; +App::$strings["Link Target"] = "Destí de l'enllaç"; +App::$strings["Edit menu"] = "Edita el menú"; +App::$strings["Edit element"] = "Edita l'element"; +App::$strings["Drop element"] = "Esborra l'element"; +App::$strings["New element"] = "Element nou"; +App::$strings["Edit this menu container"] = "Edita el contenidor de menú"; +App::$strings["Add menu element"] = "Afegeix un element de menú"; +App::$strings["Delete this menu item"] = "Esborra aquest article del menú"; +App::$strings["Edit this menu item"] = "Edita aquest article del menú"; +App::$strings["Menu item not found."] = "No s'ha trobat l'element de menú."; +App::$strings["Menu item deleted."] = "S'ha esborrat l'element de menú."; +App::$strings["Menu item could not be deleted."] = "No s'ha pogut esborrar l'element de menú."; +App::$strings["Edit Menu Element"] = "Editar elements del menú"; +App::$strings["Link text"] = "Text de l'enllaç"; +App::$strings["Calendar entries imported."] = "S'han importat les entrades de calendari."; +App::$strings["No calendar entries found."] = "No s'ha trobat cap entrada de calendari."; +App::$strings["Event can not end before it has started."] = "L'esdeveniment no pot acabar abans de començar."; App::$strings["Unable to generate preview."] = "No s'ha pogut generar la vista prèvia."; App::$strings["Event title and start time are required."] = "Cal indicar l'inici i el final de l'esdeveniment."; App::$strings["Event not found."] = "No s'ha trobat l'esdeveniment."; -App::$strings["event"] = "succés"; -App::$strings["Edit event title"] = "Edita el títol d'esdeveniment"; -App::$strings["Event title"] = "Títol esdeveniment"; -App::$strings["Required"] = "Requerit"; +App::$strings["event"] = "esdeveniment"; +App::$strings["Edit event title"] = "Edita el títol de l'esdeveniment"; +App::$strings["Required"] = "Obligatori"; App::$strings["Categories (comma-separated list)"] = "Categories (llista separada per comes)"; -App::$strings["Edit Category"] = "Editar Categoria"; +App::$strings["Edit Category"] = "Edita la categoria"; App::$strings["Category"] = "Categoria"; -App::$strings["Edit start date and time"] = "Editar data i hora d'inici"; -App::$strings["Start date and time"] = "Data i hora d'inici"; -App::$strings["Finish date and time are not known or not relevant"] = "L'ora de finalització no es coneix o es irrelevant."; -App::$strings["Edit finish date and time"] = "Editar la data i hora de finalització"; +App::$strings["Edit start date and time"] = "Edita la data i hora d'inici"; +App::$strings["Finish date and time are not known or not relevant"] = "L'hora d'acabar és desconeguda o irrellevant"; +App::$strings["Edit finish date and time"] = "Edita la data i hora de finalització"; App::$strings["Finish date and time"] = "Data i hora de finalització"; -App::$strings["Adjust for viewer timezone"] = "Ajusta a la zona horària del visitant."; +App::$strings["Adjust for viewer timezone"] = "Ajusta a la zona horària de l'usuari/a"; App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "És important per esdeveniments locals, però pels globals no és pràctic."; -App::$strings["Edit Description"] = "Editar la Descripció"; -App::$strings["Description"] = "Descripció"; -App::$strings["Edit Location"] = "Editar la localització"; -App::$strings["Location"] = "Localització"; -App::$strings["Share this event"] = "Comparteix aquest esdeveniment"; -App::$strings["Preview"] = "Avanç"; -App::$strings["Permission settings"] = "Ajustos de permisos"; -App::$strings["Advanced Options"] = "Opcions Avançades"; +App::$strings["Edit Description"] = "Edita la descripció"; +App::$strings["Edit Location"] = "Edita la ubicació"; +App::$strings["Preview"] = "Vista prèvia"; +App::$strings["Permission settings"] = "Configuració de permisos"; +App::$strings["Timezone:"] = "Zona horària:"; +App::$strings["Advanced Options"] = "Opcions avançades"; +App::$strings["l, F j"] = "l, j \\d\\e F"; App::$strings["Edit event"] = "Edita l'esdeveniment"; App::$strings["Delete event"] = "Esborra l'esdeveniment"; +App::$strings["Link to Source"] = "Enllaç a la font"; App::$strings["calendar"] = "calendari"; +App::$strings["Edit Event"] = "Edita l'esdeveniment"; +App::$strings["Create Event"] = "Crear un esdeveniment nou"; +App::$strings["Export"] = "Exporta"; App::$strings["Event removed"] = "S'ha eliminat l'esdeveniment"; App::$strings["Failed to remove event"] = "No s'ha pogut esborrar l'esdeveniment"; -App::$strings["Photos"] = "Fotos"; -App::$strings["Cancel"] = "Cancel·la"; -App::$strings["This site is not a directory server"] = "Aquest lloc web no és un servidor de directori"; -App::$strings["This directory server requires an access token"] = "Aquest servidor de directori requereix un token de accès"; -App::$strings["Save to Folder:"] = "Guardar en la Carpeta"; -App::$strings["- select -"] = "- selecciona -"; -App::$strings["Save"] = "Guardar"; -App::$strings["Invalid message"] = "Missatge invàlid."; -App::$strings["no results"] = "sense resultats"; -App::$strings["Delivery report for %1\$s"] = "Informe de lliurament per %1\$s"; -App::$strings["channel sync processed"] = "sincronització del canal processada"; -App::$strings["queued"] = "Posat en cua"; -App::$strings["posted"] = "enviat"; -App::$strings["accepted for delivery"] = "acceptat per entregar"; -App::$strings["updated"] = "actualitzat"; -App::$strings["update ignored"] = "actualització ignorada"; -App::$strings["permission denied"] = "permís denegat"; -App::$strings["recipient not found"] = "Contenidor no trobat"; -App::$strings["mail recalled"] = "Recupera el correu"; -App::$strings["duplicate mail received"] = "rebut correu duplicat"; -App::$strings["mail delivered"] = "correu entregat"; -App::$strings["Layout Name"] = "Nom del Format Gràfic"; -App::$strings["Layout Description (Optional)"] = "Descripció del Format (Opcional)"; -App::$strings["Edit Layout"] = "Edita Format Gràfic"; -App::$strings["Page link"] = "Enllaç de la pàgina"; -App::$strings["Edit Webpage"] = "Edita la Pàgina Web"; -App::$strings["Channel added."] = "S'ha afegit el canal."; -App::$strings["network"] = "xarxa"; -App::$strings["RSS"] = "RSS"; -App::$strings["Privacy group created."] = "Creat grup privat."; -App::$strings["Could not create privacy group."] = "No es pot crear el grup privat."; -App::$strings["Privacy group not found."] = "No es troben grups privats."; -App::$strings["Privacy group updated."] = "Grup privat actualitzat."; -App::$strings["Create a group of channels."] = "Crear un grup de canals."; -App::$strings["Privacy group name: "] = "Nom del grup privat:"; -App::$strings["Members are visible to other channels"] = "Els membres son visibles en altres canals"; -App::$strings["Privacy group removed."] = "Grup privat eliminat."; -App::$strings["Unable to remove privacy group."] = "No puc eliminar el grup privat."; -App::$strings["Privacy group editor"] = "Editor del grup privat"; -App::$strings["Members"] = "Membres"; -App::$strings["All Connected Channels"] = "Tots els Canals Connectats"; -App::$strings["Click on a channel to add or remove."] = "Clic sobre el canal per afegir o esborrar."; -App::$strings["Share content from Firefox to \$Projectname"] = "Compartir contingut des de Firefox a \$Projectname"; -App::$strings["Activate the Firefox \$Projectname provider"] = "Activar el proveïdor de \$Projectname a Firefox"; -App::$strings["Authorize application connection"] = "Autoritza la connexió de l'aplicació"; -App::$strings["Return to your app and insert this Securty Code:"] = "Torna a la teva aplicació i insereix aquest Codi de Seguretat:"; -App::$strings["Please login to continue."] = "Si et plau, identifica't per continuar."; -App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vols autoritzar a aquesta aplicació l'accés a les teves entrades i contactes i/o a crear noves entrades com si fos tu mateix."; -App::$strings["Documentation Search"] = "Cerca de Documentació"; -App::$strings["Help:"] = "Ajuda:"; -App::$strings["Help"] = "Ajuda"; -App::$strings["\$Projectname Documentation"] = "\$Projectname Documentació"; -App::$strings["Permission Denied."] = "Permisos Denegats."; -App::$strings["File not found."] = "Arxiu no torbat."; -App::$strings["Edit file permissions"] = "Edita els permisos d'arxiu"; -App::$strings["Set/edit permissions"] = "Canvia/edita permisos"; -App::$strings["Include all files and sub folders"] = "Inclou tots als arxius i subdirectoris"; -App::$strings["Return to file list"] = "Tornar al llistat d'arxius"; -App::$strings["Copy/paste this code to attach file to a post"] = "Copia/enganxa aquest codi per a adjuntar un arxiu a l'entrada"; -App::$strings["Copy/paste this URL to link file from a web page"] = "Copia/enganxa aquesta URL per a enllaçar l'arxiu d'una pàgina web"; -App::$strings["Share this file"] = "Comparteix l'arxiu"; -App::$strings["Show URL to this file"] = "Mostra la URL d'aquest arxiu"; -App::$strings["Notify your contacts about this file"] = "Notifica als teus contactes aquest arxiu"; -App::$strings["Apps"] = "Aplicatius"; -App::$strings["Item not available."] = "Article no disponible."; -App::$strings["Your service plan only allows %d channels."] = "El teu paquet de serveis només admet %d canals."; -App::$strings["Nothing to import."] = "No hi ha res a importar."; -App::$strings["Unable to download data from old server"] = "No s'han pogut descarregar les dades del servidor antic"; -App::$strings["Imported file is empty."] = "El fitxer importat està buit."; -App::$strings["Warning: Database versions differ by %1\$d updates."] = "Atenció: Les versions de la Base de Dades difereixen en %1\$d actualitzacions."; -App::$strings["Cloned channel not found. Import failed."] = "No s'ha pogut importar el canal perquè el canal clonat no s'ha trobat."; -App::$strings["No channel. Import failed."] = "Sense canal. No s'ha pogut importar."; -App::$strings["Import completed."] = "S'ha completat la importació."; -App::$strings["You must be logged in to use this feature."] = "Has d'estar registrat per fer servir aquesta funcionalitat."; -App::$strings["Import Channel"] = "Importa un canal"; -App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Empra aquest formulari per importar un canal existent en un altre servidor/concentrador. Pots recuperar el canal des de l'antic servidor/concentrador via la xarxa o mitjançant un fitxer d'exportació"; -App::$strings["File to Upload"] = "Fitxer a pujar"; -App::$strings["Or provide the old server/hub details"] = "O proveeix els detalls de l'antic servidor/node"; -App::$strings["Your old identity address (xyz@example.com)"] = "La teva adreça de canal antiga. El format és canal@exemple.org"; -App::$strings["Your old login email address"] = "La teva adreça de correu electrònic antiga"; -App::$strings["Your old login password"] = "La teva contrasenya antiga"; -App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Per a qualsevol de les opcions, escull si vols fer primària l'adreça d'aquest node o mantenir l'anterior com a primària. Podràs penjar entrades des de totes dues adreces, però per als fitxers, imatges i altres en cal una de primària."; -App::$strings["Make this hub my primary location"] = "Fes d'aquest node la meva ubicació primària"; -App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importa les entrades existents si es possible (experimental - limitat per la memòria disponible"; -App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Aquest procès pot trigar minuts en completar. Si et plau envia el formulari només una vegada i manté aquesta pàgina oberta fins que finalitzi."; -App::$strings["Unable to locate original post."] = "No s'ha pogut trobar l'entrada original."; -App::$strings["Empty post discarded."] = "S'ha descartat l'entrada perquè no té contingut."; -App::$strings["Executable content type not permitted to this channel."] = "No està permès el contingut de tipus executable en aquest canal."; -App::$strings["Duplicate post suppressed."] = "Publicació duplicada s'ha suprimit."; -App::$strings["System error. Post not saved."] = "Hi ha hagut un error del sistema. L'entrada no s'ha desat."; -App::$strings["Unable to obtain post information from database."] = "No s'ha pogut obtenir informació de l'entrada a la base de dades."; -App::$strings["You have reached your limit of %1$.0f top level posts."] = "Has assolit el teu límit de %1$.0f entrades (descomptant comentaris)."; -App::$strings["You have reached your limit of %1$.0f webpages."] = "Has assolit el teu limit de %1$.0f pàgines web."; -App::$strings["Layouts"] = "Format Gràfic"; -App::$strings["Comanche page description language help"] = "Pgina d'ajuda del llenguatge Comanche"; -App::$strings["Layout Description"] = "Descripció del Disseny de la Pàgina"; -App::$strings["Download PDL file"] = "Descarrega l'arxiu PDL"; -App::$strings["\$Projectname"] = "\$Projectname"; -App::$strings["Welcome to %s"] = "Benvingut a %s"; -App::$strings["First Name"] = "Nom"; -App::$strings["Last Name"] = "Cognoms"; -App::$strings["Nickname"] = "Àlies"; -App::$strings["Full Name"] = "Nom Sencer"; -App::$strings["Email"] = "Correu electrónic"; -App::$strings["Profile Photo"] = "Foto del Perfil"; -App::$strings["Profile Photo 16px"] = "Foto del Perfil 16px"; -App::$strings["Profile Photo 32px"] = "Foto del Perfil 32px"; -App::$strings["Profile Photo 48px"] = "Foto del Perfil 48px"; -App::$strings["Profile Photo 64px"] = "Foto del Perfil 64px"; -App::$strings["Profile Photo 80px"] = "Foto del Perfil 80px"; -App::$strings["Profile Photo 128px"] = "Foto del Perfil 128px"; -App::$strings["Timezone"] = "Zona horària"; -App::$strings["Homepage URL"] = "URL de la pàgina d'inici"; -App::$strings["Language"] = "Idioma"; -App::$strings["Birth Year"] = "Any de Naixement"; -App::$strings["Birth Month"] = "Mes de Naixement"; -App::$strings["Birth Day"] = "Dia de Naixement"; -App::$strings["Birthdate"] = "Aniversari"; -App::$strings["Gender"] = "Gènere"; -App::$strings["Male"] = "Masculí"; -App::$strings["Female"] = "Femení"; -App::$strings["webpage"] = "pàgina web"; -App::$strings["block"] = "bloc"; -App::$strings["layout"] = "disposició"; -App::$strings["menu"] = "menú"; -App::$strings["%s element installed"] = "%s element instal·lat"; -App::$strings["%s element installation failed"] = "%s instal·lació d'element va fallar"; -App::$strings["Like/Dislike"] = "M'agrada / No m'agrada"; -App::$strings["This action is restricted to members."] = "Aquesta acció està restringida als membres."; -App::$strings["Please login with your \$Projectname ID or register as a new \$Projectname member to continue."] = "Entra amb la teva identitat \$Projectname o registra't a \$Projectname per continuar."; -App::$strings["Invalid request."] = "Sol·licitud invàlida."; -App::$strings["channel"] = "canal"; -App::$strings["thing"] = "cosa"; -App::$strings["Channel unavailable."] = "El canal està inactiu."; -App::$strings["Previous action reversed."] = "S'ha desfet l'acció anterior."; +App::$strings["App installed."] = "S'ha instaŀlat l'aplicació."; +App::$strings["Malformed app."] = "L'aplicació conté errors."; +App::$strings["Embed code"] = "Codi embegut"; +App::$strings["Edit App"] = "Edita una aplicació"; +App::$strings["Create App"] = "Crea una aplicació"; +App::$strings["Name of app"] = "Nom de l'aplicació"; +App::$strings["Location (URL) of app"] = "Adreça URL de l'aplicació"; +App::$strings["Photo icon URL"] = "Adreça URL de la icona de l'aplicació"; +App::$strings["80 x 80 pixels - optional"] = "80x80 píxels (opcional)"; +App::$strings["Categories (optional, comma separated list)"] = "Categories (opcional, llista separada per comes)"; +App::$strings["Version ID"] = "Identificador o número de versió"; +App::$strings["Price of app"] = "Preu de l'aplicació"; +App::$strings["Location (URL) to purchase app"] = "Adreça URL de compra de l'aplicació"; +App::$strings["Please login."] = "Inicia sessió."; +App::$strings["Hub not found."] = "No s'ha trobat el hub."; App::$strings["photo"] = "foto"; App::$strings["status"] = "estat"; -App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s agrada %2\$s de %3\$s"; -App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s no agrada %2\$s de %3\$s"; -App::$strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s està d'acord amb %3\$s de %2\$s"; -App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s no està d'acord amb %3\$s de %2\$s"; -App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s s'abstén en %3\$s de %2\$s"; -App::$strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s assistirà a %3\$s de %2\$s"; -App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s no assistirà a %3\$s de %2\$s"; -App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s potser assistirà a %3\$s de %2\$s"; -App::$strings["Action completed."] = "S'ha completat l'acció."; -App::$strings["Thank you."] = "Gràcies."; +App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s segueix %3\$s de %2\$s"; +App::$strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s ha deixat de seguir %3\$s de %2\$s"; +App::$strings["Channel not found."] = "No s'ha trobat el canal."; +App::$strings["Insert web link"] = "Insereix un enllaç web"; +App::$strings["Title (optional)"] = "Títol (opcional)"; +App::$strings["Edit Article"] = "Edita l'article"; +App::$strings["Nothing to import."] = "No s'ha trobat res per importar."; +App::$strings["Unable to download data from old server"] = "No s'han pogut descarregar les dades del servidor antic"; +App::$strings["Imported file is empty."] = "El fitxer importat està buit."; +App::$strings["Warning: Database versions differ by %1\$d updates."] = "Atenció: Les versions de les bases de dades difereixen de %1\$d actualitzacions."; App::$strings["Import completed"] = "S'ha completat la importació"; -App::$strings["Import Items"] = "Importa Articles"; +App::$strings["Import Items"] = "Importa articles"; App::$strings["Use this form to import existing posts and content from an export file."] = "Empra aquest formulari per importar entrades existents i contingut d'un arxiu d'exportació."; -App::$strings["Total invitation limit exceeded."] = "El límit total invitacions s'ha superat."; -App::$strings["%s : Not a valid email address."] = "%s: adreça de correu electrònic no vàlida."; -App::$strings["Please join us on \$Projectname"] = "Si us plau uneix-te a nosaltres a \$Projectname."; -App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Límit d'invitacions excedit. Si us plau, poseu-vos en contacte amb l'administrador del lloc."; -App::$strings["%s : Message delivery failed."] = "%s : Entrega del Missatge fallida."; -App::$strings["%d message sent."] = array( - 0 => "%d missatge enviat.", - 1 => "%d missatges enviats.", -); -App::$strings["You have no more invitations available"] = "No té més invitacions disponibles"; -App::$strings["Send invitations"] = "Enviar invitacions"; -App::$strings["Enter email addresses, one per line:"] = "Introduïu les adreces de correu electrònic, una per línia:"; -App::$strings["Your message:"] = "El teu missatge:"; -App::$strings["Please join my community on \$Projectname."] = "Si us plau uneix-te la meva comunitat en \$Projectname."; -App::$strings["You will need to supply this invitation code:"] = "Hauràs de facilitar aquest codi d'invitació:"; -App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Pots registrar-te a qualsevol node de \$Projectname (estàn tots interconnectats)"; -App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Escriu la meva adreça de xarxa al \$Projectname, a la barra de cerca del lloc."; -App::$strings["or visit"] = "o visitar"; -App::$strings["3. Click [Connect]"] = "3. Clicar [Conectar]"; -App::$strings["Remote privacy information not available."] = "informació privada remota no disponible."; -App::$strings["Visible to:"] = "Visible per:"; -App::$strings["Location not found."] = "Situació que no es troba."; -App::$strings["Location lookup failed."] = "Ha fallat la cerca d'ubicació."; -App::$strings["Please select another location to become primary before removing the primary location."] = "Seleccioneu una altra ubicació per esdevenir primària abans de retirar la ubicació principal."; -App::$strings["Syncing locations"] = "Sincronitza ubicacions"; -App::$strings["No locations found."] = "No es troben els llocs."; -App::$strings["Manage Channel Locations"] = "Gestionar Ubicacions de Canal"; -App::$strings["Address"] = "Adreça"; -App::$strings["Primary"] = "Primari"; -App::$strings["Drop"] = "Menysprea"; -App::$strings["Sync Now"] = "Sincronitza Ara"; -App::$strings["Please wait several minutes between consecutive operations."] = "Si us plau espera diversos minuts entre operacions consecutives."; -App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Quan sigui possible, per desapareixer d'un lloc, accedeix a aquest lloc web/node i elimina el teu canal."; -App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Empra aquest formulari per desapareixer del lloc si el node ja no està operatiu."; -App::$strings["Hub not found."] = "Node no trobat."; -App::$strings["Unable to lookup recipient."] = "Incapaç de trobar el destinatari."; -App::$strings["Unable to communicate with requested channel."] = "Incapaç de comunicar amb el canal demanat."; -App::$strings["Cannot verify requested channel."] = "No puc verificar el canal demanat."; -App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionat te restriccions sobre els missatges privats. L'enviament ha fallat."; -App::$strings["Messages"] = "Missatges"; -App::$strings["Message recalled."] = "Recupera el missatge."; -App::$strings["Conversation removed."] = "Conversació eliminada."; -App::$strings["Expires YYYY-MM-DD HH:MM"] = "Expira YYYY-MM-DD HH:MM"; -App::$strings["Requested channel is not in this network"] = "El canal demanat no hi es en questa xarxa"; -App::$strings["Send Private Message"] = "Envia Missatge Privat"; -App::$strings["To:"] = "Per:"; -App::$strings["Subject:"] = "Assumpte:"; -App::$strings["Attach file"] = "Adjunta arxiu"; -App::$strings["Send"] = "Envia"; -App::$strings["Set expiration date"] = "Ajusta la data d'expiració"; -App::$strings["Delete message"] = "Elimina el missatge"; -App::$strings["Delivery report"] = "Informe d'entrega"; -App::$strings["Recall message"] = "Recupera el missatge"; -App::$strings["Message has been recalled."] = "El missatge s'ha recuperat."; -App::$strings["Delete Conversation"] = "Conversació esborrada"; -App::$strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Comunicació segura no disponible. Pots respondre des de la pàgina de perfil del remitent."; -App::$strings["Send Reply"] = "Envia Resposta"; -App::$strings["Your message for %s (%s):"] = "El teu missatge per %s (%s):"; -App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Has creat %1$.0f de %2$.0f canals permesos."; -App::$strings["Create a new channel"] = "Crear un nou canal"; -App::$strings["Channel Manager"] = "Gestor de Canals"; -App::$strings["Current Channel"] = "Canal Actual"; -App::$strings["Switch to one of your channels by selecting it."] = "Canviar a un altre dels teus canals seleccionant-ho."; -App::$strings["Default Channel"] = "Canal per Defecte"; -App::$strings["Make Default"] = "Estableix com a Predeterminat"; -App::$strings["%d new messages"] = "%d missatges nous"; -App::$strings["%d new introductions"] = "%d noves presentacions"; -App::$strings["Delegated Channel"] = "Canal Delegat"; -App::$strings["No valid account found."] = "No es troba un compte vàlid."; -App::$strings["Password reset request issued. Check your email."] = "Sol·licitud de restabliment de contrasenya emesa. Consulta el teu correu electrònic."; -App::$strings["Site Member (%s)"] = "Lloc d'Usuari (%s)"; -App::$strings["Password reset requested at %s"] = "S'ha soŀlicitat restablir la contrasenya al hub %s"; -App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Ha fallat el restabliment de contrasenya perquè la no s'ha pogut verificar soŀlicitud. Pot ser que ja ho hàgiu soŀlicitat abans."; -App::$strings["Password Reset"] = "Restabliment de contrasenya"; -App::$strings["Your password has been reset as requested."] = "S'ha restablert la vostra contrasenya."; -App::$strings["Your new password is"] = "La nova contrasenya és"; -App::$strings["Save or copy your new password - and then"] = "Desa o copia la nova contrasenya, i després"; -App::$strings["click here to login"] = "fes clic aquí per iniciar sessió"; -App::$strings["Your password may be changed from the Settings page after successful login."] = "Pots canviar la contrasenya a la pàgina Paràmetres, un cop iniciada la sessió."; -App::$strings["Your password has changed at %s"] = "La teva contrasenya a %s ha canviat"; -App::$strings["Forgot your Password?"] = "No recordes la contrasenya?"; -App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Escriu la teva adreça de correu electrònic i envia per restablir la contrasenya. Després revisa el seu correu electrònic per obtenir més instruccions."; -App::$strings["Email Address"] = "Adreça electrònica"; -App::$strings["Reset"] = "Reajustar"; -App::$strings["Unable to update menu."] = "No s'ha pogut actualitzar el menú."; -App::$strings["Unable to create menu."] = "No s'ha pogut crear el menú."; -App::$strings["Menu Name"] = "Nom del menú"; -App::$strings["Unique name (not visible on webpage) - required"] = "Nom únic (no visible a la pàgina web) - requerit"; -App::$strings["Menu Title"] = "Títol del menú"; -App::$strings["Visible on webpage - leave empty for no title"] = "Visible a la pàgina web - deixar buit per a no posar títol"; -App::$strings["Allow Bookmarks"] = "Permetre Marcadors"; -App::$strings["Menu may be used to store saved bookmarks"] = "El menú es pot emprar per a guardar marcadors"; -App::$strings["Submit and proceed"] = "Envia i procedeix"; -App::$strings["Menus"] = "Menús"; -App::$strings["Bookmarks allowed"] = "Marcadors permesos"; -App::$strings["Delete this menu"] = "Esborra el menú"; -App::$strings["Edit menu contents"] = "Edita el contingut del menú"; -App::$strings["Edit this menu"] = "Edita el menú"; -App::$strings["Menu could not be deleted."] = "El menu no es pot esborrar."; -App::$strings["Menu not found."] = "Menú no trobat."; -App::$strings["Edit Menu"] = "Edita Menú"; -App::$strings["Add or remove entries to this menu"] = "Afegeix o esborra entrades a aquest menú"; -App::$strings["Menu name"] = "Nom del Menú"; -App::$strings["Must be unique, only seen by you"] = "Ha de ser únic, nomes vist per tú"; -App::$strings["Menu title"] = "Títol del menú"; -App::$strings["Menu title as seen by others"] = "Títol del menú vist pels altres"; -App::$strings["Allow bookmarks"] = "Marcadors permesos"; -App::$strings["Not found."] = "No trobat."; -App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s es %2\$s"; -App::$strings["Mood"] = "Ànim"; -App::$strings["Set your current mood and tell your friends"] = "Estableix el teu estat d'ànim actual i digues-li als teus amics"; -App::$strings["Profile Match"] = "Perfils compatibles"; -App::$strings["No keywords to match. Please add keywords to your default profile."] = "No tens paraules clau al perfil principal per poder cercar perfils semblants."; -App::$strings["is interested in:"] = "té interès en:"; -App::$strings["No matches"] = "No s'han trobat perfils compatibles"; -App::$strings["No such group"] = "No existeix el grup"; -App::$strings["No such channel"] = "No existeix el canal"; -App::$strings["forum"] = "fòrum"; -App::$strings["Search Results For:"] = "Cerca resultats per:"; -App::$strings["Privacy group is empty"] = "el grup privat està vuit"; -App::$strings["Privacy group: "] = "Grup privat:"; -App::$strings["Invalid connection."] = "La connexió és invàlida."; -App::$strings["No more system notifications."] = "No hi ha més notificacions del sistema."; -App::$strings["System Notifications"] = "Notificacions del sistema"; -App::$strings["Unable to create element."] = "Incapaç de crear l'element."; -App::$strings["Unable to update menu element."] = "Incapaç d'actualitzar un element del menú."; -App::$strings["Unable to add menu element."] = "Incapaç d'afegir l'element del menú."; -App::$strings["Menu Item Permissions"] = "Permisos de l'Article del Menú"; -App::$strings["(click to open/close)"] = "(clica per obrir/tancar)"; -App::$strings["Link Name"] = "Nom de l'Enllaç"; -App::$strings["Link or Submenu Target"] = "Enllaç o Submenú Objectiu"; -App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Entra la URL de l'enlla´o tria un nom de menú per crear un submenú"; -App::$strings["Use magic-auth if available"] = "Empra magic-auth si esta disponible"; -App::$strings["Open link in new window"] = "Obrir l'enllaç en una nova finestra"; -App::$strings["Order in list"] = "Ordre per llista"; -App::$strings["Higher numbers will sink to bottom of listing"] = "Els números més alts aniràn al fons de la llista"; -App::$strings["Submit and finish"] = "Envia i termina"; -App::$strings["Submit and continue"] = "Envia i continua"; -App::$strings["Menu:"] = "Menú:"; -App::$strings["Link Target"] = "Enllaç Objectiu"; -App::$strings["Edit menu"] = "Edita menú"; -App::$strings["Edit element"] = "Edita element"; -App::$strings["Drop element"] = "Deixa anar element"; -App::$strings["New element"] = "Nou element"; -App::$strings["Edit this menu container"] = "Edita aquest contenidor de menú"; -App::$strings["Add menu element"] = "Afegeix element de menú"; -App::$strings["Delete this menu item"] = "Esborra aquest article del menú"; -App::$strings["Edit this menu item"] = "Edita aquest article del menú"; -App::$strings["Menu item not found."] = "Article del menú no trobat."; -App::$strings["Menu item deleted."] = "Article del menú eliminat."; -App::$strings["Menu item could not be deleted."] = "Article del menú no es pot eliminar."; -App::$strings["Edit Menu Element"] = "Editar Element del Menú"; -App::$strings["Link text"] = "Enllaç de text"; +App::$strings["File to Upload"] = "Fitxer per pujar"; +App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Has creat %1$.0f canals dels %2$.0f totals permesos."; App::$strings["Name or caption"] = "Nom o llegenda"; -App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Exemples: \"Pep Gomila\", \"Manel i els seus Cavalls\", \"Fútbol\", \"Grup d'Aviadors\""; +App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Exemples: \"Paula Gomila\", \"Manel i els seus cavalls\", \"Assemblea de veïnes del barri\", \"Filosofia\""; App::$strings["Choose a short nickname"] = "Tria un àlies curt"; -App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "El teu àlies serà emprat per crear un nom fàcil per recordar l'adreça del canal p.e. àlies%s"; -App::$strings["Channel role and privacy"] = "Funció i privacitat del canal"; -App::$strings["Select a channel role with your privacy requirements."] = "Tria una funció pel canal amb els teus requisits de privacitat."; +App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "El teu àlies servirà per crear un nom fàcil per recordar l'adreça del canal. Per exemple, àlies%s"; +App::$strings["Channel role and privacy"] = "Rol i privacitat del canal"; +App::$strings["Select a channel role with your privacy requirements."] = "Tria un rol pel canal segons les teves necessitats de privacitat."; App::$strings["Read more about roles"] = "Llegix més sobre els rols"; -App::$strings["Create Channel"] = "Crea un Canal"; -App::$strings["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."] = "Un canal es la tva identitat en aquesta xarxa. Pot representar una persona, un bloc, o un fòrum per anomenar alguns. Els canals poden connectar-se amb altres canals per compartir informació amb permisos molt detallats."; -App::$strings["or import an existing channel from another location."] = "o importa un canal existent des d'un altre ubicació."; -App::$strings["Invalid request identifier."] = "Sol·licitud d'identificació invàlida."; -App::$strings["Discard"] = "Descarta"; -App::$strings["Mark all system notifications seen"] = "Marca totes les notificacions vistes"; -App::$strings["Page owner information could not be retrieved."] = "La informació del propietari de la pàgina no va poder ser recuperada"; -App::$strings["Profile Photos"] = "Fotos del Perfil"; -App::$strings["Album not found."] = "Àlbum no trobat"; -App::$strings["Delete Album"] = "Esborra Àlbum"; -App::$strings["Multiple storage folders exist with this album name, but within different directories. Please remove the desired folder or folders using the Files manager"] = "Existeixen moltes carpetes de emmagatzemament amb aquest nom d'àlbum, però en diferents directoris. Si us plau esborra la carpeta o carpetes amb el gestor d'arxius."; -App::$strings["Delete Photo"] = "Esborra Foto"; -App::$strings["No photos selected"] = "No has seleccionat fotos"; -App::$strings["Access to this item is restricted."] = "L'accés a aquest element esta restringit."; -App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "S'estan fent servir %1$.2f MB de %2$.2f MB de l'espai per a imatges."; -App::$strings["%1$.2f MB photo storage used."] = "S'estan fent servir %1$.2f MB de l'espai per a imatges."; -App::$strings["Upload Photos"] = "Puja imatges"; -App::$strings["Enter an album name"] = "Escriu el nom del àlbum"; -App::$strings["or select an existing album (doubleclick)"] = "o bé fes doble clic a un d'existent"; -App::$strings["Create a status post for this upload"] = "Genera una entrada a partir de la pujada"; -App::$strings["Caption (optional):"] = "Subtítol (opcional):"; -App::$strings["Description (optional):"] = "Descripció (opcional):"; -App::$strings["Album name could not be decoded"] = "No s'ha pogut descodificar el nom de l'àlbum"; -App::$strings["Contact Photos"] = "Imatges de contactes"; -App::$strings["Show Newest First"] = "Ordena de més nou a més antic"; -App::$strings["Show Oldest First"] = "Ordena de més antic a més nou"; -App::$strings["View Photo"] = "Mostra la imatge"; -App::$strings["Edit Album"] = "Modifica l'àlbum"; -App::$strings["Permission denied. Access to this item may be restricted."] = "S'ha denegat el permís. Pot ser que l'accés estigui restringit."; -App::$strings["Photo not available"] = "La imatge no està disponible"; -App::$strings["Use as profile photo"] = "Fes-la imatge de perfil"; -App::$strings["Use as cover photo"] = "Emprar com a foto de portada"; -App::$strings["Private Photo"] = "Imatge privada"; -App::$strings["View Full Size"] = "Mostra a mida completa"; -App::$strings["Remove"] = "Esborra"; -App::$strings["Edit photo"] = "Modifica la imatge"; -App::$strings["Rotate CW (right)"] = "Tomba cap a la dreta"; -App::$strings["Rotate CCW (left)"] = "Tomba cap a l'esquerra"; -App::$strings["Enter a new album name"] = "Escriu el nom del nou àlbum"; -App::$strings["or select an existing one (doubleclick)"] = "o bé fes doble clic a un d'existent"; -App::$strings["Caption"] = "Llegenda"; -App::$strings["Add a Tag"] = "Afegeix una etiqueta"; -App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Exemple: @joan, @Paula_Peris, @mar@exemple.org"; -App::$strings["Flag as adult in album view"] = "Marca com a contingut adult"; -App::$strings["I like this (toggle)"] = "M'agrada això (canvia)"; -App::$strings["I don't like this (toggle)"] = "No m'agrada això (canvia)"; -App::$strings["Please wait"] = "Si us plau, espera"; -App::$strings["This is you"] = "Ets tú"; -App::$strings["Comment"] = "Comentari"; -App::$strings["__ctx:title__ Likes"] = "Agrada"; -App::$strings["__ctx:title__ Dislikes"] = "Desagrada"; -App::$strings["__ctx:title__ Agree"] = "Acord"; -App::$strings["__ctx:title__ Disagree"] = "Desacord"; -App::$strings["__ctx:title__ Abstain"] = "Abstenirse"; -App::$strings["__ctx:title__ Attending"] = "Assistint"; -App::$strings["__ctx:title__ Not attending"] = "Desassistint"; -App::$strings["__ctx:title__ Might attend"] = "Podrien assistir"; -App::$strings["View all"] = "Veure tot"; -App::$strings["__ctx:noun__ Like"] = array( - 0 => "Agrada", - 1 => "Agraden", -); -App::$strings["__ctx:noun__ Dislike"] = array( - 0 => "Desagrada", - 1 => "Desagrada", -); -App::$strings["Photo Tools"] = "Eines per Fotos"; -App::$strings["In This Photo:"] = "Hi apareixen:"; -App::$strings["Map"] = "Mapa"; -App::$strings["__ctx:noun__ Likes"] = "Agrada"; -App::$strings["__ctx:noun__ Dislikes"] = "Desagrada"; -App::$strings["Close"] = "Tanca"; -App::$strings["View Album"] = "Mostra'n l'àlbum"; -App::$strings["Recent Photos"] = "Imatges recents"; -App::$strings["sent you a private message"] = "Se t'ha enviat un missatge privat"; -App::$strings["added your channel"] = "el teu canal s'ha afegit"; -App::$strings["g A l F d"] = "g A l F d"; -App::$strings["[today]"] = "[avui]"; -App::$strings["posted an event"] = "enviat un esdeveniment"; -App::$strings["Unable to find your hub."] = "No es possible trobar el node"; -App::$strings["Post successful."] = "Entrada realitzada amb èxit. "; -App::$strings["OpenID protocol error. No ID returned."] = "Error del protocol OpenID. No ha retornat ID"; -App::$strings["Login failed."] = "Identificació fallida."; -App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; -App::$strings["This setting requires special processing and editing has been blocked."] = "Aquest ajust requereix un procés espedial i l'edició esta bloquejada."; -App::$strings["Configuration Editor"] = "Editor de Configuració"; -App::$strings["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."] = "atenció: Realitzar segons quins ajustos pot fer el canal inoperable. Deixa aquesta pàgina si no estas segur i tens suficients coneixements sobre l'ús correcte d'aquesta característica."; -App::$strings["Layout updated."] = "S'ha actualitzat la disposició."; -App::$strings["Edit System Page Description"] = "Editor del Sistema de Descripció de Pàgines"; -App::$strings["Layout not found."] = "No s'ha trobat cap disposició de pàgina."; -App::$strings["Module Name:"] = "Nom del mòdul:"; -App::$strings["Layout Help"] = "Ajuda per la disposició de pàgina"; -App::$strings["Poke"] = "Esperonar"; -App::$strings["Poke somebody"] = "Emprenyar algú"; -App::$strings["Poke/Prod"] = "Esperonat/Picat"; -App::$strings["Poke, prod or do other things to somebody"] = "emprenyar, picar o fer altres coses a algú"; -App::$strings["Recipient"] = "Destinatari"; -App::$strings["Choose what you wish to do to recipient"] = "Tria que vols fer amb el destinatari"; -App::$strings["Make this post private"] = "Fer aquesta entrada privada"; -App::$strings["Fetching URL returns error: %1\$s"] = "URL sol·licitada retorna error: %1\$s"; -App::$strings["Profile not found."] = "Perfil no trobat."; -App::$strings["Profile deleted."] = "Perfil eliminat."; -App::$strings["Profile-"] = "Perfil-"; -App::$strings["New profile created."] = "Nou perfil creat."; -App::$strings["Profile unavailable to clone."] = "Perfil que no es pot clonar."; -App::$strings["Profile unavailable to export."] = "Perfil que no es pot exportar."; -App::$strings["Profile Name is required."] = "Es requereix el Nom del Perfil."; -App::$strings["Marital Status"] = "Estat Marital"; -App::$strings["Romantic Partner"] = "Company/a Romàntic"; -App::$strings["Likes"] = "Agrada"; -App::$strings["Dislikes"] = "Desagrada"; -App::$strings["Work/Employment"] = "Treball/Feina"; -App::$strings["Religion"] = "Religió"; -App::$strings["Political Views"] = "Idees Polítiques"; -App::$strings["Sexual Preference"] = "Preferència Sexual"; -App::$strings["Homepage"] = "Pàgina Personal"; -App::$strings["Interests"] = "Interessos"; -App::$strings["Profile updated."] = "Perfil actualitzat."; -App::$strings["Hide your connections list from viewers of this profile"] = "Amaga dels curiosos la teva llista de connexions d'aquest perfil"; -App::$strings["Edit Profile Details"] = "Edita els Detalls del Perfil"; -App::$strings["View this profile"] = "Veure aquest perfil"; -App::$strings["Edit visibility"] = "Editar visibilitat"; -App::$strings["Profile Tools"] = "Eines per Perfils"; -App::$strings["Change cover photo"] = "Canviar la foto de portada"; -App::$strings["Change profile photo"] = "Canviar la foto del perfil"; -App::$strings["Create a new profile using these settings"] = "Crea un perfil nou amb aquests ajustos"; -App::$strings["Clone this profile"] = "Clonar aquest perfil"; -App::$strings["Delete this profile"] = "Elimina aquest perfil"; -App::$strings["Add profile things"] = "Afegeix coses al perfil"; -App::$strings["Personal"] = "Personal"; -App::$strings["Relation"] = "Relació"; -App::$strings["Miscellaneous"] = "Miscelania"; -App::$strings["Import profile from file"] = "Importa perfil des d'un arxiu"; -App::$strings["Export profile to file"] = "Exporta perfil a un arxiu"; -App::$strings["Your gender"] = "El teu gènere"; -App::$strings["Marital status"] = "Estat marital"; -App::$strings["Sexual preference"] = "Preferència sexual"; -App::$strings["Profile name"] = "Nom del perfil"; -App::$strings["This is your default profile."] = "Aquest es el teu perfil per defecte"; -App::$strings["Your full name"] = "El teu nom complet"; -App::$strings["Title/Description"] = "Títol/Descripció"; -App::$strings["Street address"] = "Carrer"; -App::$strings["Locality/City"] = "Població/Ciutat"; -App::$strings["Region/State"] = "Regió/Estat"; -App::$strings["Postal/Zip code"] = "Codi Postal"; -App::$strings["Country"] = "País"; -App::$strings["Who (if applicable)"] = "Qui (si es aplicable)"; -App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Examples: cathy123, Cathy Williams, cathy@example.com"; -App::$strings["Since (date)"] = "Des de (data)"; -App::$strings["Tell us about yourself"] = "Quelcom sobre tu"; -App::$strings["Hometown"] = "Ciutat Natal"; -App::$strings["Political views"] = "Idees polítiques"; -App::$strings["Religious views"] = "Creences religioses"; -App::$strings["Keywords used in directory listings"] = "Paraules clau emprades en els llistats de directoris"; -App::$strings["Example: fishing photography software"] = "Exemple: software de fotografia submarina"; -App::$strings["Musical interests"] = "Interessos Musicals"; -App::$strings["Books, literature"] = "Llibres, literatura"; -App::$strings["Television"] = "Televisió"; -App::$strings["Film/Dance/Culture/Entertainment"] = "Pel·lícules/Dansa/Cultura/Entreteniment"; -App::$strings["Hobbies/Interests"] = "Aficions/Interessos"; -App::$strings["Love/Romance"] = "Amor/Romace"; -App::$strings["School/Education"] = "Escola/Educació"; -App::$strings["Contact information and social networks"] = "Informació de contacte i xarxes socials"; -App::$strings["My other channels"] = "Els meus altres canals"; -App::$strings["Profile Image"] = "Imatge del Perfil"; -App::$strings["Edit Profiles"] = "Editar Perfils"; -App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Refresca la memòria cau del navegador si la foto no s'actualitza immediatament. Dreceres: «Ctrl+F5» i «Ctrl+Maj+R»"; -App::$strings["Upload Profile Photo"] = "Puja una Foto pel Perfil"; -App::$strings["Invalid profile identifier."] = "Identificador invàlid de perfil."; -App::$strings["Profile Visibility Editor"] = "Perfil del Editor de Visibilitat"; -App::$strings["Profile"] = "Perfil"; -App::$strings["Click on a contact to add or remove."] = "Clica sobre el contacte per afegir o esborrar."; -App::$strings["Visible To"] = "Visible per"; -App::$strings["Public Hubs"] = "Nodes Públics"; -App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself may provide additional details."] = "Els nodes llistats permeten registrar usuaris de la xarxa \$Projectname. Com que tots els nodes estan enllaçats entre ells, la identitat és vàlida a tota la xarxa. Alguns nodes poden demanar subscripció o oferir serveis addicional de pagament. Per a més detalls, proveu de seguir els enllaços dels proveïdors."; -App::$strings["Hub URL"] = "URL del Node"; -App::$strings["Access Type"] = "Tipus d'accés"; -App::$strings["Registration Policy"] = "Condicions de registre"; -App::$strings["Stats"] = "Estadístiques"; -App::$strings["Software"] = "Programari"; -App::$strings["Ratings"] = "Valoracions"; -App::$strings["Rate"] = "Puntua"; -App::$strings["Website:"] = "Lloc web:"; -App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Canal Remot [%s] (encara no es coneix en aquest lloc)"; -App::$strings["Rating (this information is public)"] = "Valoració (aquesta informació és pública)"; -App::$strings["Optionally explain your rating (this information is public)"] = "Opcionalment pots explicar la teva qualificació (aquesta informació és pública)"; -App::$strings["No ratings"] = "No valorat"; -App::$strings["Rating: "] = "Valoració:"; -App::$strings["Website: "] = "Lloc web:"; -App::$strings["Description: "] = "Descripció:"; -App::$strings["Theme settings updated."] = "Ajustos de tema actualitzats."; -App::$strings["# Accounts"] = "# Comptes"; -App::$strings["# blocked accounts"] = "# comptes bloquejats"; -App::$strings["# expired accounts"] = "# comptes expirats"; -App::$strings["# expiring accounts"] = "# comptes expirant"; -App::$strings["# Channels"] = "# Canals"; -App::$strings["# primary"] = "# primari"; -App::$strings["# clones"] = "# clons"; -App::$strings["Message queues"] = "Cues de missatges"; -App::$strings["Your software should be updated"] = "El teu programari cal que s'actualitzi"; +App::$strings["Create Channel"] = "Crea un canal"; +App::$strings["A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things. Channels can make connections with other channels to share information with each other."] = "Cada canal és una identitat de xarxa única. Tant pot representar una persona (el seu perfil social), com un fòrum (un grup), una associació o la pàgina d'algun personatge públic, una font de notícies, i moltes més coses. Els canals poden connectar-se entre ells per a compartir informació."; +App::$strings["The type of channel you create affects the basic privacy settings, the permissions that are granted to connections/friends, and also the channel's visibility across the network."] = "El tipus de canal que creïs determinarà els permisos de privacitat bàsics, els atorgats a les connexions i a la visibilitat del canal a la xarxa."; +App::$strings["or import an existing channel from another location."] = "o bé importa un canal existent des d'una altra ubicació."; +App::$strings["Validate"] = "Valida-ho"; +App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "No es permet esborrar un canal fins a 48 hores més tard d'haver canviant la contrasenya del compte al qual pertany."; +App::$strings["Remove This Channel"] = "Esborra aquest canal"; +App::$strings["WARNING: "] = "ALERTA:"; +App::$strings["This channel will be completely removed from the network. "] = "Aquest canal serà esborrat de la xarxa completament."; +App::$strings["This action is permanent and can not be undone!"] = "Aquesta acció és irreversible!"; +App::$strings["Please enter your password for verification:"] = "Per seguretat, torna a introduir la contrasenya per a confirmar aquesta acció:"; +App::$strings["Remove this channel and all its clones from the network"] = "Elimina aquest canal i els seus clons de la xarxa"; +App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Per defecte, només es pot esborrar la instància del canal ubicada en aquest hub."; +App::$strings["Remove Channel"] = "Elimina el canal"; +App::$strings["Files: shared with me"] = "Arxius: compartits amb mi"; +App::$strings["NEW"] = "NOU"; +App::$strings["Size"] = "Mida"; +App::$strings["Last Modified"] = "Última modificació"; +App::$strings["Remove all files"] = "Esborra tots els arxius"; +App::$strings["Remove this file"] = "Esborra l'arxiu"; +App::$strings["\$Projectname Server - Setup"] = "Servidor de \$Projectname - Instaŀlació"; +App::$strings["Could not connect to database."] = "No s'ha pogut establir una connexió amb la base de dades"; +App::$strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "No s'ha pogut connectar amb la URL del lloc especificat. Comprova si hi ha un problema amb el certificat TLS o amb el registre DNS."; +App::$strings["Could not create table."] = "No s'ha pogut crear la taula."; +App::$strings["Your site database has been installed."] = "S'ha instaŀlat la base de dades del teu node."; +App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Podria ser necessari importar el fitxer \"install / schema_xxx.sql\" manualment utilitzant un client de base de dades."; +App::$strings["Please see the file \"install/INSTALL.txt\"."] = "Consulta el fitxer \"install/INSTALL.txt\"."; +App::$strings["System check"] = "Comprovació del sistema"; +App::$strings["Check again"] = "Comprova de nou"; +App::$strings["Database connection"] = "Connexió amb la base de dades"; +App::$strings["In order to install \$Projectname we need to know how to connect to your database."] = "Per tal d'instaŀlar \$Projectname cal configurar la connexió amb la base de dades."; +App::$strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Si tens dubtes sobre aquests paràmetres, posa't en contacte amb la proveïdora d'allotjament web o la persona que administradora del lloc."; +App::$strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de dades que especifiquis a continuació ja ha d'existir. Si no és així, crea-la abans de continuar."; +App::$strings["Database Server Name"] = "Nom del servidor de base de dades"; +App::$strings["Default is 127.0.0.1"] = "Per defecte és 127.0.0.1"; +App::$strings["Database Port"] = "Port per a la base de dades"; +App::$strings["Communication port number - use 0 for default"] = "Número del port. Posa 0 per fer servir el valor predeterminat"; +App::$strings["Database Login Name"] = "Nom d'usuari/a a la base de dades"; +App::$strings["Database Login Password"] = "Contrasenya d'usuari/a a la base de dades"; +App::$strings["Database Name"] = "Nom de la base de dades"; +App::$strings["Database Type"] = "Tipus de base de dades"; +App::$strings["Site administrator email address"] = "Adreça de correu de l'administrador/a del lloc"; +App::$strings["Your account email address must match this in order to use the web admin panel."] = "El teu compte de correu ha de coincidir-hi per poder emprar el panell web d'administració."; +App::$strings["Website URL"] = "Adreça URL del lloc web"; +App::$strings["Please use SSL (https) URL if available."] = "Si us plau, fes servir l'adreça amb TLS (https) si està disponible."; +App::$strings["Please select a default timezone for your website"] = "Escull la zona horària per defecte del teu lloc web"; +App::$strings["Site settings"] = "Configuració del lloc"; +App::$strings["PHP version 5.5 or greater is required."] = "Es necessita una versió de PHP igual o superior a la 5.5."; +App::$strings["PHP version"] = "Versió del PHP"; +App::$strings["Could not find a command line version of PHP in the web server PATH."] = "No s'ha pogut trobar una versió de consola del PHP en la ruta del servidor web."; +App::$strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Si no tens una versió de línia de comandes de PHP instaŀlada al servidor, no es podran fer sondejos periòdics en segon pla, fent servir el cron."; +App::$strings["PHP executable path"] = "Ruta al binari de PHP"; +App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Introdueix la ruta al binari de php. Pots deixar-ho en blanc i continuar l'instaŀlació."; +App::$strings["Command line PHP"] = "Línia de comandes de PHP"; +App::$strings["Unable to check command line PHP, as shell_exec() is disabled. This is required."] = "No s'ha pogut fer servir PHP per línia de comandes perquè shell_exec() està deshabilitat. Cal habilitar-ho."; +App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versió de línia de comandes de PHP al teu sistema no té el \"register_argc_argv\" activat."; +App::$strings["This is required for message delivery to work."] = "Això és necessari per poder lliurar missatges."; +App::$strings["PHP register_argc_argv"] = "register_argc_argv de PHP"; +App::$strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "El límit màxim de pujada està establerta en %s. El límit de pujada per arxiu de pujada és de %s. Es permeten pujar %d arxius alhora."; +App::$strings["You can adjust these settings in the server php.ini file."] = "Pots modificar la configuració en l'arxiu de configuració php.ini del servidor."; +App::$strings["PHP upload limits"] = "Límits de pujada de PHP"; +App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: la funció \"openssl_pkey_new\" en aquest sistema no és capaç de generar claus de xifratge"; +App::$strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si estàs fent servir un sistema operatiu Windows, consulta \"http://www.php.net/manual/en/openssl.installation.php\"."; +App::$strings["Generate encryption keys"] = "Generar claus de xifratge"; +App::$strings["libCurl PHP module"] = "mòdul de PHP \"libCurl\""; +App::$strings["GD graphics PHP module"] = "mòdul de PHP \"GD graphics\""; +App::$strings["OpenSSL PHP module"] = "mòdul de PHP \"OpenSSL\""; +App::$strings["PDO database PHP module"] = "Mòdul PHP per la base de dades PDO"; +App::$strings["mb_string PHP module"] = "mòdul de PHP \"mb_string\""; +App::$strings["xml PHP module"] = "mòdul de PHP \"xml\""; +App::$strings["zip PHP module"] = "Mòdul PHP per als comprimits zip"; +App::$strings["Apache mod_rewrite module"] = "mòdul d'Apache: \"mod_rewrite\""; +App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: es necessita el mòdul \"mod-rewrite\" del servidor web Apache, però no està instal·lat."; +App::$strings["exec"] = "exec"; +App::$strings["Error: exec is required but is either not installed or has been disabled in php.ini"] = "Error: no s'ha pogut fer servir exec. Cal instaŀlar-lo o bé habilitar-lo al php.ini"; +App::$strings["shell_exec"] = "shell_exec"; +App::$strings["Error: shell_exec is required but is either not installed or has been disabled in php.ini"] = "Error: no s'ha pogut fer servir shell_exec. Cal instaŀlar-lo o bé habilitar-lo al php.ini"; +App::$strings["Error: libCURL PHP module required but not installed."] = "Error: es necessita el mòdul PHP \"libCURL\", però no està instal·lat."; +App::$strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: es necessita el mòdul PHP \"GD graphics\" amb support JPEG, però no està instal·lat."; +App::$strings["Error: openssl PHP module required but not installed."] = "Error: es necessita el mòdul PHP \"OpenSSL\", però no està instal·lat."; +App::$strings["Error: PDO database PHP module required but not installed."] = "Error: no s'ha trobat el mòdul PHP per a la base de dades PDO. Cal instaŀlar-lo."; +App::$strings["Error: mb_string PHP module required but not installed."] = "Error: es necessita el mòdul PHP \"mb_string\", però no està instal·lat."; +App::$strings["Error: xml PHP module required for DAV but not installed."] = "Error: es necessita el mòdul PHP \"xml\" per al DAV, però no està instal·lat."; +App::$strings["Error: zip PHP module required but not installed."] = "Error: no s'ha trobat el mòdul PHP per als fitxers zip. Cal instaŀlar-lo."; +App::$strings[".htconfig.php is writable"] = "L'arxiu «.htconfig.php» es pot modificar"; +App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "L'instaŀlador ha de poder crear i modificar un fitxer anomenat «.htconfig.php» a la carpeta arrel del servidor, però sembla que no ho pot fer."; +App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Això sol ser un problema de permisos. Per molt que el teu usuari pugui modificar-lo, és el del servidor web qui necessita els permisos de modificació."; +App::$strings["Please see install/INSTALL.txt for additional information."] = "Consulta install/INSTALL.txt per a més informació."; +App::$strings["This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Aquest software fa servir el motor de plantilles Smarty3 per a renderitzar les vistes web. Smarty3 compila plantilles a PHP per a agilitzar-ne el renderitzat."; +App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "Per tal de guardar aquestes plantilles compilades, el servidor web necessita tenir permís d'escriptura en el directori %s sota la carpeta principal."; +App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Comprova que l'usuari que executa el servidor (www-data en Apache) té permisos d'escriptura en aquesta carpeta."; +App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Nota: com a mesura de seguretat, l'usuari del servidor web ha de tenir accés d'escriptura només a %s, i no a les plantilles (.tpl) que conté."; +App::$strings["%s is writable"] = "Es pot escriure a %s"; +App::$strings["This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"] = "Aquest software fa servir la carpeta \"store\" per a desar els arxius pujats. El servidor web necessita permís d'escriptura per a accedir-hi. Es troba a la carpeta arrel del servidor web."; +App::$strings["store is writable"] = "Es pot escriure al magatzem (store)"; +App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "No s'ha pogut validar el certificat TLS. Arregla-ho o deshabilita l'accés https a aquest lloc."; +App::$strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "Si tens accés per https al teu lloc web o permets connexions pel port TCP 443 (port https), has d'emprar un certificat VÀLID. NO es poden emprar certificats AUTO-SIGNATS!"; +App::$strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "El motiu d'aquesta restricció és que les teves entrades públiques poden contenir referències a imatges del teu propi node."; +App::$strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "Si el teu certificat no és vàlid, llavors el membres d'altres hubs, encara que tinguin certificats vàlids, rebran una advertència de seguretat en carregar contingut teu."; +App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Per tant, com que perjudica la usabilitat més enllà del teu lloc, la restricció de tenir un certificat vàlid és molt important."; +App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Hi ha autoritats de certificació reconegudes que ofereixen certificats gratuïts."; +App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = "Si no tens cap dubte que el certificat és vàlid i signat per una autoritat de confiança, comprova si has instaŀlat malament un certificat intermedi. Tot i que els navegadors no en demanen, són necessaris per les connexions entre servidors."; +App::$strings["SSL certificate validation"] = "Validació del certificat TLS"; +App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "No es poden reescriure les URL a «.htaccess». Comprova la configuració del servidor:"; +App::$strings["Url rewrite is working"] = "Es poden reescriure les URL a «.htaccess»"; +App::$strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "L'arxiu de configuracio de la base de dades «.htconfig.php» no s'ha pogut modificar. L'hauràs de modificar manualment amb el text de la caixa de text, i desar-lo a l'arrel del servidor web."; +App::$strings["Errors encountered creating database tables."] = "S'han produït errors en crear taules a la base de dades."; +App::$strings["

    What next?

    "] = "

    I ara què

    "; +App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT! Cal que configuris manualment una execució periòdica de l'enquestador (poller en anglès)."; +App::$strings["Continue"] = "Continua"; +App::$strings["Premium Channel Setup"] = "Configuració dels canals prèmium"; +App::$strings["Enable premium channel connection restrictions"] = "Activa l'opció de restringir les connexions dels canals prèmium"; +App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Si us plau, introdueix les restriccions o condicions, com ara el rebut de PayPal, les pautes d'ús, etc."; +App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Aquest canal pot requerir passos addicionals o reconeixement de les següents condicions abans de connectar:"; +App::$strings["Potential connections will then see the following text before proceeding:"] = "Les possibles connexions veuran el següent text abans de continuar:"; +App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "En continuar, certifico que he complert amb totes les instruccions proporcionades en aquesta pàgina."; +App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(No s'han proporcionat instruccions específiques per la persona propietària del canal.)"; +App::$strings["Restricted or Premium Channel"] = "Canal restringit o prèmium"; +App::$strings["Queue Statistics"] = "Estadístiques de la cua"; +App::$strings["Total Entries"] = "Total d'entrades"; +App::$strings["Priority"] = "Prioritat"; +App::$strings["Destination URL"] = "Adreça URL de Destí"; +App::$strings["Mark hub permanently offline"] = "Marca el node com a permanentment fora de línia"; +App::$strings["Empty queue for this hub"] = "Buida la cua per aquest node"; +App::$strings["Last known contact"] = "Últim contacte conegut"; +App::$strings["Off"] = "No"; +App::$strings["On"] = "Sí"; +App::$strings["Lock feature %s"] = "Bloqueja l'opció «%s»"; +App::$strings["Manage Additional Features"] = "Gestiona les funcionalitats addicionals"; +App::$strings["Update has been marked successful"] = "S'ha marcat l'actualització com a exitosa"; +App::$strings["Executing %s failed. Check system logs."] = "Ha fallat l'execució de %s. Comprova el registre del sistema."; +App::$strings["Update %s was successfully applied."] = "S'ha aplicat amb èxit l'actualització %s."; +App::$strings["Update %s did not return a status. Unknown if it succeeded."] = "Es desconeix si l'actualització %s s'ha aplicat amb èxit, ja que no ha retornat cap resultat."; +App::$strings["Update function %s could not be found."] = "No s'ha pogut trobar la funció d'actualització %s."; +App::$strings["Failed Updates"] = "Actualitzacions fallides"; +App::$strings["Mark success (if update was manually applied)"] = "Marca com a exitosa. Fes-ho només si l'actualització s'ha aplicat de forma manual i saps del cert que ha estat així."; +App::$strings["Attempt to execute this update step automatically"] = "Prova a fer automàticament aquesta actualització"; +App::$strings["No failed updates."] = "No hi ha actualitzacions fallides."; +App::$strings["Item not found."] = "No s'ha trobat l'element."; +App::$strings["Plugin %s disabled."] = "S'ha desactivat l'extensió %s."; +App::$strings["Plugin %s enabled."] = "S'ha activat l'extensió %s."; +App::$strings["Disable"] = "Desactiva"; +App::$strings["Enable"] = "Activa"; App::$strings["Administration"] = "Administració"; -App::$strings["Summary"] = "Sumari"; -App::$strings["Registered accounts"] = "Comptes registrades"; -App::$strings["Pending registrations"] = "Comptes pendents de registre"; -App::$strings["Registered channels"] = "Canals registrats"; -App::$strings["Active plugins"] = "Plugins actius"; -App::$strings["Version"] = "Versió"; -App::$strings["Repository version (master)"] = "Versió (master) del repositori"; -App::$strings["Repository version (dev)"] = "Versió (desenvolupament) del repositori"; -App::$strings["Site settings updated."] = "Ajustos del Lloc actualitzats"; +App::$strings["Plugins"] = "Extensions"; +App::$strings["Toggle"] = "Commuta'n l'estat"; +App::$strings["Settings"] = "Configuració"; +App::$strings["Author: "] = "Autor/a:"; +App::$strings["Maintainer: "] = "Persona mantenidora:"; +App::$strings["Minimum project version: "] = "Versió mínima del projecte:"; +App::$strings["Maximum project version: "] = "Versió màxima del projecte:"; +App::$strings["Minimum PHP version: "] = "Versió mínima de PHP:"; +App::$strings["Compatible Server Roles: "] = "Rols de servidor compatibles"; +App::$strings["Requires: "] = "Demana:"; +App::$strings["Disabled - version incompatibility"] = "Desactivada - versions incompatibles"; +App::$strings["Enter the public git repository URL of the plugin repo."] = "Introdueix la URL del repositori git d'extensions. Ha de ser un repositori públic."; +App::$strings["Plugin repo git URL"] = "Adreça URL del repositori d'extensions."; +App::$strings["Custom repo name"] = "Nom personalitzat pel repositori"; +App::$strings["(optional)"] = "(opcional)"; +App::$strings["Download Plugin Repo"] = "Descarrega el repositori"; +App::$strings["Install new repo"] = "Instal·la un nou repositori"; +App::$strings["Install"] = "Instal·la"; +App::$strings["Manage Repos"] = "Gestiona els repositoris"; +App::$strings["Installed Plugin Repositories"] = "Repositoris instaŀlats"; +App::$strings["Install a New Plugin Repository"] = "Instal·la un nou repositori"; +App::$strings["Switch branch"] = "Canvia de branca"; +App::$strings["Remove"] = "Esborra"; +App::$strings["%s account blocked/unblocked"] = array( + 0 => "S'ha [des]bloquejat %s compte", + 1 => "S'han [des]bloquejat %s comptes", +); +App::$strings["%s account deleted"] = array( + 0 => "S'ha esborrat el compte %s", + 1 => "S'han esborrat %s comptes", +); +App::$strings["Account not found"] = "No s'ha trobat el compte"; +App::$strings["Account '%s' deleted"] = "S'ha esborrat el compte '%s'"; +App::$strings["Account '%s' blocked"] = "S'ha bloquejat el compte '%s'"; +App::$strings["Account '%s' unblocked"] = "S'ha desbloquejat el compte '%s'"; +App::$strings["Accounts"] = "Comptes"; +App::$strings["select all"] = "sel·leciona-ho tot"; +App::$strings["Registrations waiting for confirm"] = "Inscripcions esperant confirmació"; +App::$strings["Request date"] = "Data de la petició"; +App::$strings["No registrations."] = "Sense inscripcions."; +App::$strings["Approve"] = "Aprova"; +App::$strings["Deny"] = "Denega"; +App::$strings["Block"] = "Bloqueja"; +App::$strings["Unblock"] = "Desbloqueja"; +App::$strings["ID"] = "Identificador"; +App::$strings["All Channels"] = "Tots els canals"; +App::$strings["Register date"] = "Data d'inscripció"; +App::$strings["Last login"] = "Últim inici de sessió"; +App::$strings["Expires"] = "Caduca"; +App::$strings["Service Class"] = "Classe de servei"; +App::$strings["Selected accounts will be deleted!\\n\\nEverything these accounts had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "S'esborraran tots els comptes seleccionats!\\n\\nTot el que hagin publicat en aquest lloc també serà esborrat permanentment!\\n\\nN'estàs segur/a de continuar?"; +App::$strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "El compte {0} serà eliminat!\\n\\nTot el que hagi publicat en aquest lloc serà esborrat permanentment!\\n\\nN'estàs segur/a?"; +App::$strings["Log settings updated."] = "S'ha actualitzat la configuració del registre."; +App::$strings["Logs"] = "Registre"; +App::$strings["Clear"] = "Neteja"; +App::$strings["Debugging"] = "Depuració"; +App::$strings["Log file"] = "Arxiu de registre"; +App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "El servidor web l'ha de poder modificar. Escriu la ruta relativa respecte a la carpeta arrel del servidor web."; +App::$strings["Log level"] = "Nivell de registre"; +App::$strings["%s channel censored/uncensored"] = array( + 0 => "%s canal censurat/no censurat", + 1 => "S'han [des]censurat %s canals", +); +App::$strings["%s channel code allowed/disallowed"] = array( + 0 => "%s codi permes/no permes al canal", + 1 => "S'han [des]activat %s codis de canal", +); +App::$strings["%s channel deleted"] = array( + 0 => "%s canal esborrat", + 1 => "S'han esborrat %s canals", +); +App::$strings["Channel not found"] = "No s'ha trobat el canal"; +App::$strings["Channel '%s' deleted"] = "S'ha esborrat el canal «%s»"; +App::$strings["Channel '%s' censored"] = "S'ha censurat el canal «%s»"; +App::$strings["Channel '%s' uncensored"] = "S'ha descensurat el canal «%s»"; +App::$strings["Channel '%s' code allowed"] = "S'ha activat un codi pel canal «%s»"; +App::$strings["Channel '%s' code disallowed"] = "S'ha desactivat un codi pel canal «%s»"; +App::$strings["Channels"] = "Canals"; +App::$strings["Censor"] = "Censura"; +App::$strings["Uncensor"] = "Descensura"; +App::$strings["Allow Code"] = "Activa el codi"; +App::$strings["Disallow Code"] = "Desactiva el codi"; +App::$strings["Channel"] = "Canal"; +App::$strings["UID"] = "Identificador"; +App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Els canals seleccionats estan a punt de ser esborrats\\n\\nTotes les seves publicacions en aquest lloc s'eliminaran de forma permanent!\\n\\nN'estàs segur/a? "; +App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "El canal {0} està a punt de ser esborrat!\\n\\nTotes les seves publicacions d'aquest en aquest lloc s'eliminaran de forma permanent!\\n\\nN'estàs segur/a?"; +App::$strings["Theme settings updated."] = "S'ha actualitzat la configuració de tema."; +App::$strings["No themes found."] = "No s'ha trobat cap tema."; +App::$strings["Screenshot"] = "Captura de pantalla"; +App::$strings["Themes"] = "Temes"; +App::$strings["[Experimental]"] = "[Experimental]"; +App::$strings["[Unsupported]"] = "[Incompatible]"; +App::$strings["Site settings updated."] = "S'ha actualitzat la configuració del lloc"; App::$strings["Default"] = "Predeterminat"; +App::$strings["%s - (Incompatible)"] = "%s - (Incompatible)"; App::$strings["mobile"] = "mòbil"; App::$strings["experimental"] = "experimental"; -App::$strings["unsupported"] = "no soportat"; +App::$strings["unsupported"] = "incompatible"; App::$strings["Yes - with approval"] = "Sí - amb aprovació"; -App::$strings["My site is not a public server"] = "El meu lloc no es un servidor públic"; -App::$strings["My site has paid access only"] = "El meu lloc te accès per pagament"; -App::$strings["My site has free access only"] = "El meu lloc te lliure accés"; -App::$strings["My site offers free accounts with optional paid upgrades"] = "El meu lloc te comptes gratis amb opció de millores per pagament"; -App::$strings["Site"] = "Lloc"; -App::$strings["Registration"] = "Registre"; -App::$strings["File upload"] = "Pujar arxiu"; +App::$strings["My site is not a public server"] = "El meu node no es un servidor públic"; +App::$strings["My site has paid access only"] = "El meu node només ofereix accés de pagament"; +App::$strings["My site has free access only"] = "El meu node només ofereix accés gratuït"; +App::$strings["My site offers free accounts with optional paid upgrades"] = "El meu node ofereix comptes gratuïts i millores de pagament"; +App::$strings["Beginner/Basic"] = "Principiant/bàsica"; +App::$strings["Novice - not skilled but willing to learn"] = "Aprenent - amb poca experiència però amb ganes d'aprendre"; +App::$strings["Intermediate - somewhat comfortable"] = "Intermedi - còmode en entorns informàtics"; +App::$strings["Advanced - very comfortable"] = "Avançat - molt còmode en entorns informàtics"; +App::$strings["Expert - I can write computer code"] = "Expert - Sé programar"; +App::$strings["Wizard - I probably know more than you do"] = "Bruixot - Segurament en sé més que tu"; +App::$strings["Site"] = "Node"; +App::$strings["Registration"] = "Inscripcions"; +App::$strings["File upload"] = "Pujada d'arxius"; App::$strings["Policies"] = "Polítiques"; App::$strings["Advanced"] = "Avançat"; -App::$strings["Site name"] = "Nom del lloc"; -App::$strings["Banner/Logo"] = "Senyera/Logo"; -App::$strings["Administrator Information"] = "Informació de l'Administrador"; -App::$strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Informació per contactar amb els administradors del lloc. Mostrada a la pàgina d'informació del lloc. Es pot emprar BBCode aquí"; -App::$strings["System language"] = "Idioma del sistema"; +App::$strings["Site name"] = "Nom del node"; +App::$strings["Site default technical skill level"] = "Nivell per defecte del lloc de competències tècniques"; +App::$strings["Used to provide a member experience matched to technical comfort level"] = "Es fa servir per oferir una experiència ajustada al nivell tècnic de cadascú"; +App::$strings["Lock the technical skill level setting"] = "Bloqueja el paràmetre de nivell tècnic"; +App::$strings["Members can set their own technical comfort level by default"] = "Per defecte, els/les membres poden modificar el paràmetre de nivell tècnic"; +App::$strings["Banner/Logo"] = "Cartell i logotip"; +App::$strings["Unfiltered HTML/CSS/JS is allowed"] = "Es permet contingut HTML, CSS i JS, sense filtrar"; +App::$strings["Administrator Information"] = "Informació de l'administració"; +App::$strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Informació per contactar amb les persones administradores del node. Es mostra a la pàgina d'informació del node. S'hi pot emprar BBCode."; +App::$strings["Site Information"] = "Informació del node"; +App::$strings["Publicly visible description of this site. Displayed on siteinfo page. BBCode can be used here"] = "Descripció del node visible públicament. Es mostra a la pàgina d'informació del node. S'hi pot emprar BBCode."; +App::$strings["System language"] = "Llengua del sistema"; App::$strings["System theme"] = "Tema del sistema"; -App::$strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Tema del sistema per defecte - pot ser sobrescrit pel perfils dels usuaris - Ajustos de canvi del tema"; -App::$strings["Mobile system theme"] = "Tema del sistema per a mòbils"; -App::$strings["Theme for mobile devices"] = "Tema per a aparells mòbils"; -App::$strings["Allow Feeds as Connections"] = "Permetre Retroalimentadors com Connexions"; -App::$strings["(Heavy system resource usage)"] = "(Demana molts recursos del sistema)"; +App::$strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Tema del sistema per defecte. Les persones usuàries poden sobreescriure'l a la configuració de perfil: canvia la configuració de tema"; +App::$strings["Allow Feeds as Connections"] = "Permet connectar-se a fluxos RSS"; +App::$strings["(Heavy system resource usage)"] = "(Demana molts recursos de sistema)"; App::$strings["Maximum image size"] = "Mida màxima d'imatge"; -App::$strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Mida màxima en bytes d'imatges pujades. Per defecte es 0, el que vol dir sense límits."; -App::$strings["Does this site allow new member registration?"] = "Permet aquest lloc registre de nous membres?"; +App::$strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Mida màxima total per les imatges pujades, en bytes. Per defecte és 0, que vol dir iŀlimitada."; +App::$strings["Does this site allow new member registration?"] = "Aquest node està obert a la inscripció de nous membres?"; App::$strings["Invitation only"] = "Només per invitació"; -App::$strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Només permet registre de nos membres amb codi d'invitació. A més la política de registre s'ha d'establir a Sí."; -App::$strings["Which best describes the types of account offered by this hub?"] = "Que es es que millor descriu la mena de comptes oferits per aquest concentrador?"; -App::$strings["Register text"] = "text de registre"; -App::$strings["Will be displayed prominently on the registration page."] = "Es mostrarà preminentment a la pàgina de registre"; -App::$strings["Site homepage to show visitors (default: login box)"] = "Pàgina d'inici a mostrar als visitants (per defecte: la pàgina d'identificació)"; -App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "exemple: 'públic' per a mostrar un flux públic, 'page/sys/home' per a mostrar una pàgina web dita 'home' o 'include:home.html' per a incloure un arxiu."; -App::$strings["Preserve site homepage URL"] = "Preservar URL de la pàgina web"; -App::$strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Presenta la pàgina web del lloc en un marc en el lloc original enlloc de redirigir cap a ella"; -App::$strings["Accounts abandoned after x days"] = "Els copmte es consideren abandonats despres de x dies"; -App::$strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No malgastar recursos del sistema sondejant llocs externs per acomptes abandonats. Entrar 0 vol dir sense límit de temps."; -App::$strings["Allowed friend domains"] = "dominis amics permesos"; -App::$strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "llista separada per comes de dominis en els que està permès establir relacions d'amistat amb aquest lloc. S'accepten comodins. Deixar buit per acceptar qualsevol domini"; -App::$strings["Allowed email domains"] = "Dominis de correu electonic acceptats"; -App::$strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "llista separada per comes de dominis d'adreces de correu electrònic permeses en aquest lloc. S'accepten comodins. Deixar buit per acceptar qualsevol domini"; -App::$strings["Not allowed email domains"] = "Dominis de correu electrònic no acceptats"; -App::$strings["Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined."] = "llista separada per comes de dominis d'adreces de correu electrònic no permeses en aquest lloc. S'accepten comodins. Deixar buit per no acceptar cap domini, excepte els que s'hagin definits com acceptats."; -App::$strings["Verify Email Addresses"] = "Verifica l'Adreça de Correu Electrònic"; -App::$strings["Check to verify email addresses used in account registration (recommended)."] = "Activa per comprovar l'adreça de correu electrònic emprada durant el registre d'un nou compte (recomanat)"; -App::$strings["Force publish"] = "Forza la publicació"; -App::$strings["Check to force all profiles on this site to be listed in the site directory."] = "Activa per forzar que tots el perfils en aquest lloc siguin llistats en el directori del lloc."; -App::$strings["Import Public Streams"] = "Importar Fluxos Públics"; +App::$strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Només permet nous membres només a través d'invitacions. Perquè tingui efecte, les inscripcions han d'estar obertes a nous membres."; +App::$strings["Minimum age"] = "Edat mínima"; +App::$strings["Minimum age (in years) for who may register on this site."] = "Edat mínima en anys per a poder crear un compte en aquest lloc."; +App::$strings["Which best describes the types of account offered by this hub?"] = "Quina descripció s'acosta més al tipus de comptes oferts en aquest node?"; +App::$strings["Register text"] = "Text d'inscripció"; +App::$strings["Will be displayed prominently on the registration page."] = "Es mostrarà en gran a la pàgina d'inscripció"; +App::$strings["Site homepage to show visitors (default: login box)"] = "Pàgina d'inici a mostrar als visitants (per defecte: la pàgina d'inici de sessió)"; +App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "exemple: 'public' per a mostrar el flux públic, 'page/sys/home' per a mostrar una pàgina web de sistema de nom 'home', o 'include:home.html' per a incloure un arxiu."; +App::$strings["Preserve site homepage URL"] = "Preserva l'adreça URL de la pàgina d'inici"; +App::$strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Presenta la pàgina d'inici del node en un marc en el lloc original enlloc de redirigir-hi"; +App::$strings["Accounts abandoned after x days"] = "Els comptes es consideren abandonats després de X dies"; +App::$strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Estalviarà recursos del sistema en no sondejar nodes externs per a comptes abandonats. Un 0 vol dir \"mai\"."; +App::$strings["Allowed friend domains"] = "Dominis amb permisos de connexió"; +App::$strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Llista separada per comes de dominis en els quals està permès establir relacions d'amistat amb aquest node. S'accepten comodins (*). Deixa-ho buit per a acceptar qualsevol domini"; +App::$strings["Verify Email Addresses"] = "Verifica les adreces de correu electrònic"; +App::$strings["Check to verify email addresses used in account registration (recommended)."] = "Activa per a comprovar l'adreça de correu emprada durant la inscripció d'un nou compte (recomanat)."; +App::$strings["Force publish"] = "Força la publicació"; +App::$strings["Check to force all profiles on this site to be listed in the site directory."] = "Activa per a forçar que tots el perfils en aquest node siguin llistats en el directori del lloc."; +App::$strings["Import Public Streams"] = "Importar fluxos públics"; App::$strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Importa i permet l'accés a contingut públic sondejat d'altres llocs. Avís: aquest contingut no estarà moderat."; +App::$strings["Site only Public Streams"] = "Fluxos públics només locals"; +App::$strings["Allow access to public content originating only from this site if Imported Public Streams are disabled."] = "Permet accedir a aquell contingut públic que s'hagi originat en aquest lloc, suposant que no s'estan important fluxos públics d'altres nodes."; +App::$strings["Allow anybody on the internet to access the Public streams"] = "Permet a qualsevol persona d'internet d'accedir els fluxos públics"; +App::$strings["Disable to require authentication before viewing. Warning: this content is unmoderated."] = "Desabilita-ho per a demanar iniciar sessió per poder-ho veure. Alerta: el contingut no estarà moderat."; App::$strings["Login on Homepage"] = "Accés a la Pàgina d'inici"; App::$strings["Present a login box to visitors on the home page if no other content has been configured."] = "Presenta una casella d'identificació a la pàgina d'inici als visitants si no s'ha configurat altre contingut."; App::$strings["Enable context help"] = "Activar l'ajuda contextual"; App::$strings["Display contextual help for the current page when the help button is pressed."] = "Mostra l'ajuda contextual per la pàgina actual quan el botó d'ajuda es pressionat."; +App::$strings["Reply-to email address for system generated email."] = "Adreça de correu de resposta per als correus generats."; +App::$strings["Sender (From) email address for system generated email."] = "Adreça de correu de remitent per als correus generats."; +App::$strings["Name of email sender for system generated email."] = "Nom visible de remitent per als correus generats."; App::$strings["Directory Server URL"] = "URL del Servidor de Directoris"; App::$strings["Default directory server"] = "Servidor de directori per defecte"; App::$strings["Proxy user"] = "Usuari Proxy"; @@ -874,21 +599,52 @@ App::$strings["Delivery interval"] = "Interval de lliurament"; App::$strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Retarda en segon plà l'interval de lliurament per aquests segons per reduir la càrrega del sistema. Recomanat: 4-5 per a hostes compartits, 2-3 per a servidors privats virtuals. 0-1 per a servidors dedicats."; App::$strings["Deliveries per process"] = "Entregues per processar"; App::$strings["Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5."] = "Nombre de entregues a intentar processar en un únic procèss del sistema operatiu. Ajustar si es necessari per millorar el rendiment. Es recomana: 1-5."; +App::$strings["Queue Threshold"] = "Llindar de la cua"; +App::$strings["Always defer immediate delivery if queue contains more than this number of entries."] = "Posposa el lliurament immediat si la cua conté més d'aquest nombre d'entrades."; App::$strings["Poll interval"] = "interval de sondeig"; App::$strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Retarda en segon pla el sondeig en aquesta quantitat de segons per a reduir la càrrega dels sistema. Si es 0 , empra l'interval de lliurament."; +App::$strings["Path to ImageMagick convert program"] = "Ruta al programa de conversió d'imatges ImageMagick"; +App::$strings["If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert"] = "Si se n'indica la ruta, es farà servir aquest programa per a generar miniatures per a imatges enormes (més de 4000 píxels d'ample o alt). En cas contrari es pot esgotar la memòria del servidor. Ruta d'exemple: /usr/bin/convert"; +App::$strings["Allow SVG thumbnails in file browser"] = "Permet miniatures en SVG a l'explorador de fitxers"; +App::$strings["WARNING: SVG images may contain malicious code."] = "Alerta: Les imatges SVG poden contenir codi maliciós."; App::$strings["Maximum Load Average"] = "Càrrega Mitja Màxima"; App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Càrrega màxima del sistema, abans que els processos de lliurament i sondeig es difereixin - 50 per defecte."; App::$strings["Expiration period in days for imported (grid/network) content"] = "Període d'expiració en dies per contingut importat (malla/xarxa)"; App::$strings["0 for no expiration of imported content"] = "0 vol dir sense temps d'expiració pel contingut importat"; -App::$strings["Off"] = "Apagat"; -App::$strings["On"] = "Funcionant"; -App::$strings["Lock feature %s"] = "Bloca característica %s"; -App::$strings["Manage Additional Features"] = "Gestiona Funcionalitats Addicionals"; -App::$strings["No server found"] = "No es troba servidor"; -App::$strings["ID"] = "ID"; -App::$strings["for channel"] = "per a canal"; -App::$strings["on server"] = "al servidor"; -App::$strings["Server"] = "Servidor"; +App::$strings["Do not expire any posts which have comments less than this many days ago"] = "No facis caducar les entrades que tinguin comentaris més nous que aquest nombre de dies"; +App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Servidors públics: Pàgina d'arribada promocional per a nous usuaris o usuàries."; +App::$strings["Create this page first. Default is %s/register"] = "Crea primer aquesta pàgina. Per defecte és %s/register"; +App::$strings["Page to display after creating a new channel"] = "Pàgina que es mostrarà després d'haver creat un canal nou"; +App::$strings["Recommend: profiles, go, or settings"] = "Recomanat: profiles (perfils), go (mostra diverses opcions), settings (configuració)"; +App::$strings["Optional: site location"] = "Opcional: ubicació del node"; +App::$strings["Region or country"] = "Regió o país"; +App::$strings["New Profile Field"] = "Camp de Perfil Nou"; +App::$strings["Field nickname"] = "Àlies de Camp"; +App::$strings["System name of field"] = "nOM DEL SISTEMA DEL CAMP"; +App::$strings["Input type"] = "Tipus d'entrada"; +App::$strings["Field Name"] = "Nom de Camp"; +App::$strings["Label on profile pages"] = "Etiqueta a les pàgines de perfil"; +App::$strings["Help text"] = "Text d'ajuda"; +App::$strings["Additional info (optional)"] = "Informació adicional (opcional)"; +App::$strings["Save"] = "Guardar"; +App::$strings["Field definition not found"] = "No es troba la definició del camp"; +App::$strings["Edit Profile Field"] = "Camp d'Edició del Perfil"; +App::$strings["Profile Fields"] = "Camps del Perfil"; +App::$strings["Basic Profile Fields"] = "Camps Bàsics del Perfil"; +App::$strings["Advanced Profile Fields"] = "Camps Avançats del Perfil"; +App::$strings["(In addition to basic fields)"] = "( addicionalment als camps bàsics)"; +App::$strings["All available fields"] = "Tots els camps disponibles"; +App::$strings["Custom Fields"] = "Camps Personalitzats"; +App::$strings["Create Custom Field"] = "Crear un Camp Personalitzat"; +App::$strings["Password changed for account %d."] = "S'ha modificat la contrasenya pel compte %d."; +App::$strings["Account settings updated."] = "S'han actualitzat els paràmetres del compte."; +App::$strings["Account not found."] = "No s'ha trobat el compte."; +App::$strings["Account Edit"] = "Edita el compte"; +App::$strings["New Password"] = "Introdueix la nova contrasenya"; +App::$strings["New Password again"] = "Repeteix la nova contrasenya"; +App::$strings["Technical skill level"] = "Nivell de competències tècniques"; +App::$strings["Account language (for emails)"] = "Idioma pel compte (pels correus)"; +App::$strings["Service class"] = "Classe de servei"; App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Per defecte, HTML no filtrat està permés als media embeguts. Això es inherentment no segur."; App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "L'ajust recomanat és només permetre HTML sense filtrar dels següents llocs:"; App::$strings["https://youtube.com/
    https://www.youtube.com/
    https://youtu.be/
    https://vimeo.com/
    https://soundcloud.com/
    "] = "https://youtube.com/
    https://www.youtube.com/
    https://youtu.be/
    https://vimeo.com/
    https://soundcloud.com/
    "; @@ -898,6 +654,10 @@ App::$strings["Block public"] = "Bloca que sigui públic"; App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "activa per blocar l'accés a les pàgines personals públiques a tothom excepte aquells/es que s'hagin autenticat en aquest node."; App::$strings["Set \"Transport Security\" HTTP header"] = "Set \"Transport Security\" HTTP header"; App::$strings["Set \"Content Security Policy\" HTTP header"] = "Set \"Content Security Policy\" HTTP header"; +App::$strings["Allowed email domains"] = "Dominis de correu electonic acceptats"; +App::$strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "llista separada per comes de dominis d'adreces de correu electrònic permeses en aquest lloc. S'accepten comodins. Deixar buit per acceptar qualsevol domini"; +App::$strings["Not allowed email domains"] = "Dominis de correu electrònic no acceptats"; +App::$strings["Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined."] = "llista separada per comes de dominis d'adreces de correu electrònic no permeses en aquest lloc. S'accepten comodins. Deixar buit per no acceptar cap domini, excepte els que s'hagin definits com acceptats."; App::$strings["Allow communications only from these sites"] = "Permetre comunicacions únicament des de aquests llocs"; App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Un lloc per línia. Deixar en blanc per permetre, per defecte, la comunicació amb tothom."; App::$strings["Block communications from these sites"] = "Bloca comunicacions que venen d'aquests llocs"; @@ -908,253 +668,22 @@ App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Perm App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Permetre HTML embegut sense filtrar només d'aquests dominis."; App::$strings["One site per line. By default embedded content is filtered."] = "Un lloc per línia. Per defecte el contingut embegut es filtrat."; App::$strings["Block embedded HTML from these domains"] = "Bloca HTML embegut d'aquests dominis"; -App::$strings["Update has been marked successful"] = "Actualització marcada amb exit"; -App::$strings["Executing %s failed. Check system logs."] = "Executant %s ha fallat. Comprova els logs del sistema."; -App::$strings["Update %s was successfully applied."] = "Actualització %s es va realitzar correctament."; -App::$strings["Update %s did not return a status. Unknown if it succeeded."] = "Actualització %s no ha retornat l'estat. Es desconeix si ha finalitzat amb exit."; -App::$strings["Update function %s could not be found."] = "La funció d'actualitzacio %s no es pot trobar."; -App::$strings["No failed updates."] = "No hi ha actualitzacions fallides."; -App::$strings["Failed Updates"] = "Actualitzacions Fallides"; -App::$strings["Mark success (if update was manually applied)"] = "Marca èxit (si l'actualització s'ha aplicat de forma manual)"; -App::$strings["Attempt to execute this update step automatically"] = "Prova a fer automàticament aquesta actualització"; -App::$strings["Queue Statistics"] = "Cua d'Estadístiques"; -App::$strings["Total Entries"] = "Total d'Entrades"; -App::$strings["Priority"] = "Prioritat"; -App::$strings["Destination URL"] = "URL de Destí"; -App::$strings["Mark hub permanently offline"] = "Marca el node com a permanentment fora de línia"; -App::$strings["Empty queue for this hub"] = "Cua buida per aquest node"; -App::$strings["Last known contact"] = "Últim contacte conegut"; -App::$strings["%s account blocked/unblocked"] = array( - 0 => "S'ha [des]bloquejat %s compte", - 1 => "S'han [des]bloquejat %s comptes", -); -App::$strings["%s account deleted"] = array( - 0 => "S'ha esborrat el compte %s", - 1 => "S'han esborrat %s comptes", -); -App::$strings["Account not found"] = "Compte no trobat"; -App::$strings["Account '%s' deleted"] = "S'ha esborrat el compte '%s'"; -App::$strings["Account '%s' blocked"] = "S'ha bloquejat el compte '%s'"; -App::$strings["Account '%s' unblocked"] = "S'ha desbloquejat el compte '%s'"; -App::$strings["Accounts"] = "Comptes"; -App::$strings["select all"] = "Sel·leciona-ho tot"; -App::$strings["Registrations waiting for confirm"] = ""; -App::$strings["Request date"] = "Data de la petició"; -App::$strings["No registrations."] = "Sense registracions."; -App::$strings["Deny"] = "Denegat"; -App::$strings["All Channels"] = "Tots els Canals"; -App::$strings["Register date"] = "Data de registre"; -App::$strings["Last login"] = "Darrera identificació"; -App::$strings["Expires"] = "Expira"; -App::$strings["Service Class"] = "Classe de Servei"; -App::$strings["Selected accounts will be deleted!\\n\\nEverything these accounts had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Els comptes seleccionats seran eliminats!\\n\\nTot el que hagin publicat en aquest lloc serà esborrat permanentment!\\n\\nN'estàs segur de continuar?"; -App::$strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'usuari {0} serà eliminat!\\n\\nTot el que hagi publicat l'usuari en aquest lloc serà esborrat de permanentment!\\n\\nN'estàs segur?"; -App::$strings["%s channel censored/uncensored"] = array( - 0 => "%s canal censurat/no censurat", - 1 => "%s canals censurats/no censurats", -); -App::$strings["%s channel code allowed/disallowed"] = array( - 0 => "%s codi permes/no permes al canal", - 1 => "%s codi permesos/no permesos al canal", -); -App::$strings["%s channel deleted"] = array( - 0 => "%s canal esborrat", - 1 => "%s canals esborrats", -); -App::$strings["Channel not found"] = "Canal no trobat"; -App::$strings["Channel '%s' deleted"] = "Canal '%s' esborrat"; -App::$strings["Channel '%s' censored"] = "Canal '%s' censurat"; -App::$strings["Channel '%s' uncensored"] = "Canal '%s' no censurat"; -App::$strings["Channel '%s' code allowed"] = "Canal '%s' permet codi"; -App::$strings["Channel '%s' code disallowed"] = "Canal '%s' no permet codi"; -App::$strings["Channels"] = "Canals"; -App::$strings["Censor"] = "Censurat"; -App::$strings["Uncensor"] = "No censurat"; -App::$strings["Allow Code"] = "Permet Codi"; -App::$strings["Disallow Code"] = "No Permet Codi"; -App::$strings["Channel"] = "Canal"; -App::$strings["UID"] = "UID"; -App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Els canals sel·leccionats s'esborraran!\\n\\nTotes les publicacions d'aquests canals en aquest lloc s'eliminaran de forma permanent!\\n\\nEstàs segur? "; -App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "El canal {0} serà esborrat!\\n\\nTotes les publicacions d'aquest canal en aquest lloc s'eliminaran de forma permanent!\\n\\nEstàs segur?"; -App::$strings["Plugin %s disabled."] = "Plugin %s desactivat."; -App::$strings["Plugin %s enabled."] = "Plugin %s activat."; -App::$strings["Disable"] = "Desactivat"; -App::$strings["Enable"] = "Activat"; -App::$strings["Plugins"] = "Plugins"; -App::$strings["Toggle"] = "Commutar"; -App::$strings["Settings"] = "Ajustos"; -App::$strings["Author: "] = "Autor: "; -App::$strings["Maintainer: "] = "Mantenedor:"; -App::$strings["Minimum project version: "] = "Versió mínima del projecte:"; -App::$strings["Maximum project version: "] = "Versió màxima del projecte:"; -App::$strings["Minimum PHP version: "] = "Versió mínima de PHP:"; -App::$strings["Requires: "] = "Requereix:"; -App::$strings["Disabled - version incompatibility"] = "Desactiva - incompatibilitat de versió"; -App::$strings["Enter the public git repository URL of the plugin repo."] = "Introdueix la URL del repositori git públic del repositori de plugins."; -App::$strings["Plugin repo git URL"] = "URL del repositori de plugins."; -App::$strings["Custom repo name"] = "Nom del repositori personalitzat"; -App::$strings["(optional)"] = "(opcional)"; -App::$strings["Download Plugin Repo"] = "Descarrega el Repositori de Plugins"; -App::$strings["Install new repo"] = "Instal·la un nou repositori "; -App::$strings["Install"] = "Instal·lar"; -App::$strings["Manage Repos"] = "Gestiona Repositoris"; -App::$strings["Installed Plugin Repositories"] = "Repositori de Plugins Instal·lat"; -App::$strings["Install a New Plugin Repository"] = "Instal·la un Nou Repositori de Plugins"; -App::$strings["Update"] = "Actualització"; -App::$strings["Switch branch"] = "Canvia de branca"; -App::$strings["No themes found."] = "No s'han trobat temes."; -App::$strings["Screenshot"] = "Copia de pantalla"; -App::$strings["Themes"] = "Temes"; -App::$strings["[Experimental]"] = "[Experimental]"; -App::$strings["[Unsupported]"] = "[No soportat]"; -App::$strings["Log settings updated."] = "Registre d'ajustos actualitzat."; -App::$strings["Logs"] = "Logs"; -App::$strings["Clear"] = "Neteja"; -App::$strings["Debugging"] = "Depurant"; -App::$strings["Log file"] = "Arxiu de registre"; -App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = ""; -App::$strings["Log level"] = "Nivell de registre"; -App::$strings["New Profile Field"] = "Camp de Perfil Nou"; -App::$strings["Field nickname"] = "Àlies de Camp"; -App::$strings["System name of field"] = "nOM DEL SISTEMA DEL CAMP"; -App::$strings["Input type"] = "Tipus d'entrada"; -App::$strings["Field Name"] = "Nom de Camp"; -App::$strings["Label on profile pages"] = "Etiqueta a les pàgines de perfil"; -App::$strings["Help text"] = "Text d'ajuda"; -App::$strings["Additional info (optional)"] = "Informació adicional (opcional)"; -App::$strings["Field definition not found"] = "No es troba la definició del camp"; -App::$strings["Edit Profile Field"] = "Camp d'Edició del Perfil"; -App::$strings["Profile Fields"] = "Camps del Perfil"; -App::$strings["Basic Profile Fields"] = "Camps Bàsics del Perfil"; -App::$strings["Advanced Profile Fields"] = "Camps Avançats del Perfil"; -App::$strings["(In addition to basic fields)"] = "( addicionalment als camps bàsics)"; -App::$strings["All available fields"] = "Tots els camps disponibles"; -App::$strings["Custom Fields"] = "Camps Personalitzats"; -App::$strings["Create Custom Field"] = "Crear un Camp Personalitzat"; -App::$strings["App installed."] = "Aplicació instal·lada."; -App::$strings["Malformed app."] = "Aplicació amb errors"; -App::$strings["Embed code"] = "Codi embegut"; -App::$strings["Edit App"] = "Edita l'Aplicació"; -App::$strings["Create App"] = "Crea l'Aplicació"; -App::$strings["Name of app"] = "Nom de l'Aplicació"; -App::$strings["Location (URL) of app"] = "Ubicació (URL) de l'aplicació"; -App::$strings["Photo icon URL"] = "Foto icona URL"; -App::$strings["80 x 80 pixels - optional"] = "80 x 80 pixels - opcional"; -App::$strings["Categories (optional, comma separated list)"] = "Categories (opcional, lista separada per comes)"; -App::$strings["Version ID"] = "Versió ID"; -App::$strings["Price of app"] = "Preu de l'aplicació"; -App::$strings["Location (URL) to purchase app"] = "Ubicació (URL) per comprar l'aplicació"; -App::$strings["Select a bookmark folder"] = "Tria una carpeta d'interès"; -App::$strings["Save Bookmark"] = "Guarda Favorits"; -App::$strings["URL of bookmark"] = "URL de favorit"; -App::$strings["Or enter new bookmark folder name"] = "O entra un nou nom de favorit"; -App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Nombre màxim de registres diaris excedit. Si us plau, provau demà."; -App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "El registre ha fallat. Si et plau, indica que acceptes les Condicions del Servei."; -App::$strings["Passwords do not match."] = "Les contrasenyes no coincideixen."; -App::$strings["Registration successful. Please check your email for validation instructions."] = "Registrat amb èxit. Si et plau revisa el teu correu electrònic per a les instruccions de validació."; -App::$strings["Your registration is pending approval by the site owner."] = "El teu registre esta pendent de validació pel propietari del lloc."; -App::$strings["Your registration can not be processed."] = "El teu registre no ha pogut ser processat. "; -App::$strings["Registration on this hub is disabled."] = "El registre en aquest node està deshabilitat."; -App::$strings["Registration on this hub is by approval only."] = "El registre en aquest node es únicament per validació."; -App::$strings["Register at another affiliated hub."] = "Registre en altre node afiliat"; -App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "El lloc ha excedit el límit màxim diari de nous comptes/registres. Provau demà."; -App::$strings["Terms of Service"] = "Condicions del Servei"; -App::$strings["I accept the %s for this website"] = "Accepto el %s per a aquest lloc web"; -App::$strings["I am over 13 years of age and accept the %s for this website"] = "Tinc més de 13 anys i accepto les %s d'aquest lloc web"; -App::$strings["Your email address"] = "La teva adreça de correu electrónic"; -App::$strings["Choose a password"] = "Tria una contrasenya"; -App::$strings["Please re-enter your password"] = "Si et plau, re-entra la contrasenya"; -App::$strings["Please enter your invitation code"] = "Si et plau, introdueix el teu codi d'invitació"; -App::$strings["no"] = "no"; -App::$strings["yes"] = "sí"; -App::$strings["Membership on this site is by invitation only."] = "La pertinença en aquest lloc es per invitació exclusivament."; -App::$strings["Register"] = "Registre"; -App::$strings["Proceed to create your first channel"] = "Comença a crear el teu primer canal"; -App::$strings["Please login."] = "Inicia Sessió."; -App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "L'esborrat de comptes no està permès fins que transcorren 48 hores des de l'últim canvi de contrasenya."; -App::$strings["Remove This Account"] = "Esborra el compte"; -App::$strings["WARNING: "] = "ALERTA:"; -App::$strings["This account and all its channels will be completely removed from the network. "] = "Aquest compte i tots els seus canals s'estan apunt d'esborrar totalment de la xarxa."; -App::$strings["This action is permanent and can not be undone!"] = "Aquesta acció és irreversible!"; -App::$strings["Please enter your password for verification:"] = "Aquesta acció requereix tornar a introduir la contrasenya:"; -App::$strings["Remove this account, all its channels and all its channel clones from the network"] = "Esborra de la xarxa aquest compte, tots els seus canals, i tots els seus canals clons."; -App::$strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Per defecte, només les instancies dels canal ubicats en aquest node poden esser esborrades de la xarxa"; -App::$strings["Remove Account"] = "Esborra el Compte"; -App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "L'esborrat de canals no està permès fins que transcorren 48 hores des de l'últim canvi de contrasenya."; -App::$strings["Remove This Channel"] = "Elimina Aquest Canal"; -App::$strings["This channel will be completely removed from the network. "] = "Aquest canal serà completament eliminat de la xarxa."; -App::$strings["Remove this channel and all its clones from the network"] = "Elimina aquest canal i els seus clons de la xarxa"; -App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Per defecte, només la instancia del canal ubicat en aquest node pot esser esborrat de la xarxa"; -App::$strings["Remove Channel"] = "Elimina el canal"; -App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Em trobat un problema durant l'inici de sessió amb el OpenID que has facilitat. verifica l'ortografia correcta de la ID."; -App::$strings["The error message was:"] = "El missatge d'error fou:"; -App::$strings["Authentication failed."] = "Ha fallat l'autentificació."; -App::$strings["Remote Authentication"] = "Autentificació Remota"; -App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Introdueix la teva adreça del canal (eg canal@exemple.com)"; -App::$strings["Authenticate"] = "Autentica't"; -App::$strings["Items tagged with: %s"] = "Elements etiquetats amb: %s"; -App::$strings["Search results for: %s"] = "Resultats de cerca per: %s"; -App::$strings["No service class restrictions found."] = "No s'han trobat restriccions de clase."; -App::$strings["Name is required"] = "Es requereix un Nom"; -App::$strings["Key and Secret are required"] = "Es requereix Clau (Key) i el Secret (Secret)"; -App::$strings["Not valid email."] = "E-correu no vàlid."; -App::$strings["Protected email address. Cannot change to that email."] = "Adreça d'e-correu protegida. No es pot canviar a aquest e-correu."; -App::$strings["System failure storing new email. Please try again."] = "Fallada del sistema al guardar un nou correu. Si us plau, proba de nou."; -App::$strings["Password verification failed."] = "La verificació de la contrasenya ha fallat."; -App::$strings["Passwords do not match. Password unchanged."] = "Les contrasenyes no coincideixen. Contrasenya sense canvis."; -App::$strings["Empty passwords are not allowed. Password unchanged."] = "Les contrasenyes en blanc no estan permesas. Contrasenya sense canvis."; -App::$strings["Password changed."] = "Contrasenya canviada."; -App::$strings["Password update failed. Please try again."] = "L'actualització de la contrasenya va fallar. Si us plau, torneu a intentar-ho."; +App::$strings["Remote privacy information not available."] = "informació privada remota no disponible."; +App::$strings["Visible to:"] = "Visible per:"; +App::$strings["__ctx:acl__ Profile"] = "Perfil"; +App::$strings["Comment approved"] = "S'ha aprovat el comentari"; +App::$strings["Comment deleted"] = "S'ha esborrat el comentari"; +App::$strings["Permission Name is required."] = "Es necessita el nom del perfil."; +App::$strings["Permission category saved."] = "S'ha desat la categoria de permisos."; +App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Pots crear regles de permisos segons classe de persona o de connexió."; +App::$strings["Permission Categories"] = "Categories de permisos"; +App::$strings["Permission Name"] = "Nom de permís"; +App::$strings["My Settings"] = "Els Meus Ajustos"; +App::$strings["inherited"] = "heretat"; +App::$strings["Individual Permissions"] = "Permisos Individuals"; +App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can not change those settings here."] = "Alguns permisos poden ser heretats dels teus canals ajustos de privacitat, Els quals tenen més prioritat que els ajustos individuals. No pots canviar aquests ajustos aquí."; +App::$strings["Friends"] = "Amics"; App::$strings["Settings updated."] = "Ajustes actualizados."; -App::$strings["Add application"] = "Afegir aplicatiu"; -App::$strings["Name of application"] = "Nom de l'aplicatiu"; -App::$strings["Consumer Key"] = "Consumer Key"; -App::$strings["Automatically generated - change if desired. Max length 20"] = "Generat automàticament- Canvia-ho si ho vols. Max. longitud 20"; -App::$strings["Consumer Secret"] = "Consumer Secret"; -App::$strings["Redirect"] = "Redirecciona"; -App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI redirigida - No canviar excepte perquè el teu aplicatiu ho requereixi."; -App::$strings["Icon url"] = "Icona de url"; -App::$strings["Optional"] = "Opcional"; -App::$strings["Application not found."] = "Aplicatiu no trobat."; -App::$strings["Connected Apps"] = "Aplicatius Conectats"; -App::$strings["Client key starts with"] = "La clau del client comença amb"; -App::$strings["No name"] = "Sin nombre"; -App::$strings["Remove authorization"] = "Elimina autorització"; -App::$strings["No feature settings configured"] = "No hi ha opcions de les funcions configurades"; -App::$strings["Feature/Addon Settings"] = "Ajustos de Complements"; -App::$strings["Account Settings"] = "Ajustos de Compte"; -App::$strings["Current Password"] = "Contrasenya Actual"; -App::$strings["Enter New Password"] = "Entra la Nova Contrasenya"; -App::$strings["Confirm New Password"] = "Confirma la Nova Contrasenya"; -App::$strings["Leave password fields blank unless changing"] = "Deixa els camps de contrasenya en blanc llevat que la vulguis canviar"; -App::$strings["Email Address:"] = "Adreça de E-Correu:"; -App::$strings["Remove this account including all its channels"] = "Esborra aquest compte inclosos tots els seus canals"; -App::$strings["Additional Features"] = "Característiques Addicionals"; -App::$strings["Connector Settings"] = "Ajustos de Connector"; -App::$strings["No special theme for mobile devices"] = "No emprar tema especial per aparells mòbils"; -App::$strings["%s - (Experimental)"] = "%s - (Experimental)"; -App::$strings["Display Settings"] = "Ajustos de Pantalla"; -App::$strings["Theme Settings"] = "Ajustos de Tema"; -App::$strings["Custom Theme Settings"] = "Ajustos Personals de Tema"; -App::$strings["Content Settings"] = "Ajustos de Contingut"; -App::$strings["Display Theme:"] = "Ajustos de Tema:"; -App::$strings["Mobile Theme:"] = "Tema Mòbil:"; -App::$strings["Preload images before rendering the page"] = "Precarrega les imatges abans de dibuixar la pàgina"; -App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "El temps subjectiu per carregar la pàgina pot ser llarg però la pàgina estarà preparada quan es mostri"; -App::$strings["Enable user zoom on mobile devices"] = "Zoom d'usuari en dispositius mòbils"; -App::$strings["Update browser every xx seconds"] = "Actualitza el navegador cada xx segons"; -App::$strings["Minimum of 10 seconds, no maximum"] = "Mínim de 10 segons, sense màxim"; -App::$strings["Maximum number of conversations to load at any time:"] = "Nombre màxim de conversacions a càrregar cada vegada"; -App::$strings["Maximum of 100 items"] = "Màxim de 100 elements"; -App::$strings["Show emoticons (smilies) as images"] = "Mostra emoticons (smilies) com a imatges"; -App::$strings["Link post titles to source"] = "Enllaça a l'origen els títols de l'entrada"; -App::$strings["System Page Layout Editor - (advanced)"] = "Editor de Disseny de la Pàgina del Sistema - (avançat)"; -App::$strings["Use blog/list mode on channel page"] = "Empra el mode blog/llista a la pàgina del canal"; -App::$strings["(comments displayed separately)"] = "(Observacions es mostren per separat)"; -App::$strings["Use blog/list mode on grid page"] = "Empra el mode de blog/llista a la pàgina de la malla"; -App::$strings["Channel page max height of content (in pixels)"] = "Alçada màxima de contingut (en píxels) de la pàgina de Canal"; -App::$strings["click to expand content exceeding this height"] = "Clic per expandir el contingut que excedeixi aquesta alçada"; -App::$strings["Grid page max height of content (in pixels)"] = "Alçada màxima dels continguts (en píxels) de la Pàgina de Malla "; App::$strings["Nobody except yourself"] = "Ningú excepte tú"; App::$strings["Only those you specifically allow"] = "Només allò que específicament permetis"; App::$strings["Approved connections"] = "Connexions aprovades"; @@ -1165,10 +694,13 @@ App::$strings["Anybody authenticated"] = "Qualsevol autenticat"; App::$strings["Anybody on the internet"] = "Qualsevol a internet"; App::$strings["Publish your default profile in the network directory"] = "Publica el teu perfil per defecte al directori de la xarxa"; App::$strings["Allow us to suggest you as a potential friend to new members?"] = "Ens permets suggerir-te com a potencial amic als nous membres?"; +App::$strings["or"] = "o"; App::$strings["Your channel address is"] = "La teva adreça del canal es"; +App::$strings["Your files/photos are accessible via WebDAV at"] = "Les teves fotos i arxius estan disponibles mitjançant WebDAV a"; App::$strings["Channel Settings"] = "Ajustos del Canal"; App::$strings["Basic Settings"] = "Ajustos Bàsics"; App::$strings["Full Name:"] = "Nom Complet:"; +App::$strings["Email Address:"] = "Adreça de E-Correu:"; App::$strings["Your Timezone:"] = "La teva Franja Horària"; App::$strings["Default Post Location:"] = "Localització Predeterminada de les Entrades:"; App::$strings["Geographical location to display on your posts"] = "Posició geogràfica a mostrar a les teves entrades"; @@ -1186,7 +718,7 @@ App::$strings["Private - default private, never open or public"] = "Pri App::$strings["Blocked - default blocked to/from everybody"] = "Bloquejat - tothom bloquejat per defecte"; App::$strings["Allow others to tag your posts"] = "Permet a altres etiquetar les teves entrades"; App::$strings["Often used by the community to retro-actively flag inappropriate content"] = "Sovint emprat per la comunitat per marcar retroactivament contingut inapropiat"; -App::$strings["Advanced Privacy Settings"] = "Ajustos avançats de privacitat"; +App::$strings["Channel Permission Limits"] = "Límits dels permisos del canal"; App::$strings["Expire other channel content after this many days"] = "El contingut d'altes canals caduca després d'aquests dies"; App::$strings["0 or blank to use the website limit."] = "0 o en blanc per emprar el limit del lloc web."; App::$strings["This website expires after %d days."] = "Aquest lloc web expira després de %d dies."; @@ -1194,9 +726,10 @@ App::$strings["This website does not expire imported content."] = "A aquest lloc App::$strings["The website limit takes precedence if lower than your limit."] = "El límit del lloc web pren la preferència si es inferior al teu límit."; App::$strings["Maximum Friend Requests/Day:"] = "Nombre màxim de peticions d'amistat per dia"; App::$strings["May reduce spam activity"] = "Pot reduir l'SPAM"; -App::$strings["Default Post and Publish Permissions"] = "Permisos de Entrades i Publicació per defecte"; +App::$strings["Default Privacy Group"] = "Grup de privacitat per defecte"; App::$strings["Use my default audience setting for the type of object published"] = "Empra els meus ajustos per defecte segons el tipus de entrada publicada"; -App::$strings["Channel permissions category:"] = "Categoria de permisos de canal:"; +App::$strings["Profile to assign new connections"] = "Perfil al qual assignar les connexions noves"; +App::$strings["Default Permissions Group"] = "Grup de permisos per defecte"; App::$strings["Maximum private messages per day from unknown people:"] = "Nombre màxim de missatges privats de desconeguts al dia:"; App::$strings["Useful to reduce spamming"] = "Útil per a reduir l'spam"; App::$strings["Notification Settings"] = "Ajustos de notificacions"; @@ -1213,6 +746,7 @@ App::$strings["You receive a private message"] = "Rebi un missatge privat"; App::$strings["You receive a friend suggestion"] = "Rebi una suggerència d'amistat"; App::$strings["You are tagged in a post"] = "Estàs etiquetat a l'entrada"; App::$strings["You are poked/prodded/etc. in a post"] = "S'enfoten/te piquen/etc. en una entrada"; +App::$strings["Someone likes your post/comment"] = "A algú li ha agradat la teva entrada o comentari"; App::$strings["Show visual notifications including:"] = "Mostra notificacion visuals, com ara:"; App::$strings["Unseen grid activity"] = "Activitat de malla no vista"; App::$strings["Unseen channel activity"] = "Activitat no vista del canal"; @@ -1226,13 +760,17 @@ App::$strings["System (personal) notifications"] = "Notificacions (personals) de App::$strings["System info messages"] = "Missatges d'informació del sistema"; App::$strings["System critical alerts"] = "Alertes crítiques del sistema"; App::$strings["New connections"] = "Noves connexions"; -App::$strings["System Registrations"] = "Registres del sistema"; -App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Mostra també les entrades de mur noves, les entrades privades i les connexions a \"Notícies\""; +App::$strings["System Registrations"] = "Inscripcions del Sistema"; +App::$strings["Unseen shared files"] = "Fitxers compartits nous"; +App::$strings["Unseen public activity"] = "Activitat pública nova"; +App::$strings["Unseen likes and dislikes"] = "\"M'agrada\" i \"no m'agrada\" pendents"; +App::$strings["Email notification hub (hostname)"] = "Hub per a notificacions per correu (nom de domini)"; +App::$strings["If your channel is mirrored to multiple hubs, set this to your preferred location. This will prevent duplicate email notifications. Example: %s"] = "En cas que el teu canal estigui repicat en diversos hubs, habilita aquesta opció al teu hub preferit. Això evita notificacions duplicades. Exemple: %s"; +App::$strings["Show new wall posts, private messages and connections under Notices"] = "Mostra totes les novetats d'entrades de mur, missatges privats i connexions a Notícies"; App::$strings["Notify me of events this many days in advance"] = "Notifica'm dels esdeveniments amb aquests dies d'antelació"; App::$strings["Must be greater than 0"] = "Ha de ser més gran que 0"; App::$strings["Advanced Account/Page Type Settings"] = "Ajustos avançats de compte i tipus de pàgina"; App::$strings["Change the behaviour of this account for special situations"] = "Modifica el comportament d'aquest compte en situacions especials"; -App::$strings["Please enable expert mode (in Settings > Additional features) to adjust!"] = "Activa el mode d'expert (a Ajustos > Més funcions)"; App::$strings["Miscellaneous Settings"] = "Ajustos diversos"; App::$strings["Default photo upload folder"] = "Carpeta per defecte de fotos pujades"; App::$strings["%Y - current year, %m - current month"] = "%Y - any en curs, %m - mes corrent"; @@ -1240,112 +778,665 @@ App::$strings["Default file upload folder"] = "Carpeta per defecte d'arxius puja App::$strings["Personal menu to display in your channel pages"] = "Menú personal per mostrar en les teves pàgines de canal"; App::$strings["Remove this channel."] = "Elimina aquest canal."; App::$strings["Firefox Share \$Projectname provider"] = "Firefox Share \$Projectname provider"; -App::$strings["Start calendar week on monday"] = "Comença la setmana del calendari el dilluns"; -App::$strings["\$Projectname Server - Setup"] = "Servidor \$Projectname - Configuració"; -App::$strings["Could not connect to database."] = "No puc connectar amb la base de dades"; -App::$strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "No s'ha pogut connectar a l'URL del lloc especificat. Possible problema amb el certificat SSL o de DNS."; -App::$strings["Could not create table."] = "No puc crear la taula."; -App::$strings["Your site database has been installed."] = "La teva base de dades del lloc s'ha instal·lat."; -App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Podria ser necessari importar el fitxer \"install / schema_xxx.sql\" manualment utilitzant un client de base de dades."; -App::$strings["Please see the file \"install/INSTALL.txt\"."] = "Si us plau, consulteu el fitxer \"install / INSTALL.txt\"."; -App::$strings["System check"] = "Comprovació del sistema"; -App::$strings["Check again"] = "Comprova de nou"; -App::$strings["Database connection"] = "Connexió de base de dades"; -App::$strings["In order to install \$Projectname we need to know how to connect to your database."] = "Per tal d'instaŀlar \$Projectname cal configurar la connexió a la base de dades."; -App::$strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Si us plau, poseu-vos en contacte amb el proveïdor de serveis o administrador del lloc si vostè té preguntes sobre aquests paràmetres."; -App::$strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de dades s'especifica a continuació ja ha d'existir. Si no és així, si us plau crear-la abans de continuar."; -App::$strings["Database Server Name"] = "Base de Dades Nom del Servidor"; -App::$strings["Default is 127.0.0.1"] = "Per defecte es 127.0.0.1"; -App::$strings["Database Port"] = "Port per a la Base de Dades"; -App::$strings["Communication port number - use 0 for default"] = "Numero del port de comunicacions - empra 0 per defecte"; -App::$strings["Database Login Name"] = "Base de Dades Nom d'Accès"; -App::$strings["Database Login Password"] = "Base de Dades Contrasenya d'Accès"; -App::$strings["Database Name"] = "Nom de la Base de Dades"; -App::$strings["Database Type"] = "Tipus de Base de Dades"; -App::$strings["Site administrator email address"] = "Adreça de correu de l'administrador del lloc"; -App::$strings["Your account email address must match this in order to use the web admin panel."] = "El teu compte de email ha de coincidir amb això per poder emprar el panel web d'administrador."; -App::$strings["Website URL"] = "URL del lloc web"; -App::$strings["Please use SSL (https) URL if available."] = "Si us plau, empra SSL (https) URL si està disponible."; -App::$strings["Please select a default timezone for your website"] = "Si us plau, tria la zona horària del teu lloc web"; -App::$strings["Site settings"] = "Ajustos del lloc"; -App::$strings["Enable \$Projectname advanced features?"] = "Activar característiques advanced de \$Projectname?"; -App::$strings["Some advanced features, while useful - may be best suited for technically proficient audiences"] = "Algunes característiques avançades, hauran de ser ajustades per persones tècnicament capaces, per poder emprar-les."; -App::$strings["PHP version 5.5 or greater is required."] = "PHP version 5.5 or greater is required."; -App::$strings["PHP version"] = "PHP version"; -App::$strings["Could not find a command line version of PHP in the web server PATH."] = "No s'ha pogut trobar una versió de línia d'ordres del PHP en el PATH del servidor web."; -App::$strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Si vostè no té una versió de línia d'ordres del PHP instal·lada al servidor, vostè no serà capaç d'executar sondejos en segon pla via cron."; -App::$strings["PHP executable path"] = "Camí cap l'executable de PHP"; -App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Introdueix el camí cap l'executable de php. Pots deixa-ho en blanc i continuar l'instal·lació."; -App::$strings["Command line PHP"] = "Línia d'ordres de PHP"; -App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versió de línia d'ordres de PHP al teu sistema no te el \"register_argc_argv\" activat."; -App::$strings["This is required for message delivery to work."] = "Això es requereix per que funcioni l'entrega de missatges."; -App::$strings["PHP register_argc_argv"] = "PHP register_argc_argv"; -App::$strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "La mida màxima que se't permet pujar està establerta en %s. La mida màxima per arxiu pujat es de %s. Se't permet pujar fins a %d arxius d'una vegada."; -App::$strings["You can adjust these settings in the servers php.ini."] = "Pots ajustar aquests valors a l'arxiu php.ini del servidor"; -App::$strings["PHP upload limits"] = "Límits de pujada de PHP"; -App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: la funció \"openssl_pkey_new\" en aquest sistema no es capaç de generar claus d'encriptació"; -App::$strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si esta funcionant sota Windows, per favor, miri \"http://www.php.net/manual/en/openssl.installation.php\"."; -App::$strings["Generate encryption keys"] = "Generar claus de xifrat"; -App::$strings["libCurl PHP module"] = "mòdul PHP libCurl "; -App::$strings["GD graphics PHP module"] = "mòdul PHP GD gràfics"; -App::$strings["OpenSSL PHP module"] = "mòdul PHP OpenSSL"; -App::$strings["mysqli or postgres PHP module"] = "mòdul PHP mysqli o postgres"; -App::$strings["mb_string PHP module"] = "mòdul PHP mb_string"; -App::$strings["mcrypt PHP module"] = "mòdul PHP mcrypt"; -App::$strings["xml PHP module"] = "Mòdul xml de PHP"; -App::$strings["Apache mod_rewrite module"] = "mòdul Apache mod_rewrite"; -App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: el mòdul mod-rewrite del servidor web Apache es requereix i no està instal·lat."; -App::$strings["proc_open"] = "proc_open"; -App::$strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Error: es requereix proc_open però o no està instal·lat o ha estat desactivat a php.ini"; -App::$strings["Error: libCURL PHP module required but not installed."] = "Error: el mòdul PHP libCURL es requereix però no està instal·lat."; -App::$strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: el mòdul PHP GD graphics amb support JPEG es requereix però no està instal·lat."; -App::$strings["Error: openssl PHP module required but not installed."] = "Error: el mòdul PHP openssl es requereix però no està instal·lat."; -App::$strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Error: el mòdul PHO mysqli o postgres es requereix però no està instal·lat."; -App::$strings["Error: mb_string PHP module required but not installed."] = "Error: el mòdul PHP mb_string es requereix però no està instal·lat."; -App::$strings["Error: mcrypt PHP module required but not installed."] = "Error: el mòdul PHP mcrypt es requereix però no està instal·lat."; -App::$strings["Error: xml PHP module required for DAV but not installed."] = "Error: el mòdul xml de PHP es requereix per DAV però no està instal·lat."; -App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "L'instaŀlador ha de poder crear i modificar un fitxer anomenat «.htconfig.php» a la carpeta arrel del servidor, però sembla que no ho pot fer."; -App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Això sol ser un problema de permisos. Per molt que el teu usuari pugui modificar-lo, és el del servidor web qui necessita els poders de modificació."; -App::$strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Al final d'aquest procés hauràs de desar un text a l'arxiu «.htconfig.php», que es troba a la carpeta arrel del servidor."; -App::$strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Aquest procés és opcional. Per a fer una instaŀlació manual consulta les instruccions a «install/INSTALL.txt\"."; -App::$strings[".htconfig.php is writable"] = "L'arxiu «.htconfig.php» es pot modificar"; -App::$strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red fa servir el motor de plantilles Smarty3 per a renderitzar les vistes més ràpidament."; -App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "Per tal de guardar aquestes plantilles compilades, el servidor web necessita tenir premis d'escriptura en el directori %s sota la carpeta principal."; -App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Comprova que l'usuari que executa el servidor (www-data en Apache) té permisos d'escriptura en aquesta carpeta."; -App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Nota: com a mesura de seguretat l'usuari del servidor web ha de tenir accés d'escriptura només a %s, i no a les plantilles (.tpl) que conté."; -App::$strings["%s is writable"] = "Es pot escriure a %s"; -App::$strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red fa servir la carpeta «store» per a desar els fitxers pujats. Per tant, el servidor web necessita tenir permís d'escriptura en aquesta carpeta, que està a l'arrel del servidor web."; -App::$strings["store is writable"] = "Es pot escriure al magatzem (store)"; -App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "El certificat SSL no s'ha pogut validar. Arregla-ho o deshabilita l'accés https a aquest lloc"; -App::$strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "Si tens accès pet https al teu lloc web o permets connexions pel port TCP 443 (port https), Has d'emprar un certificat VÀLID. NO es poden emprar certificats AUTO-SIGNATS!"; -App::$strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "El motiu d'aquesta restricció és que les teves entrades públiques poden contenir referències a imatges del teu propi node."; -App::$strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "Si el teu certificat no és reconegut, llavors el membres d'altres hubs, encara que tinguin certificats vàlids, rebran una advertència de seguretat en carregar contingut teu."; -App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Per tant, com que perjudica la usabilitat més enllà del teu lloc, la restricció de tenir un certificat reconegut és molt important."; -App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Hi ha autoritats de certificació reconegudes que ofereixen certificats gratuïts."; -App::$strings["SSL certificate validation"] = "Validació del certificat SSL"; -App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "No es poden reescriure les URL a «.htaccess». Comprova la configuració del servidor:"; -App::$strings["Url rewrite is working"] = "Es poden reescriure les URL a «.htaccess»"; -App::$strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "L'arxiu de configuracio de la base de dades «.htconfig.php» no s'ha pogut modificar. El pots crear tu a l'arrel del servidor web amb el text de la caixa com a contingut."; -App::$strings["Errors encountered creating database tables."] = "S'han produït errors mentre es creaven taules a la base de dades."; -App::$strings["

    What next

    "] = "

    I ara què?

    "; -App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT! Cal que configuris manualment una execució periòdica del \"poller\"."; -App::$strings["Files: shared with me"] = "Arxius: compartits amb jo"; -App::$strings["NEW"] = "NOU"; -App::$strings["Remove all files"] = "Esborra tots els arxius"; -App::$strings["Remove this file"] = "Esborra l'arxiu"; +App::$strings["Start calendar week on Monday"] = "Comença la setmana en dilluns"; +App::$strings["Additional Features"] = "Característiques Addicionals"; +App::$strings["Your technical skill level"] = "El teu nivell tècnic"; +App::$strings["Used to provide a member experience and additional features consistent with your comfort level"] = "Es fa servir per a oferir-te una experiència i un seguit de funcionalitats addicionals d'acord amb la complexitat que desitgis."; +App::$strings["This channel is limited to %d tokens"] = "Aquest canal té un límit de %d tokens"; +App::$strings["Name and Password are required."] = "El nom i la contrasenya són necessaris."; +App::$strings["Token saved."] = "S'ha desat el token."; +App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content."] = "Fes servir aquest formulari per a crear identificadors d'accés temporal per tal de compartir coses amb persones no membres. Aquestes identitats són reconegudes a \"Control d'accés\" i poden ser usades per iniciar sessió i accedir a contingut privat."; +App::$strings["You may also provide dropbox style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "Si vols donar enllaços que no requereixin dos passos, pots afegir la contrasenya d'accés a la URL per compartir. Per exemple:"; +App::$strings["Guest Access Tokens"] = "Tokens d'accés de convidat"; +App::$strings["Login Name"] = "Nom d'usuari"; +App::$strings["Login Password"] = "Contrasenya d'usuari"; +App::$strings["Expires (yyyy-mm-dd)"] = "Data de caducitat (aaaa-mm-dd)"; +App::$strings["Their Settings"] = "Els seus Ajustos"; +App::$strings["Name and Secret are required"] = "Es necessiten el nom i el secret"; +App::$strings["Add OAuth2 application"] = "Afegeix una aplicació OAuth2"; +App::$strings["Name of application"] = "Nom de l'aplicatiu"; +App::$strings["Consumer Secret"] = "Consumer Secret"; +App::$strings["Automatically generated - change if desired. Max length 20"] = "Generat automàticament- Canvia-ho si ho vols. Max. longitud 20"; +App::$strings["Redirect"] = "Redirecciona"; +App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI redirigida - No canviar excepte perquè el teu aplicatiu ho requereixi."; +App::$strings["Grant Types"] = "Tipus de permís"; +App::$strings["leave blank unless your application sepcifically requires this"] = "deixa-ho en blanc si no és que la teva aplicació ho demana explícitament"; +App::$strings["Authorization scope"] = "Àmbit d'autorització"; +App::$strings["OAuth2 Application not found."] = "No s'ha trobat l'aplicació OAuth2."; +App::$strings["Add application"] = "Afegir aplicatiu"; +App::$strings["Connected OAuth2 Apps"] = "Aplicacions OAuth2 connectades"; +App::$strings["Client key starts with"] = "La clau del client comença amb"; +App::$strings["No name"] = "Sin nombre"; +App::$strings["Remove authorization"] = "Elimina autorització"; +App::$strings["Not valid email."] = "E-correu no vàlid."; +App::$strings["Protected email address. Cannot change to that email."] = "Adreça d'e-correu protegida. No es pot canviar a aquest e-correu."; +App::$strings["System failure storing new email. Please try again."] = "Fallada del sistema al guardar un nou correu. Si us plau, proba de nou."; +App::$strings["Technical skill level updated"] = "S'ha actualitzat el nivell de competències tècniques"; +App::$strings["Password verification failed."] = "La verificació de la contrasenya ha fallat."; +App::$strings["Passwords do not match. Password unchanged."] = "Les contrasenyes no coincideixen. Contrasenya sense canvis."; +App::$strings["Empty passwords are not allowed. Password unchanged."] = "Les contrasenyes en blanc no estan permesas. Contrasenya sense canvis."; +App::$strings["Password changed."] = "Contrasenya canviada."; +App::$strings["Password update failed. Please try again."] = "L'actualització de la contrasenya va fallar. Si us plau, torneu a intentar-ho."; +App::$strings["Account Settings"] = "Ajustos de Compte"; +App::$strings["Current Password"] = "Contrasenya Actual"; +App::$strings["Enter New Password"] = "Entra la Nova Contrasenya"; +App::$strings["Confirm New Password"] = "Confirma la Nova Contrasenya"; +App::$strings["Leave password fields blank unless changing"] = "Deixa els camps de contrasenya en blanc llevat que la vulguis canviar"; +App::$strings["Remove Account"] = "Esborra el Compte"; +App::$strings["Remove this account including all its channels"] = "Esborra aquest compte inclosos tots els seus canals"; +App::$strings["Affinity Slider settings updated."] = "S'ha actualitzat la configuració de la barra d'afinitat"; +App::$strings["No feature settings configured"] = "No hi ha opcions de les funcions configurades"; +App::$strings["Default maximum affinity level"] = "Nivell màxim d'afinitat predeterminat"; +App::$strings["0-99 default 99"] = "0-99 (per defecte 99)"; +App::$strings["Default minimum affinity level"] = "Nivell mínim d'afinitat predeterminat"; +App::$strings["0-99 - default 0"] = "0-99 (per defecte 0)"; +App::$strings["Affinity Slider Settings"] = "Configuració de la barra d'afinitat"; +App::$strings["Addon Settings"] = "Configuració de les extensions"; +App::$strings["Please save/submit changes to any panel before opening another."] = "Desa els canvis en un panell abans d'obrir-ne un altre."; +App::$strings["%s - (Experimental)"] = "%s - (Experimental)"; +App::$strings["Display Settings"] = "Ajustos de Pantalla"; +App::$strings["Theme Settings"] = "Ajustos de Tema"; +App::$strings["Custom Theme Settings"] = "Ajustos Personals de Tema"; +App::$strings["Content Settings"] = "Ajustos de Contingut"; +App::$strings["Display Theme:"] = "Ajustos de Tema:"; +App::$strings["Select scheme"] = "Tria esquema"; +App::$strings["Preload images before rendering the page"] = "Precarrega les imatges abans de dibuixar la pàgina"; +App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "El temps subjectiu per carregar la pàgina pot ser llarg però la pàgina estarà preparada quan es mostri"; +App::$strings["Enable user zoom on mobile devices"] = "Zoom d'usuari en dispositius mòbils"; +App::$strings["Update browser every xx seconds"] = "Actualitza el navegador cada xx segons"; +App::$strings["Minimum of 10 seconds, no maximum"] = "Mínim de 10 segons, sense màxim"; +App::$strings["Maximum number of conversations to load at any time:"] = "Nombre màxim de conversacions a càrregar cada vegada"; +App::$strings["Maximum of 100 items"] = "Màxim de 100 elements"; +App::$strings["Show emoticons (smilies) as images"] = "Mostra emoticons (smilies) com a imatges"; +App::$strings["Provide channel menu in navigation bar"] = "Mostra el menú de canal a la barra de navegació"; +App::$strings["Default: channel menu located in app menu"] = "Per defecte, el menú de canal es troba al menú d'aplicacions"; +App::$strings["Manual conversation updates"] = "Actualitza les converses manualment"; +App::$strings["Default is on, turning this off may increase screen jumping"] = "Per defecte està habilitada perquè evita que la pàgina salti cap avall en actualitzar-se."; +App::$strings["Link post titles to source"] = "Enllaça a l'origen els títols de l'entrada"; +App::$strings["System Page Layout Editor - (advanced)"] = "Editor de dissenys de pàgines de sistema (avançat)"; +App::$strings["Use blog/list mode on channel page"] = "Empra el mode blog/llista a la pàgina del canal"; +App::$strings["(comments displayed separately)"] = "(Observacions es mostren per separat)"; +App::$strings["Use blog/list mode on grid page"] = "Empra el mode de blog/llista a la pàgina de la malla"; +App::$strings["Channel page max height of content (in pixels)"] = "Alçada màxima de contingut (en píxels) de la pàgina de Canal"; +App::$strings["click to expand content exceeding this height"] = "Clic per expandir el contingut que excedeixi aquesta alçada"; +App::$strings["Grid page max height of content (in pixels)"] = "Alçada màxima dels continguts (en píxels) de la Pàgina de Malla "; +App::$strings["Name is required"] = "Es requereix un Nom"; +App::$strings["Key and Secret are required"] = "Es requereix Clau (Key) i el Secret (Secret)"; +App::$strings["Consumer Key"] = "Consumer Key"; +App::$strings["Icon url"] = "Icona de url"; +App::$strings["Optional"] = "Opcional"; +App::$strings["Application not found."] = "Aplicatiu no trobat."; +App::$strings["Connected Apps"] = "Aplicatius Conectats"; +App::$strings["View Photo"] = "Mostra la imatge"; +App::$strings["Edit Album"] = "Modifica l'àlbum"; +App::$strings["Upload"] = "Pujar"; +App::$strings["Some blurb about what to do when you're new here"] = "Algunes propostes sobre el que cal fer quan ets nou aquí"; +App::$strings["Thing updated"] = "S'ha actualitzat la cosa"; +App::$strings["Object store: failed"] = "No s'ha pogut emmagatzemar l'objecte"; +App::$strings["Thing added"] = "S'ha afegit la cosa"; +App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s"; +App::$strings["Show Thing"] = "Mostra la cosa"; +App::$strings["item not found."] = "no s'ha trobat l'element."; +App::$strings["Edit Thing"] = "Edita la cosa"; +App::$strings["Select a profile"] = "Tria un perfil"; +App::$strings["Post an activity"] = "Publica una activitat"; +App::$strings["Only sends to viewers of the applicable profile"] = "S'envia només a visitants del perfil corresponent"; +App::$strings["Name of thing e.g. something"] = "Nom de la cosa. Exemple: patata"; +App::$strings["URL of thing (optional)"] = "Adreça URL de la cosa (opcional)"; +App::$strings["URL for photo of thing (optional)"] = "Adreça URL de la foto d'una cosa (opcional)"; +App::$strings["Permissions"] = "Permisos "; +App::$strings["Add Thing to your Profile"] = "Afegeix una cosa al teu perfil"; +App::$strings["No more system notifications."] = "No hi ha més notificacions del sistema."; +App::$strings["System Notifications"] = "Notificacions del sistema"; +App::$strings["Connection added."] = "S'ha afegit la connexió."; +App::$strings["Your service plan only allows %d channels."] = "El teu paquet de serveis només admet %d canals."; +App::$strings["No channel. Import failed."] = "Sense canal. No s'ha pogut importar."; +App::$strings["Import completed."] = "S'ha completat la importació."; +App::$strings["You must be logged in to use this feature."] = "Has d'estar registrat per fer servir aquesta funcionalitat."; +App::$strings["Import Channel"] = "Importa un canal"; +App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Empra aquest formulari per importar un canal existent en un altre servidor/concentrador. Pots recuperar el canal des de l'antic servidor/concentrador via la xarxa o mitjançant un fitxer d'exportació"; +App::$strings["Or provide the old server/hub details"] = "O proveeix els detalls de l'antic servidor/node"; +App::$strings["Your old identity address (xyz@example.com)"] = "La teva adreça de canal antiga. El format és canal@exemple.org"; +App::$strings["Your old login email address"] = "La teva adreça de correu electrònic antiga"; +App::$strings["Your old login password"] = "La teva contrasenya antiga"; +App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Per a qualsevol de les opcions, escull si vols fer primària l'adreça d'aquest node o mantenir l'anterior com a primària. Podràs penjar entrades des de totes dues adreces, però per als fitxers, imatges i altres en cal una de primària."; +App::$strings["Make this hub my primary location"] = "Fes d'aquest node la meva ubicació primària"; +App::$strings["Move this channel (disable all previous locations)"] = "Moure aquest canal (desactiva totes les prèvies localitzacions)"; +App::$strings["Import a few months of posts if possible (limited by available memory"] = "Importa, si es possible, missatges de fa uns quants mesos (limitat per la memòria disponible) "; +App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Aquest procès pot trigar minuts en completar. Si et plau envia el formulari només una vegada i manté aquesta pàgina oberta fins que finalitzi."; +App::$strings["Authentication failed."] = "Ha fallat l'autentificació."; +App::$strings["Remote Authentication"] = "Autentificació Remota"; +App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Introdueix la teva adreça del canal (eg canal@exemple.com)"; +App::$strings["Authenticate"] = "Autentica't"; +App::$strings["Permissions denied."] = "Permís denegat."; +App::$strings["Import"] = "Importar"; +App::$strings["Authorize application connection"] = "Autoritza la connexió de l'aplicació"; +App::$strings["Return to your app and insert this Security Code:"] = "Torna a la teva aplicació i introdueix aquest codi de seguertat"; +App::$strings["Please login to continue."] = "Si et plau, identifica't per continuar."; +App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vols autoritzar a aquesta aplicació l'accés a les teves entrades i contactes i/o a crear noves entrades com si fos tu mateix."; +App::$strings["Item not available."] = "Article no disponible."; +App::$strings["Edit Block"] = "Editar Bloc"; +App::$strings["vcard"] = "vcard (targeta estàndard de contacte)"; +App::$strings["Apps"] = "Aplicatius"; +App::$strings["Manage apps"] = "Gestiona apps"; +App::$strings["Create new app"] = "Crear una nova app"; +App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s es %2\$s"; +App::$strings["Mood"] = "Ànim"; +App::$strings["Set your current mood and tell your friends"] = "Estableix el teu estat d'ànim actual i digues-li als teus amics"; +App::$strings["Active"] = "Actives"; +App::$strings["Blocked"] = "Bloquejades"; +App::$strings["Ignored"] = "Ignorades"; +App::$strings["Hidden"] = "Amagades"; +App::$strings["Archived/Unreachable"] = "Arxivades o inaccessibles"; +App::$strings["New"] = "Nou"; +App::$strings["All"] = "Tots"; +App::$strings["Active Connections"] = "Connexions actives"; +App::$strings["Show active connections"] = "Mostra les connexions actives"; +App::$strings["New Connections"] = "Noves Connexions"; +App::$strings["Show pending (new) connections"] = "Mostra les connexions pendents (noves)"; +App::$strings["Only show blocked connections"] = "Mostra només les connexions bloquejades"; +App::$strings["Only show ignored connections"] = "Mostra només les connexions ignorades"; +App::$strings["Only show archived/unreachable connections"] = "Mostra només les connexions arxivades o inaccessibles"; +App::$strings["Only show hidden connections"] = "Mostra només les connexions amagades"; +App::$strings["Show all connections"] = "Mostra totes les connexions"; +App::$strings["Pending approval"] = "Pendent d'aprovació"; +App::$strings["Archived"] = "Arxivades"; +App::$strings["Not connected at this location"] = "No està connectada des d'aquest aquest hub"; +App::$strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]"; +App::$strings["Edit connection"] = "Modifica la connexió"; +App::$strings["Delete connection"] = "Elimina la connexió"; +App::$strings["Channel address"] = "Adreça del canal"; +App::$strings["Network"] = "Xarxa"; +App::$strings["Call"] = "Crida"; +App::$strings["Status"] = "Estat"; +App::$strings["Connected"] = "Connectat"; +App::$strings["Approve connection"] = "Aprovar la Connexió "; +App::$strings["Ignore connection"] = "Ignorar connexió"; +App::$strings["Ignore"] = "Ignora"; +App::$strings["Recent activity"] = "Activitat recent"; +App::$strings["Connections"] = "Connexions"; +App::$strings["Search your connections"] = "Cerca entre les teves connexions"; +App::$strings["Connections search"] = "Cerca connexions"; +App::$strings["Find"] = "Troba"; +App::$strings["item"] = "element"; +App::$strings["Source of Item"] = "Origen de l'article"; +App::$strings["Bookmark added"] = "Favorit afegit"; +App::$strings["My Bookmarks"] = "Els Meus Favorits"; +App::$strings["My Connections Bookmarks"] = "Les connexions dels meus Favorits"; +App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "L'esborrat de comptes no està permès fins que transcorren 48 hores des de l'últim canvi de contrasenya."; +App::$strings["Remove This Account"] = "Esborra el compte"; +App::$strings["This account and all its channels will be completely removed from the network. "] = "Aquest compte i tots els seus canals s'estan apunt d'esborrar totalment de la xarxa."; +App::$strings["Remove this account, all its channels and all its channel clones from the network"] = "Esborra de la xarxa aquest compte, tots els seus canals, i tots els seus canals clons."; +App::$strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Per defecte, només les instancies dels canal ubicats en aquest node poden esser esborrades de la xarxa"; +App::$strings["Page owner information could not be retrieved."] = "La informació del propietari de la pàgina no va poder ser recuperada"; +App::$strings["Album not found."] = "Àlbum no trobat"; +App::$strings["Delete Album"] = "Esborra Àlbum"; +App::$strings["Delete Photo"] = "Esborra Foto"; +App::$strings["No photos selected"] = "No has seleccionat fotos"; +App::$strings["Access to this item is restricted."] = "L'accés a aquest element esta restringit."; +App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "S'estan fent servir %1$.2f MB de %2$.2f MB de l'espai per a imatges."; +App::$strings["%1$.2f MB photo storage used."] = "S'estan fent servir %1$.2f MB de l'espai per a imatges."; +App::$strings["Upload Photos"] = "Puja imatges"; +App::$strings["Enter an album name"] = "Escriu el nom del àlbum"; +App::$strings["or select an existing album (doubleclick)"] = "o bé fes doble clic a un d'existent"; +App::$strings["Create a status post for this upload"] = "Genera una entrada a partir de la pujada"; +App::$strings["Description (optional)"] = "Descripció (opcional)"; +App::$strings["Show Newest First"] = "Ordena de més nou a més antic"; +App::$strings["Show Oldest First"] = "Ordena de més antic a més nou"; +App::$strings["Add Photos"] = "Afegeix fotos"; +App::$strings["Permission denied. Access to this item may be restricted."] = "S'ha denegat el permís. Pot ser que l'accés estigui restringit."; +App::$strings["Photo not available"] = "La imatge no està disponible"; +App::$strings["Use as profile photo"] = "Fes-la imatge de perfil"; +App::$strings["Use as cover photo"] = "Emprar com a foto de portada"; +App::$strings["Private Photo"] = "Imatge privada"; +App::$strings["View Full Size"] = "Mostra a mida completa"; +App::$strings["Edit photo"] = "Modifica la imatge"; +App::$strings["Rotate CW (right)"] = "Tomba cap a la dreta"; +App::$strings["Rotate CCW (left)"] = "Tomba cap a l'esquerra"; +App::$strings["Move photo to album"] = "Mou la foto a un àlbum"; +App::$strings["Enter a new album name"] = "Escriu el nom del nou àlbum"; +App::$strings["or select an existing one (doubleclick)"] = "o bé fes doble clic a un d'existent"; +App::$strings["Add a Tag"] = "Afegeix una etiqueta"; +App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Exemple: @joan, @Paula_Peris, @mar@exemple.org"; +App::$strings["Flag as adult in album view"] = "Marca com a contingut adult"; +App::$strings["I like this (toggle)"] = "M'agrada això (canvia)"; +App::$strings["I don't like this (toggle)"] = "No m'agrada això (canvia)"; +App::$strings["Please wait"] = "Si us plau, espera"; +App::$strings["This is you"] = "Ets tú"; +App::$strings["Comment"] = "Comentari"; +App::$strings["__ctx:title__ Likes"] = "Agrada"; +App::$strings["__ctx:title__ Dislikes"] = "Desagrada"; +App::$strings["__ctx:title__ Agree"] = "Acord"; +App::$strings["__ctx:title__ Disagree"] = "Desacord"; +App::$strings["__ctx:title__ Abstain"] = "Abstenirse"; +App::$strings["__ctx:title__ Attending"] = "Assistint"; +App::$strings["__ctx:title__ Not attending"] = "Desassistint"; +App::$strings["__ctx:title__ Might attend"] = "Podrien assistir"; +App::$strings["View all"] = "Veure tot"; +App::$strings["__ctx:noun__ Like"] = array( + 0 => "Agrada", + 1 => "Agraden", +); +App::$strings["__ctx:noun__ Dislike"] = array( + 0 => "Desagrada", + 1 => "Desagrada", +); +App::$strings["Photo Tools"] = "Eines per Fotos"; +App::$strings["In This Photo:"] = "Hi apareixen:"; +App::$strings["Map"] = "Mapa"; +App::$strings["__ctx:noun__ Likes"] = "Agrada"; +App::$strings["__ctx:noun__ Dislikes"] = "Desagrada"; +App::$strings["Close"] = "Tanca"; +App::$strings["Recent Photos"] = "Imatges recents"; +App::$strings["Profile Unavailable."] = "El perfil no està disponible."; +App::$strings["Not found"] = "No s'ha trobat"; +App::$strings["Invalid channel"] = "El canal és invàlid"; +App::$strings["Error retrieving wiki"] = "S'ha produït un error en carregar la wiki"; +App::$strings["Error creating zip file export folder"] = "S'ha produït un error en crear la carpeta per al fitxer comprimit d'exportació"; +App::$strings["Error downloading wiki: "] = "S'ha produït un error en descarregar la wiki:"; +App::$strings["Wikis"] = "Wikis"; +App::$strings["Download"] = "Descarrega"; +App::$strings["Create New"] = "Crear Nou"; +App::$strings["Wiki name"] = "Nom de la wiki"; +App::$strings["Content type"] = "Llenguatge de formatació"; +App::$strings["Markdown"] = "Markdown"; +App::$strings["BBcode"] = "BBCode"; +App::$strings["Text"] = "Cap (text pla)"; +App::$strings["Type"] = "Tipus"; +App::$strings["Any type"] = "Qualsevol"; +App::$strings["Lock content type"] = "Bloca el llenguatge de formatació"; +App::$strings["Create a status post for this wiki"] = "Crea una entrada d'estat per aquesta wiki"; +App::$strings["Edit Wiki Name"] = "Canvia el nom de la wiki"; +App::$strings["Wiki not found"] = "No s'ha trobat la wiki"; +App::$strings["Rename page"] = "Canvia el nom de la pàgina"; +App::$strings["Error retrieving page content"] = "S'ha produït un error en carregar el contingut de la pàgina"; +App::$strings["New page"] = "Crea una pàgina nova"; +App::$strings["Revision Comparison"] = "Comparació de revisió"; +App::$strings["Revert"] = "Reverteix"; +App::$strings["Short description of your changes (optional)"] = "Descripció curta dels canvis (opcional)"; +App::$strings["Source"] = "Font"; +App::$strings["New page name"] = "Nou nom de pàgina"; +App::$strings["Embed image from photo albums"] = "Embeu una imatge dels àlbums de fotos"; +App::$strings["Embed an image from your albums"] = "Embeu una imatge dels teus àlbums"; +App::$strings["OK"] = "OK"; +App::$strings["Choose images to embed"] = "Tria una imatge per a embeure-la"; +App::$strings["Choose an album"] = "Tria un àlbum"; +App::$strings["Choose a different album"] = "Escull un àlbum diferent"; +App::$strings["Error getting album list"] = "Ha ocorregut un error quan treia la llista de àlbums"; +App::$strings["Error getting photo link"] = "Ha ocorregut un error quan treia l'enllaç a la foto"; +App::$strings["Error getting album"] = "Ha ocorregut un error treient l'àlbum"; +App::$strings["Error creating wiki. Invalid name."] = "S'ha produït un error en crear la wiki. El nom no és vàlid."; +App::$strings["A wiki with this name already exists."] = "Ja existeix una wiki amb aquest nom."; +App::$strings["Wiki created, but error creating Home page."] = "S'ha creat la wiki, però s'ha produït un error en crear-ne la pàgina principal."; +App::$strings["Error creating wiki"] = "S'ha produït un error en crear la wiki"; +App::$strings["Error updating wiki. Invalid name."] = "S'ha produït un error en actualitzar la wiki. El nom no és vàlid."; +App::$strings["Error updating wiki"] = "S'ha produït un error en actualitzar la wiki"; +App::$strings["Wiki delete permission denied."] = "No tens permís per a eliminar la wiki"; +App::$strings["Error deleting wiki"] = "S'ha produït un error en eliminar la wiki"; +App::$strings["New page created"] = "S'ha desat la nova pàgina"; +App::$strings["Cannot delete Home"] = "No es pot esborrar la pàgina principal"; +App::$strings["Current Revision"] = "Revisió actual"; +App::$strings["Selected Revision"] = "Revisió seleccionada"; +App::$strings["You must be authenticated."] = "Has d'estar autenticat."; +App::$strings["toggle full screen mode"] = "commuta el mode de pantalla completa"; +App::$strings["Layout updated."] = "S'ha actualitzat el disseny."; +App::$strings["Feature disabled."] = "Funcionalitat desactivada."; +App::$strings["Edit System Page Description"] = "Editor del Sistema de Descripció de Pàgines"; +App::$strings["(modified)"] = "(modificat)"; +App::$strings["Reset"] = "Reajustar"; +App::$strings["Layout not found."] = "No s'ha trobat cap disseny de pàgina."; +App::$strings["Module Name:"] = "Nom del mòdul:"; +App::$strings["Layout Help"] = "Ajuda per al disseny de pàgina"; +App::$strings["Edit another layout"] = "Modifica un altre disseny"; +App::$strings["System layout"] = "Disseny del sistema"; +App::$strings["Poke"] = "Esperonar"; +App::$strings["Poke somebody"] = "Emprenyar algú"; +App::$strings["Poke/Prod"] = "Esperonat/Picat"; +App::$strings["Poke, prod or do other things to somebody"] = "emprenyar, picar o fer altres coses a algú"; +App::$strings["Recipient"] = "Destinatari"; +App::$strings["Choose what you wish to do to recipient"] = "Tria que vols fer amb el destinatari"; +App::$strings["Make this post private"] = "Fer aquesta entrada privada"; +App::$strings["Image uploaded but image cropping failed."] = "S'ha pujat la imatge però no s'ha pogut retallar."; +App::$strings["Profile Photos"] = "Fotos del Perfil"; +App::$strings["Image resize failed."] = "No s'ha pogut escalar la imatge."; +App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Refresca la memòria cau del navegador si la foto no s'actualitza immediatament. Dreceres: «Ctrl+F5» i «Ctrl+Maj+R»"; +App::$strings["Unable to process image"] = "incapaç de processar la imatge"; +App::$strings["Image upload failed."] = "La pujada de la imatge va fracassar."; +App::$strings["Unable to process image."] = "Incapaç de processar l'imatge."; +App::$strings["Photo not available."] = "Foto no disponible."; +App::$strings["Upload File:"] = "Puja Arxiu:"; +App::$strings["Select a profile:"] = "Tria un perfil:"; +App::$strings["Use Photo for Profile"] = "Fes servir la foto per al perfil"; +App::$strings["Change Profile Photo"] = "Canvia la imatge de perfil"; +App::$strings["Use"] = "Aplica"; +App::$strings["Use a photo from your albums"] = "Agafa una foto dels àlbums"; +App::$strings["Select existing photo"] = "Tria una foto existent"; +App::$strings["Crop Image"] = "Retalla Imatge"; +App::$strings["Please adjust the image cropping for optimum viewing."] = "Si us plau, retalla la imatge per a una optima visualització"; +App::$strings["Done Editing"] = "Edició Feta"; +App::$strings["Away"] = "Absent"; +App::$strings["Online"] = "En connexió"; +App::$strings["Unable to locate original post."] = "No s'ha pogut trobar l'entrada original."; +App::$strings["Empty post discarded."] = "S'ha descartat l'entrada perquè no té contingut."; +App::$strings["Duplicate post suppressed."] = "Publicació duplicada s'ha suprimit."; +App::$strings["System error. Post not saved."] = "Hi ha hagut un error del sistema. L'entrada no s'ha desat."; +App::$strings["Your comment is awaiting approval."] = "El teu comentari encara no ha estat aprovat."; +App::$strings["Unable to obtain post information from database."] = "No s'ha pogut obtenir informació de l'entrada a la base de dades."; +App::$strings["You have reached your limit of %1$.0f top level posts."] = "Has assolit el teu límit de %1$.0f entrades (descomptant comentaris)."; +App::$strings["You have reached your limit of %1$.0f webpages."] = "Has assolit el teu limit de %1$.0f pàgines web."; +App::$strings["sent you a private message"] = "Se t'ha enviat un missatge privat"; +App::$strings["added your channel"] = "el teu canal s'ha afegit"; +App::$strings["requires approval"] = "requereix aprovació"; +App::$strings["g A l F d"] = "g A l F d"; +App::$strings["[today]"] = "[avui]"; +App::$strings["posted an event"] = "enviat un esdeveniment"; +App::$strings["shared a file with you"] = "ha compartit un fitxer amb tu"; +App::$strings["Invalid item."] = "Article invàlid."; +App::$strings["Page not found."] = "Pàgina no trobada."; +App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; +App::$strings["Could not access contact record."] = "No s'ha pogut accedir al llibre de contactes."; +App::$strings["Could not locate selected profile."] = "No s'ha trobat el perfil indicat."; +App::$strings["Connection updated."] = "S'ha actualitzat la connexió."; +App::$strings["Failed to update connection record."] = "No s'ha pogut actualitzar el registre de connexió."; +App::$strings["is now connected to"] = "Ara està conectat amb"; +App::$strings["Could not access address book record."] = "No puc accedir al registre del contacte"; +App::$strings["Refresh failed - channel is currently unavailable."] = "Ha fallat la recàrrega - el canal es actualment inaccesible."; +App::$strings["Unable to set address book parameters."] = "No es poden ajustar els paràmetres dels contactes."; +App::$strings["Connection has been removed."] = "S'han eliminat les conexions."; +App::$strings["View Profile"] = "Veure Perfil"; +App::$strings["View %s's profile"] = "Mostra el perfil de %s"; +App::$strings["Refresh Permissions"] = "Recarrega els Permissos"; +App::$strings["Fetch updated permissions"] = "Obté els permisos actualitzats"; +App::$strings["Refresh Photo"] = "Recarrega la foto"; +App::$strings["Fetch updated photo"] = "Demana la nova foto al servidor"; +App::$strings["Recent Activity"] = "Activitat Recent"; +App::$strings["View recent posts and comments"] = "Mostra les entrades i comentaris recents"; +App::$strings["Block (or Unblock) all communications with this connection"] = "Boqueja (o Desbloqueja) les comunicacions amb aquesta connexió"; +App::$strings["This connection is blocked!"] = "Aquesta connexió està bloquejada!"; +App::$strings["Unignore"] = "Inhabilita"; +App::$strings["Ignore (or Unignore) all inbound communications from this connection"] = "Ignora (o Considera) les communicacions entrants d'aquesta connexió"; +App::$strings["This connection is ignored!"] = "Aquesta connexió es ignorada!"; +App::$strings["Unarchive"] = "Desarxiva"; +App::$strings["Archive"] = "Arxiva"; +App::$strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Arxiva (o Desarxiva) aquesta connexió - Marca el canal com a mort pero manté el contingut "; +App::$strings["This connection is archived!"] = "Aquesta connexió està arxivada!"; +App::$strings["Unhide"] = "Mostra"; +App::$strings["Hide"] = "Amaga"; +App::$strings["Hide or Unhide this connection from your other connections"] = "Amaga (o Mostra) aquesta connexió de les altres connexions teves"; +App::$strings["This connection is hidden!"] = "Aquesta connexió està amagada!"; +App::$strings["Delete this connection"] = "Elimina aquesta connexió"; +App::$strings["Fetch Vcard"] = "Obté la targeta de contacte Vcard"; +App::$strings["Fetch electronic calling card for this connection"] = "Obté la targeta de trucada electrònica d'aquesta connexió"; +App::$strings["Open Individual Permissions section by default"] = "Obrir, per defecte, la secció de Permisos Individuals"; +App::$strings["Affinity"] = "Afinitat"; +App::$strings["Open Set Affinity section by default"] = "Obrir, per defecte, la secció d'Ajustos d'Afinitat"; +App::$strings["Me"] = "Jo"; +App::$strings["Family"] = "Família"; +App::$strings["Acquaintances"] = "Coneguts"; +App::$strings["Filter"] = "Filtre"; +App::$strings["Open Custom Filter section by default"] = "Obrir, per defecte, la secció de Filtres a Mida"; +App::$strings["Approve this connection"] = "Apccepta aquesta connexió"; +App::$strings["Accept connection to allow communication"] = "Accepta la connexió per permetre la comunicació"; +App::$strings["Set Affinity"] = "Ajusta l'Afinitat"; +App::$strings["Set Profile"] = "Ajusta el Perfil"; +App::$strings["Set Affinity & Profile"] = "Ajusta Afinitat i Perfil"; +App::$strings["This connection is unreachable from this location."] = "Aquesta connexió no és accessible des d'aquest hub."; +App::$strings["This connection may be unreachable from other channel locations."] = "Aquesta connexió no és accessibles des d'altres hubs del canal."; +App::$strings["Location independence is not supported by their network."] = "La xarxa d'aquesta connexió no és compatible amb la independència de hub."; +App::$strings["This connection is unreachable from this location. Location independence is not supported by their network."] = "Aquesta connexió no és accessible des d'aquest hub. La seva xarxa no és compatible amb la independència de hub."; +App::$strings["Connection Default Permissions"] = "Permisos per Defecte de la Connexió"; +App::$strings["Connection: %s"] = "Connexió: %s"; +App::$strings["Apply these permissions automatically"] = "Aplica aquests permissos automaticament"; +App::$strings["Connection requests will be approved without your interaction"] = "Les peticions de connexió seran aprovades sense la teva interacció"; +App::$strings["Permission role"] = "Permisos de rol"; +App::$strings["Loading"] = "S'està carregant"; +App::$strings["Add permission role"] = "Afegir permisos de rol"; +App::$strings["This connection's primary address is"] = "La primera adreça d'aqueste connexió es"; +App::$strings["Available locations:"] = "Localització disponible:"; +App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Els permisos indicats en aquesta pàgina seran aplicats a totes les noves connexions."; +App::$strings["Connection Tools"] = "Eines de Connexió"; +App::$strings["Slide to adjust your degree of friendship"] = "Llisca per ajustar el nivell d'amistat"; +App::$strings["Rating"] = "Valora"; +App::$strings["Slide to adjust your rating"] = "Llisca per ajustar la valoració"; +App::$strings["Optionally explain your rating"] = "Opcionalment pots explicar la teva valoració"; +App::$strings["Custom Filter"] = "Filtre a mida"; +App::$strings["Only import posts with this text"] = "Importa exclusivament entrades amb aquest text"; +App::$strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "paraules una per línia o #etiquetes o /patrons/ o idioma=xx, deixar en blanc per importar totes les entrades"; +App::$strings["Do not import posts with this text"] = "No importar entrades amb aquest text"; +App::$strings["This information is public!"] = "Aquesta informació es pública!"; +App::$strings["Connection Pending Approval"] = "Connexió Pendent d'Aprovació"; +App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Tria el perfil que vols mostrar a %s quan es vegi el perfil segur."; +App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Alguns permisos poden ser heretats dels teus canals ajustos de privacitat, Els quals tenen més prioritat que els ajustos individuals. Pots canviar aquests ajustos aquí pero no tindran cap impacte fins que no canviis els ajustos heretats."; +App::$strings["Last update:"] = "Darrera actualització:"; +App::$strings["Details"] = "Detalls"; +App::$strings["Room not found"] = "No s'ha trobat la sala"; +App::$strings["Leave Room"] = "Abandona la sala"; +App::$strings["Delete Room"] = "Esborra Sala"; +App::$strings["I am away right now"] = "Absent"; +App::$strings["I am online"] = "Estic connectat/da"; +App::$strings["Bookmark this room"] = "Fes favorit aquest xat"; +App::$strings["Please enter a link URL:"] = "Si us plau entra l'enllaç URL:"; +App::$strings["Encrypt text"] = "Text encriptat"; +App::$strings["New Chatroom"] = "Nova sala per a Xerrar"; +App::$strings["Chatroom name"] = "Nom de la sala de xat"; +App::$strings["Expiration of chats (minutes)"] = "Expiració dels chats (minuts)"; +App::$strings["%1\$s's Chatrooms"] = "%1\$s de Xats"; +App::$strings["No chatrooms available"] = "No hi ha sales de xat disponibles"; +App::$strings["Expiration"] = "Expiració"; +App::$strings["min"] = "min"; +App::$strings["Photos"] = "Fotos"; +App::$strings["Files"] = "Arxius"; +App::$strings["Unable to update menu."] = "No s'ha pogut actualitzar el menú."; +App::$strings["Unable to create menu."] = "No s'ha pogut crear el menú."; +App::$strings["Menu Name"] = "Nom del menú"; +App::$strings["Unique name (not visible on webpage) - required"] = "Nom únic (no visible a la pàgina web) - requerit"; +App::$strings["Menu Title"] = "Títol del menú"; +App::$strings["Visible on webpage - leave empty for no title"] = "Visible a la pàgina web - deixar buit per a no posar títol"; +App::$strings["Allow Bookmarks"] = "Permetre Marcadors"; +App::$strings["Menu may be used to store saved bookmarks"] = "El menú es pot emprar per a guardar marcadors"; +App::$strings["Submit and proceed"] = "Envia i procedeix"; +App::$strings["Menus"] = "Menús"; +App::$strings["Bookmarks allowed"] = "Marcadors permesos"; +App::$strings["Delete this menu"] = "Esborra el menú"; +App::$strings["Edit menu contents"] = "Edita el contingut del menú"; +App::$strings["Edit this menu"] = "Edita el menú"; +App::$strings["Menu could not be deleted."] = "El menu no es pot esborrar."; +App::$strings["Edit Menu"] = "Edita Menú"; +App::$strings["Add or remove entries to this menu"] = "Afegeix o esborra entrades a aquest menú"; +App::$strings["Menu name"] = "Nom del Menú"; +App::$strings["Must be unique, only seen by you"] = "Ha de ser únic, nomes vist per tú"; +App::$strings["Menu title"] = "Títol del menú"; +App::$strings["Menu title as seen by others"] = "Títol del menú vist pels altres"; +App::$strings["Allow bookmarks"] = "Marcadors permesos"; +App::$strings["Layouts"] = "Dissenys"; +App::$strings["Help"] = "Ajuda"; +App::$strings["Comanche page description language help"] = "Pgina d'ajuda del llenguatge Comanche"; +App::$strings["Layout Description"] = "Descripció del disseny pàgina"; +App::$strings["Download PDL file"] = "Descarrega l'arxiu PDL"; +App::$strings["Please refresh page"] = "Recarrega la pàgina"; +App::$strings["Unknown error"] = "S'ha produït un error desconegut"; +App::$strings["Token verification failed."] = "Ha fallat la verificació del token."; +App::$strings["Email Verification Required"] = "Cal verificar el correu"; +App::$strings["A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message."] = "S'ha enviat al teu correu (%s) un token de verificació. Introdueix-lo aquí per a completar la verificació del compte. Tingues en compte que el correu pot trigar uns minuts en arribar, i que hi ha proveïdors de correu que el classificaran com a correu brossa."; +App::$strings["Resend Email"] = "Torna a enviar el correu"; +App::$strings["Validation token"] = "Token de validació"; +App::$strings["Post not found."] = "No s'ha trobat l'entrada"; +App::$strings["post"] = "entrada"; +App::$strings["comment"] = "comentari"; +App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetat %3\$s de %2\$s amb %4\$s"; +App::$strings["This setting requires special processing and editing has been blocked."] = "Aquest ajust requereix un procés espedial i l'edició esta bloquejada."; +App::$strings["Configuration Editor"] = "Editor de Configuració"; +App::$strings["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."] = "atenció: Realitzar segons quins ajustos pot fer el canal inoperable. Deixa aquesta pàgina si no estas segur i tens suficients coneixements sobre l'ús correcte d'aquesta característica."; +App::$strings["If enabled, connection requests will be approved without your interaction"] = "Si s'habilita, les soŀlicituds de connexió s'aprovaran automàticament sense requerir la teva interacció"; +App::$strings["Automatic approval settings"] = "Aprovació automàtica de soŀlicituds de connexió"; +App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "El valor per defecte dels permisos individuals poden tenir valors per defecte segons el tipus de canal i les opcions de privacitat. Pot ser que no estiguis autoritzat/da a modificar-los."; +App::$strings["Unknown App"] = "No es coneix l'aplicació"; +App::$strings["Authorize"] = "Autoritza"; +App::$strings["Do you authorize the app %s to access your channel data?"] = "Vols autoritzar l'aplicació %s a accedir a les dades del teu canal?"; +App::$strings["Allow"] = "Permet-ho"; +App::$strings["Privacy group created."] = "Creat grup privat."; +App::$strings["Could not create privacy group."] = "No es pot crear el grup privat."; +App::$strings["Privacy group not found."] = "No es troben grups privats."; +App::$strings["Privacy group updated."] = "Grup privat actualitzat."; +App::$strings["Create a group of channels."] = "Crear un grup de canals."; +App::$strings["Privacy group name: "] = "Nom del grup privat:"; +App::$strings["Members are visible to other channels"] = "Els membres son visibles en altres canals"; +App::$strings["Privacy group removed."] = "Grup privat eliminat."; +App::$strings["Unable to remove privacy group."] = "No puc eliminar el grup privat."; +App::$strings["Privacy group editor"] = "Editor del grup privat"; +App::$strings["Members"] = "Membres"; +App::$strings["All Connected Channels"] = "Tots els Canals Connectats"; +App::$strings["Click on a channel to add or remove."] = "Clic sobre el canal per afegir o esborrar."; +App::$strings["Profile not found."] = "Perfil no trobat."; +App::$strings["Profile deleted."] = "Perfil eliminat."; +App::$strings["Profile-"] = "Perfil-"; +App::$strings["New profile created."] = "Nou perfil creat."; +App::$strings["Profile unavailable to clone."] = "Perfil que no es pot clonar."; +App::$strings["Profile unavailable to export."] = "Perfil que no es pot exportar."; +App::$strings["Profile Name is required."] = "Es requereix el Nom del Perfil."; +App::$strings["Marital Status"] = "Estat Marital"; +App::$strings["Romantic Partner"] = "Company/a Romàntic"; +App::$strings["Likes"] = "Agrada"; +App::$strings["Dislikes"] = "Desagrada"; +App::$strings["Work/Employment"] = "Treball/Feina"; +App::$strings["Religion"] = "Religió"; +App::$strings["Political Views"] = "Idees Polítiques"; +App::$strings["Gender"] = "Gènere"; +App::$strings["Sexual Preference"] = "Preferència Sexual"; +App::$strings["Homepage"] = "Pàgina Personal"; +App::$strings["Interests"] = "Interessos"; +App::$strings["Profile updated."] = "Perfil actualitzat."; +App::$strings["Hide your connections list from viewers of this profile"] = "Amaga dels curiosos la teva llista de connexions d'aquest perfil"; +App::$strings["Edit Profile Details"] = "Edita els Detalls del Perfil"; +App::$strings["View this profile"] = "Veure aquest perfil"; +App::$strings["Edit visibility"] = "Editar visibilitat"; +App::$strings["Profile Tools"] = "Eines per Perfils"; +App::$strings["Change cover photo"] = "Canviar la foto de portada"; +App::$strings["Change profile photo"] = "Canviar la foto del perfil"; +App::$strings["Create a new profile using these settings"] = "Crea un perfil nou amb aquests ajustos"; +App::$strings["Clone this profile"] = "Clonar aquest perfil"; +App::$strings["Delete this profile"] = "Elimina aquest perfil"; +App::$strings["Add profile things"] = "Afegeix coses al perfil"; +App::$strings["Personal"] = "Personal"; +App::$strings["Relationship"] = "Relació"; +App::$strings["Miscellaneous"] = "Miscelania"; +App::$strings["Import profile from file"] = "Importa perfil des d'un arxiu"; +App::$strings["Export profile to file"] = "Exporta perfil a un arxiu"; +App::$strings["Your gender"] = "El teu gènere"; +App::$strings["Marital status"] = "Estat marital"; +App::$strings["Sexual preference"] = "Preferència sexual"; +App::$strings["Profile name"] = "Nom del perfil"; +App::$strings["This is your default profile."] = "Aquest es el teu perfil per defecte"; +App::$strings["Your full name"] = "El teu nom complet"; +App::$strings["Title/Description"] = "Títol/Descripció"; +App::$strings["Street address"] = "Carrer"; +App::$strings["Locality/City"] = "Població/Ciutat"; +App::$strings["Region/State"] = "Regió/Estat"; +App::$strings["Postal/Zip code"] = "Codi Postal"; +App::$strings["Who (if applicable)"] = "Qui (si es aplicable)"; +App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Examples: cathy123, Cathy Williams, cathy@example.com"; +App::$strings["Since (date)"] = "Des de (data)"; +App::$strings["Tell us about yourself"] = "Quelcom sobre tu"; +App::$strings["Homepage URL"] = "URL de la pàgina d'inici"; +App::$strings["Hometown"] = "Ciutat Natal"; +App::$strings["Political views"] = "Idees polítiques"; +App::$strings["Religious views"] = "Creences religioses"; +App::$strings["Keywords used in directory listings"] = "Paraules clau emprades en els llistats de directoris"; +App::$strings["Example: fishing photography software"] = "Exemple: software de fotografia submarina"; +App::$strings["Musical interests"] = "Interessos Musicals"; +App::$strings["Books, literature"] = "Llibres, literatura"; +App::$strings["Television"] = "Televisió"; +App::$strings["Film/Dance/Culture/Entertainment"] = "Pel·lícules/Dansa/Cultura/Entreteniment"; +App::$strings["Hobbies/Interests"] = "Aficions/Interessos"; +App::$strings["Love/Romance"] = "Amor/Romace"; +App::$strings["School/Education"] = "Escola/Educació"; +App::$strings["Contact information and social networks"] = "Informació de contacte i xarxes socials"; +App::$strings["My other channels"] = "Els meus altres canals"; +App::$strings["Communications"] = "Comunicacions"; +App::$strings["Profile Image"] = "Imatge del Perfil"; +App::$strings["Edit Profiles"] = "Editar Perfils"; +App::$strings["This page is available only to site members"] = "Aquesta pàgina només és accessible per als membres del node."; +App::$strings["Welcome"] = "Benvingut/da"; +App::$strings["What would you like to do?"] = "Què t'agradaria fer?"; +App::$strings["Please bookmark this page if you would like to return to it in the future"] = "Marca aquesta pàgina si vols tornar-hi en un futur"; +App::$strings["Upload a profile photo"] = "Puja una imatge de perfil"; +App::$strings["Upload a cover photo"] = "Puja una imatge de portada"; +App::$strings["Edit your default profile"] = "Modifica el teu perfil"; +App::$strings["View friend suggestions"] = "Mostra suggerències de connexions"; +App::$strings["View the channel directory"] = "Mostra el directori del canal"; +App::$strings["View/edit your channel settings"] = "Mostra o modifica la configuració del teu canal"; +App::$strings["View the site or project documentation"] = "Mostra la documentació del projecte"; +App::$strings["Visit your channel homepage"] = "Ves a la pàgina del teu canal"; +App::$strings["View your connections and/or add somebody whose address you already know"] = "Mostra les teves connexions o afegeix-ne una de nova introduint la seva adreça a mà."; +App::$strings["View your personal stream (this may be empty until you add some connections)"] = "Mostra el teu flux personal. Estarà buit mentre no et connectis amb ningú."; +App::$strings["View the public stream. Warning: this content is not moderated"] = "Mostra el flux públic. Avís: aquest contingut no està moderat"; +App::$strings["Page link"] = "Enllaç de la pàgina"; +App::$strings["Edit Webpage"] = "Edita la Pàgina Web"; +App::$strings["Create a new channel"] = "Crear un nou canal"; +App::$strings["Channel Manager"] = "Gestor de Canals"; +App::$strings["Current Channel"] = "Canal Actual"; +App::$strings["Switch to one of your channels by selecting it."] = "Canviar a un altre dels teus canals seleccionant-ho."; +App::$strings["Default Channel"] = "Canal per Defecte"; +App::$strings["Make Default"] = "Estableix com a Predeterminat"; +App::$strings["%d new messages"] = "%d missatges nous"; +App::$strings["%d new introductions"] = "%d noves presentacions"; +App::$strings["Delegated Channel"] = "Canal Delegat"; +App::$strings["Cards"] = "Targetes"; +App::$strings["Add Card"] = "Afegeix una carta"; +App::$strings["This directory server requires an access token"] = "Aquest servidor de directori requereix un token de accès"; +App::$strings["About this site"] = "Sobre aquest lloc web"; +App::$strings["Site Name"] = "Nom del lloc web"; +App::$strings["Administrator"] = "Administrador"; +App::$strings["Terms of Service"] = "Condicions del Servei"; +App::$strings["Software and Project information"] = "Informació del programari i del projecte"; +App::$strings["This site is powered by \$Projectname"] = "Aquest lloc web funciona amb \$Projectname"; +App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "Els serveis d'identitat i la federació i descentralització de la xarxa funcionen amb Zot"; App::$strings["Version %s"] = "Versió %s"; -App::$strings["Installed plugins/addons/apps:"] = "Plugins/addons/apps Instal·lats:"; -App::$strings["No installed plugins/addons/apps"] = "Plugins/addons/apps no instal·lats"; -App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Aquest és un node de \$Projectname, una xarxa cooperativa mundial de llocs web descentralitzats amb gran control de la privacitat."; -App::$strings["Tag: "] = "Etiqueta:"; -App::$strings["Last background fetch: "] = "Última actualització en rerefons:"; -App::$strings["Current load average: "] = "Càrrega actual mitja:"; -App::$strings["Running at web location"] = "Correguent en el lloc web"; -App::$strings["Please visit hubzilla.org to learn more about \$Projectname."] = "Visita hubzilla.org per saber-ne més de \$Projectname."; -App::$strings["Bug reports and issues: please visit"] = "Per informar d'errors o problemes ves a"; -App::$strings["\$projectname issues"] = "\$projectname qüestions"; -App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Per suggerències, felicitacions i altres, envia'ns un mail a «redmatrix» [arroba] librelist [punt] com"; -App::$strings["Site Administrators"] = "Administradors del lloc"; +App::$strings["Project homepage"] = "Pàgina principal del projecte"; +App::$strings["Developer homepage"] = "Pàgina principal de desenvolupament"; +App::$strings["No ratings"] = "No valorat"; +App::$strings["Ratings"] = "Valoracions"; +App::$strings["Rating: "] = "Valoració:"; +App::$strings["Website: "] = "Lloc web:"; +App::$strings["Description: "] = "Descripció:"; +App::$strings["Import Webpage Elements"] = "Importa elements de pàgina web"; +App::$strings["Import selected"] = "Importa la selecció"; +App::$strings["Export Webpage Elements"] = "Exporta elements de pàgina web"; +App::$strings["Export selected"] = "Exporta la selecció"; +App::$strings["Webpages"] = "Pàgines web"; +App::$strings["Actions"] = "Accions"; +App::$strings["Page Link"] = "Enllaç a Pàgina"; +App::$strings["Page Title"] = "Títol de la pàgina"; +App::$strings["Invalid file type."] = "El tipus de fitxer és invàlid."; +App::$strings["Error opening zip file"] = "Hi ha hagut un error descomprimint"; +App::$strings["Invalid folder path."] = "El camí de carpeta és invàlid."; +App::$strings["No webpage elements detected."] = "No s'ha detectat cap element de pàgina web."; +App::$strings["Import complete."] = "S'ha completat la importació."; +App::$strings["Channel name changes are not allowed within 48 hours of changing the account password."] = "No es permet canviar el nom d'un canal fins a 48 hores més tard d'haver canviant la contrasenya del compte al que pertany."; +App::$strings["Reserved nickname. Please choose another."] = "Àlies reservat. Tria un altre."; +App::$strings["Nickname has unsupported characters or is already being used on this site."] = "L'álies te caracters no soportats o ja esta en ús en aquest lloc"; +App::$strings["Change channel nickname/address"] = "Canvia el nom o adreça del canal"; +App::$strings["Any/all connections on other networks will be lost!"] = "Es perdran totes les connexions amb xarxes externes!"; +App::$strings["New channel address"] = "Adreça de canal nova"; +App::$strings["Rename Channel"] = "Canvia el nom del canal"; +App::$strings["Item is not editable"] = "Article no editable"; +App::$strings["Edit post"] = "Modifica l'entrada"; +App::$strings["Invalid message"] = "Missatge invàlid."; +App::$strings["no results"] = "sense resultats"; +App::$strings["channel sync processed"] = "sincronització del canal processada"; +App::$strings["queued"] = "Posat en cua"; +App::$strings["posted"] = "enviat"; +App::$strings["accepted for delivery"] = "acceptat per entregar"; +App::$strings["updated"] = "actualitzat"; +App::$strings["update ignored"] = "actualització ignorada"; +App::$strings["permission denied"] = "permís denegat"; +App::$strings["recipient not found"] = "Contenidor no trobat"; +App::$strings["mail recalled"] = "Recupera el correu"; +App::$strings["duplicate mail received"] = "rebut correu duplicat"; +App::$strings["mail delivered"] = "correu entregat"; +App::$strings["Delivery report for %1\$s"] = "Informe de lliurament per %1\$s"; +App::$strings["Options"] = "Opcions"; +App::$strings["Redeliver"] = "Tornar a lliurar"; App::$strings["Failed to create source. No channel selected."] = "Error en crear l'origen. Cap canal seleccionat."; App::$strings["Source created."] = "Origen creat."; App::$strings["Source updated."] = "Origen actualitzat."; @@ -1363,58 +1454,230 @@ App::$strings["Edit Source"] = "Edita la font"; App::$strings["Delete Source"] = "Esborra la font"; App::$strings["Source removed"] = "S'ha esborrat la font"; App::$strings["Unable to remove source."] = "No s'ha pogut esborrar la font."; -App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s esta seguint %2\$s de %3\$s"; -App::$strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s abandona el seguiment %2\$s de %3\$s"; +App::$strings["Like/Dislike"] = "M'agrada / No m'agrada"; +App::$strings["This action is restricted to members."] = "Aquesta acció està restringida als membres."; +App::$strings["Please login with your \$Projectname ID or register as a new \$Projectname member to continue."] = "Entra amb la teva identitat \$Projectname o registra't a \$Projectname per continuar."; +App::$strings["Invalid request."] = "Sol·licitud invàlida."; +App::$strings["channel"] = "canal"; +App::$strings["thing"] = "cosa"; +App::$strings["Channel unavailable."] = "El canal està inactiu."; +App::$strings["Previous action reversed."] = "S'ha desfet l'acció anterior."; +App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s agrada %2\$s de %3\$s"; +App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s no agrada %2\$s de %3\$s"; +App::$strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s està d'acord amb %3\$s de %2\$s"; +App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s no està d'acord amb %3\$s de %2\$s"; +App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s s'abstén en %3\$s de %2\$s"; +App::$strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s assistirà a %3\$s de %2\$s"; +App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s no assistirà a %3\$s de %2\$s"; +App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s potser assistirà a %3\$s de %2\$s"; +App::$strings["Action completed."] = "S'ha completat l'acció."; +App::$strings["Thank you."] = "Gràcies."; +App::$strings["No default suggestions were found."] = "No s'han trobat suggerències predefinides."; +App::$strings["%d rating"] = array( + 0 => "%d valoració", + 1 => "%d valoracions", +); +App::$strings["Gender: "] = "Gènere:"; +App::$strings["Status: "] = "Estatus:"; +App::$strings["Homepage: "] = "Pàgina Personal:"; +App::$strings["Age:"] = "Edat:"; +App::$strings["Location:"] = "Localització:"; +App::$strings["Description:"] = "Descripció:"; +App::$strings["Hometown:"] = "Ciutat Natal:"; +App::$strings["About:"] = "Sobre:"; +App::$strings["Connect"] = "Connecta "; +App::$strings["Public Forum:"] = "Forum Públic:"; +App::$strings["Keywords: "] = "Paraules Clau:"; +App::$strings["Don't suggest"] = "No suggerir"; +App::$strings["Common connections (estimated):"] = "Connexions en comú (aproximades):"; +App::$strings["Global Directory"] = "Directori Global"; +App::$strings["Local Directory"] = "Directori Local"; +App::$strings["Finding:"] = "Cercant:"; +App::$strings["Channel Suggestions"] = "Canals Suggerits"; +App::$strings["next page"] = "pàgina següent"; +App::$strings["previous page"] = "pàgina anterior"; +App::$strings["Sort options"] = "Opcions per ordenar"; +App::$strings["Alphabetic"] = "Alfabètic"; +App::$strings["Reverse Alphabetic"] = "Alfabètic Invers"; +App::$strings["Newest to Oldest"] = "De més Nou a més Vell"; +App::$strings["Oldest to Newest"] = "De més Antic a més Nou"; +App::$strings["No entries (some entries may be hidden)."] = "Sense entrades (algunes podrien estar amagades)."; +App::$strings["Xchan Lookup"] = "Cerca a xchan"; +App::$strings["Lookup xchan beginning with (or webbie): "] = "Cerca a xchan començant per (o webbie)"; App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hi ha suggerencies. Si es un lloc nou, espera 24 hores i proba de nou."; App::$strings["Ignore/Hide"] = "Ignora/Amaga"; -App::$strings["post"] = "entrada"; -App::$strings["comment"] = "comentari"; -App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetat %3\$s de %2\$s amb %4\$s"; +App::$strings["Unable to find your hub."] = "No es possible trobar el node"; +App::$strings["Post successful."] = "Entrada realitzada amb èxit. "; +App::$strings["Unable to lookup recipient."] = "Incapaç de trobar el destinatari."; +App::$strings["Unable to communicate with requested channel."] = "Incapaç de comunicar amb el canal demanat."; +App::$strings["Cannot verify requested channel."] = "No puc verificar el canal demanat."; +App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionat te restriccions sobre els missatges privats. L'enviament ha fallat."; +App::$strings["Messages"] = "Missatges"; +App::$strings["message"] = "missatge"; +App::$strings["Message recalled."] = "Recupera el missatge."; +App::$strings["Conversation removed."] = "Conversació eliminada."; +App::$strings["Expires YYYY-MM-DD HH:MM"] = "Expira YYYY-MM-DD HH:MM"; +App::$strings["Requested channel is not in this network"] = "El canal demanat no hi es en questa xarxa"; +App::$strings["Send Private Message"] = "Envia Missatge Privat"; +App::$strings["To:"] = "Per:"; +App::$strings["Subject:"] = "Assumpte:"; +App::$strings["Attach file"] = "Adjunta arxiu"; +App::$strings["Send"] = "Envia"; +App::$strings["Set expiration date"] = "Ajusta la data d'expiració"; +App::$strings["Delete message"] = "Elimina el missatge"; +App::$strings["Delivery report"] = "Informe d'entrega"; +App::$strings["Recall message"] = "Recupera el missatge"; +App::$strings["Message has been recalled."] = "El missatge s'ha recuperat."; +App::$strings["Delete Conversation"] = "Conversació esborrada"; +App::$strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Comunicació segura no disponible. Pots respondre des de la pàgina de perfil del remitent."; +App::$strings["Send Reply"] = "Envia Resposta"; +App::$strings["Your message for %s (%s):"] = "El teu missatge per %s (%s):"; +App::$strings["Public Hubs"] = "Nodes Públics"; +App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself may provide additional details."] = "Els nodes llistats permeten registrar usuaris de la xarxa \$Projectname. Com que tots els nodes estan enllaçats entre ells, la identitat és vàlida a tota la xarxa. Alguns nodes poden demanar subscripció o oferir serveis addicional de pagament. Per a més detalls, proveu de seguir els enllaços dels proveïdors."; +App::$strings["Hub URL"] = "URL del Node"; +App::$strings["Access Type"] = "Tipus d'accés"; +App::$strings["Registration Policy"] = "Condicions d'inscripció"; +App::$strings["Stats"] = "Estadístiques"; +App::$strings["Software"] = "Programari"; +App::$strings["Rate"] = "Puntua"; +App::$strings["webpage"] = "pàgina web"; +App::$strings["block"] = "bloc"; +App::$strings["layout"] = "disposició"; +App::$strings["menu"] = "menú"; +App::$strings["%s element installed"] = "%s element instal·lat"; +App::$strings["%s element installation failed"] = "%s instal·lació d'element va fallar"; +App::$strings["Select a bookmark folder"] = "Tria una carpeta d'interès"; +App::$strings["Save Bookmark"] = "Guarda Favorits"; +App::$strings["URL of bookmark"] = "URL de favorit"; +App::$strings["Or enter new bookmark folder name"] = "O entra un nou nom de favorit"; +App::$strings["Enter a folder name"] = "Escriu el nom de la carpeta"; +App::$strings["or select an existing folder (doubleclick)"] = "o escull-ne una d'existent amb doble clic"; +App::$strings["Save to Folder"] = "Guardar en la Carpeta"; +App::$strings["Fetching URL returns error: %1\$s"] = "URL sol·licitada retorna error: %1\$s"; +App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Nombre màxim d'inscripcions diaris excedit. Si us plau, provau demà."; +App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "L'inscripció ha fallat. Si et plau, indica que acceptes les Condicions del Servei."; +App::$strings["Passwords do not match."] = "Les contrasenyes no coincideixen."; +App::$strings["Registration successful. Continue to create your first channel..."] = "S'ha registrat el compte amb èxit. Ara pots crear el teu primer canal..."; +App::$strings["Registration successful. Please check your email for validation instructions."] = "Registrat amb èxit. Si et plau revisa el teu correu electrònic per a les instruccions de validació."; +App::$strings["Your registration is pending approval by the site owner."] = "La teva inscripció esta pendent de validació pel propietari del lloc."; +App::$strings["Your registration can not be processed."] = "La teva inscripció no ha pogut ser processat. "; +App::$strings["Registration on this hub is disabled."] = "L'inscripció en aquest node està deshabilitat."; +App::$strings["Registration on this hub is by approval only."] = "L'inscripció en aquest node es únicament per validació."; +App::$strings["Register at another affiliated hub."] = "Inscripció en altre node afiliat"; +App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "El lloc ha excedit el límit màxim diari de nous comptes/inscripció. Provau demà."; +App::$strings["I accept the %s for this website"] = "Accepto el %s per a aquest lloc web"; +App::$strings["I am over %s years of age and accept the %s for this website"] = "Tinc més de %s anys i accepto les %s"; +App::$strings["Your email address"] = "La teva adreça de correu electrónic"; +App::$strings["Choose a password"] = "Tria una contrasenya"; +App::$strings["Please re-enter your password"] = "Si et plau, re-entra la contrasenya"; +App::$strings["Please enter your invitation code"] = "Si et plau, introdueix el teu codi d'invitació"; +App::$strings["no"] = "no"; +App::$strings["yes"] = "sí"; +App::$strings["Membership on this site is by invitation only."] = "La pertinença en aquest lloc es per invitació exclusivament."; +App::$strings["Register"] = "Inscripció"; +App::$strings["This site requires email verification. After completing this form, please check your email for further instructions."] = "Aquest node demana que es verifiquin els comptes de correu. Un cop completat el formulari, comprova la teva safata d'entrada i segueix les instruccions que hi trobaràs."; +App::$strings["Cover Photos"] = "Fotos de Portada"; +App::$strings["female"] = "femení"; +App::$strings["%1\$s updated her %2\$s"] = "%1\$s actualitzà el seu %2\$s"; +App::$strings["male"] = "masculí"; +App::$strings["%1\$s updated his %2\$s"] = "%1\$s actualitzà el seu %2\$s"; +App::$strings["%1\$s updated their %2\$s"] = "%1\$s actualitzà els seus %2\$s"; +App::$strings["cover photo"] = "Foto de la portada"; +App::$strings["Change Cover Photo"] = "Canvia la foto de portada"; +App::$strings["Documentation Search"] = "Cerca de Documentació"; +App::$strings["About"] = "El Meu Perfil"; +App::$strings["Administrators"] = "Administradors"; +App::$strings["Developers"] = "Desenvolupadors"; +App::$strings["Tutorials"] = "Tutorials"; +App::$strings["\$Projectname Documentation"] = "\$Projectname Documentació"; +App::$strings["Contents"] = "Continguts"; +App::$strings["Article"] = "Article"; +App::$strings["Item has been removed."] = "S'ha esborrat l'element."; App::$strings["Tag removed"] = "S'ha tret l'etiqueta"; App::$strings["Remove Item Tag"] = "Elimina l'etiqueta d'element"; App::$strings["Select a tag to remove: "] = "Tria l'etiqueta a eliminar:"; -App::$strings["Thing updated"] = "S'ha actualitzat la cosa"; -App::$strings["Object store: failed"] = "No s'ha pogut emmagatzemar l'objecte"; -App::$strings["Thing added"] = "S'ha afegit la cosa"; -App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s"; -App::$strings["Show Thing"] = "Mostra la cosa"; -App::$strings["item not found."] = "no s'ha trobat l'element."; -App::$strings["Edit Thing"] = "Edita la cosa"; -App::$strings["Select a profile"] = "Tria un perfil"; -App::$strings["Post an activity"] = "Publica una activitat"; -App::$strings["Only sends to viewers of the applicable profile"] = "S'envia només a visitants del perfil corresponent"; -App::$strings["Name of thing e.g. something"] = "Nom de la cosa. Exemple: patata"; -App::$strings["URL of thing (optional)"] = "Adreça URL de la cosa (opcional)"; -App::$strings["URL for photo of thing (optional)"] = "Adreça URL de la foto d'una cosa (opcional)"; -App::$strings["Add Thing to your Profile"] = "Afegeix una cosa al teu perfil"; -App::$strings["Export Channel"] = "Exportar Canal"; -App::$strings["Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exporta la informació bàsica del canal a un arxiu. Això actua com a còpia de recolzament de les teves connexions, permisos, perfil i dades bàsiques, les quals pots emprar per traslladar aquestes dades a una altre lloc/node, però no conté el contingut del canal."; -App::$strings["Export Content"] = "Exportar el Contingut"; -App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin."] = "Exporta la informació del canal i tot el contingut recent a un arxiu de recolzament JSON que por ser restaurat o importat en altre lloc/node. Això còpia totes les teves connexions, permisos, perfil i dades i mesos de entrades. L'arxiu pot ser MOLT gran. Si et plau, sigues pacient ja que pot trigar uns minuts a començar a baixar."; -App::$strings["Export your posts from a given year."] = "Exporta les teves entrades d'un any donat."; -App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Pots també exportar les teves entrades i conversacions d'un any o un mes en particular. Ajusta la data a la barra de direccions del navegador per seleccionar altres dates. Si la exportació falla (possiblement degut al esgotament de la memòria del node servidor), si et plau, intenta de nou la selecció d'un rang de dates més limitat."; -App::$strings["To select all posts for a given year, such as this year, visit %2\$s"] = "Per seleccionar tots els missatges per a un any determinat, com aquest any, visiteu %2\$s"; -App::$strings["To select all posts for a given month, such as January of this year, visit %2\$s"] = "Per seleccionar tots els missatges per a un mes determinat, com el de gener d'aquest any, visiteu %2\$s"; -App::$strings["These content files may be imported or restored by visiting %2\$s on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Aquests arxius de contingut poden ser importats o restaurats per visitar %2\$s en qualsevol lloc que conté el teu canal. Per obtenir els millors resultats si us plau, importar o restaurar aquests en ordre de data (la més antiga primer)."; +App::$strings["No such group"] = "No existeix el grup"; +App::$strings["No such channel"] = "No existeix el canal"; +App::$strings["forum"] = "fòrum"; +App::$strings["Search Results For:"] = "Cerca resultats per:"; +App::$strings["Privacy group is empty"] = "el grup privat està vuit"; +App::$strings["Privacy group: "] = "Grup privat:"; +App::$strings["Invalid connection."] = "La connexió és invàlida."; +App::$strings["Invalid channel."] = "El canal no és vàlid."; +App::$strings["network"] = "xarxa"; +App::$strings["\$Projectname"] = "\$Projectname"; +App::$strings["Welcome to %s"] = "Benvingut a %s"; +App::$strings["Permission Denied."] = "Permisos Denegats."; +App::$strings["File not found."] = "Arxiu no torbat."; +App::$strings["Edit file permissions"] = "Edita els permisos d'arxiu"; +App::$strings["Set/edit permissions"] = "Canvia/edita permisos"; +App::$strings["Include all files and sub folders"] = "Inclou tots als arxius i subdirectoris"; +App::$strings["Return to file list"] = "Tornar al llistat d'arxius"; +App::$strings["Copy/paste this code to attach file to a post"] = "Copia/enganxa aquest codi per a adjuntar un arxiu a l'entrada"; +App::$strings["Copy/paste this URL to link file from a web page"] = "Copia/enganxa aquesta URL per a enllaçar l'arxiu d'una pàgina web"; +App::$strings["Share this file"] = "Comparteix l'arxiu"; +App::$strings["Show URL to this file"] = "Mostra la URL d'aquest arxiu"; +App::$strings["Show in your contacts shared folder"] = "Mostra les carpetes compartides dels teus contactes"; +App::$strings["No channel."] = "No s'ha trobat el canal"; +App::$strings["No connections in common."] = "No hi ha connexions en comú."; +App::$strings["View Common Connections"] = "Mostra les connexions en comú"; +App::$strings["Email verification resent"] = "S'ha tornat a enviar la verificació de orreu"; +App::$strings["Unable to resend email verification message."] = "No s'ha pogut tornar a enviar el correu de verificació."; App::$strings["No connections."] = "Sense connexions."; App::$strings["Visit %s's profile [%s]"] = "Visita el perfil [%s] de %s"; App::$strings["View Connections"] = "Veure Connexions"; -App::$strings["Source of Item"] = "Origen de l'article"; -App::$strings["Webpages"] = "Pàgines web"; -App::$strings["Actions"] = "Accions"; -App::$strings["Page Link"] = "Enllaç a Pàgina"; -App::$strings["Page Title"] = "Títol de la pàgina"; -App::$strings["Xchan Lookup"] = "Cerca a xchan"; -App::$strings["Lookup xchan beginning with (or webbie): "] = "Cerca a xchan començant per (o webbie)"; +App::$strings["Blocked accounts"] = "Comptes bloquejats"; +App::$strings["Expired accounts"] = "Comptes caducats"; +App::$strings["Expiring accounts"] = "Comptes a punt de caducar"; +App::$strings["Clones"] = "Clons"; +App::$strings["Message queues"] = "Cues de missatges"; +App::$strings["Your software should be updated"] = "El teu programari cal que s'actualitzi"; +App::$strings["Summary"] = "Sumari"; +App::$strings["Registered accounts"] = "Comptes registrades"; +App::$strings["Pending registrations"] = "Comptes pendents d'inscripció"; +App::$strings["Registered channels"] = "Canals registrats"; +App::$strings["Active plugins"] = "Extensions actives"; +App::$strings["Version"] = "Versió"; +App::$strings["Repository version (master)"] = "Versió (master) del repositori"; +App::$strings["Repository version (dev)"] = "Versió (desenvolupament) del repositori"; +App::$strings["No service class restrictions found."] = "No s'han trobat restriccions de clase."; +App::$strings["Website:"] = "Lloc web:"; +App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Canal Remot [%s] (encara no es coneix en aquest lloc)"; +App::$strings["Rating (this information is public)"] = "Valoració (aquesta informació és pública)"; +App::$strings["Optionally explain your rating (this information is public)"] = "Opcionalment pots explicar la teva qualificació (aquesta informació és pública)"; +App::$strings["Edit Card"] = "Edita la targeta"; +App::$strings["No valid account found."] = "No es troba un compte vàlid."; +App::$strings["Password reset request issued. Check your email."] = "Sol·licitud de restabliment de contrasenya emesa. Consulta el teu correu electrònic."; +App::$strings["Site Member (%s)"] = "Lloc d'Usuari (%s)"; +App::$strings["Password reset requested at %s"] = "S'ha soŀlicitat restablir la contrasenya al hub %s"; +App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Ha fallat el restabliment de contrasenya perquè la no s'ha pogut verificar soŀlicitud. Pot ser que ja ho hàgiu soŀlicitat abans."; +App::$strings["Password Reset"] = "Restabliment de contrasenya"; +App::$strings["Your password has been reset as requested."] = "S'ha restablert la vostra contrasenya."; +App::$strings["Your new password is"] = "La nova contrasenya és"; +App::$strings["Save or copy your new password - and then"] = "Desa o copia la nova contrasenya, i després"; +App::$strings["click here to login"] = "fes clic aquí per iniciar sessió"; +App::$strings["Your password may be changed from the Settings page after successful login."] = "Pots canviar la contrasenya a la pàgina Paràmetres, un cop iniciada la sessió."; +App::$strings["Your password has changed at %s"] = "La teva contrasenya a %s ha canviat"; +App::$strings["Forgot your Password?"] = "No recordes la contrasenya?"; +App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Escriu la teva adreça de correu electrònic i envia per restablir la contrasenya. Després revisa el seu correu electrònic per obtenir més instruccions."; +App::$strings["Email Address"] = "Adreça electrònica"; +App::$strings["Mark all seen"] = "Marca tot com ja vist"; +App::$strings["0. Beginner/Basic"] = "0. Bàsic, principiant"; +App::$strings["1. Novice - not skilled but willing to learn"] = "1. Novell - amb pocs coneixements però amb ganes d'aprendre"; +App::$strings["2. Intermediate - somewhat comfortable"] = "2. Intermedi - més o menys còmode"; +App::$strings["3. Advanced - very comfortable"] = "3. Avançat - molt còmode"; +App::$strings["4. Expert - I can write computer code"] = "4. Expert - puc escriure codi en algun llenguatge de programació"; +App::$strings["5. Wizard - I probably know more than you do"] = "5. Ninja - probablement en sé més que tu"; App::$strings["Site Admin"] = "Administració"; -App::$strings["Bug Report"] = "Informe d'Errors"; +App::$strings["Report Bug"] = "Informa d'errors"; App::$strings["View Bookmarks"] = "Veure Marcadors"; App::$strings["My Chatrooms"] = "Les meves Sales de Xat"; App::$strings["Firefox Share"] = "Compartir amb Firefox"; App::$strings["Remote Diagnostics"] = "Diagnòstics Remots"; App::$strings["Suggest Channels"] = "Suggerir Canals"; App::$strings["Login"] = "Identifica't"; -App::$strings["Grid"] = "Malla"; +App::$strings["Activity"] = "Activitat"; +App::$strings["Wiki"] = "Wiki"; App::$strings["Channel Home"] = "Canal Personal"; App::$strings["Events"] = "Esdeveniments"; App::$strings["Directory"] = "Directori"; @@ -1425,8 +1688,48 @@ App::$strings["Suggest"] = "Suggeriment"; App::$strings["Random Channel"] = "Canal Aleatori"; App::$strings["Invite"] = "Convida"; App::$strings["Features"] = "Funcionalitats"; +App::$strings["Language"] = "Idioma"; App::$strings["Post"] = "Entrada"; +App::$strings["Profile Photo"] = "Foto del Perfil"; App::$strings["Purchase"] = "Compra"; +App::$strings["Undelete"] = "Desfés l'operació d'esborrar"; +App::$strings["Add to app-tray"] = "Afegeix a la safata d'aplicacions"; +App::$strings["Remove from app-tray"] = "Esborra de la safata d'aplicacions"; +App::$strings["Pin to navbar"] = "Fixa a la barra de navegació"; +App::$strings["Unpin from navbar"] = "Treu de la barra de navegació"; +App::$strings["__ctx:permcat__ default"] = "per defecte"; +App::$strings["__ctx:permcat__ follower"] = "seguidor"; +App::$strings["__ctx:permcat__ contributor"] = "contribuïdor"; +App::$strings["__ctx:permcat__ publisher"] = "publicador"; +App::$strings["(No Title)"] = "(sense títol)"; +App::$strings["Wiki page create failed."] = "No s'ha pogut crear la pàgina a la wiki."; +App::$strings["Wiki not found."] = "No s'ha trobat la wiki."; +App::$strings["Destination name already exists"] = "El nom de destí ja existeix"; +App::$strings["Page not found"] = "No s'ha trobat la pàgina"; +App::$strings["Error reading page content"] = "S'ha produït un error en carregar el contingut de la pàgina"; +App::$strings["Error reading wiki"] = "S'ha produït un error en carregar la wiki"; +App::$strings["Page update failed."] = "No s'ha pogut actualitzar la pàgina."; +App::$strings["Nothing deleted"] = "No s'ha esborrat res"; +App::$strings["Compare: object not found."] = "S'ha produït un error en comparar la pàgina."; +App::$strings["Page updated"] = "S'ha actualitzat la pàgina"; +App::$strings["Untitled"] = "Sense títol"; +App::$strings["Wiki resource_id required for git commit"] = "Per a fer el git commit cal el resource_id de la wiki"; +App::$strings["__ctx:wiki_history__ Message"] = "Missatge"; +App::$strings["Different viewers will see this text differently"] = "Diferents observadors veuran aquest text de diferents formes"; +App::$strings["Visible to your default audience"] = "Visible per a la teva audiència "; +App::$strings["Only me"] = "Només jo"; +App::$strings["Public"] = "Públic"; +App::$strings["Anybody in the \$Projectname network"] = "Ningú a la xarxa \$Projectname"; +App::$strings["Any account on %s"] = "Qualsevol compte a %s"; +App::$strings["Any of my connections"] = "Qualsevol de les meves connexions"; +App::$strings["Only connections I specifically allow"] = "Només les connexions que permeto específicament"; +App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Qualsevol persona autenticada (podria incloure als usuaris d'altres xarxes)"; +App::$strings["Any connections including those who haven't yet been approved"] = "Qualsevol connexió incloent aquells que encara no han estat aprovats"; +App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Aquest és l'ajust per defecte per al públic del seu flux normal i entrades."; +App::$strings["This is your default setting for who can view your default channel profile"] = "Aquesta és la configuració per defecte per a qui pugui veure el teu perfil per defecte del canal"; +App::$strings["This is your default setting for who can view your connections"] = "Aquesta és la configuració per defecte per a qui pugui veure les teves connexions"; +App::$strings["This is your default setting for who can view your file storage and photos"] = "Aquesta és la configuració per defecte per a qui pugui veure els teus arxius i fotos"; +App::$strings["This is your default setting for the audience of your webpages"] = "Aquests son els ajustos per defecte de l'audiència de les teves pàgines web"; App::$strings["Missing room name"] = "Perdut el nom de la sala"; App::$strings["Duplicate room name"] = "Nom de la sala duplicat"; App::$strings["Invalid room specifier."] = "Especificació de la sala invàlida."; @@ -1436,47 +1739,63 @@ App::$strings["\$Projectname Notification"] = "Notificació de \$Projectname"; App::$strings["\$projectname"] = "\$projectname"; App::$strings["Thank You,"] = "Gràcies,"; App::$strings["%s Administrator"] = "%s Administrador"; +App::$strings["This email was sent by %1\$s at %2\$s."] = "Aquest correu ha estat enviat per %1\$s a %2\$s."; +App::$strings["To stop receiving these messages, please adjust your Notification Settings at %s"] = "Per deixar de rebre aquests missatges, modifica la configuració de notificacions a %s"; +App::$strings["To stop receiving these messages, please adjust your %s."] = "Per deixar de rebre aquests missatges, modifica la teva %s."; App::$strings["%s "] = "%s "; -App::$strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Notify] Nou corrreu rebut en %s"; -App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s t'ha enviat un nou missatge privat a %3\$s."; +App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Avís] S'ha rebut correu nou a %s"; +App::$strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s t'ha enviat un missatge privat a %2\$s."; App::$strings["%1\$s sent you %2\$s."] = "%1\$s t'ha enviat %2\$s."; App::$strings["a private message"] = "un missatge privat"; App::$strings["Please visit %s to view and/or reply to your private messages."] = "Per favor, visita %s per a veure i/o respondre els teus missatges privats."; -App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s comentat en [zrl=%3\$s]a %4\$s[/zrl]"; -App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s comentat en [zrl=%3\$s]%4\$s de %5\$s[/zrl]"; -App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s comentat en [zrl=%3\$s]el teu %4\$s[/zrl]"; -App::$strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Notify] Comentari sobre una conversació #%1\$d per %2\$s"; -App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s comentat en un article/conversa que havies estat seguint."; +App::$strings["commented on"] = "ha comentat"; +App::$strings["liked"] = "li ha agradat"; +App::$strings["disliked"] = "no li ha agradat"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]%5\$s de %4\$s[/zrl]"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]la teva %4\$s[/zrl]"; +App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Avís] S'ha moderat el comentari de %2\$s a la conversa #%1\$d"; +App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Avís] Comentari de %2\$s a la conversa #%1\$d"; +App::$strings["%1\$s commented on an item/conversation you have been following."] = "%1\$s ha comentat en una conversa que estàs seguint."; App::$strings["Please visit %s to view and/or reply to the conversation."] = "Si us plau visita %s per veure i/o contestar a la conversa"; -App::$strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Avís] %s ha escrit una entrada al teu mur"; -App::$strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s ha escrit una entrada al teu mur en %3\$s"; -App::$strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s enviat correu a [zrl=%3\$s]el teu mur[/zrl]"; -App::$strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Notificació] %s t'ha etiquetat"; -App::$strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s t'ha etiquetat a %3\$s"; -App::$strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]t'ha etiquetat[/zrl]."; -App::$strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Avís] %1\$s s'en fot de tu"; -App::$strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s s'en fot de tú a %3\$s"; -App::$strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]s'en fot de tú[/zrl]."; -App::$strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Avís] %s ha etiquetat la teva entrada"; -App::$strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha etiquetat la teva entrada a %3\$s"; -App::$strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s etiquetat [zrl=%3\$s]la teva entrada[/zrl]"; -App::$strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Avís] Presentació rebuda"; -App::$strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, has rebut una nova petició de connexió de '%2\$s' a %3\$s"; -App::$strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, has rebut [zrl=%2\$s]una nova petició de connexió[/zrl] de %3\$s."; +App::$strings["Please visit %s to approve or reject this comment."] = "Vés a %s per a aprovar o rebutjar el comentari."; +App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = "A %1\$s li ha agradat [zrl=%2\$s]la teva %3\$s[/zrl]"; +App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Avís] Un \"m'agrada\" a la conversa #%1\$d de %2\$s"; +App::$strings["%1\$s liked an item/conversation you created."] = "A %1\$s li ha agradat una conversa que has creat."; +App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = "[\$Projectname:Avís] %s ha penjat una entrada al teu mur"; +App::$strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s ha publicat al mur del teu perfil a %2\$s"; +App::$strings["%1\$s posted to [zrl=%2\$s]your wall[/zrl]"] = "%1\$s ha publicat al [zrl=%2\$s]teu mur[/zrl]"; +App::$strings["[\$Projectname:Notify] %s tagged you"] = "[\$Projectname:Avís] %s t'ha etiquetat"; +App::$strings["%1\$s tagged you at %2\$s"] = "%1\$s t'ha etiquetat a %2\$s"; +App::$strings["%1\$s [zrl=%2\$s]tagged you[/zrl]."] = "%1\$s [zrl=%2\$s]t'ha etiquetat[/zrl]."; +App::$strings["[\$Projectname:Notify] %1\$s poked you"] = "[\$Projectname:Avís] %1\$s t'ha fet un toc"; +App::$strings["%1\$s poked you at %2\$s"] = "%1\$s t'ha fet un toc a %2\$s"; +App::$strings["%1\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s [zrl=%2\$s]t'ha fet un toc[/zrl]."; +App::$strings["[\$Projectname:Notify] %s tagged your post"] = "[\$Projectname:Avís] %s t'ha etiquetat una entrada"; +App::$strings["%1\$s tagged your post at %2\$s"] = "%1\$s ha etiquetat una entrada teva a %2\$s"; +App::$strings["%1\$s tagged [zrl=%2\$s]your post[/zrl]"] = "%1\$s ha etiquetat [zrl=%2\$s]la teva entrada[/zrl]"; +App::$strings["[\$Projectname:Notify] Introduction received"] = "[\$Projectname:Avís] S'ha rebut una sol·licitud de connexió"; +App::$strings["You've received an new connection request from '%1\$s' at %2\$s"] = "Has rebut una soŀlicitud de connexió de '%1\$s' a %2\$s"; +App::$strings["You've received [zrl=%1\$s]a new connection request[/zrl] from %2\$s."] = "Has rebut [zrl=%1\$s]una soŀlicitud de connexió[/zrl] de %2\$s."; App::$strings["You may visit their profile at %s"] = "Pots visitar el seu perfil a %s"; App::$strings["Please visit %s to approve or reject the connection request."] = "Si us plau, visita %s per aprovar o rebutjar la petició de connexió."; -App::$strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Notificació] Rebuda suggerencia d'amistat"; -App::$strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, has rebut una suggerència d'amistat de '%2\$s' a %3\$s"; -App::$strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, has rebut [zrl=%2\$s]una suggerència d'amistat[/zrl] per %3\$s de %4\$s."; +App::$strings["[\$Projectname:Notify] Friend suggestion received"] = "[\$Projectname:Avís] S'ha rebut una suggerència d'amistat"; +App::$strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Has rebut una soŀlicitud d'amistat de '%1\$s' a %2\$s"; +App::$strings["You've received [zrl=%1\$s]a friend suggestion[/zrl] for %2\$s from %3\$s."] = "Has rebut [zrl=%1\$s]una soŀlicitud d'amistat[/zrl] per a %2\$s de part de %3\$s."; App::$strings["Name:"] = "Nom:"; App::$strings["Photo:"] = "Foto:"; App::$strings["Please visit %s to approve or reject the suggestion."] = "Per favor, visita %s per a aprovar o rebutjar la suggerencia."; -App::$strings["[Hubzilla:Notify]"] = "[Hubzilla:Notificació]"; +App::$strings["[\$Projectname:Notify]"] = "[\$Projectname:Avís]"; App::$strings["created a new post"] = "Creada una nova entrada"; App::$strings["commented on %s's post"] = "comentat a l'entrada de %s"; +App::$strings["edited a post dated %s"] = "ha editat una entrada amb data de %s"; +App::$strings["edited a comment dated %s"] = "ha editat un comentari amb data de %s"; +App::$strings["Wiki updated successfully"] = "S'ha actualitzat la wiki amb èxit"; +App::$strings["Wiki files deleted successfully"] = "S'han esborrat els fitxers de la wiki amb èxit"; +App::$strings["Update Error at %s"] = "Error d'Actualització a %s"; +App::$strings["Update %s failed. See error logs."] = "L'actualització %s ha fallat. Mira el registre d'errors."; App::$strings["Private Message"] = "Missatge Privat"; App::$strings["Select"] = "Selecciona"; -App::$strings["Save to Folder"] = "Guardar en la Carpeta"; App::$strings["I will attend"] = "Assistiré"; App::$strings["I will not attend"] = "No assistiré"; App::$strings["I might attend"] = "Podria assistir"; @@ -1507,291 +1826,866 @@ App::$strings["via Wall-To-Wall:"] = "via Mur-a-Mur:"; App::$strings["from %s"] = "De %s"; App::$strings["last edited: %s"] = "últim editat: %s"; App::$strings["Expires: %s"] = "Expira: %s"; +App::$strings["Attend"] = "Assistir-hi"; +App::$strings["Attendance Options"] = "Opcions d'assistència"; +App::$strings["Vote"] = "Votar"; +App::$strings["Voting Options"] = "Opcions de votació"; App::$strings["Save Bookmarks"] = "Guarda Favorits"; App::$strings["Add to Calendar"] = "Afegeix al Calendari"; -App::$strings["Mark all seen"] = "Marca tot com ja vist"; -App::$strings["[+] show all"] = "[+] mostra tot"; +App::$strings["This is an unsaved preview"] = "Això només és una vista prèvia, no està desada"; +App::$strings["%s show all"] = "%s mostra-ho tot"; App::$strings["Bold"] = "Negreta"; App::$strings["Italic"] = "Italica"; App::$strings["Underline"] = "Subratllat"; App::$strings["Quote"] = "Cometes"; App::$strings["Code"] = "Codi"; App::$strings["Image"] = "Imatge"; +App::$strings["Attach File"] = "Adjunta un fitxer"; App::$strings["Insert Link"] = "Insereix Enllaç"; App::$strings["Video"] = "Video"; -App::$strings["No username found in import file."] = "No s'ha trobat nom d'usuari a l'arxiu d'importació."; -App::$strings["Unable to create a unique channel address. Import failed."] = "No s'ha pogut importar el canal perquè l'adreça única de canal no s'ha pogut crear."; -App::$strings["Cannot locate DNS info for database server '%s'"] = "No s'ha trobat informació de DNS pel servidor de base de dades '%s'"; +App::$strings["Your full name (required)"] = "Nom complet (obligatori)"; +App::$strings["Your email address (required)"] = "Adreça de correu (obligatòria)"; +App::$strings["Your website URL (optional)"] = "Adreça web (opcional)"; +App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Autenticació remota bloquejada. Ha iniciat sessió en aquest lloc a nivell local. Si us plau, tanca la sessió i torna-ho a intentar."; +App::$strings["Welcome %s. Remote authentication successful."] = "Benvingut %s. Autenticació remota reeixida."; +App::$strings["parent"] = "amunt"; +App::$strings["Collection"] = "Col·lecció"; +App::$strings["Principal"] = "Principal"; +App::$strings["Addressbook"] = "Llista d'Adreçes"; +App::$strings["Calendar"] = "Calendari"; +App::$strings["Schedule Inbox"] = "Programació de la bústia d'entrada"; +App::$strings["Schedule Outbox"] = "Programació de la bústia de sortida"; +App::$strings["Total"] = "Total"; +App::$strings["Shared"] = "Compartit"; +App::$strings["Add Files"] = "Afegeix arxius"; +App::$strings["You are using %1\$s of your available file storage."] = "Estàs emprant el %1\$s de l'espai d'emmagatzematge disponible"; +App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s%)"] = "Estàs emprant %1\$s de %2\$s d'emmagatzematge d'arxius disponible.\n(%3\$s%)"; +App::$strings["WARNING:"] = "ALERTA:"; +App::$strings["Create new folder"] = "Crea una nova carpeta"; +App::$strings["Upload file"] = "Puja arxiu"; +App::$strings["Drop files here to immediately upload"] = "Deixa anar fitxers aquí per a pujar-los immediatament"; +App::$strings["Forums"] = "Forums"; +App::$strings["Select Channel"] = "Escull canal"; +App::$strings["Read-write"] = "Llegir i escriure"; +App::$strings["Read-only"] = "Només lectura"; +App::$strings["My Calendars"] = "Els meus calendaris"; +App::$strings["Shared Calendars"] = "Calendaris compartits"; +App::$strings["Share this calendar"] = "Comparteix aquest calendari"; +App::$strings["Calendar name and color"] = "Nom i color del calendari"; +App::$strings["Create new calendar"] = "Crea un nou calendari"; +App::$strings["Calendar Name"] = "Nom del calendari"; +App::$strings["Calendar Tools"] = "Eines de calendari"; +App::$strings["Import calendar"] = "Importa un calendari"; +App::$strings["Select a calendar to import to"] = "Escull el calendari a on importar"; +App::$strings["Addressbooks"] = "Llibretes d'adreces"; +App::$strings["Addressbook name"] = "Nom de llibreta d'adreces"; +App::$strings["Create new addressbook"] = "Crea una nova llibreta d'adreces"; +App::$strings["Addressbook Name"] = "Nom de llibreta d'adreces"; +App::$strings["Addressbook Tools"] = "Eines de llibreta d'adreces"; +App::$strings["Import addressbook"] = "Importa una llibreta d'adreces"; +App::$strings["Select an addressbook to import to"] = "Escull la llibreta d'adreces a on importar"; App::$strings["Categories"] = "Categories"; -App::$strings["Tags"] = "Etiquetes"; -App::$strings["Keywords"] = "Paraules clau"; -App::$strings["have"] = "tinc"; -App::$strings["has"] = "tens"; -App::$strings["want"] = "vull"; -App::$strings["wants"] = "vols"; -App::$strings["likes"] = "agrada"; -App::$strings["dislikes"] = "desagrada"; -App::$strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; -App::$strings["Starts:"] = "Inicia:"; -App::$strings["Finishes:"] = "Acaba:"; -App::$strings["This event has been added to your calendar."] = "Aquest succés ha estat afegit al teu calendari."; -App::$strings["Not specified"] = "Sense especificar"; -App::$strings["Needs Action"] = "Necessita una Acció"; -App::$strings["Completed"] = "Completat"; -App::$strings["In Process"] = "En Procès"; -App::$strings["Cancelled"] = "Cancel·lat"; -App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No s'ha pogut importar el canal perquè l'identificador del canal no s'ha pogut duplicar en aquest servidor."; -App::$strings["Channel clone failed. Import failed."] = "No s'ha pogut importar el canal perquè el canal no s'ha pogut clonar."; -App::$strings["(Unknown)"] = "(Desconegut)"; -App::$strings["Visible to anybody on the internet."] = "Visible per tothom a la Internet"; -App::$strings["Visible to you only."] = "Visible només per tú."; -App::$strings["Visible to anybody in this network."] = "Visible per tothom en aquesta xarxa."; -App::$strings["Visible to anybody authenticated."] = "Visible per tothom autenticat."; -App::$strings["Visible to anybody on %s."] = "Visible per a tothom a %s."; -App::$strings["Visible to all connections."] = "Visible per a totes les connexions."; -App::$strings["Visible to approved connections."] = "Visible per a les connexions aprovades."; -App::$strings["Visible to specific connections."] = "Visible per a específiques connexions."; -App::$strings["Privacy group is empty."] = "El grup privat està vuit."; -App::$strings["Privacy group: %s"] = "Grup privat: %s"; -App::$strings["Connection not found."] = "Connexió no trobada."; -App::$strings["profile photo"] = "foto del perfil"; -App::$strings["No recipient provided."] = "No s'ha proporcionat bústia."; -App::$strings["[no subject]"] = "[no subject]"; -App::$strings["Unable to determine sender."] = "incapaç de determinar el remitent"; -App::$strings["Stored post could not be verified."] = "L'entrada guardada no pot ser verificada"; -App::$strings["prev"] = "prev"; -App::$strings["first"] = "primer"; -App::$strings["last"] = "últim"; -App::$strings["next"] = "pròxim"; -App::$strings["older"] = "el més antic"; -App::$strings["newer"] = "El més nou"; -App::$strings["No connections"] = "Sense Connexions"; -App::$strings["View all %s connections"] = "Veure totes les connexions de %s"; -App::$strings["poke"] = "esperona"; -App::$strings["poked"] = "esperonat"; -App::$strings["ping"] = "coloca"; -App::$strings["pinged"] = "colocat"; -App::$strings["prod"] = "picar"; -App::$strings["prodded"] = "picat"; -App::$strings["slap"] = "bufetada"; -App::$strings["slapped"] = "bufetejat"; -App::$strings["finger"] = "senyal"; -App::$strings["fingered"] = "senyalat"; -App::$strings["rebuff"] = "menyspreu"; -App::$strings["rebuffed"] = "menyspreuat"; -App::$strings["happy"] = "feliç"; -App::$strings["sad"] = "trist"; -App::$strings["mellow"] = "melós"; -App::$strings["tired"] = "cansat"; -App::$strings["perky"] = "turgent"; -App::$strings["angry"] = "enfadat"; -App::$strings["stupefied"] = "estupefacte"; -App::$strings["puzzled"] = "perplexe"; -App::$strings["interested"] = "Interessat"; -App::$strings["bitter"] = "amargat"; -App::$strings["cheerful"] = "feliç"; -App::$strings["alive"] = "viu"; -App::$strings["annoyed"] = "molest"; -App::$strings["anxious"] = "ansiós"; -App::$strings["cranky"] = "malagaitós"; -App::$strings["disturbed"] = "transtornat"; -App::$strings["frustrated"] = "frustrat"; -App::$strings["depressed"] = "deprimit"; -App::$strings["motivated"] = "motivat"; -App::$strings["relaxed"] = "relaxat"; -App::$strings["surprised"] = "sorprès"; -App::$strings["Monday"] = "Dilluns"; -App::$strings["Tuesday"] = "Dimarts"; -App::$strings["Wednesday"] = "Dimecres"; -App::$strings["Thursday"] = "Dijous"; -App::$strings["Friday"] = "Divendres"; -App::$strings["Saturday"] = "Dissabte"; -App::$strings["Sunday"] = "Diumenge"; -App::$strings["January"] = "Gener"; -App::$strings["February"] = "Febrer"; -App::$strings["March"] = "Març"; -App::$strings["April"] = "Abril"; -App::$strings["May"] = "Maig"; -App::$strings["June"] = "Juny"; -App::$strings["July"] = "Juliol"; -App::$strings["August"] = "Agost"; -App::$strings["September"] = "Setembre"; -App::$strings["October"] = "Octubre"; -App::$strings["November"] = "Novembre"; -App::$strings["December"] = "Desembre"; -App::$strings["Unknown Attachment"] = "Adjunt Desconegut"; -App::$strings["unknown"] = "desconegut"; -App::$strings["remove category"] = "elimina categoria"; -App::$strings["remove from file"] = "elimina del arxiu"; -App::$strings["default"] = "per defecte"; -App::$strings["Page layout"] = "Format de la pàgina"; -App::$strings["You can create your own with the layouts tool"] = "Pots crear el teu propi amb l'editor de format de pàgina."; -App::$strings["Page content type"] = "Tipus de contingut de la pàgina"; -App::$strings["Select an alternate language"] = "Tria un idioma alternatiu"; -App::$strings["activity"] = "activitat"; -App::$strings["Design Tools"] = "Eines de disseny"; -App::$strings["Pages"] = "Pàgines"; -App::$strings["System"] = "Sistema"; -App::$strings["New App"] = "Nova App"; -App::$strings["Suggestions"] = "Suggerencies"; -App::$strings["See more..."] = "Veure més....."; -App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Tens %1$.0f de %2$.0f connexions permeses."; -App::$strings["Add New Connection"] = "Afegeix una Nova Connexió"; -App::$strings["Enter channel address"] = "Introdueix l'adreça del canal"; -App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Exemples: bob@example.com, https://exemple.com/barbara"; -App::$strings["Notes"] = "Notes"; -App::$strings["Remove term"] = "Plaç de remoció"; -App::$strings["Saved Searches"] = "Cerques Guardades"; -App::$strings["add"] = "afegeix"; -App::$strings["Saved Folders"] = "Carpetes Guardades"; App::$strings["Everything"] = "Tot"; -App::$strings["Archives"] = "Arxius"; -App::$strings["Refresh"] = "Refresc"; -App::$strings["Account settings"] = "Ajustos de Compte"; -App::$strings["Channel settings"] = "Ajustos de Canal"; -App::$strings["Additional features"] = "Característiques addicionals"; -App::$strings["Feature/Addon settings"] = "Ajustos de Complements"; -App::$strings["Display settings"] = "Ajustos de pantalla"; -App::$strings["Manage locations"] = "Gestiona ubicacions"; -App::$strings["Export channel"] = "Exportat canal"; -App::$strings["Connected apps"] = "Apps connectades"; -App::$strings["Premium Channel Settings"] = "Ajustos Premium de Canal"; +App::$strings["Events Tools"] = "Eina d'Esdeveniments"; +App::$strings["Export Calendar"] = "Exportar Calendari"; +App::$strings["Import Calendar"] = "Importar Calendari"; +App::$strings["Suggested Chatrooms"] = "Sales de Xat Suggerides"; +App::$strings["HQ Control Panel"] = "Panell de control"; +App::$strings["Create a new post"] = "Crea una nova entrada"; App::$strings["Private Mail Menu"] = "Menú de Correu Privat"; App::$strings["Combined View"] = "Vista Combinada"; App::$strings["Inbox"] = "Safata d'entrada"; App::$strings["Outbox"] = "Safata de sortida"; App::$strings["New Message"] = "Nou Missatge"; -App::$strings["Conversations"] = "Conversacions"; +App::$strings["Chatrooms"] = "Sala per Xerrar"; +App::$strings["Overview"] = "Visió General"; +App::$strings["Rating Tools"] = "Eines de Valoració"; +App::$strings["Rate Me"] = "Valora'm"; +App::$strings["View Ratings"] = "Veure Valoracions"; +App::$strings["__ctx:widget__ Activity"] = "Activitat"; +App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Tens %1$.0f de %2$.0f connexions permeses."; +App::$strings["Add New Connection"] = "Afegeix una Nova Connexió"; +App::$strings["Enter channel address"] = "Introdueix l'adreça del canal"; +App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Exemples: bob@example.com, https://exemple.com/barbara"; +App::$strings["Wiki List"] = "Llista de Wikis"; +App::$strings["Archives"] = "Arxius"; App::$strings["Received Messages"] = "Missatges Rebuts"; App::$strings["Sent Messages"] = "Missatges Enviats"; +App::$strings["Conversations"] = "Conversacions"; App::$strings["No messages."] = "Sense missatges."; App::$strings["Delete conversation"] = "Conversació esborrada"; -App::$strings["Events Menu"] = "Menú d'Esdeveniments"; -App::$strings["Day View"] = "Vista de Dia"; -App::$strings["Week View"] = "Vista de Setmana"; -App::$strings["Month View"] = "Vista de Mes"; -App::$strings["Events Tools"] = "Eina d'Esdeveniments"; -App::$strings["Export Calendar"] = "Exportar Calendari"; -App::$strings["Import Calendar"] = "Importar Calendari"; -App::$strings["Chatrooms"] = "Sala per Xerrar"; -App::$strings["Overview"] = "Visió General"; App::$strings["Chat Members"] = "Membres de la Sala de Xat"; -App::$strings["Bookmarked Chatrooms"] = "Sales de Xat Favorites"; -App::$strings["Suggested Chatrooms"] = "Sales de Xat Suggerides"; App::$strings["photo/image"] = "foto/imatge"; -App::$strings["Click to show more"] = "Fes clic per veure més"; -App::$strings["Rating Tools"] = "Eines de Valoració"; -App::$strings["Rate Me"] = "Valora'm"; -App::$strings["View Ratings"] = "Veure Valoracions"; -App::$strings["Forums"] = "Forums"; +App::$strings["Remove term"] = "Plaç de remoció"; +App::$strings["Saved Searches"] = "Cerques Guardades"; +App::$strings["add"] = "afegeix"; +App::$strings["Notes"] = "Notes"; +App::$strings["Add new page"] = "Afegeix una pàgina nova"; +App::$strings["Wiki Pages"] = "Pàgines de Wikis"; +App::$strings["Page name"] = "Canvia el nom de la pàgina"; +App::$strings["Refresh"] = "Refresc"; App::$strings["Tasks"] = "Tasques"; +App::$strings["Suggestions"] = "Suggerencies"; +App::$strings["See more..."] = "Veure més....."; +App::$strings["Saved Folders"] = "Carpetes Guardades"; +App::$strings["Click to show more"] = "Fes clic per veure més"; +App::$strings["Tags"] = "Etiquetes"; +App::$strings["Profile Creation"] = "Creació de perfils"; +App::$strings["Upload profile photo"] = "Puja una foto de perfil"; +App::$strings["Upload cover photo"] = "Puja una foto de portada"; +App::$strings["Edit your profile"] = "Edita el teu perfil"; +App::$strings["Find and Connect with others"] = "Cerca altres canals i connecta-t'hi"; +App::$strings["View the directory"] = "Mostra la carpeta"; +App::$strings["Manage your connections"] = "Gestiona les teves conexions"; +App::$strings["Communicate"] = "Communica't"; +App::$strings["View your channel homepage"] = "Mostra el teu canal"; +App::$strings["View your network stream"] = "Mostra el teu flux de xarxa"; App::$strings["Documentation"] = "Documentació"; -App::$strings["Project/Site Information"] = "Informació del Projecte/Lloc"; -App::$strings["For Members"] = "Per Membres"; -App::$strings["For Administrators"] = "Per Administradors"; -App::$strings["For Developers"] = "Per Desenvolupadors"; +App::$strings["View public stream"] = "Mostra el flux públic"; +App::$strings["New Member Links"] = "Enllaços de membres nous"; App::$strings["Member registrations waiting for confirmation"] = "Una inscripció per a ser membre està esperant confirmació"; App::$strings["Inspect queue"] = "Revisa cua"; App::$strings["DB updates"] = "Actualitzacions de Base de Dades"; App::$strings["Admin"] = "Admin"; -App::$strings["Plugin Features"] = "Característiques del Plugin"; -App::$strings["Channel is blocked on this site."] = "El canal està bloquejat en aquest lloc."; -App::$strings["Channel location missing."] = "Ubicació del canal perduda."; -App::$strings["Response from remote channel was incomplete."] = "La resposta del canal remot fou incompleta."; -App::$strings["Channel was deleted and no longer exists."] = "El canal fou esborrat i actualment no existeix."; -App::$strings["Protocol disabled."] = "Protocol desactivat."; -App::$strings["Channel discovery failed."] = "Descobriment de canal fallit."; -App::$strings["Cannot connect to yourself."] = "No pots connectar amb tu mateix."; -App::$strings["%1\$s's bookmarks"] = "%1\$s de marcadors"; -App::$strings["Public Timeline"] = "Línia de Temps Pública"; -App::$strings["Image/photo"] = "Imatge/foto"; -App::$strings["Encrypted content"] = "Contingut encriptat"; -App::$strings["Install %s element: "] = "Instal·la l'element %s:"; -App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Aquesta entrada contè un element %s instal·lable, potser manques de permissos per instal·lar-lo en aquest lloc."; -App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s va escriure el següent %2\$s %3\$s"; -App::$strings["Click to open/close"] = "Clic per obrir/tancar"; -App::$strings["spoiler"] = "xafa guitarres"; -App::$strings["Different viewers will see this text differently"] = "Diferents observadors veuran aquest text de diferents formes"; -App::$strings["$1 wrote:"] = "$1 va escriure:"; -App::$strings["Directory Options"] = "Opcions de Directori"; -App::$strings["Safe Mode"] = "Manera Segura"; -App::$strings["Public Forums Only"] = "Només Fòrums Públics"; -App::$strings["This Website Only"] = "Només Aquest Lloc Web"; -App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "El formulario de la cadena de seguridad no era correcto. Esto probablemente ocurrió porque el formulario se ha abierto durante demasiado tiempo (> 3 horas) antes de enviarlo."; +App::$strings["Plugin Features"] = "Extensions configurables"; +App::$strings["Account settings"] = "Ajustos de Compte"; +App::$strings["Channel settings"] = "Ajustos de Canal"; +App::$strings["Additional features"] = "Característiques addicionals"; +App::$strings["Addon settings"] = "Configuració de les extensions"; +App::$strings["Display settings"] = "Ajustos de pantalla"; +App::$strings["Manage locations"] = "Gestiona ubicacions"; +App::$strings["Export channel"] = "Exportat canal"; +App::$strings["OAuth1 apps"] = "Aplicacions OAuth1"; +App::$strings["OAuth2 apps"] = "Aplicacions OAuth2"; +App::$strings["Permission Groups"] = "Grups de permisos"; +App::$strings["Premium Channel Settings"] = "Ajustos Premium de Canal"; +App::$strings["Bookmarked Chatrooms"] = "Sales de Xat Favorites"; +App::$strings["New Network Activity"] = "Activitat nova a la xarxa"; +App::$strings["New Network Activity Notifications"] = "Notificacions noves d'activitat a la xarxa"; +App::$strings["View your network activity"] = "Mostra l'activitat a la xarxa"; +App::$strings["Mark all notifications read"] = "Marca totes les notificacions com a vistes"; +App::$strings["Show new posts only"] = "Mostra només les entrades noves"; +App::$strings["Filter by name"] = "Filtra per nom"; +App::$strings["New Home Activity"] = "Activitat nova al mur"; +App::$strings["New Home Activity Notifications"] = "Notificacions noves d'activitat al mur"; +App::$strings["View your home activity"] = "Mostra l'activitat al teu mur"; +App::$strings["Mark all notifications seen"] = "Marca totes les notificacions com a vistes"; +App::$strings["New Mails"] = "Correus nous"; +App::$strings["New Mails Notifications"] = "Notificacions noves de correus"; +App::$strings["View your private mails"] = "Mostra els correus privats"; +App::$strings["Mark all messages seen"] = "Marca tots els missatges com a llegits"; +App::$strings["New Events"] = "Esdeveniments nous"; +App::$strings["New Events Notifications"] = "Notificacions noves d'esdeveniments"; +App::$strings["View events"] = "Mostra els esdeveniments"; +App::$strings["Mark all events seen"] = "Marcar tots els esdeveniments vistos"; +App::$strings["New Connections Notifications"] = "Notificacions noves de connexió"; +App::$strings["View all connections"] = "Mostra totes les connexions"; +App::$strings["New Files"] = "Arxius nous"; +App::$strings["New Files Notifications"] = "Notificacions noves d'arxius"; +App::$strings["Notices"] = "Noticies"; +App::$strings["View all notices"] = "Mostra totes les notificacions"; +App::$strings["Mark all notices seen"] = "Marca totes les notificacions com a vistes"; +App::$strings["New Registrations"] = "Inscripcions noves"; +App::$strings["New Registrations Notifications"] = "Notificacions noves d'inscripció"; +App::$strings["Public Stream Notifications"] = "Notificacions del flux públic"; +App::$strings["View the public stream"] = "Mostra el flux públic"; +App::$strings["Sorry, you have got no notifications at the moment"] = "No tens cap notificació"; +App::$strings["Source channel not found."] = "No s'ha trobat el canal font."; +App::$strings["Create an account to access services and applications"] = "Crea un compte per tal d'accedir a serveis i aplicacions"; App::$strings["Logout"] = "Desconectar"; -App::$strings["End this session"] = "Finalitza aquesta sessió"; -App::$strings["Home"] = "Inici"; -App::$strings["Your posts and conversations"] = "Les teves entrades i converses"; -App::$strings["Your profile page"] = "La teva pàgina de perfil"; -App::$strings["Manage/Edit profiles"] = "Gestiona/Edita perfils"; +App::$strings["Login/Email"] = "Correu d'usuari"; +App::$strings["Password"] = "Contrasenya"; +App::$strings["Remember me"] = "Recorda'm"; +App::$strings["Forgot your password?"] = "Has perdut la Contrasenya?"; +App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] Error de TLS per a %s"; +App::$strings["Website SSL certificate is not valid. Please correct."] = "El certificat SSL és invalid, soluciona-ho, si us plau."; +App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Les tasques del cron tasks no s'estan executant a %s"; +App::$strings["Cron/Scheduled tasks not running."] = "No s'estan executant les tasques programades al cron."; +App::$strings["never"] = "mai"; +App::$strings["Cover Photo"] = "Foto de portada"; +App::$strings["Focus (Hubzilla default)"] = "Focus (Hubzilla per defecte)"; +App::$strings["Theme settings"] = "Ajustos de tema"; +App::$strings["Narrow navbar"] = "Barra de navegació estreta"; +App::$strings["Navigation bar background color"] = "Color de fons de la barra de navegació"; +App::$strings["Navigation bar icon color "] = "Color de la icona de la barra de navegació"; +App::$strings["Navigation bar active icon color "] = "Color de la icona de la barra de navegació activa"; +App::$strings["Link color"] = "Color dels enllaços"; +App::$strings["Set font-color for banner"] = "Ajusta el color del tipus de lletra per la senyera"; +App::$strings["Set the background color"] = "Ajusta el color de fons"; +App::$strings["Set the background image"] = "Ajusta la imatge de fons"; +App::$strings["Set the background color of items"] = "ajusta el color dels articles de fons"; +App::$strings["Set the background color of comments"] = "Ajusta el color dels comentaris en segon pla"; +App::$strings["Set font-size for the entire application"] = "Ajusta la mida del tipus de lletra per tota l'aplicació"; +App::$strings["Examples: 1rem, 100%, 16px"] = "Exemples: 1rem, 100%, 16px"; +App::$strings["Set font-color for posts and comments"] = "Ajusta el color del tipus de lletra per entrades i comentaris"; +App::$strings["Set radius of corners"] = "Ajusta el radi de les cantonades"; +App::$strings["Example: 4px"] = "Exemple: 4px"; +App::$strings["Set shadow depth of photos"] = "Ajusta la profunditat d'ombres de les fotos"; +App::$strings["Set maximum width of content region in pixel"] = "Ajusta l'amplada màxima de la zona de contingut en pixels"; +App::$strings["Leave empty for default width"] = "Deixa en blanc per l'amplada predeterminada"; +App::$strings["Left align page content"] = "Alineació esquerra del contingut de la pàgina"; +App::$strings["Set size of conversation author photo"] = "Ajusta la mida de la foto del autor a la conversa"; +App::$strings["Set size of followup author photos"] = "Ajusta la mida del seguidor de les fotos de l'autor"; +App::$strings["Errors encountered deleting database table "] = "S'ha produït un o més errors en esborrar una taula de la base de dades"; +App::$strings["Submit Settings"] = "Desa els canvis"; +App::$strings["Drop tables when uninstalling?"] = "Vols eliminar les taules en desinstaŀlar?"; +App::$strings["If checked, the Rendezvous database tables will be deleted when the plugin is uninstalled."] = "En cas afirmatiu, s'esborraran de la base de dades les taules del Rendezvous en desinstaŀlar l'extensió."; +App::$strings["Mapbox Access Token"] = "Testimoni d'accés a Mapbox"; +App::$strings["If you enter a Mapbox access token, it will be used to retrieve map tiles from Mapbox instead of the default OpenStreetMap tile server."] = "Es farà servir aquest testimoni per a descarregar les tesseŀles des de Mapbox en comptes del servidor per defecte d'OpenStreetMap."; +App::$strings["Rendezvous"] = "Rendezvous"; +App::$strings["This identity has been deleted by another member due to inactivity. Please press the \"New identity\" button or refresh the page to register a new identity. You may use the same name."] = "Un altre membre ha esborrat aquesta identitat per inactivitat. Pots crear-ne una nova amb el botó o recarregant la pàgina. Pots tornar a fer servir el mateix nom."; +App::$strings["Welcome to Rendezvous!"] = "Benvingut/da al Rendezvous!"; +App::$strings["Enter your name to join this rendezvous. To begin sharing your location with the other members, tap the GPS control. When your location is discovered, a red dot will appear and others will be able to see you on the map."] = "Escriu un nom per unir-te an aquest Rendezvous. Per a començar compartint la teva ubicació amb els altres membres, toca el control de GPS. Un cop descoberta la teva ubicació, apareixerà un punt vermell i la resta podran veure't en el mapa."; +App::$strings["Let's meet here"] = "Trobem-nos aquí"; +App::$strings["New marker"] = "Nova xinxeta"; +App::$strings["Edit marker"] = "Modifica la xinxeta"; +App::$strings["New identity"] = "Nova identitat"; +App::$strings["Delete marker"] = "Esborra la xinxeta"; +App::$strings["Delete member"] = "Esborra el membre"; +App::$strings["Edit proximity alert"] = "Modifica l'alerta de proximitat"; +App::$strings["A proximity alert will be issued when this member is within a certain radius of you.

    Enter a radius in meters (0 to disable):"] = "Es mostrarà una alerta de proximitat si aquest membre està dins un cert radi de distància.

    Introdueix un radi en metres (0 ho deshabilita):"; +App::$strings["distance"] = "distància"; +App::$strings["Proximity alert distance (meters)"] = "Distància d'alerta de proximitat (metres)"; +App::$strings["A proximity alert will be issued when you are within a certain radius of the marker location.

    Enter a radius in meters (0 to disable):"] = "Es mostrarà una alerta de proximitat quan siguis dins un cert radi de distància de la ubicació de la xinxeta.

    Introdueix un radi en metres (0 ho deshabilita):"; +App::$strings["Marker proximity alert"] = "Alerta de proximitat de xinxeta"; +App::$strings["Reminder note"] = "Nota de recordatori"; +App::$strings["Enter a note to be displayed when you are within the specified proximity..."] = "Introdueix una nota per a mostrar amb l'alerta"; +App::$strings["Add new rendezvous"] = "Afegeix un rendezvous nou"; +App::$strings["Create a new rendezvous and share the access link with those you wish to invite to the group. Those who open the link become members of the rendezvous. They can view other member locations, add markers to the map, or share their own locations with the group."] = "Crea un rendezvous nou i comparteix-lo amb aquelles persones a qui vulguis convidar al grup. Qui obri l'enllaç es faran membres del rendezvous. Podran veure les ubicacions dels altres membres, afegir xinxetes al mapa i compartir les seves ubicacions amb el grup."; +App::$strings["You have no rendezvous. Press the button above to create a rendezvous!"] = "No tens cap rendezvous. Pica el botó de sobre per a crear-ne un!"; +App::$strings["Some setting"] = "Opció X"; +App::$strings["A setting"] = "Opció Y"; +App::$strings["Skeleton Settings"] = "Configuració del Skeleton"; +App::$strings["GNU-Social Protocol Settings updated."] = "S'ha actualitzat la configuració del Protocol GNU-Social"; +App::$strings["The GNU-Social protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El Protocol GNU-Social és incompatible amb la independència de hub. Les connexions que facis en aquesta xarxa no seran accessibles des de hubs alternatius del teu canal."; +App::$strings["Enable the GNU-Social protocol for this channel"] = "Habilita el Protocol GNU-Social per a aquest canal"; +App::$strings["GNU-Social Protocol Settings"] = "Configuració del Protocol GNU-Social "; +App::$strings["Follow"] = "Segueix"; +App::$strings["%1\$s is now following %2\$s"] = "%1\$s ara segueix a %2\$s"; +App::$strings["Planets Settings updated."] = "S'ha actualitzat la configuració de Planetes."; +App::$strings["Enable Planets Plugin"] = "Habilita l'extensió Planetes"; +App::$strings["Planets Settings"] = "Configuració de Planetes"; +App::$strings["System defaults:"] = "Opcions per defecte:"; +App::$strings["Preferred Clipart IDs"] = "Identitats Clipart preferides"; +App::$strings["List of preferred clipart ids. These will be shown first."] = "Llista d'identitats Clipart preferides. Aquestes es mostren primer"; +App::$strings["Default Search Term"] = "Paraula de cerca predeterminada"; +App::$strings["The default search term. These will be shown second."] = "La paraula de cerca predeterminada. Aquestes es mostraran en segon lloc."; +App::$strings["Return After"] = "Acaba després de"; +App::$strings["Page to load after image selection."] = "Pàgina per carregar després d'haver seleccionat una imatge."; App::$strings["Edit Profile"] = "Edita Perfil"; -App::$strings["Edit your profile"] = "Edita el teu perfil"; -App::$strings["Your photos"] = "Les Teves Fotos"; -App::$strings["Your files"] = "Els teus arxius"; -App::$strings["Your chatrooms"] = "Les teves sales de xerrar"; -App::$strings["Bookmarks"] = "Marcadors"; -App::$strings["Your bookmarks"] = "Els teus marcadors"; -App::$strings["Your webpages"] = "Les teves pàgines web"; -App::$strings["Sign in"] = "Signatura"; -App::$strings["%s - click to logout"] = "%s - click per desconectar"; -App::$strings["Remote authentication"] = "Autenticació remota"; -App::$strings["Click to authenticate to your home hub"] = "Clica per autentificar-te en el teu node"; -App::$strings["Home Page"] = "Pàgina Personal"; -App::$strings["Create an account"] = "Crear un compte"; -App::$strings["Help and documentation"] = "Ajuda i documentació"; -App::$strings["Applications, utilities, links, games"] = "Aplicacions, utilitats, enllaços, jocs"; -App::$strings["Search site @name, #tag, ?docs, content"] = "Cerca pel lloc @name, #tag, ?docs, contingut"; -App::$strings["Channel Directory"] = "Directori de Canals"; -App::$strings["Your grid"] = "La teva malla"; -App::$strings["Mark all grid notifications seen"] = "Marca totes les notificacions de la malla vistes"; -App::$strings["Channel home"] = "Canal personal"; -App::$strings["Mark all channel notifications seen"] = "Marca totes les notificacions de canal vistes"; -App::$strings["Notices"] = "Noticies"; -App::$strings["Notifications"] = "Notificacions"; -App::$strings["See all notifications"] = "Veure totes les Notificacions"; -App::$strings["Private mail"] = "Correu privat"; -App::$strings["See all private messages"] = "Veure tots els missatges privats"; -App::$strings["Mark all private messages seen"] = "Marcar tots els missatges privats vistos"; -App::$strings["Event Calendar"] = "Calendari d'Events"; -App::$strings["See all events"] = "Veure tots els esdeveniments"; -App::$strings["Mark all events seen"] = "Marcar tots els esdeveniments vistos"; -App::$strings["Manage Your Channels"] = "Gestiona els Teus Canals"; -App::$strings["Account/Channel Settings"] = "Ajustos de Compte/Canal"; -App::$strings["Site Setup and Configuration"] = "Ajustos i Configuració del Lloc"; -App::$strings["Loading..."] = "Carregant..."; -App::$strings["@name, #tag, ?doc, content"] = "@nom, #etiqueta, ?doc, contingut"; -App::$strings["Please wait..."] = "Si us plau, espera......."; -App::$strings["New window"] = "Nova finestra"; -App::$strings["Open the selected location in a different window or browser tab"] = "Obrir la localització seleccionada en un altre finestra o pestanya del navegador"; -App::$strings["User '%s' deleted"] = "usuari '%s' esborrat"; -App::$strings["%d invitation available"] = array( - 0 => "%d invitació disponible", - 1 => "%d invitacions disponibles", -); -App::$strings["Find Channels"] = "Troba Canals"; -App::$strings["Enter name or interest"] = "Entra un nom o interes"; -App::$strings["Connect/Follow"] = "Conecta/Segueix"; -App::$strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Lionel Messi, Futbolista"; -App::$strings["Random Profile"] = "Perfil Aleatori"; -App::$strings["Invite Friends"] = "Convida Amics"; -App::$strings["Advanced example: name=fred and country=iceland"] = "Exemple avançat: nom=pep i pais=eire"; -App::$strings["%d connection in common"] = array( - 0 => "%d connexió en comú", - 1 => "%d connexions en comú", -); -App::$strings["show more"] = "mostrar més"; +App::$strings["Profile List"] = "Llista de perfils"; +App::$strings["Order of Preferred"] = "Ordre de les preferides"; +App::$strings["Sort order of preferred clipart ids."] = "Ordena les identitats Clipart preferides"; +App::$strings["Newest first"] = "La més nova primer"; +App::$strings["As entered"] = "En ordre d'entrada"; +App::$strings["Order of other"] = "Ordre de les altres"; +App::$strings["Sort order of other clipart ids."] = "Ordena les altres identitats Clipart."; +App::$strings["Most downloaded first"] = "Les més descarregades primer"; +App::$strings["Most liked first"] = "Les més votades primer"; +App::$strings["Preferred IDs Message"] = "Missatge de les identitats preferides"; +App::$strings["Message to display above preferred results."] = "Missatge per a mostrar per sobre dels resultats preferits."; +App::$strings["Uploaded by: "] = "Carregada per:"; +App::$strings["Drawn by: "] = "Dibuixada per:"; +App::$strings["Use this image"] = "Fes servir aquesta imatge"; +App::$strings["Or select from a free OpenClipart.org image:"] = "O bé tria una imatge lliure d'OpenClipart.org:"; +App::$strings["Search Term"] = "Paraules de cerca"; +App::$strings["Unknown error. Please try again later."] = "S'ha produït un error desconegut. Torna a provar-ho més tard."; +App::$strings["Profile photo updated successfully."] = "S'ha carregat la foto amb èxit."; +App::$strings["Flag Adult Photos"] = "Marca contingut adult"; +App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Habilita una opció per a amagar fotos sensibles de la vista per defecte de l'àlbum."; +App::$strings["Post to WordPress"] = "Publica a un Wordpress"; +App::$strings["Enable WordPress Post Plugin"] = "Activa l'extensió Publica a un Wordpress"; +App::$strings["WordPress username"] = "Nom d'usuari al Wordpress"; +App::$strings["WordPress password"] = "Contrassenya al Wordpress"; +App::$strings["WordPress API URL"] = "Adreça URL de l'API del Wordpress"; +App::$strings["Typically https://your-blog.tld/xmlrpc.php"] = "Normalment https://el-meu-blog.cat/xmlrpc.php"; +App::$strings["WordPress blogid"] = "Identitat blogid del Wordpress"; +App::$strings["For multi-user sites such as wordpress.com, otherwise leave blank"] = "Fer a llocs multi-usuari com wordpress.com . Deixa en blanc en cas contrari"; +App::$strings["Post to WordPress by default"] = "Publica a Wordpress per defecte"; +App::$strings["Forward comments (requires hubzilla_wp plugin)"] = "Reenvia comentaris (necessita l'extensió hubzilla_wp)"; +App::$strings["WordPress Post Settings"] = "Configuració d'entrades"; +App::$strings["Wordpress Settings saved."] = "S'ha desat la configuració."; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Aquesta extensió cerca paraules que especifiquis en les entrades, i amaga plegant qualsevol contingut que en contingui alguna. Així, no es mostrarà per defecte i no quedaràs exposat/da en llocs on més gent vegi la teva pantalla. Sempre es recomana etiquetar els continguts amb nuesa amb l'etiqueta #NSFW (insegur per a la feina, en anglès). Tanmateix, el filtre es pot fer servir per qualsevol tipus de contingut."; +App::$strings["Enable Content filter"] = "Activa el filtre de contingut"; +App::$strings["Comma separated list of keywords to hide"] = "Llista de paraules clau a amagar, separada per comes"; +App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "Paraula, /expressió-regular/, lang=xx, lang=!xx. Nota: lang és per llengua en anglès"; +App::$strings["Not Safe For Work Settings"] = "Configuració de Not Safe For Work"; +App::$strings["General Purpose Content Filter"] = "Filtre de contingut genèric"; +App::$strings["NSFW Settings saved."] = "S'ha desat la configuració del NSFW."; +App::$strings["Possible adult content"] = "Possible contingut inadequat"; +App::$strings["%s - view"] = "%s - mostra"; +App::$strings["Post to Insanejournal"] = "Publicar a Insanejournal"; +App::$strings["Enable InsaneJournal Post Plugin"] = "Habilita la publicació a InsaneJournal"; +App::$strings["InsaneJournal username"] = "Nom d'usuari a InsaneJournal"; +App::$strings["InsaneJournal password"] = "Contrasenya a InsaneJournal"; +App::$strings["Post to InsaneJournal by default"] = "Publica per defecte a InsaneJournal"; +App::$strings["InsaneJournal Post Settings"] = "Opcions de publicació a InsaneJournal"; +App::$strings["Insane Journal Settings saved."] = "S'han actualitzat els paàrmetres de InsaneJournal."; +App::$strings["Post to Dreamwidth"] = "Publica a Dreamwidth"; +App::$strings["Enable Dreamwidth Post Plugin"] = "Habilita el connector per a publicar a la xarxa Dreamwidth"; +App::$strings["Dreamwidth username"] = "Nom a Dreamwidth"; +App::$strings["Dreamwidth password"] = "Contrasenya a Dreamwidth"; +App::$strings["Post to Dreamwidth by default"] = "Publica a Dreamwidth per defecte"; +App::$strings["Dreamwidth Post Settings"] = "Opcions de publicació a Dreamwidth"; +App::$strings["New registration"] = "S'ha registrat un nou compte"; +App::$strings["Message sent to %s. New account registration: %s"] = "S'ha enviat el correu a %s. El nou compte és %s"; +App::$strings["Hubzilla Directory Stats"] = "Estadístiques del directori de Hubzilla"; +App::$strings["Total Hubs"] = "Hubs totals"; +App::$strings["Hubzilla Hubs"] = "Hubs de Hubzilla"; +App::$strings["Friendica Hubs"] = "Hubs de Friendica"; +App::$strings["Diaspora Pods"] = "Pods de Diaspora"; +App::$strings["Hubzilla Channels"] = "Canals de Hubzilla"; +App::$strings["Friendica Channels"] = "Canals de Friendica"; +App::$strings["Diaspora Channels"] = "Canals de Diaspora"; +App::$strings["Aged 35 and above"] = "De 35 o més anys d'edat"; +App::$strings["Aged 34 and under"] = "De 34 o menys anys d'edat"; +App::$strings["Average Age"] = "Mitjana d'edat"; +App::$strings["Known Chatrooms"] = "Sales de xat conegudes"; +App::$strings["Known Tags"] = "Etiquetes conegudes"; +App::$strings["Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network. This also applies to chatrooms,"] = "Tingueu en compte que les estadístiques de Diaspora i Friendica només són les **aquest directori** n'és conscient, i no totes les de la xarxa. Això també aplica a sales de xat,"; +App::$strings["Your Webbie:"] = "El teu Webbie:"; +App::$strings["Fontsize (px):"] = "Mida de lletra (px):"; +App::$strings["Link:"] = "Enllaç:"; +App::$strings["Like us on Hubzilla"] = "Segueix-nos a Hubzilla"; +App::$strings["Embed:"] = "Incrusta:"; +App::$strings["Photos imported"] = "S'han importat les fotos"; +App::$strings["Redmatrix Photo Album Import"] = "Importa els àlbums de fotos de \$Projectname"; +App::$strings["This will import all your Redmatrix photo albums to this channel."] = "Importa els àlbums de fotos de \$Projectname"; +App::$strings["Redmatrix Server base URL"] = "Adreça URL arrel del servidor de Redmatrix"; +App::$strings["Redmatrix Login Username"] = "Nom d'usuari de Redmatrix"; +App::$strings["Redmatrix Login Password"] = "Contrasenya de Redmatrix"; +App::$strings["Import just this album"] = "Importa només aquest album"; +App::$strings["Leave blank to import all albums"] = "Deixa-ho en blanc per a importar tots els àlbums"; +App::$strings["Maximum count to import"] = "Nombre màxim d'importacions"; +App::$strings["0 or blank to import all available"] = "Deixa-ho en blanc o amb un 0 per a importar-ho tot"; +App::$strings["Channels to auto connect"] = "Canals per connectar automàticament"; +App::$strings["Comma separated list"] = "Llista amb separació per comes"; +App::$strings["Popular Channels"] = "Canals populars"; +App::$strings["IRC Settings"] = "Paràmetres de IRC"; +App::$strings["IRC settings saved."] = "S'han actualitzat els paràmetres de IRC."; +App::$strings["IRC Chatroom"] = "Sala de IRC"; +App::$strings["Post to LiveJournal"] = "Publica a LiveJournal"; +App::$strings["Enable LiveJournal Post Plugin"] = "Habilita la publicació a LiveJournal"; +App::$strings["LiveJournal username"] = "Nom a LiveJournal"; +App::$strings["LiveJournal password"] = "Contrasenya a LiveJournal"; +App::$strings["Post to LiveJournal by default"] = "Publica a LiveJournal per defecte"; +App::$strings["LiveJournal Post Settings"] = "Paràmetres de LiveJournal"; +App::$strings["LiveJournal Settings saved."] = "S'han desat els paràmetres de LiveJournal."; +App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "No s'ha pogut autenticar la identitat OpenID que has proporcionat. Comprova que l'hagis introduïda bé."; +App::$strings["The error message was:"] = "El missatge d'error ha estat:"; +App::$strings["First Name"] = "Nom"; +App::$strings["Last Name"] = "Cognoms"; +App::$strings["Nickname"] = "Àlies"; +App::$strings["Full Name"] = "Nom complet"; +App::$strings["Profile Photo 16px"] = "Imatge de perfil de 16x16 píxels"; +App::$strings["Profile Photo 32px"] = "Imatge de perfil de 32x32 píxels"; +App::$strings["Profile Photo 48px"] = "Imatge de perfil de 48x48 píxels"; +App::$strings["Profile Photo 64px"] = "Imatge de perfil de 64x64 píxels"; +App::$strings["Profile Photo 80px"] = "Imatge de perfil de 80x80 píxels"; +App::$strings["Profile Photo 128px"] = "Imatge de perfil de 128x128 píxels"; +App::$strings["Timezone"] = "Zona horària"; +App::$strings["Birth Year"] = "Any de naixement"; +App::$strings["Birth Month"] = "Mes de naixement"; +App::$strings["Birth Day"] = "Dia de naixement"; +App::$strings["Birthdate"] = "Aniversar"; +App::$strings["OpenID protocol error. No ID returned."] = "Error d'OpenID. No s'ha aconseguit cap ID."; +App::$strings["Login failed."] = "Identificació fallida."; +App::$strings["Male"] = "Masculí"; +App::$strings["Female"] = "Femení"; +App::$strings["You're welcome."] = "De res."; +App::$strings["Ah shucks..."] = "Oh merda..."; +App::$strings["Don't mention it."] = "Ni ho pensis."; +App::$strings["<blush>"] = "<em poso vermell>"; +App::$strings["Page to load after login"] = "Pàgina a carregar després d'iniciar sessió"; +App::$strings["Examples: "apps", "network?f=&gid=37" (privacy collection), "channel" or "notifications/system" (leave blank for default network page (grid)."] = "Exemples: "apps", "network?f=&gid=37" (grup de privacitat), "channel" or "notifications/system" (deixa-ho en blanc per a la pàgina per defecte, la del flux públic."; +App::$strings["Startpage Settings"] = "Configuració de Pàgina d'inici"; +App::$strings["bitchslap"] = "bofetades"; +App::$strings["bitchslapped"] = "ha fet una bofetada a"; +App::$strings["shag"] = "polvo"; +App::$strings["shagged"] = "ha fet un polvo amb"; +App::$strings["patent"] = "amb dret de"; +App::$strings["patented"] = "ha patentat a"; +App::$strings["hug"] = "abraçada"; +App::$strings["hugged"] = "ha abraçat"; +App::$strings["murder"] = "assassinat"; +App::$strings["murdered"] = "ha assassinat"; +App::$strings["worship"] = "retre-li culte"; +App::$strings["worshipped"] = "ara ret culte a"; +App::$strings["kiss"] = "un petó"; +App::$strings["kissed"] = "ha fet un petó a"; +App::$strings["tempt"] = "temptar"; +App::$strings["tempted"] = "ha temptat a"; +App::$strings["raise eyebrows at"] = "aixecar-li una cella"; +App::$strings["raised their eyebrows at"] = "li ha aixecat una cella a"; +App::$strings["insult"] = "insultar"; +App::$strings["insulted"] = "ha insultat a"; +App::$strings["praise"] = "elogiar"; +App::$strings["praised"] = "ha elogiat a"; +App::$strings["be dubious of"] = "sospitar"; +App::$strings["was dubious of"] = "sospita de"; +App::$strings["eat"] = "menjar"; +App::$strings["ate"] = "s'ha menjat"; +App::$strings["giggle and fawn at"] = "cantar-ne les mil meravelles"; +App::$strings["giggled and fawned at"] = "està cantant les mil meravelles de"; +App::$strings["doubt"] = "dubtar-ne"; +App::$strings["doubted"] = "dubta de"; +App::$strings["glare"] = "fer-li una mirada assassina"; +App::$strings["glared at"] = "li ha fet una mirada assassina a"; +App::$strings["fuck"] = "follar-hi"; +App::$strings["fucked"] = "ha follat amb"; +App::$strings["bonk"] = "tirar-se'l/la"; +App::$strings["bonked"] = "s'ha tirat a"; +App::$strings["declare undying love for"] = "declarar-li l'amor etern a"; +App::$strings["declared undying love for"] = "li ha declarar amor etern a"; +App::$strings["Diaspora Protocol Settings updated."] = "S'ha actualitzat la configuració del Protocol de Diàspora"; +App::$strings["The Diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El Protocol de Diàspora és incompatible amb la independència de hub. Les connexions que facis en aquesta xarxa no seran accessibles des de hubs alternatius del teu canal."; +App::$strings["Enable the Diaspora protocol for this channel"] = "Activa el Protocol de Diàspora per aquest canal"; +App::$strings["Allow any Diaspora member to comment on your public posts"] = "Permet a qualsevol membre de Diàspora de comentar les teves entrades públiques"; +App::$strings["Prevent your hashtags from being redirected to other sites"] = "Evita que les teves etiquetes siguin redirigides a altres llocs web"; +App::$strings["Sign and forward posts and comments with no existing Diaspora signature"] = "Signa i reenvia entrades o comentaris encara que no tinguin una signatura de Diàspora vàlida."; +App::$strings["Followed hashtags (comma separated, do not include the #)"] = "Etiquetes seguides (separades per comes i sense incloure #)"; +App::$strings["Diaspora Protocol Settings"] = "Configuració del Protocol de Diàspora"; +App::$strings["No username found in import file."] = "No s'ha trobat el nom d'usuari en el fitxer d'importació."; +App::$strings["Unable to create a unique channel address. Import failed."] = "No s'ha pogut importar el canal perquè l'adreça única de canal no s'ha pogut crear."; +App::$strings["Your account on %s will expire in a few days."] = "El teu compte a %s caducarà d'aquí a pocs dies."; +App::$strings["Your $Productname test account is about to expire."] = "El teu compte de prova a $Productname està a punt de caducar."; +App::$strings["Enable Rainbowtag"] = "Activa el Rainbowtag"; +App::$strings["Rainbowtag Settings"] = "Configuració de Rainbowtag"; +App::$strings["Rainbowtag Settings saved."] = "S'ha desat la configuració del Rainbowtag."; +App::$strings["Show Upload Limits"] = "Mostra els límits de pujada"; +App::$strings["Hubzilla configured maximum size: "] = "Mida màxima configurada a \$Projectname:"; +App::$strings["PHP upload_max_filesize: "] = "Mida màxima de fitxer del PHP (upload_max_filesize):"; +App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = "Mida màxima de consulta web del PHP (post_max_size > upload_max_filesize):"; +App::$strings["generic profile image"] = "imatge de perfil genèrica"; +App::$strings["random geometric pattern"] = "patró geomètric aleatori"; +App::$strings["monster face"] = "cara de monstre"; +App::$strings["computer generated face"] = "cara generada per ordinador"; +App::$strings["retro arcade style face"] = "cara d'estil arcade retro"; +App::$strings["Hub default profile photo"] = "Foto de perfil per defecte al hub"; +App::$strings["Information"] = "Informació"; +App::$strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
    The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "L'extensió Libravatar també està instaŀlada. Desactiva-la o desactiva aquesta.
    Libravatar rebotarà a Gravatar si no es troba res a Libravatar."; +App::$strings["Save Settings"] = "Des la configuració"; +App::$strings["Default avatar image"] = "Avatar per defecte"; +App::$strings["Select default avatar image if none was found at Gravatar. See README"] = "Escull l'avatar per defecte si no se'n troba cap al Gravatar. Consulta el README"; +App::$strings["Rating of images"] = "Categorització de les imatges"; +App::$strings["Select the appropriate avatar rating for your site. See README"] = "Escull la categorització d'avatar per al teu lloc. Consulta el README"; +App::$strings["Gravatar settings updated."] = "S'ha actualitzat la configuració del Gravatar"; +App::$strings["Hubzilla File Storage Import"] = "Importació d'emmagatzematge de Hubzilla"; +App::$strings["This will import all your cloud files from another server."] = "Permet importar tots els arxius de núvol des d'un altre servidor."; +App::$strings["Hubzilla Server base URL"] = "Adreça URL base de l'altre servidor Hubzilla"; +App::$strings["Since modified date yyyy-mm-dd"] = "Més nous que aaaa-mm-dd"; +App::$strings["Until modified date yyyy-mm-dd"] = "Més antics que aaaa-mm-dd"; +App::$strings["Recent Channel/Profile Viewers"] = "Visitants recents del canal o perfil"; +App::$strings["This plugin/addon has not been configured."] = "Aquesta extensió encara no està configurada."; +App::$strings["Please visit the Visage settings on %s"] = "Visita la configuració del Visage a %s"; +App::$strings["your feature settings page"] = "la pàgina de configuració de funcionalitats"; +App::$strings["No entries."] = "No hi ha entrades."; +App::$strings["Enable Visage Visitor Logging"] = "Activa el registre de visitants de Visage"; +App::$strings["Visage Settings"] = "Configuració del Visage"; +App::$strings["Nsabait Settings updated."] = "S'ha actualitzat la configuració de NSAbait."; +App::$strings["Enable NSAbait Plugin"] = "Activa l'extensió NSAbait"; +App::$strings["NSAbait Settings"] = "Configuració del NSAbait"; +App::$strings["Send test email"] = "Envia un correu de prova"; +App::$strings["No recipients found."] = "No s'han trobat destinataris."; +App::$strings["Mail sent."] = "S'ha enviat el correu."; +App::$strings["Sending of mail failed."] = "Ha fallat l'enviament de correu."; +App::$strings["Mail Test"] = "Prova de correu"; +App::$strings["Message subject"] = "Assumpte"; +App::$strings["Use markdown for editing posts"] = "Fes servir markdown per editar les entrades"; +App::$strings["View Larger"] = "Amplia"; +App::$strings["Tile Server URL"] = "Adreça URL del servidor de tesseŀles"; +App::$strings["A list of public tile servers"] = "Una llista de servidors públics de tesseŀles"; +App::$strings["Nominatim (reverse geocoding) Server URL"] = "Adreça URL del servei Nominatim (geocoding invers)"; +App::$strings["A list of Nominatim servers"] = "Una llista de servidors públics de Nominatim"; +App::$strings["Default zoom"] = "Zoom per defecte"; +App::$strings["The default zoom level. (1:world, 18:highest, also depends on tile server)"] = "El nivell de zoom predeterminat. (1: mínim, món. 18: màxim. També depèn del servidor)"; +App::$strings["Include marker on map"] = "Inclou una xinxeta al mapa"; +App::$strings["Include a marker on the map."] = "Inclou una xinxeta al mapa."; +App::$strings["text to include in all outgoing posts from this site"] = "text per incloure en totes les entrades que s'enviïn des d'aquest lloc"; +App::$strings["Fuzzloc Settings updated."] = "S'ha actualitzat la configuració de Fuzzloc."; +App::$strings["Fuzzloc allows you to blur your precise location if your channel uses browser location mapping."] = "El Fuzzloc permet difuminar la teva ubicació si el teu canal fa servir la ubicació precisa del navegador."; +App::$strings["Enable Fuzzloc Plugin"] = "Habilita l'extensió Fuzzloc"; +App::$strings["Minimum offset in meters"] = "Afegit mínim en metres"; +App::$strings["Maximum offset in meters"] = "Afegit màxim en metres"; +App::$strings["Fuzzloc Settings"] = "Configuració del Fuzzloc"; +App::$strings["Post to Friendica"] = "Publica a Friendica"; +App::$strings["rtof Settings saved."] = "S'ha desat la Configuració de rtof."; +App::$strings["Allow posting to Friendica"] = "Permet publicar a xarxes Friendica"; +App::$strings["Send public postings to Friendica by default"] = "Envia per defecte les entrades públiques cap a Friendica"; +App::$strings["Friendica API Path"] = "Ruta a l'API de Friendica"; +App::$strings["https://{sitename}/api"] = "https://{nomdedomini}/api"; +App::$strings["Friendica login name"] = "Nom d'usuari a Friendica"; +App::$strings["Friendica password"] = "Contrasenya a Friendica"; +App::$strings["Hubzilla to Friendica Post Settings"] = "Configuració de Publicació de Hubzilla cap a Friendica"; +App::$strings["Status:"] = "Estatus:"; +App::$strings["Activate addon"] = "Habilita l'extensió"; +App::$strings["Hide Jappixmini Chat-Widget from the webinterface"] = "Amaga el giny de xat Jappixmini"; +App::$strings["Jabber username"] = "Nom a Jabber"; +App::$strings["Jabber server"] = "Servidor de Jabber"; +App::$strings["Jabber BOSH host URL"] = "URL de l'amfitrió BOSH de Jabber"; +App::$strings["Jabber password"] = "Contrassenya de Jabber"; +App::$strings["Encrypt Jabber password with Hubzilla password"] = "Xifra la contrasenya de Jabber amb la del Hubzilla"; +App::$strings["Hubzilla password"] = "Contrasenya del Hubzilla"; +App::$strings["Approve subscription requests from Hubzilla contacts automatically"] = "Aprova automàticament les sol·licituds de subscripció de contactes de Hubzilla"; +App::$strings["Purge internal list of jabber addresses of contacts"] = "Neteja la llista interna de contactes de Jabber"; +App::$strings["Configuration Help"] = "Ajuda de configuració"; +App::$strings["Jappix Mini Settings"] = "Paràmetres de Jappix Mini"; +App::$strings["Currently blocked"] = "Bloquejats actualment"; +App::$strings["No channels currently blocked"] = "No hi ha canals bloquejats"; +App::$strings["Superblock Settings"] = "Configuració del Superblock"; +App::$strings["Block Completely"] = "Bloqueja completament"; +App::$strings["superblock settings updated"] = "S'ha actualitzat la configuració del Superblock"; +App::$strings["Federate"] = "Federa"; +App::$strings["nofed Settings saved."] = "S'ha desat la configuració del NoFed."; +App::$strings["Allow Federation Toggle"] = "Permet commutar entre federar o no"; +App::$strings["Federate posts by default"] = "Per defecte federa les entrades"; +App::$strings["NoFed Settings"] = "Configuració del NoFed"; +App::$strings["Post to Red"] = "Publica a Red"; +App::$strings["Channel is required."] = "Cal un canal."; +App::$strings["redred Settings saved."] = "S'ha desat la configuració del RedRed"; +App::$strings["Allow posting to another Hubzilla Channel"] = "Permet publicar a un altre canal de Hubzilla"; +App::$strings["Send public postings to Hubzilla channel by default"] = "Envia per defecte les entrades públiques cap a l'altre canal de Hubzilla"; +App::$strings["Hubzilla API Path"] = "Ruta de l'API de Hubzilla"; +App::$strings["Hubzilla login name"] = "Nom d'usuari a l'altre Hubzilla"; +App::$strings["Hubzilla channel name"] = "Nom de canal a l'altre Hubzilla"; +App::$strings["Hubzilla Crosspost Settings"] = "Configuració del replicador de Hubzilla"; +App::$strings["Logfile archive directory"] = "Carpeta d'arxius de registre d'activitat"; +App::$strings["Directory to store rotated logs"] = "Carpeta per desar els registres circulars"; +App::$strings["Logfile size in bytes before rotating"] = "Mida en Bytes del fitxer de registre abans de rotar"; +App::$strings["Number of logfiles to retain"] = "Número de fitxers de registre per a conservar"; +App::$strings["Friendica Photo Album Import"] = "Importa àlbums de fotos de Friendica"; +App::$strings["This will import all your Friendica photo albums to this Red channel."] = "Aquesta acció importarà tots els teus àlbums de fotos de Friendica a aquest canal."; +App::$strings["Friendica Server base URL"] = "URL base del servidor de Friendica"; +App::$strings["Friendica Login Username"] = "Nom de registre a Friendica"; +App::$strings["Friendica Login Password"] = "Contrasenya a Friendica"; +App::$strings["ActivityPub"] = "ActivityPub"; +App::$strings["ActivityPub Protocol Settings updated."] = "S'ha actualitzat la configuració del Protocol ActivityPub."; +App::$strings["The ActivityPub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El Protocol ActivityPub és incompatible amb la independència de hub. Les connexions que facis en aquesta xarxa no seran accessibles des de hubs alternatius del teu canal."; +App::$strings["Enable the ActivityPub protocol for this channel"] = "Activa el Protocol ActivityPub en aquest canal"; +App::$strings["Send multi-media HTML articles"] = "Envia articles HTML multimèdia"; +App::$strings["Not supported by some microblog services such as Mastodon"] = "Incompatible amb alguns serveis de microbloguing com Mastodon"; +App::$strings["ActivityPub Protocol Settings"] = "Configuració del Protocol ActivityPub"; +App::$strings["Project Servers and Resources"] = "Servidors de projecte i Recursos"; +App::$strings["Project Creator and Tech Lead"] = "Creador del projecte i cap tècnic"; +App::$strings["Admin, developer, directorymin, support bloke"] = "Administradora, desenvolupadora, admin del directori, persona de suport"; +App::$strings["And the hundreds of other people and organisations who helped make the Hubzilla possible."] = "I els centenars d'altra gent i organitzacions que han ajudat que Hubzilla fos possible."; +App::$strings["The Redmatrix/Hubzilla projects are provided primarily by volunteers giving their time and expertise - and often paying out of pocket for services they share with others."] = "Els projectes Redmatrix i Hubzilla són oferts principalment per voluntàries que donen el seu temps i experiència i que fins i tot solen posar-hi diners de la seva butxaca per a compartir serveis amb altres."; +App::$strings["There is no corporate funding and no ads, and we do not collect and sell your personal information. (We don't control your personal information - you do.)"] = "No rebem cap mena de finançament corporatiu, ni posem anuncis ni recollim i venem les teves dades personals. Nosaltres no controlem les dades personals, sinó tu."; +App::$strings["Help support our ground-breaking work in decentralisation, web identity, and privacy."] = "Ajuda'ns a mantenir la nostra feina pionera cap a la descentralització, la identitat a la web i la privacitat."; +App::$strings["Your donations keep servers and services running and also helps us to provide innovative new features and continued development."] = "Les teves donacions mantenen els servidors i els serveis corrent, i ens ajuda a oferir noves funcionalitats i continuar el desenvolupament en marxa."; +App::$strings["Donate"] = "Dóna"; +App::$strings["Choose a project, developer, or public hub to support with a one-time donation"] = "Tria un projecte, desenvolupador o hub públic per a donar suport amb una donació"; +App::$strings["Donate Now"] = "Dóna ara"; +App::$strings["Or become a project sponsor (Hubzilla Project only)"] = "O bé, fes-te patrocinador/a del projecte Hubzilla"; +App::$strings["Please indicate if you would like your first name or full name (or nothing) to appear in our sponsor listing"] = "Indica com vols aparèixer a la llista de patrocinadors: anònim, amb nom, o nom i cognoms"; +App::$strings["Sponsor"] = "Patrocinador"; +App::$strings["Special thanks to: "] = "Agraïments especials a:"; +App::$strings["This is a fairly comprehensive and complete guitar chord dictionary which will list most of the available ways to play a certain chord, starting from the base of the fingerboard up to a few frets beyond the twelfth fret (beyond which everything repeats). A couple of non-standard tunings are provided for the benefit of slide players, etc."] = "És un diccionari prou complet d'acords de guitarra. Llista la majoria de maneres possibles de tocar un cert acord, començant des de la base del mànec fins una mica més apunt del dotzè trast, a partir del qual es repeteixen. Ofereix també un parell d'afinacions no estàndards."; +App::$strings["Chord names start with a root note (A-G) and may include sharps (#) and flats (b). This software will parse most of the standard naming conventions such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."] = "Els noms dels acords estan formats per la nota fonamental en notació anglesa (A-G), i modificadors com \"sostingut\" (#) i \"bemoll\" (b). El programa entén la majoria de convencions com maj, min, dim, sus2, sus4 i aug, amb més d'un element potencialment."; +App::$strings["Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."] = "Exemples vàlids: A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11"; +App::$strings["Guitar Chords"] = "Acords de guitarra"; +App::$strings["The complete online chord dictionary"] = "El diccionari on-line d'acords"; +App::$strings["Tuning"] = "Afinació"; +App::$strings["Chord name: example: Em7"] = "Exemple de nom d'acord: Em7"; +App::$strings["Show for left handed stringing"] = "Disposició per esquerrans"; +App::$strings["Quick Reference"] = "Xuleta"; +App::$strings["Post to Libertree"] = "Publica a Libertree"; +App::$strings["Enable Libertree Post Plugin"] = "Habilita la publicació a Libertree"; +App::$strings["Libertree API token"] = "Token per a l'API de Libertree"; +App::$strings["Libertree site URL"] = "URL del servidor de Libertree"; +App::$strings["Post to Libertree by default"] = "Publica a Libertree per defecte"; +App::$strings["Libertree Post Settings"] = "Paràmetres de publicació a Libertree"; +App::$strings["Libertree Settings saved."] = "S'han actualitzat els paràmetres de Libertree."; +App::$strings["Flattr this!"] = "Dóna-hi suport amb Flattr!"; +App::$strings["Flattr widget settings updated."] = "S'han actualitzat els paràmetres del giny de Flattr."; +App::$strings["Flattr user"] = "Nom a Flattr"; +App::$strings["URL of the Thing to flattr"] = "URL del lloc per a donar suport"; +App::$strings["If empty channel URL is used"] = "Si la deixes buida, es farà servir la URL del canal"; +App::$strings["Title of the Thing to flattr"] = "Títol del lloc a donar suport"; +App::$strings["If empty \"channel name on The Hubzilla\" will be used"] = "Si el deixes buit, es farà servir el nom del canal a Hubzilla"; +App::$strings["Static or dynamic flattr button"] = "Botó estàtic o dinàmic"; +App::$strings["static"] = "estàtic"; +App::$strings["dynamic"] = "dinàmic"; +App::$strings["Alignment of the widget"] = "Aliniament del giny"; +App::$strings["left"] = "esquerra"; +App::$strings["right"] = "dreta"; +App::$strings["Enable Flattr widget"] = "Habilita el giny de Flattr"; +App::$strings["Flattr Widget Settings"] = "Opcions del giny de Flattr"; +App::$strings["Post to GNU social"] = "Publica a GNU Social"; +App::$strings["Please contact your site administrator.
    The provided API URL is not valid."] = "Contacta l'administrador del teu lloc.
    L'adreça URL de l'API no és vàlida."; +App::$strings["We could not contact the GNU social API with the Path you entered."] = "No s'ha trobat una API de GNU Social a la ruta introduïda."; +App::$strings["GNU social settings updated."] = "S'ha actualitzat la configuració de GNU Social "; +App::$strings["Globally Available GNU social OAuthKeys"] = "Claus OAuth de GNU Social diponibles públicament"; +App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
    If not feel free to connect to any other GNU social instance (see below)."] = "Hi ha disponibles preconfigurats alguns parells de clau OAuth per a alguns servidors de GNU Social. I en fas servir algun, fes servir aquestes credencials.
    Altrament, pots connectar-te a qualsevol altra instància de GNU Social (mira més avall)"; +App::$strings["Provide your own OAuth Credentials"] = "Proporciona credencials OAuth pròpies"; +App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
    Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "No s'ha trobat cap parell de claus per a GNU Social. Registra el teu compte de Hubzilla com un client d'escriptori al teu compte de GNU Social, després copia el parell de claus de consumidor aquí i finalment introdueix l'adreça arrel de l'API.
    Abans de registrar el teu propi parell de claus, pregunta a l'administració d'aquest hub si ja hi ha un parell de claus registrat per al mateix servidor de GNU Social."; +App::$strings["OAuth Consumer Key"] = "Clau de consumidor OAuth"; +App::$strings["OAuth Consumer Secret"] = "Secret de consumidor OAuth"; +App::$strings["Base API Path"] = "Ruta arrel de l'API"; +App::$strings["Remember the trailing /"] = "Recorda la / final"; +App::$strings["GNU social application name"] = "Nom de l'aplicació GNU Social"; +App::$strings["To connect to your GNU social account click the button below to get a security code from GNU social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU social."] = "Per tal de connectar al teu compte de GNU Social, fes clic al botó de sota per a obtenir un codi de seguretat de GNU Social. Després insereix-lo a la caixa de sota i envia el formulari. Només seran publicades a GNU Social les teves entrades públiques"; +App::$strings["Log in with GNU social"] = "Inicia la sessió amb GNU Social"; +App::$strings["Copy the security code from GNU social here"] = "Copia el codi de seguretat de GNU Social aquí"; +App::$strings["Cancel Connection Process"] = "Aborta el procés de connexió"; +App::$strings["Current GNU social API is"] = "La ruta actual a l'API de GNU Social és"; +App::$strings["Cancel GNU social Connection"] = "Aborta la connexió a GNU Social"; +App::$strings["Currently connected to: "] = "Actualment estàs connectat/da a:"; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: La teva configuració de privacitat amaga els detalls del perfil a visitants desconeguts. Això provocarà que l'enllaç mostrat a GNU Social per a la teva identitat portarà a una pàgina en blanc avisant de la restricció."; +App::$strings["Allow posting to GNU social"] = "Permet publicar a GNU Social"; +App::$strings["If enabled your public postings can be posted to the associated GNU-social account"] = "Si s'activa, les entrades públiques poden ser penjades al compte associat de GNU Social"; +App::$strings["Post to GNU social by default"] = "Per defecte publica a GNU Social"; +App::$strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Si s'activa, per defecte es penjaran les teves entrades públiques al teu compte associat de GNU Social"; +App::$strings["Clear OAuth configuration"] = "Esborra la configuració de OAuth"; +App::$strings["GNU social Post Settings"] = "Configuració de Publica a GNU Social"; +App::$strings["API URL"] = "Adreça URL de l'API"; +App::$strings["Application name"] = "Nom de l'aplicació"; +App::$strings["QR code"] = "Codi QR"; +App::$strings["QR Generator"] = "Generador de codi QR"; +App::$strings["Enter some text"] = "Escriu un text"; +App::$strings["Invalid game."] = "El joc no és vàlid."; +App::$strings["You are not a player in this game."] = "No ets un jugador en aquest joc."; +App::$strings["You must be a local channel to create a game."] = "Has de crear la partida des d'un canal local."; +App::$strings["You must select one opponent that is not yourself."] = "Has de triar un oponent diferent a tu mateix/a."; +App::$strings["Random color chosen."] = "S'ha escollit un color aleatori."; +App::$strings["Error creating new game."] = "S'ha produït un error en crear la partida."; +App::$strings["Requested channel is not available."] = "El canal demanat no està disponible."; +App::$strings["You must select a local channel /chess/channelname"] = "Has de triar un canal local /chess/nomdelcanal"; +App::$strings["Enable notifications"] = "Activa les notificacions"; +App::$strings["Post to Twitter"] = "Publica a Twitter"; +App::$strings["Twitter settings updated."] = "S'ha actualitzat la configuració de Twitter."; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No s'ha trobat cap parell de claus de Twitter. Contacte l'administrador del teu lloc."; +App::$strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "L'extensió de Twitter està activada però encara no t'has connectat a cap compte de Twitter. Per a fer-ho, fes clic al botó de sota per a obtenir un PIN des de Twitter. Després insereix-lo a la caixa de sota i envia el formulari. Només seran publicades a GNU Social les teves entrades públiques"; +App::$strings["Log in with Twitter"] = "Inicia la sessió amb Twitter"; +App::$strings["Copy the PIN from Twitter here"] = "Copia el PIN de Twitter aquí"; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: La teva configuració de privacitat amaga els detalls del perfil a visitants desconeguts. Això provocarà que l'enllaç mostrat a Twitter per a la teva identitat portarà a una pàgina en blanc avisant de la restricció."; +App::$strings["Allow posting to Twitter"] = "Permet publicar a Twitter"; +App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Si s'activa, les entrades públiques poden ser penjades al compte associat de Twitter"; +App::$strings["Twitter post length"] = "Llargada del tuit"; +App::$strings["Maximum tweet length"] = "Llargada màxima de tuit"; +App::$strings["Send public postings to Twitter by default"] = "Envia per defecte les entrades públiques cap a Twitter"; +App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Si s'activa, per defecte es penjaran les teves entrades públiques al teu compte associat de Twitter"; +App::$strings["Twitter Post Settings"] = "Configuració de Twitter"; +App::$strings["Deactivate the feature"] = "Desactiva la funcionalitat"; +App::$strings["Hide the button and show the smilies directly."] = "Amaga el botó i mostra les icones directament."; +App::$strings["Smileybutton Settings"] = "Configuració de Smileybutton"; +App::$strings["Order Not Found"] = "No s'ha trobat l'ordre"; +App::$strings["Order cannot be checked out."] = "No s'ha pogut confirmar l'ordre."; +App::$strings["Enable Shopping Cart"] = "Habilita la cistella de la compra"; +App::$strings["Enable Test Catalog"] = "Habilita un catàleg de prova"; +App::$strings["Enable Manual Payments"] = "Habilita els pagaments manuals"; +App::$strings["Base Cart Settings"] = "Configuració bàsica de la cistella"; +App::$strings["Add Item"] = "Afegeix un element"; +App::$strings["Call cart_post_"] = "Crida cart_post_"; +App::$strings["Cart Not Enabled (profile: "] = "La cistella no està habilitada (perfil:"; +App::$strings["Order not found."] = "No s'ha trobat l'ordre."; +App::$strings["No Order Found"] = "No s'ha trobat cap ordre"; +App::$strings["call: "] = "crida:"; +App::$strings["An unknown error has occurred Please start again."] = "S'ha produït un error inesperat. Torna-ho a provar."; +App::$strings["Invalid Payment Type. Please start again."] = "El tipus de pagament no és vàlid. Torna a començar."; +App::$strings["Order not found"] = "No s'ha trobat l'ordre"; +App::$strings["Error: order mismatch. Please try again."] = "Error: l'ordre no coincideix. Torna-ho a provar."; +App::$strings["Manual payments are not enabled."] = "El pagament manual no està habilitat."; +App::$strings["Finished"] = "Operació completa"; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Aquest lloc web analitza el trànsit amb l'eina Piwik."; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Si no vols que es registrin les teves visites d'aquesta manera, pots crear una cookie per fer que Piwik deixi de fer-ho. En anglès es coneix com \"opt-out\"."; +App::$strings["Piwik Base URL"] = "Adreça URL arrel del Piwik"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Adreça absoluta a la instaŀlació de Piwik: sense protocol (http[s]) amb una barra (/) final"; +App::$strings["Site ID"] = "Identitat del lloc"; +App::$strings["Show opt-out cookie link?"] = "Vols mostrar un enllaç per poder crear una cookie per evitar el seguiment?"; +App::$strings["Asynchronous tracking"] = "Seguiment asíncron"; +App::$strings["Enable frontend JavaScript error tracking"] = "Activa el seguiment d'errors de Javascript al frontend "; +App::$strings["This feature requires Piwik >= 2.2.0"] = "Aquesta funcionalitat necessita una versió del Piwik >= 2.2.0"; +App::$strings["Edit your profile and change settings."] = "Modifica el teu perfil i canvia la configuració."; +App::$strings["Click here to see activity from your connections."] = "Clica aquí per a veure l'activitat de les teves connexions."; +App::$strings["Click here to see your channel home."] = "Clica aquí per a veure el mur del teu canal."; +App::$strings["You can access your private messages from here."] = "Pots accedir als teus missatges privats des d'aquí."; +App::$strings["Create new events here."] = "Pots crear esdeveniments des d'aquí."; +App::$strings["You can accept new connections and change permissions for existing ones here. You can also e.g. create groups of contacts."] = "Pots acceptar connexions noves des d'aquí i canviar els permisos de les existents. També pots crear grups de contactes, per exemple."; +App::$strings["System notifications will arrive here"] = "Les notificacions t'arriben per aquí"; +App::$strings["Search for content and users"] = "Cerca contingut i usuaris"; +App::$strings["Browse for new contacts"] = "Explora per trobar nous contactes"; +App::$strings["Launch installed apps"] = "Obre aplicacions instaŀlades"; +App::$strings["Looking for help? Click here."] = "Que busques ajuda? Clica aquí."; +App::$strings["New events have occurred in your network. Click here to see what has happened!"] = "Hi ha hagut activitat nova a la teva xarxa. Clica aquí a veure què ha passat!"; +App::$strings["You have received a new private message. Click here to see from who!"] = "Has rebut un missatge privat. A veure de qui és!"; +App::$strings["There are events this week. Click here too see which!"] = "Hi ha esdeveniments aquesta setmana. Clica per veure quins!"; +App::$strings["You have received a new introduction. Click here to see who!"] = "Has rebut una presentació. Clica per veure de qui és!"; +App::$strings["There is a new system notification. Click here to see what has happened!"] = "Tens una notificació de sistema. Clica per veure què ha passat!"; +App::$strings["Click here to share text, images, videos and sound."] = "Clica aquí per a compartir text, imatges, vídeos, i sons."; +App::$strings["You can write an optional title for your update (good for long posts)."] = "Si vols, pots posar un títol a les teves entrades. És una bona idea per a entrades llargues."; +App::$strings["Entering some categories here makes it easier to find your post later."] = "Si afegeixes categories serà més fàcil de trobar l'entrada més endavant."; +App::$strings["Share photos, links, location, etc."] = "Comparteix fotos, enllaços, la ubicació, etc."; +App::$strings["Only want to share content for a while? Make it expire at a certain date."] = "Vols compartir un contingut només durant una estona? Fes-lo caducar a un cert moment."; +App::$strings["You can password protect content."] = "Pots protegir el contingut per contrasenya."; +App::$strings["Choose who you share with."] = "Escull amb qui ho vols compartir."; +App::$strings["Click here when you are done."] = "I clica aquí quan acabis."; +App::$strings["Adjust from which channels posts should be displayed."] = "Tria des de quins canals s'haurien de mostrar les entrades."; +App::$strings["Only show posts from channels in the specified privacy group."] = "Mostra només entrades de canals especificats en el grup de privacitat."; +App::$strings["Easily find posts containing tags (keywords preceded by the \"#\" symbol)."] = "Pots trobar fàcilment entrades que continguin etiquetes (paraules clau precedides per un símbol \"#\")."; +App::$strings["Easily find posts in given category."] = "Troba fàcilment entrades en una certa categoria."; +App::$strings["Easily find posts by date."] = "Troba fàcilment entrades per data."; +App::$strings["Suggested users who have volounteered to be shown as suggestions, and who we think you might find interesting."] = "Els usuaris que et suggerim s'han mostrat voluntaris a ser suggerits perquè els puguis afegir. Que potser t'interessa connectar-t'hi?"; +App::$strings["Here you see channels you have connected to."] = "Aquí pots veure els canals als quals estàs connectat/da."; +App::$strings["Save your search so you can repeat it at a later date."] = "Si deses la teva cerca la podràs repetir més tard."; +App::$strings["If you see this icon you can be sure that the sender is who it say it is. It is normal that it is not always possible to verify the sender, so the icon will be missing sometimes. There is usually no need to worry about that."] = "Si veus aquesta icona, pots donar per fet que el/la remitent és qui diu ser. De tota manera, és habitual que no es pugui verificar, i per tant, que de vegades falti aquesta icona. Però és només una capa més de seguretat del sistema."; +App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "Alerta! Sembla que algú ha intentat falsificar un missatge! Pot ser que el remitent d'aquest missatge no sigui qui diu ser!"; +App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?

    You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.

    You can also advance by pressing the return key"] = "Benvingut/da a Hubzilla! T'agradaria fer un tur pel lloc?

    Pots pausar-lo en qualsevol moment i continuar més tard on ho havies deixat. Per fer-ho navega a una altra pàgina o recarrega aquesta.

    També pots avançar prement la tecla de retorn"; +App::$strings["Extended Identity Sharing"] = "Compartició d'identitats extesa"; +App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with \$Projectname sites."] = "Comparteix la teva identitat amb tota la web. Si es deshabilita, la identitat només es comparteix amb altres nodes de \$Projectname."; +App::$strings["Three Dimensional Tic-Tac-Toe"] = "Tres en ratlla 3D"; +App::$strings["3D Tic-Tac-Toe"] = "Tres en ratlla 3D"; +App::$strings["New game"] = "Nova partida"; +App::$strings["New game with handicap"] = "Nova partida amb desavantatge"; +App::$strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "El tres en ratlla en 3D és com el clàssic en 2D excepte que es juga en diversos nivells simultàniament."; +App::$strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "En aquest cas hi ha tres nivells. Guanya qui aconsegueixi fer 3 en ratlla en qualsevol nivell, així com amunt, avall, o en diagonal en qualsevol nivell"; +App::$strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Una partida amb desavantatge desactiva la posició del centre perquè el jugador que aconsegueix aquest quadrat sol aconseguir un avantatge injust."; +App::$strings["You go first..."] = "Comences!"; +App::$strings["I'm going first this time..."] = "Aquest cop començo jo!"; +App::$strings["You won!"] = "Has guanyat!"; +App::$strings["\"Cat\" game!"] = "Empat!"; +App::$strings["I won!"] = "He guanyat!"; +App::$strings["Message to display on every page on this server"] = "Missatge per mostrar en cada pàgina d'aquest servidor"; +App::$strings["Pageheader Settings"] = "Configuració del Pageheader"; +App::$strings["pageheader Settings saved."] = "S'ha desat la configuració del Pageheader."; +App::$strings["Only authenticate automatically to sites of your friends"] = "Autentica'm automàticament només en hubs on hi tinc connexions"; +App::$strings["By default you are automatically authenticated anywhere in the network"] = "Per defecte se t'autentica en qualsevol hub de la xarxa"; +App::$strings["Authchoose Settings"] = "Configuració de l'Authchoose"; +App::$strings["Atuhchoose Settings updated."] = "S'ha actualitzat la configuració de l'Authchoose."; +App::$strings["lonely"] = "solitari/ària"; +App::$strings["drunk"] = "borratxo/a"; +App::$strings["horny"] = "calent/a"; +App::$strings["stoned"] = "perplex/a"; +App::$strings["fucked up"] = "fotut/da"; +App::$strings["clusterfucked"] = "rematadament fotut/da"; +App::$strings["crazy"] = "boig/boja"; +App::$strings["hurt"] = "ferit/da"; +App::$strings["sleepy"] = "amb son"; +App::$strings["grumpy"] = "de mal humor"; +App::$strings["high"] = "flipat/da"; +App::$strings["semi-conscious"] = "semi-conscient"; +App::$strings["in love"] = "enamorat/da"; +App::$strings["in lust"] = "en zel"; +App::$strings["naked"] = "nu/nua"; +App::$strings["stinky"] = "pudent/a"; +App::$strings["sweaty"] = "suat/da"; +App::$strings["bleeding out"] = "sagnant"; +App::$strings["victorious"] = "victoriós/a"; +App::$strings["defeated"] = "derrotat/da"; +App::$strings["envious"] = "envejós/a"; +App::$strings["jealous"] = "gelós/a"; +App::$strings["XMPP settings updated."] = "S'ha actualitzat la configuració de l'XMPP."; +App::$strings["Enable Chat"] = "Activa el xat"; +App::$strings["Individual credentials"] = "Credencials individuals"; +App::$strings["Jabber BOSH server"] = "Servidor de Jabber BOSH"; +App::$strings["XMPP Settings"] = "Configuració XMPP"; +App::$strings["Jabber BOSH host"] = "Nom de domini de Jabber BOSH"; +App::$strings["Use central userbase"] = "Fes servir una base d'usuari/es central"; +App::$strings["If enabled, members will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Si s'activa, s'iniciarà sessió automàticament als membres en un servidor ejabberd. Aquest ha d'estar instaŀlat en la mateixa màquina amb credencials sincronitzades, mitjançant l'script \"auth_ejabberd.php\"."; +App::$strings["Who likes me?"] = "A qui agrado?"; +App::$strings["You are now authenticated to pumpio."] = "Has iniciat sessió a pumpio."; +App::$strings["return to the featured settings page"] = "torna a la pàgina de configuració"; +App::$strings["Post to Pump.io"] = "Publica a Pump.io"; +App::$strings["Pump.io servername"] = "Nom del servidor de Pump.io"; +App::$strings["Without \"http://\" or \"https://\""] = "Sense \"http://\" ni \"https://\""; +App::$strings["Pump.io username"] = "Nom d'usuari a Pump.io"; +App::$strings["Without the servername"] = "Sense el nom de servidor"; +App::$strings["You are not authenticated to pumpio"] = "No has iniciat sessió a pumpio"; +App::$strings["(Re-)Authenticate your pump.io connection"] = "[Re]autentica la teva connexió a pump.io"; +App::$strings["Enable pump.io Post Plugin"] = "Activa l'extensió Publica a pump.io"; +App::$strings["Post to pump.io by default"] = "Publica a Pump.io per defecte"; +App::$strings["Should posts be public"] = "Vols que les entrades siguin públiques?"; +App::$strings["Mirror all public posts"] = "Replica totes les entrades públiques"; +App::$strings["Pump.io Post Settings"] = "Configuració de les entrades de pump.io"; +App::$strings["PumpIO Settings saved."] = "S'ha desat la configuració de pump.io"; +App::$strings["An account has been created for you."] = "S'ha creat un compte nou."; +App::$strings["Authentication successful but rejected: account creation is disabled."] = "L'autenticació ha tingut èxit però no s'ha pogut crear un compte perquè no està permès."; +App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Cerca %1\$s(%2\$s)"; +App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname"; +App::$strings["Search \$Projectname"] = "Cerca \$Projectname"; +App::$strings["Redmatrix File Storage Import"] = "Importa l'emmagatzematge d'arxius de Redmatrix"; +App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Importa tots els teus arxius de núvol cap aquest canal."; +App::$strings["file"] = "arxiu"; +App::$strings["Send email to all members"] = "Enviar correus a tothom"; +App::$strings["%1\$d of %2\$d messages sent."] = "S'ha/n enviat %1\$d de %2\$d missatges."; +App::$strings["Send email to all hub members."] = "Envia un correu a tots els membres del hub."; +App::$strings["Sender Email address"] = "Adreça del remitent"; +App::$strings["Test mode (only send to hub administrator)"] = "Mode de proves (envia'l només a l'administrador del hub)"; +App::$strings["Frequently"] = "Freqüentment"; +App::$strings["Hourly"] = "Horariament"; +App::$strings["Twice daily"] = "Dos vegades al dia"; +App::$strings["Daily"] = "Diariament"; +App::$strings["Weekly"] = "Setmanalment"; +App::$strings["Monthly"] = "Mensualment"; +App::$strings["Currently Male"] = "Actualment Masculí"; +App::$strings["Currently Female"] = "Actualment Femení"; +App::$strings["Mostly Male"] = "Més aviat Masculí"; +App::$strings["Mostly Female"] = "Més Aviat Femení"; +App::$strings["Transgender"] = "Canvi de Sexe"; +App::$strings["Intersex"] = "Intersexual"; +App::$strings["Transsexual"] = "Transsexual"; +App::$strings["Hermaphrodite"] = "Hermafrodita"; +App::$strings["Neuter"] = "Neutre"; +App::$strings["Non-specific"] = "Indefinit"; +App::$strings["Undecided"] = "Indecís"; +App::$strings["Males"] = "Homes"; +App::$strings["Females"] = "Dones"; +App::$strings["Gay"] = "Gay"; +App::$strings["Lesbian"] = "Lesbianes"; +App::$strings["No Preference"] = "Sense Preferències"; +App::$strings["Bisexual"] = "Bisexual"; +App::$strings["Autosexual"] = "Autosexual"; +App::$strings["Abstinent"] = "Abstinent"; +App::$strings["Virgin"] = "Verge"; +App::$strings["Deviant"] = "Desviat"; +App::$strings["Fetish"] = "Fetixiste"; +App::$strings["Oodles"] = "Orgies"; +App::$strings["Nonsexual"] = "Asexual"; +App::$strings["Single"] = "Solter"; +App::$strings["Lonely"] = "Solitari"; +App::$strings["Available"] = "Disponible"; +App::$strings["Unavailable"] = "No Disponible"; +App::$strings["Has crush"] = "Aplastat"; +App::$strings["Infatuated"] = "Encapritxat"; +App::$strings["Dating"] = "Promés"; +App::$strings["Unfaithful"] = "Infidel"; +App::$strings["Sex Addict"] = "Adicte al Sexe"; +App::$strings["Friends/Benefits"] = "Amics amb Beneficis"; +App::$strings["Casual"] = "Casual"; +App::$strings["Engaged"] = "Ocupat"; +App::$strings["Married"] = "Casat"; +App::$strings["Imaginarily married"] = "Casat Imaginàriament"; +App::$strings["Partners"] = "Parella"; +App::$strings["Cohabiting"] = "Cohabitant"; +App::$strings["Common law"] = "Tradició"; +App::$strings["Happy"] = "Feliç"; +App::$strings["Not looking"] = "No Cerco"; +App::$strings["Swinger"] = "Llibertí"; +App::$strings["Betrayed"] = "Traït"; +App::$strings["Separated"] = "Separat"; +App::$strings["Unstable"] = "Inestable"; +App::$strings["Divorced"] = "Divorciat"; +App::$strings["Imaginarily divorced"] = "Divorciat Imaginàriament"; +App::$strings["Widowed"] = "Vidu/ua"; +App::$strings["Uncertain"] = "Incert"; +App::$strings["It's complicated"] = "Es Complicat"; +App::$strings["Don't care"] = "No Et Fa Res"; +App::$strings["Ask me"] = "Pregunta"; +App::$strings["likes %1\$s's %2\$s"] = "li agrada %2\$s de %1\$s"; +App::$strings["doesn't like %1\$s's %2\$s"] = "no li agrada %2\$s de %1\$s"; App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s esta ara connectat amb %2\$s"; App::$strings["%1\$s poked %2\$s"] = "%1\$s a esperonat %2\$s"; +App::$strings["poked"] = "esperonat"; App::$strings["View %s's profile @ %s"] = "Vista %s del perfil @ %s"; App::$strings["Categories:"] = "Categories:"; App::$strings["Filed under:"] = "Arxivar a:"; App::$strings["View in context"] = "Veure en context"; App::$strings["remove"] = "treu"; +App::$strings["Loading..."] = "Carregant..."; App::$strings["Delete Selected Items"] = "Esborra els Articles Seleccionats"; App::$strings["View Source"] = "Veure l'Origen"; App::$strings["Follow Thread"] = "Segueix el Fil"; App::$strings["Unfollow Thread"] = "Fil Abandonat"; -App::$strings["Activity/Posts"] = "Activitat/Entrades"; App::$strings["Edit Connection"] = "Modifica la Connexió"; App::$strings["Message"] = "Missatge"; App::$strings["%s likes this."] = "%s agrada això."; @@ -1815,14 +2709,17 @@ App::$strings["Set your location"] = "Ajusta la teva ubicació"; App::$strings["Clear browser location"] = "Treu la localització del navegador"; App::$strings["Tag term:"] = "Paraula de l'Etiqueta:"; App::$strings["Where are you right now?"] = "On ets ara?"; +App::$strings["Choose a different album..."] = "Tria un àlbum diferent..."; +App::$strings["Comments enabled"] = "S'han activat els comentaris"; +App::$strings["Comments disabled"] = "S'han activat els comentaris"; App::$strings["Page link name"] = "Nom de la pàgina enllaçada"; App::$strings["Post as"] = "Envia com"; App::$strings["Toggle voting"] = "Commutar votació"; +App::$strings["Disable comments"] = "Desactiva els comentaris"; +App::$strings["Toggle comments"] = "Commuta l'estat dels comentaris"; App::$strings["Categories (optional, comma-separated list)"] = "Categories (opcional, llista separada per comes)"; +App::$strings["Other networks and post services"] = "Altres xarxes i serveis de correu"; App::$strings["Set publish date"] = "Ajusta la data de publicació"; -App::$strings["OK"] = "OK"; -App::$strings["Discover"] = "Descobrir"; -App::$strings["Imported public streams"] = "Importar fluxos públics"; App::$strings["Commented Order"] = "Ordenar per Comentaris"; App::$strings["Sort by Comment Date"] = "Ordenar per Data del Comentari"; App::$strings["Posted Order"] = "Ordenar per Entrades"; @@ -1834,12 +2731,15 @@ App::$strings["Favourite Posts"] = "Entrades Favorites"; App::$strings["Spam"] = "Spam"; App::$strings["Posts flagged as SPAM"] = "Entrades marcades com a SPAM"; App::$strings["Status Messages and Posts"] = "Estat dels Missatges i Entrades"; -App::$strings["About"] = "El Meu Perfil"; App::$strings["Profile Details"] = "Detalls del Perfil"; App::$strings["Photo Albums"] = "Albums de Fotos"; App::$strings["Files and Storage"] = "Arxius i Emmagatzegament"; +App::$strings["Bookmarks"] = "Marcadors"; App::$strings["Saved Bookmarks"] = "Marcadors Guardats"; -App::$strings["Manage Webpages"] = "Gestió de Pàgines Web"; +App::$strings["View Cards"] = "Mostra les targetes"; +App::$strings["articles"] = "articles"; +App::$strings["View Articles"] = "Mostra els articles"; +App::$strings["View Webpages"] = "Mostra les pàgines web"; App::$strings["__ctx:noun__ Attending"] = array( 0 => "Assistint", 1 => "Assistint", @@ -1864,99 +2764,194 @@ App::$strings["__ctx:noun__ Abstain"] = array( 0 => "Abstenirse", 1 => "Abstenirse", ); -App::$strings["Frequently"] = "Freqüentment"; -App::$strings["Hourly"] = "Horariament"; -App::$strings["Twice daily"] = "Dos vegades al dia"; -App::$strings["Daily"] = "Diariament"; -App::$strings["Weekly"] = "Setmanalment"; -App::$strings["Monthly"] = "Mensualment"; -App::$strings["Currently Male"] = "Actualment Masculí"; -App::$strings["Currently Female"] = "Actualment Femení"; -App::$strings["Mostly Male"] = "Més aviat Masculí"; -App::$strings["Mostly Female"] = "Més Aviat Femení"; -App::$strings["Transgender"] = "Canvi de Sexe"; -App::$strings["Intersex"] = "Intersexual"; -App::$strings["Transsexual"] = "Transsexual"; -App::$strings["Hermaphrodite"] = "Hermafrodita"; -App::$strings["Neuter"] = "Neutre"; -App::$strings["Non-specific"] = "Indefinit"; -App::$strings["Other"] = "Altres"; -App::$strings["Undecided"] = "Indecís"; -App::$strings["Males"] = "Homes"; -App::$strings["Females"] = "Dones"; -App::$strings["Gay"] = "Gay"; -App::$strings["Lesbian"] = "Lesbianes"; -App::$strings["No Preference"] = "Sense Preferències"; -App::$strings["Bisexual"] = "Bisexual"; -App::$strings["Autosexual"] = "Autosexual"; -App::$strings["Abstinent"] = "Abstinent"; -App::$strings["Virgin"] = "Verge"; -App::$strings["Deviant"] = "Desviat"; -App::$strings["Fetish"] = "Fetixiste"; -App::$strings["Oodles"] = "Orgies"; -App::$strings["Nonsexual"] = "Asexual"; -App::$strings["Single"] = "Solter"; -App::$strings["Lonely"] = "Solitari"; -App::$strings["Available"] = "Disponible"; -App::$strings["Unavailable"] = "No Disponible"; -App::$strings["Has crush"] = "Aplastat"; -App::$strings["Infatuated"] = "Encapritxat"; -App::$strings["Dating"] = "Promés"; -App::$strings["Unfaithful"] = "Infidel"; -App::$strings["Sex Addict"] = "Adicte al Sexe"; -App::$strings["Friends/Benefits"] = "Amics amb Beneficis"; -App::$strings["Casual"] = "Casual"; -App::$strings["Engaged"] = "Ocupat"; -App::$strings["Married"] = "Casat"; -App::$strings["Imaginarily married"] = "Casat Imaginàriament"; -App::$strings["Partners"] = "Parella"; -App::$strings["Cohabiting"] = "Cohabitant"; -App::$strings["Common law"] = "Tradició"; -App::$strings["Happy"] = "Feliç"; -App::$strings["Not looking"] = "No Cerco"; -App::$strings["Swinger"] = "Llibertí"; -App::$strings["Betrayed"] = "Traït"; -App::$strings["Separated"] = "Separat"; -App::$strings["Unstable"] = "Inestable"; -App::$strings["Divorced"] = "Divorciat"; -App::$strings["Imaginarily divorced"] = "Divorciat Imaginàriament"; -App::$strings["Widowed"] = "Vidu/ua"; -App::$strings["Uncertain"] = "Incert"; -App::$strings["It's complicated"] = "Es Complicat"; -App::$strings["Don't care"] = "No Et Fa Res"; -App::$strings["Ask me"] = "Pregunta"; -App::$strings["Visible to your default audience"] = "Visible per a la teva audiència "; -App::$strings["Only me"] = "Només jo"; -App::$strings["Public"] = "Públic"; -App::$strings["Anybody in the \$Projectname network"] = "Ningú a la xarxa \$Projectname"; -App::$strings["Any account on %s"] = "Qualsevol compte a %s"; -App::$strings["Any of my connections"] = "Qualsevol de les meves connexions"; -App::$strings["Only connections I specifically allow"] = "Només les connexions que permeto específicament"; -App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Qualsevol persona autenticada (podria incloure als usuaris d'altres xarxes)"; -App::$strings["Any connections including those who haven't yet been approved"] = "Qualsevol connexió incloent aquells que encara no han estat aprovats"; -App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Aquest és l'ajust per defecte per al públic del seu flux normal i entrades."; -App::$strings["This is your default setting for who can view your default channel profile"] = "Aquesta és la configuració per defecte per a qui pugui veure el teu perfil per defecte del canal"; -App::$strings["This is your default setting for who can view your connections"] = "Aquesta és la configuració per defecte per a qui pugui veure les teves connexions"; -App::$strings["This is your default setting for who can view your file storage and photos"] = "Aquesta és la configuració per defecte per a qui pugui veure els teus arxius i fotos"; -App::$strings["This is your default setting for the audience of your webpages"] = "Aquests son els ajustos per defecte de l'audiència de les teves pàgines web"; -App::$strings["Not a valid email address"] = "Adreça de correu electrònic no vàlida"; -App::$strings["Your email domain is not among those allowed on this site"] = "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc"; -App::$strings["Your email address is already registered at this site."] = "La teva adreça de correu electrònic ja esta registrada en aquest lloc"; -App::$strings["An invitation is required."] = "Es requereix Invitació"; -App::$strings["Invitation could not be verified."] = "L'invitació no ha pogut ser verificada"; -App::$strings["Please enter the required information."] = "Entra la informació sol·licitada"; -App::$strings["Failed to store account information."] = "Ha fallat guardar la informació del compte"; -App::$strings["Registration confirmation for %s"] = "Registre confirmat per %s"; -App::$strings["Registration request at %s"] = "Sol·licitud de registre a %s"; -App::$strings["Administrator"] = "Administrador"; -App::$strings["your registration password"] = "la teva contrasenya registrada"; -App::$strings["Registration details for %s"] = "Detalls del registre per %s"; -App::$strings["Account approved."] = "Compte aprovat."; -App::$strings["Registration revoked for %s"] = "Registre revocat per %s"; -App::$strings["Account verified. Please login."] = "Compte verificat. Si us plau, inicia sessió."; -App::$strings["Click here to upgrade."] = "Feu clic aquí per actualitzar."; -App::$strings["This action exceeds the limits set by your subscription plan."] = "Aquesta acció és superior als límits establerts pel seu pla de subscripció."; -App::$strings["This action is not available under your subscription plan."] = "Aquesta acció no està disponible en el seu pla de subscripció."; +App::$strings["Directory Options"] = "Opcions de Directori"; +App::$strings["Safe Mode"] = "Manera Segura"; +App::$strings["Public Forums Only"] = "Només Fòrums Públics"; +App::$strings["This Website Only"] = "Només Aquest Lloc Web"; +App::$strings["%1\$s's bookmarks"] = "%1\$s de marcadors"; +App::$strings["Unable to import a removed channel."] = "No s'ha pogut importar un canal esborrat."; +App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No s'ha pogut importar el canal perquè l'identificador del canal no s'ha pogut duplicar en aquest servidor."; +App::$strings["Cloned channel not found. Import failed."] = "No s'ha pogut importar el canal perquè el canal clonat no s'ha trobat."; +App::$strings["prev"] = "prev"; +App::$strings["first"] = "primer"; +App::$strings["last"] = "últim"; +App::$strings["next"] = "pròxim"; +App::$strings["older"] = "el més antic"; +App::$strings["newer"] = "El més nou"; +App::$strings["No connections"] = "Sense Connexions"; +App::$strings["View all %s connections"] = "Veure totes les connexions de %s"; +App::$strings["poke"] = "esperona"; +App::$strings["ping"] = "coloca"; +App::$strings["pinged"] = "colocat"; +App::$strings["prod"] = "picar"; +App::$strings["prodded"] = "picat"; +App::$strings["slap"] = "bufetada"; +App::$strings["slapped"] = "bufetejat"; +App::$strings["finger"] = "senyal"; +App::$strings["fingered"] = "senyalat"; +App::$strings["rebuff"] = "menyspreu"; +App::$strings["rebuffed"] = "menyspreuat"; +App::$strings["happy"] = "feliç"; +App::$strings["sad"] = "trist"; +App::$strings["mellow"] = "melós"; +App::$strings["tired"] = "cansat"; +App::$strings["perky"] = "turgent"; +App::$strings["angry"] = "enfadat"; +App::$strings["stupefied"] = "estupefacte"; +App::$strings["puzzled"] = "perplexe"; +App::$strings["interested"] = "Interessat"; +App::$strings["bitter"] = "amargat"; +App::$strings["cheerful"] = "feliç"; +App::$strings["alive"] = "viu"; +App::$strings["annoyed"] = "molest"; +App::$strings["anxious"] = "ansiós"; +App::$strings["cranky"] = "malagaitós"; +App::$strings["disturbed"] = "transtornat"; +App::$strings["frustrated"] = "frustrat"; +App::$strings["depressed"] = "deprimit"; +App::$strings["motivated"] = "motivat"; +App::$strings["relaxed"] = "relaxat"; +App::$strings["surprised"] = "sorprès"; +App::$strings["Monday"] = "Dilluns"; +App::$strings["Tuesday"] = "Dimarts"; +App::$strings["Wednesday"] = "Dimecres"; +App::$strings["Thursday"] = "Dijous"; +App::$strings["Friday"] = "Divendres"; +App::$strings["Saturday"] = "Dissabte"; +App::$strings["Sunday"] = "Diumenge"; +App::$strings["January"] = "Gener"; +App::$strings["February"] = "Febrer"; +App::$strings["March"] = "Març"; +App::$strings["April"] = "Abril"; +App::$strings["May"] = "Maig"; +App::$strings["June"] = "Juny"; +App::$strings["July"] = "Juliol"; +App::$strings["August"] = "Agost"; +App::$strings["September"] = "Setembre"; +App::$strings["October"] = "Octubre"; +App::$strings["November"] = "Novembre"; +App::$strings["December"] = "Desembre"; +App::$strings["Unknown Attachment"] = "Adjunt Desconegut"; +App::$strings["unknown"] = "desconegut"; +App::$strings["remove category"] = "elimina categoria"; +App::$strings["remove from file"] = "elimina del arxiu"; +App::$strings["Download binary/encrypted content"] = "Descarrega el binari o contingut xifrat"; +App::$strings["default"] = "per defecte"; +App::$strings["Page layout"] = "Disseny de pàgina"; +App::$strings["You can create your own with the layouts tool"] = "Pots crear el teu propi amb l'editor de dissenys de pàgina."; +App::$strings["HTML"] = "HTML"; +App::$strings["Comanche Layout"] = "Disseny Comanche"; +App::$strings["PHP"] = "PHP"; +App::$strings["Page content type"] = "Tipus de contingut de la pàgina"; +App::$strings["activity"] = "activitat"; +App::$strings["a-z, 0-9, -, and _ only"] = "només caràcters alfanumèrics en minúscula (a-z, 0-9), guió (-) i guió baix (_)"; +App::$strings["Design Tools"] = "Eines de disseny"; +App::$strings["Pages"] = "Pàgines"; +App::$strings["Import website..."] = "Importa un lloc web"; +App::$strings["Select folder to import"] = "Escull la carpeta a on importar"; +App::$strings["Import from a zipped folder:"] = "Importa des d'una carpeta comprimida:"; +App::$strings["Import from cloud files:"] = "Importa des de fitxers penjats a un núvol:"; +App::$strings["/cloud/channel/path/to/folder"] = "/núvol/canal/ruta/a/la/carpeta"; +App::$strings["Enter path to website files"] = "Introdueix la ruta als arxius de la web"; +App::$strings["Select folder"] = "Escull la carpeta"; +App::$strings["Export website..."] = "Exporta un lloc web"; +App::$strings["Export to a zip file"] = "Exporta a una carpeta comprimida"; +App::$strings["website.zip"] = "lloc-web.zip"; +App::$strings["Enter a name for the zip file."] = "Introdueix un nom per al fitxer comprimit."; +App::$strings["Export to cloud files"] = "Exporta a arxius de núvol"; +App::$strings["/path/to/export/folder"] = "/ruta/a/la/carpeta/exportació"; +App::$strings["Enter a path to a cloud files destination."] = "Introdueix la ruta dels fitxers de núvol de destí."; +App::$strings["Specify folder"] = "Escull una carpeta"; +App::$strings["%d invitation available"] = array( + 0 => "%d invitació disponible", + 1 => "%d invitacions disponibles", +); +App::$strings["Find Channels"] = "Troba Canals"; +App::$strings["Enter name or interest"] = "Entra un nom o interes"; +App::$strings["Connect/Follow"] = "Conecta/Segueix"; +App::$strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Lionel Messi, Futbolista"; +App::$strings["Random Profile"] = "Perfil Aleatori"; +App::$strings["Invite Friends"] = "Convida Amics"; +App::$strings["Advanced example: name=fred and country=iceland"] = "Exemple avançat: nom=pep i pais=eire"; +App::$strings["Common Connections"] = "Connexions en comú"; +App::$strings["View all %d common connections"] = "Mostra totes les connexions en comú amb %d"; +App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s va escriure el següent %2\$s %3\$s"; +App::$strings["Channel is blocked on this site."] = "El canal està bloquejat en aquest lloc."; +App::$strings["Channel location missing."] = "Ubicació del canal perduda."; +App::$strings["Response from remote channel was incomplete."] = "La resposta del canal remot fou incompleta."; +App::$strings["Premium channel - please visit:"] = "Canal prèmium - ves a:"; +App::$strings["Channel was deleted and no longer exists."] = "El canal fou esborrat i actualment no existeix."; +App::$strings["Remote channel or protocol unavailable."] = "El canal remot o el protocol no estan disponibles."; +App::$strings["Channel discovery failed."] = "Descobriment de canal fallit."; +App::$strings["Protocol disabled."] = "Protocol desactivat."; +App::$strings["Cannot connect to yourself."] = "No pots connectar amb tu mateix."; +App::$strings["Delete this item?"] = "Esborrar aquest item?"; +App::$strings["%s show less"] = "%smostra'n menys"; +App::$strings["%s expand"] = "%sdesplega"; +App::$strings["%s collapse"] = "%splega"; +App::$strings["Password too short"] = "Contrasenya massa curta"; +App::$strings["Passwords do not match"] = "Les paraules de pas no coincideixen"; +App::$strings["everybody"] = "tothom"; +App::$strings["Secret Passphrase"] = "Contrasenya Secreta"; +App::$strings["Passphrase hint"] = "Pista per la Contrasenya"; +App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Avis: Els permisos han canviat però encara no han estat enviats."; +App::$strings["close all"] = "tanca tot"; +App::$strings["Nothing new here"] = "Res de nou per aquí"; +App::$strings["Rate This Channel (this is public)"] = "Valora Aquest Canal (això es farà públic)"; +App::$strings["Describe (optional)"] = "Descriu (opcional)"; +App::$strings["Please enter a link URL"] = "Si us plau, entra l'enllaç URL"; +App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Hi ha canvis sense desar, estàs segur que vols abandonar la pàgina?"; +App::$strings["timeago.prefixAgo"] = "fa"; +App::$strings["timeago.prefixFromNow"] = "d'aquí a"; +App::$strings["timeago.suffixAgo"] = "fa"; +App::$strings["timeago.suffixFromNow"] = "d'aquí a"; +App::$strings["less than a minute"] = "uns segons"; +App::$strings["about a minute"] = "prop d'un minut"; +App::$strings["%d minutes"] = "%d minuts"; +App::$strings["about an hour"] = "prop d'una hora"; +App::$strings["about %d hours"] = "unes %d hores"; +App::$strings["a day"] = "un dia"; +App::$strings["%d days"] = "%d dies"; +App::$strings["about a month"] = "prop d'un mes"; +App::$strings["%d months"] = "%d mesos"; +App::$strings["about a year"] = "prop d'un any"; +App::$strings["%d years"] = "%d anys"; +App::$strings[" "] = " "; +App::$strings["timeago.numbers"] = "timeago.numbers"; +App::$strings["__ctx:long__ May"] = "maig"; +App::$strings["Jan"] = "gen."; +App::$strings["Feb"] = "feb."; +App::$strings["Mar"] = "març"; +App::$strings["Apr"] = "abr."; +App::$strings["__ctx:short__ May"] = "maig"; +App::$strings["Jun"] = "juny"; +App::$strings["Jul"] = "jul."; +App::$strings["Aug"] = "ag."; +App::$strings["Sep"] = "set."; +App::$strings["Oct"] = "oct."; +App::$strings["Nov"] = "nov."; +App::$strings["Dec"] = "des."; +App::$strings["Sun"] = "dg."; +App::$strings["Mon"] = "dl."; +App::$strings["Tue"] = "dm."; +App::$strings["Wed"] = "dc."; +App::$strings["Thu"] = "dj."; +App::$strings["Fri"] = "dv."; +App::$strings["Sat"] = "ds."; +App::$strings["__ctx:calendar__ today"] = "avui"; +App::$strings["__ctx:calendar__ month"] = "mes"; +App::$strings["__ctx:calendar__ week"] = "setmana"; +App::$strings["__ctx:calendar__ day"] = "dia"; +App::$strings["__ctx:calendar__ All day"] = "Tot el dia"; +App::$strings["Unable to determine sender."] = "incapaç de determinar el remitent"; +App::$strings["No recipient provided."] = "No s'ha proporcionat bústia."; +App::$strings["[no subject]"] = "[no subject]"; +App::$strings["Stored post could not be verified."] = "L'entrada guardada no pot ser verificada"; +App::$strings[" and "] = "i"; +App::$strings["public profile"] = "Perfil públic"; +App::$strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s canviat %2\$s a “%3\$s”"; +App::$strings["Visit %1\$s's %2\$s"] = "Visita %1\$s en %2\$s"; +App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s Ha actualitzat %2\$s, canviant %3\$s."; App::$strings["Item was not found."] = "Article no trobat."; App::$strings["No source file."] = "No hi ha arxiu d'origen."; App::$strings["Cannot locate file to replace"] = "No trobo l'arxiu a reemplaçar"; @@ -1972,29 +2967,45 @@ App::$strings["Path not found."] = "Trajectòria no trobada."; App::$strings["mkdir failed."] = "mkdir va fracassar."; App::$strings["database storage failed."] = "Arxiu de base de dades va fallar."; App::$strings["Empty path"] = "Trajèctoria vuida"; +App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "El formulario de la cadena de seguridad no era correcto. Esto probablemente ocurrió porque el formulario se ha abierto durante demasiado tiempo (> 3 horas) antes de enviarlo."; +App::$strings["(Unknown)"] = "(Desconegut)"; +App::$strings["Visible to anybody on the internet."] = "Visible per tothom a la Internet"; +App::$strings["Visible to you only."] = "Visible només per tú."; +App::$strings["Visible to anybody in this network."] = "Visible per tothom en aquesta xarxa."; +App::$strings["Visible to anybody authenticated."] = "Visible per tothom autenticat."; +App::$strings["Visible to anybody on %s."] = "Visible per a tothom a %s."; +App::$strings["Visible to all connections."] = "Visible per a totes les connexions."; +App::$strings["Visible to approved connections."] = "Visible per a les connexions aprovades."; +App::$strings["Visible to specific connections."] = "Visible per a específiques connexions."; +App::$strings["Privacy group is empty."] = "El grup privat està vuit."; +App::$strings["Privacy group: %s"] = "Grup privat: %s"; +App::$strings["Connection not found."] = "Connexió no trobada."; +App::$strings["profile photo"] = "foto del perfil"; +App::$strings["[Edited %s]"] = "[S'ha editat %s]"; +App::$strings["__ctx:edit_activity__ Post"] = "Entrada"; +App::$strings["__ctx:edit_activity__ Comment"] = "Comentari"; App::$strings["Unable to obtain identity information from database"] = "Incapaç de trobar l'informació d'identitat a la base de dades"; App::$strings["Empty name"] = "Nom buit"; App::$strings["Name too long"] = "Nom massa llarg"; App::$strings["No account identifier"] = "Sense identificador de compte"; App::$strings["Nickname is required."] = "Alies/malnom es requerit."; -App::$strings["Reserved nickname. Please choose another."] = "Àlies reservat. Tria un altre."; -App::$strings["Nickname has unsupported characters or is already being used on this site."] = "L'álies te caracters no soportats o ja esta en ús en aquest lloc"; App::$strings["Unable to retrieve created identity"] = "No es pot recuperar la identitat creada"; App::$strings["Default Profile"] = "Perfil per Defecte"; -App::$strings["Requested channel is not available."] = "El canal demanat no està disponible."; +App::$strings["Unable to retrieve modified identity"] = "No s'ha pogut carregar la identitat modificada"; App::$strings["Create New Profile"] = "Crear un Perfil Nou"; App::$strings["Visible to everybody"] = "Visible per tothom"; App::$strings["Gender:"] = "Gènere:"; -App::$strings["Status:"] = "Estatus:"; App::$strings["Homepage:"] = "Pàgina Personal:"; App::$strings["Online Now"] = "Ara en Linia"; +App::$strings["Change your profile photo"] = "Canvia la foto de peril"; +App::$strings["Trans"] = "Trans"; App::$strings["Like this channel"] = "M'agrada aquest canal"; App::$strings["j F, Y"] = "j F, Y"; App::$strings["j F"] = "j F"; App::$strings["Birthday:"] = "Aniversari:"; App::$strings["for %1\$d %2\$s"] = "per %1\$d %2\$s"; -App::$strings["Sexual Preference:"] = "Preferència Sexual:"; App::$strings["Tags:"] = "Etiquetes:"; +App::$strings["Sexual Preference:"] = "Preferència Sexual:"; App::$strings["Political Views:"] = "Idees Polítiques:"; App::$strings["Religion:"] = "Religió:"; App::$strings["Hobbies/Interests:"] = "Aficions/Interessos:"; @@ -2010,21 +3021,67 @@ App::$strings["Love/Romance:"] = "Amor/Romace:"; App::$strings["Work/employment:"] = "Treball/feina:"; App::$strings["School/education:"] = "Escola/educació:"; App::$strings["Like this thing"] = "M'agrada això"; +App::$strings["l F d, Y \\@ g:i A"] = "l d \\d\\e/\\d' F de Y \\@ H:i T"; +App::$strings["Starts:"] = "Inicia:"; +App::$strings["Finishes:"] = "Acaba:"; +App::$strings["This event has been added to your calendar."] = "Aquest succés ha estat afegit al teu calendari."; +App::$strings["Not specified"] = "Sense especificar"; +App::$strings["Needs Action"] = "Necessita una Acció"; +App::$strings["Completed"] = "Completat"; +App::$strings["In Process"] = "En Procès"; +App::$strings["Cancelled"] = "Cancel·lat"; +App::$strings["Home, Voice"] = "Casa, veu"; +App::$strings["Home, Fax"] = "Casa, fax"; +App::$strings["Work, Voice"] = "Feina, veu"; +App::$strings["Work, Fax"] = "Feina, fax"; +App::$strings["view full size"] = "Veure a mida competa"; +App::$strings["Friendica"] = "Friendica"; +App::$strings["OStatus"] = "OStatus"; +App::$strings["GNU-Social"] = "GNU-Social"; +App::$strings["RSS/Atom"] = "RSS/Atom"; +App::$strings["Diaspora"] = "Diaspora"; +App::$strings["Facebook"] = "Facebook"; +App::$strings["Zot"] = "Zot"; +App::$strings["LinkedIn"] = "LinkedIn"; +App::$strings["XMPP/IM"] = "XMPP/IM"; +App::$strings["MySpace"] = "MySpace"; +App::$strings["Select an alternate language"] = "Tria un idioma alternatiu"; +App::$strings["Who can see this?"] = "Qui pot veure això?"; +App::$strings["Custom selection"] = "Selecció a mida"; +App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Selecciona \"Mostrar\" per permetre la visualització. \"No Mostrar\" et permet obviar i limitar l'abast de \"Mostrar\"."; +App::$strings["Show"] = "Mostra"; +App::$strings["Don't show"] = "No mostrar"; +App::$strings["Post permissions %s cannot be changed %s after a post is shared.
    These permissions set who is allowed to view the post."] = "Els permisos d'entrada %s no poden esser canviats %s posteriorment a que una entrada ja està compartida.
    Aquest ajust dels permisos indica qui pot veure l'entrada."; +App::$strings["Cannot locate DNS info for database server '%s'"] = "No s'ha trobat informació de DNS pel servidor de base de dades '%s'"; +App::$strings["Image/photo"] = "Imatge/foto"; +App::$strings["Encrypted content"] = "Contingut encriptat"; +App::$strings["Install %1\$s element %2\$s"] = "Instaŀla l'element %2\$s del tipus %1\$s"; +App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Aquesta entrada contè un element %s instal·lable, potser manques de permissos per instal·lar-lo en aquest lloc."; +App::$strings["card"] = "targeta"; +App::$strings["article"] = "article"; +App::$strings["Click to open/close"] = "Clic per obrir/tancar"; +App::$strings["spoiler"] = "xafa guitarres"; +App::$strings["View article"] = "Mostra l'article"; +App::$strings["View summary"] = "Mostra'n un resum"; +App::$strings["$1 wrote:"] = "$1 va escriure:"; +App::$strings[" by "] = "de"; +App::$strings[" on "] = "a"; +App::$strings["Embedded content"] = "Contingut embegut"; +App::$strings["Embedding disabled"] = "Incorporació desactivada"; +App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s dóna la benvinguda a %2\$s"; App::$strings["General Features"] = "Característiques Generals"; -App::$strings["Content Expiration"] = "Expiració del Contingut"; -App::$strings["Remove posts/comments and/or private messages at a future time"] = "eliminarà entrades/comentaris i/o missatges privats en un període determinat de temps."; -App::$strings["Multiple Profiles"] = "Multiples Perfils"; -App::$strings["Ability to create multiple profiles"] = "Capacitat per crear multiples perfils"; +App::$strings["Display new member quick links menu"] = "Mostra el menú d'enllaços ràpids per a nous membres"; App::$strings["Advanced Profiles"] = "Perfils Avançats"; App::$strings["Additional profile sections and selections"] = "Seccions i seleccions addicionals de perfils "; App::$strings["Profile Import/Export"] = "Importar/Exportar Perfil"; App::$strings["Save and load profile details across sites/channels"] = "Guarda i carrega els detalls del perfil al llarg dels llocs/canals"; App::$strings["Web Pages"] = "Pàgines Web"; App::$strings["Provide managed web pages on your channel"] = "Proporcionar pàgines web gestionades al seu canal"; -App::$strings["Hide Rating"] = "Amaga la Valoració"; -App::$strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Amaga el botó de valoracions al teu canal i pàgines del perfil. Nota: Et poden continuar valorant en altres llocs."; +App::$strings["Provide a wiki for your channel"] = "Proporciona una wiki per al teu canal"; App::$strings["Private Notes"] = "Notes Privades"; App::$strings["Enables a tool to store notes and reminders (note: not encrypted)"] = "Activa l'eina per guardar notes i recordatoris (nota:no està encriptat)"; +App::$strings["Create personal planning cards"] = "Crea targetes de planificació personal"; +App::$strings["Create interactive articles"] = "Crea articles interactius"; App::$strings["Navigation Channel Select"] = "Navegació pel Selector de Canals"; App::$strings["Change channels directly from within the navigation dropdown menu"] = "Canvieu els canals directament des del menú desplegable de navegació"; App::$strings["Photo Location"] = "Ubicació de la Foto"; @@ -2033,10 +3090,26 @@ App::$strings["Access Controlled Chatrooms"] = "Accés Controlat a les Sales de App::$strings["Provide chatrooms and chat services with access control."] = "Proveeix sales de Xat i serveis de Xat amb control d'accés."; App::$strings["Smart Birthdays"] = "Aniversaris Intel·ligents"; App::$strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "Fes, conscients de la zona horària, els esdeveniments d'aniversari, en cas que els teus amics estiguin dispersos per tot el planeta."; -App::$strings["Expert Mode"] = "Manera Experta"; -App::$strings["Enable Expert Mode to provide advanced configuration options"] = "Activar Mode Expert per a proporcionar opcions avançades de configuració"; +App::$strings["Event Timezone Selection"] = "Zona horària dels esdeveniments"; +App::$strings["Allow event creation in timezones other than your own."] = "Permet crear esdeveniments en zones horàries diferents a la teva."; App::$strings["Premium Channel"] = "Privilegis del Canal"; App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Li permet establir restriccions i els termes en els quals es connecten amb el seu canal"; +App::$strings["Advanced Directory Search"] = "Cerca de directori avançada"; +App::$strings["Allows creation of complex directory search queries"] = "Permet fer cerques de directori complexes"; +App::$strings["Advanced Theme and Layout Settings"] = "Configuració de disseny i de tema avançada"; +App::$strings["Allows fine tuning of themes and page layouts"] = "Permet configurar al detall els temes i els dissenys de pàgina"; +App::$strings["Access Control and Permissions"] = "Control d'accés i permisos"; +App::$strings["Privacy Groups"] = "Grup Privat"; +App::$strings["Enable management and selection of privacy groups"] = "Habilita gestió i selecció de grups privats"; +App::$strings["Multiple Profiles"] = "Multiples Perfils"; +App::$strings["Ability to create multiple profiles"] = "Capacitat per crear multiples perfils"; +App::$strings["Provide alternate connection permission roles."] = "Proporciona rols diferents per als permisos de connexió."; +App::$strings["OAuth1 Clients"] = "Clients OAuth1"; +App::$strings["Manage OAuth1 authenticatication tokens for mobile and remote apps."] = "Gestiona els tokens d'autenticació OAuth1 per al mòbil i aplicacions remotes."; +App::$strings["OAuth2 Clients"] = "Clients OAuth2"; +App::$strings["Manage OAuth2 authenticatication tokens for mobile and remote apps."] = "Gestiona els tokens d'autenticació OAuth2 per al mòbil i aplicacions remotes."; +App::$strings["Access Tokens"] = "Tokens d'accés"; +App::$strings["Create access tokens so that non-members can access private content."] = "Crea tokens d'accés per tal que no-membres puguis accedir contingut privat."; App::$strings["Post Composition Features"] = "Característiques de Composició d'Entrades"; App::$strings["Large Photos"] = "Grans Fotos"; App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Inclou gran (1024px) foto de miniatura a les entrades. Si no està activat, empra petita (640px) foto de miniatura."; @@ -2045,15 +3118,19 @@ App::$strings["Even More Encryption"] = "Encara Més Encriptació"; App::$strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Permet l'encripció opcional del contingut extrem-a-extrem amb clau secreta compartida"; App::$strings["Enable Voting Tools"] = "Habilitar Eines de Votació"; App::$strings["Provide a class of post which others can vote on"] = "Proporcionar una classe d'entrada que altres puguin votar"; +App::$strings["Disable Comments"] = "Deshabilita els comentaris"; +App::$strings["Provide the option to disable comments for a post"] = "Proporciona l'opció de deshabilitar els comentaris per a una entrada"; App::$strings["Delayed Posting"] = "Retarda Publicació"; App::$strings["Allow posts to be published at a later date"] = "Permet que les publicacions es publiquin en data posterior"; +App::$strings["Content Expiration"] = "Expiració del Contingut"; +App::$strings["Remove posts/comments and/or private messages at a future time"] = "eliminarà entrades/comentaris i/o missatges privats en un període determinat de temps."; App::$strings["Suppress Duplicate Posts/Comments"] = "Suprimeix Duplicats de Publicacions/Comentaris"; App::$strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Evita que publicacions amb identic contingut siguin publicades amb menys de dos minuts entre entregues."; +App::$strings["Auto-save drafts of posts and comments"] = "Desa automàticament esborranys de les entrades i comentaris"; +App::$strings["Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions"] = "Desa esborranys automàticament en l'emmagatzematge local del navegador per a evitar perdre escrits per a comentaris o entrades"; App::$strings["Network and Stream Filtering"] = "Filtrat de Xarxa i Flux"; App::$strings["Search by Date"] = "Cerca per Data"; App::$strings["Ability to select posts by date ranges"] = "Capacitat per seleccionar entrades per rang de dates"; -App::$strings["Privacy Groups"] = "Grup Privat"; -App::$strings["Enable management and selection of privacy groups"] = "Habilita gestió i selecció de grups privats"; App::$strings["Save search terms for re-use"] = "Guardar els termin de la cerca per a re-usar"; App::$strings["Network Personal Tab"] = "Pestanya Personal de Xarxa"; App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Activa la pestanya per mostrar només les entrades de xarxa en les que has intervingut"; @@ -2061,16 +3138,16 @@ App::$strings["Network New Tab"] = "Pestanya Nou a la Xarxa"; App::$strings["Enable tab to display all new Network activity"] = "Activa pestanya per mostrar tota l'activitat nova de la Xarxa"; App::$strings["Affinity Tool"] = "Eina d'Afinitat"; App::$strings["Filter stream activity by depth of relationships"] = "Filtre d'activitat del flux per importància de la relació"; +App::$strings["Show friend and connection suggestions"] = "Suggereix connexions o amistats"; App::$strings["Connection Filtering"] = "Filtre de Connexió"; App::$strings["Filter incoming posts from connections based on keywords/content"] = "Filtre de missatges d'entrada de conexions, basat en paraules clau/contingut "; -App::$strings["Show channel suggestions"] = "Mostra suggerencies de canals"; App::$strings["Post/Comment Tools"] = "Eina d'Entrades/Comentaris"; App::$strings["Community Tagging"] = "Etiquetat per la Comunitat"; App::$strings["Ability to tag existing posts"] = "Capacitat d'etiquetar entrades existents"; App::$strings["Post Categories"] = "Categories d'Entrades"; App::$strings["Add categories to your posts"] = "Afegeix categoria a la teva entrada"; -App::$strings["Emoji Reactions"] = ""; -App::$strings["Add emoji reaction ability to posts"] = ""; +App::$strings["Emoji Reactions"] = "Reaccions dels Emoji"; +App::$strings["Add emoji reaction ability to posts"] = "Afegeix un emoji habilitat per reaccionar a entrades"; App::$strings["Ability to file posts under folders"] = "Capacitat de arxivar entrades en les carpetes"; App::$strings["Dislike Posts"] = "No Agrada l'Entrada"; App::$strings["Ability to dislike posts/comments"] = "Capacitat per marcar amb \"No Agrada\" les entrades/comentaris"; @@ -2078,21 +3155,33 @@ App::$strings["Star Posts"] = "Entrades Excel·lents"; App::$strings["Ability to mark special posts with a star indicator"] = "Capacitat per marcar entrades especials amb l'indicador d'excel·lencia"; App::$strings["Tag Cloud"] = "Núvol d'Etiquetes."; App::$strings["Provide a personal tag cloud on your channel page"] = "Proporcionar un núvol d'etiquetes personals a la teva pàgina de canal"; -App::$strings["Embedded content"] = "Contingut embegut"; -App::$strings["Embedding disabled"] = "Incorporació desactivada"; -App::$strings["Who can see this?"] = "Qui pot veure això?"; -App::$strings["Custom selection"] = "Selecció a mida"; -App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Selecciona \"Mostrar\" per permetre la visualització. \"No Mostrar\" et permet obviar i limitar l'abast de \"Mostrar\"."; -App::$strings["Show"] = "Mostra"; -App::$strings["Don't show"] = "No mostrar"; -App::$strings["Other networks and post services"] = "Altres xarxes i serveis de correu"; -App::$strings["Post permissions %s cannot be changed %s after a post is shared.
    These permissions set who is allowed to view the post."] = "Els permisos d'entrada %s no poden esser canviats %s posteriorment a que una entrada ja està compartida.
    Aquest ajust dels permisos indica qui pot veure l'entrada."; -App::$strings["Logged out."] = "Sortir."; -App::$strings["Failed authentication"] = "Autenticació fallida"; +App::$strings["Trending"] = "Tema del moment"; +App::$strings["Keywords"] = "Paraules clau"; +App::$strings["have"] = "tinc"; +App::$strings["has"] = "tens"; +App::$strings["want"] = "vull"; +App::$strings["wants"] = "vols"; +App::$strings["likes"] = "agrada"; +App::$strings["dislikes"] = "desagrada"; +App::$strings["Not a valid email address"] = "Adreça de correu electrònic no vàlida"; +App::$strings["Your email domain is not among those allowed on this site"] = "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc"; +App::$strings["Your email address is already registered at this site."] = "La teva adreça de correu electrònic ja esta registrada en aquest lloc"; +App::$strings["An invitation is required."] = "Es requereix Invitació"; +App::$strings["Invitation could not be verified."] = "L'invitació no ha pogut ser verificada"; +App::$strings["Please enter the required information."] = "Entra la informació sol·licitada"; +App::$strings["Failed to store account information."] = "Ha fallat guardar la informació del compte"; +App::$strings["Registration confirmation for %s"] = "Inscripció confirmada per %s"; +App::$strings["Registration request at %s"] = "Sol·licitud d'inscripció a %s"; +App::$strings["your registration password"] = "la teva contrasenya registrada"; +App::$strings["Registration details for %s"] = "Detalls de l'inscripció per %s"; +App::$strings["Account approved."] = "Compte aprovat."; +App::$strings["Registration revoked for %s"] = "Inscripció revocada per %s"; +App::$strings["Click here to upgrade."] = "Feu clic aquí per actualitzar."; +App::$strings["This action exceeds the limits set by your subscription plan."] = "Aquesta acció és superior als límits establerts pel seu pla de subscripció."; +App::$strings["This action is not available under your subscription plan."] = "Aquesta acció no està disponible en el seu pla de subscripció."; App::$strings["Birthday"] = "Aniversari"; App::$strings["Age: "] = "Edat:"; App::$strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD o MM-DD"; -App::$strings["never"] = "mai"; App::$strings["less than a second ago"] = "fa menys d'un segon"; App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "Fa %1\$d %2\$s"; App::$strings["__ctx:relative_date__ year"] = array( @@ -2125,82 +3214,25 @@ App::$strings["__ctx:relative_date__ second"] = array( ); App::$strings["%1\$s's birthday"] = "Aniversari de %1\$s"; App::$strings["Happy Birthday %1\$s"] = "Feliç Aniversari %1\$s"; -App::$strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grup esborrat amb aquest nom fou reviscolat. Els permisos dels items existents poden aplicar-se a aquest grup i qualsevol membre futur. Si no es això el que vols, si et plau, crea un altre grup amb un nom diferent."; -App::$strings["Add new connections to this privacy group"] = "Afegir noves connexions a aquest grup privat"; -App::$strings["edit"] = "edita"; -App::$strings["Edit group"] = "Editar grup"; -App::$strings["Add privacy group"] = "Afegir grup privat"; -App::$strings["Channels not in any privacy group"] = "Sense canals en grups privats"; -App::$strings["Delete this item?"] = "Esborrar aquest item?"; -App::$strings["[-] show less"] = "[-] mostra menys"; -App::$strings["[+] expand"] = "[+] expandeix"; -App::$strings["[-] collapse"] = "[-] colapsa"; -App::$strings["Password too short"] = "Contrasenya massa curta"; -App::$strings["Passwords do not match"] = "Les paraules de pas no coincideixen"; -App::$strings["everybody"] = "tothom"; -App::$strings["Secret Passphrase"] = "Contrasenya Secreta"; -App::$strings["Passphrase hint"] = "Pista per la Contrasenya"; -App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Avis: Els permisos han canviat però encara no han estat enviats."; -App::$strings["close all"] = "tanca tot"; -App::$strings["Nothing new here"] = "Res de nou per aquí"; -App::$strings["Rate This Channel (this is public)"] = "Valora Aquest Canal (això es farà públic)"; -App::$strings["Describe (optional)"] = "Descriu (opcional)"; -App::$strings["Please enter a link URL"] = "Si us plau, entra l'enllaç URL"; -App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Hi ha canvis sense desar, estàs segur que vols abandonar la pàgina?"; -App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo"; -App::$strings["timeago.prefixFromNow"] = "timeago.prefixFromNow"; -App::$strings["ago"] = "abans"; -App::$strings["from now"] = "des d'ara"; -App::$strings["less than a minute"] = "menys d'un minut"; -App::$strings["about a minute"] = "prop d'un minut"; -App::$strings["%d minutes"] = "%d minuts"; -App::$strings["about an hour"] = "prop d'una hora"; -App::$strings["about %d hours"] = "al voltant de %d hores"; -App::$strings["a day"] = "un dia"; -App::$strings["%d days"] = "%d dies"; -App::$strings["about a month"] = "prop d'un mes"; -App::$strings["%d months"] = "%d mesos"; -App::$strings["about a year"] = "prop d'un any"; -App::$strings["%d years"] = "%d anys"; -App::$strings[" "] = " "; -App::$strings["timeago.numbers"] = "timeago.numbers"; -App::$strings["__ctx:long__ May"] = "Maig"; -App::$strings["Jan"] = "Gen"; -App::$strings["Feb"] = "Feb"; -App::$strings["Mar"] = "Mar"; -App::$strings["Apr"] = "Apr"; -App::$strings["__ctx:short__ May"] = "Maig"; -App::$strings["Jun"] = "Jun"; -App::$strings["Jul"] = "Jul"; -App::$strings["Aug"] = "Ago"; -App::$strings["Sep"] = "Set"; -App::$strings["Oct"] = "Oct"; -App::$strings["Nov"] = "Nov"; -App::$strings["Dec"] = "Des"; -App::$strings["Sun"] = "Dg."; -App::$strings["Mon"] = "Dl."; -App::$strings["Tue"] = "Dm."; -App::$strings["Wed"] = "Dc."; -App::$strings["Thu"] = "Dj."; -App::$strings["Fri"] = "Dv."; -App::$strings["Sat"] = "Ds."; -App::$strings["__ctx:calendar__ today"] = "avui"; -App::$strings["__ctx:calendar__ month"] = "mes"; -App::$strings["__ctx:calendar__ week"] = "setmana"; -App::$strings["__ctx:calendar__ day"] = "dia"; -App::$strings["__ctx:calendar__ All day"] = "Tot el dia"; -App::$strings["view full size"] = "Veure a mida competa"; -App::$strings["No Subject"] = "Sense Assumpte"; -App::$strings["Friendica"] = "Friendica"; -App::$strings["OStatus"] = "OStatus"; -App::$strings["GNU-Social"] = "GNU-Social"; -App::$strings["RSS/Atom"] = "RSS/Atom"; -App::$strings["Diaspora"] = "Diaspora"; -App::$strings["Facebook"] = "Facebook"; -App::$strings["Zot"] = "Zot"; -App::$strings["LinkedIn"] = "LinkedIn"; -App::$strings["XMPP/IM"] = "XMPP/IM"; -App::$strings["MySpace"] = "MySpace"; +App::$strings["Remote authentication"] = "Autenticació remota"; +App::$strings["Click to authenticate to your home hub"] = "Clica per autentificar-te en el teu node"; +App::$strings["Manage Your Channels"] = "Gestiona els Teus Canals"; +App::$strings["Account/Channel Settings"] = "Ajustos de Compte/Canal"; +App::$strings["End this session"] = "Finalitza aquesta sessió"; +App::$strings["Your profile page"] = "La teva pàgina de perfil"; +App::$strings["Manage/Edit profiles"] = "Gestiona/Edita perfils"; +App::$strings["Sign in"] = "Signatura"; +App::$strings["Take me home"] = "Porta'm a casa"; +App::$strings["Log me out of this site"] = "Tanca'm la sessió en aquest lloc web"; +App::$strings["Create an account"] = "Crear un compte"; +App::$strings["Help and documentation"] = "Ajuda i documentació"; +App::$strings["Search site @name, !forum, #tag, ?docs, content"] = "Cerca en el node @nom, !fòrum, #etiqueta, ?documentació, contingut"; +App::$strings["Site Setup and Configuration"] = "Ajustos i Configuració del Lloc"; +App::$strings["@name, !forum, #tag, ?doc, content"] = "@nom, !fòrum, #etiqueta, ?documentació, contingut"; +App::$strings["Please wait..."] = "Si us plau, espera......."; +App::$strings["Add Apps"] = "Afegeix aplicacions"; +App::$strings["Arrange Apps"] = "Endreça les aplicacions"; +App::$strings["Toggle System Apps"] = "Commuta l'estat de les aplicacions de sistema"; App::$strings["Image exceeds website size limit of %lu bytes"] = "La imatge excedeix la mida limit pel lloc web en %lu bytes"; App::$strings["Image file is empty."] = "El fitxer d'imatge esta buit."; App::$strings["Photo storage failed."] = "Fracassà l'emmagatzematge de la Foto"; @@ -2211,94 +3243,17 @@ App::$strings["Invalid data packet"] = "paquet de dades invàlid"; App::$strings["Unable to verify channel signature"] = "No es pot verificar la signatura del canal"; App::$strings["Unable to verify site signature for %s"] = "No es pot verificar la signatura del lloc per %s"; App::$strings["invalid target signature"] = "Signatura objectiu invàlida"; -App::$strings["New Page"] = "Pàgina Nova"; -App::$strings["Title"] = "Títol"; -App::$strings["Can view my normal stream and posts"] = "Pot veure el flux i entrades normals"; -App::$strings["Can view my default channel profile"] = "Pot veure el meu perfil del canal per defecte"; -App::$strings["Can view my connections"] = "Pot veure les meves connexions"; -App::$strings["Can view my file storage and photos"] = "Pot veure al meu magatzem d'arxius i fotos"; -App::$strings["Can view my webpages"] = "Pot veure les meves pàgines web"; -App::$strings["Can send me their channel stream and posts"] = "Pot enviar-me el flux i entrades del seu canal"; -App::$strings["Can post on my channel page (\"wall\")"] = "Pot fer entrades a la meva pàgina de canal (\"mur\")"; -App::$strings["Can comment on or like my posts"] = "Pot fer comentaris o dir si agrada en les meves entrades"; -App::$strings["Can send me private mail messages"] = "Pot enviar-me un missatge de correu privat"; -App::$strings["Can like/dislike stuff"] = "Pot dir si agrada/desagrada "; -App::$strings["Profiles and things other than posts/comments"] = "Perfils i altres coses a més d'entrades/comentaris"; -App::$strings["Can forward to all my channel contacts via post @mentions"] = "Ho pot enviar a tots els meus contactes del canal via entrades @mencions"; -App::$strings["Advanced - useful for creating group forum channels"] = "Avançat - capaç de crear canals de grups de foro"; -App::$strings["Can chat with me (when available)"] = "Pot xatejar amb mi (si estic disponible)"; -App::$strings["Can write to my file storage and photos"] = "Pot escriure al meu magatzem d'arxius i fotos"; -App::$strings["Can edit my webpages"] = "Pot editar les meves pàgines web"; -App::$strings["Can source my public posts in derived channels"] = "Pot mostrar l'origen de les meves entrades públiques en altres canals"; -App::$strings["Somewhat advanced - very useful in open communities"] = "Quelcom avançat - molt útil en comunitats obertes"; -App::$strings["Can administer my channel resources"] = "Pot administrar els meus recursos del canal"; -App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Extremadament avançat. No toquis res si no saps que estàs fent"; -App::$strings["Social Networking"] = "Xarxes Socials"; -App::$strings["Social - Mostly Public"] = "Social - Principalment Públic"; -App::$strings["Social - Restricted"] = "Social - Restingit"; -App::$strings["Social - Private"] = "Social - Privat"; -App::$strings["Community Forum"] = "Foro de Comunitat"; -App::$strings["Forum - Mostly Public"] = "Fòrum - Principalment Públic"; -App::$strings["Forum - Restricted"] = "Fòrum - Restringit"; -App::$strings["Forum - Private"] = "Fòrum - Privat"; -App::$strings["Feed Republish"] = "Republicador"; -App::$strings["Feed - Mostly Public"] = "Realimentador - Públic Principalment"; -App::$strings["Feed - Restricted"] = "Retroalimentador - Restringit"; -App::$strings["Special Purpose"] = "Objectiu Especial"; -App::$strings["Special - Celebrity/Soapbox"] = "Espacial - Celebritat/Plataforma"; -App::$strings["Special - Group Repository"] = "Especial - Repositori d'un Grup"; -App::$strings["Custom/Expert Mode"] = "Personalitzat/Manera Experta"; -App::$strings[" and "] = "i"; -App::$strings["public profile"] = "Perfil públic"; -App::$strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s canviat %2\$s a “%3\$s”"; -App::$strings["Visit %1\$s's %2\$s"] = "Visita %1\$s en %2\$s"; -App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s Ha actualitzat %2\$s, canviant %3\$s."; -App::$strings["Attachments:"] = "Adjuntat:"; -App::$strings["\$Projectname event notification:"] = "Notificació d'esdeveniment de \$Projectname"; -App::$strings["Focus (Hubzilla default)"] = "Focus (Hubzilla per defecte)"; -App::$strings["Theme settings"] = "Ajustos de tema"; -App::$strings["Select scheme"] = "Tria esquema"; -App::$strings["Narrow navbar"] = "Barra de navegació estreta"; -App::$strings["Navigation bar background color"] = "Color de fons de la barra de navegació"; -App::$strings["Navigation bar gradient top color"] = "Gradient de color de la part superior de la barra de navegació"; -App::$strings["Navigation bar gradient bottom color"] = "Gradient de color de la part inferior de la barra de navegació"; -App::$strings["Navigation active button gradient top color"] = "Gradient de color de la part superior del botó actiu de la barra de navegació"; -App::$strings["Navigation active button gradient bottom color"] = "Gradient de color de la part inferior del botó actiu de la barra de navegació"; -App::$strings["Navigation bar border color "] = "Color de la barra de navegació"; -App::$strings["Navigation bar icon color "] = "Color de la icona de la barra de navegació"; -App::$strings["Navigation bar active icon color "] = "Color de la icona de la barra de navegació activa"; -App::$strings["link color"] = "Color d'enllaç"; -App::$strings["Set font-color for banner"] = "Ajusta el color del tipus de lletra per la senyera"; -App::$strings["Set the background color"] = "Ajusta el color de fons"; -App::$strings["Set the background image"] = "Ajusta la imatge de fons"; -App::$strings["Set the background color of items"] = "ajusta el color dels articles de fons"; -App::$strings["Set the background color of comments"] = "Ajusta el color dels comentaris en segon pla"; -App::$strings["Set the border color of comments"] = "Canviar el color del marge dels comentaris"; -App::$strings["Set the indent for comments"] = "ajusta l'indentació dels comentaris"; -App::$strings["Set the basic color for item icons"] = "ajusta el color basic per les icones dels articles"; -App::$strings["Set the hover color for item icons"] = "Ajusta el color de la libració de les icones dels articles"; -App::$strings["Set font-size for the entire application"] = "Ajusta la mida del tipus de lletra per tota l'aplicació"; -App::$strings["Example: 14px"] = "Exemple: 14px"; -App::$strings["Set font-size for posts and comments"] = "Ajusta la mida del tipus de lletra per a entrades i comentaris"; -App::$strings["Set font-color for posts and comments"] = "Ajusta el color del tipus de lletra per entrades i comentaris"; -App::$strings["Set radius of corners"] = "Ajusta el radi de les cantonades"; -App::$strings["Set shadow depth of photos"] = "Ajusta la profunditat d'ombres de les fotos"; -App::$strings["Set maximum width of content region in pixel"] = "Ajusta l'amplada màxima de la zona de contingut en pixels"; -App::$strings["Leave empty for default width"] = "Deixa en blanc per l'amplada predeterminada"; -App::$strings["Left align page content"] = "Alineació esquerra del contingut de la pàgina"; -App::$strings["Set minimum opacity of nav bar - to hide it"] = "Ajusta la opacitat mínima de la harra de navegació - per amagar-la"; -App::$strings["Set size of conversation author photo"] = "Ajusta la mida de la foto del autor a la conversa"; -App::$strings["Set size of followup author photos"] = "Ajusta la mida del seguidor de les fotos de l'autor"; -App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Cerca %1\$s(%2\$s)"; -App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname"; -App::$strings["Update %s failed. See error logs."] = "L'actualització %s ha fallat. Mira el registre d'errors."; -App::$strings["Update Error at %s"] = "Error d'Actualització a %s"; -App::$strings["Create an account to access services and applications within the Hubzilla"] = "Crea un compte per accedir als serveis i aplicacions dins de Hubzilla"; -App::$strings["Password"] = "Contrasenya"; -App::$strings["Remember me"] = "Recorda'm"; -App::$strings["Forgot your password?"] = "Has perdut la Contrasenya?"; -App::$strings["toggle mobile"] = "canvia a format per a mòbils"; -App::$strings["Website SSL certificate is not valid. Please correct."] = "El certificat SSL és invalid, soluciona-ho, si us plau."; -App::$strings["[hubzilla] Website SSL error for %s"] = "[hubzilla] Error de SSL per la web %s"; -App::$strings["Cron/Scheduled tasks not running."] = "No s'estan executant les tasques programades al cron."; -App::$strings["[hubzilla] Cron tasks not running on %s"] = "[hubzilla] Les tasques de Cron no rulen a %s"; +App::$strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grup esborrat amb aquest nom fou reviscolat. Els permisos dels items existents poden aplicar-se a aquest grup i qualsevol membre futur. Si no es això el que vols, si et plau, crea un altre grup amb un nom diferent."; +App::$strings["Add new connections to this privacy group"] = "Afegir noves connexions a aquest grup privat"; +App::$strings["edit"] = "edita"; +App::$strings["Edit group"] = "Editar grup"; +App::$strings["Add privacy group"] = "Afegir grup privat"; +App::$strings["Channels not in any privacy group"] = "Sense canals en grups privats"; +App::$strings["New window"] = "Nova finestra"; +App::$strings["Open the selected location in a different window or browser tab"] = "Obrir la localització seleccionada en un altre finestra o pestanya del navegador"; +App::$strings["Delegation session ended."] = "S'ha tancat la sessió de delegació."; +App::$strings["Logged out."] = "Sortir."; +App::$strings["Email validation is incomplete. Please check your email."] = "Encara no s'ha validat el teu correu. Comprova la safata d'entrada i la paperera."; +App::$strings["Failed authentication"] = "Autenticació fallida"; +App::$strings["Help:"] = "Ajuda:"; +App::$strings["Not Found"] = "No s'ha pogut trobar la pàgina"; -- cgit v1.2.3 From 7a294c38432491622f5c036e30082830af1ffe90 Mon Sep 17 00:00:00 2001 From: antil0pa Date: Tue, 22 May 2018 16:24:04 +0200 Subject: Update remote_friends_common.tpl Found an improperly closed

    tag. It breaks the way widget are displayed on the page. --- view/tpl/remote_friends_common.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl index 9e149b574..efc0ab49a 100755 --- a/view/tpl/remote_friends_common.tpl +++ b/view/tpl/remote_friends_common.tpl @@ -12,5 +12,5 @@ {{/foreach}}
    {{/if}} -
    +
    -- cgit v1.2.3 From fcd9e115c2e4dda9f0a1373ba78597255b8e5604 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Thu, 24 May 2018 18:22:09 +0200 Subject: Finaly an update of Dutch language strings --- view/nl/hmessages.po | 20150 +++++++++++++++++++++++++------------------------ view/nl/hstrings.php | 5460 +++++++------- 2 files changed, 13136 insertions(+), 12474 deletions(-) diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po index df00ee6b1..5d22d74a5 100644 --- a/view/nl/hmessages.po +++ b/view/nl/hmessages.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the hubzilla package. # # Translators: -# jeroenpraat , 2015-2016 -# jeroenpraat , 2016-2017 +# jeroenpraat , 2017-2018 +# jeroenpraat , 2015-2016 +# jeroenpraat , 2016-2017 msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-03 00:05-0800\n" -"PO-Revision-Date: 2017-03-06 21:47+0000\n" -"Last-Translator: jeroenpraat \n" +"POT-Creation-Date: 2018-04-23 11:34+0200\n" +"PO-Revision-Date: 2018-05-24 16:16+0000\n" +"Last-Translator: jeroenpraat \n" "Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,1796 +20,2529 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../../Zotlabs/Access/PermissionRoles.php:248 -#: ../../include/permissions.php:945 -msgid "Social Networking" -msgstr "Sociaal netwerk" - -#: ../../Zotlabs/Access/PermissionRoles.php:249 -#: ../../include/permissions.php:945 -msgid "Social - Mostly Public" -msgstr "Sociaal - Vrijwel alles openbaar" - -#: ../../Zotlabs/Access/PermissionRoles.php:250 -#: ../../include/permissions.php:945 -msgid "Social - Restricted" -msgstr "Sociaal - Beperkt zichtbaar" - -#: ../../Zotlabs/Access/PermissionRoles.php:251 -#: ../../include/permissions.php:945 -msgid "Social - Private" -msgstr "Sociaal - Verborgen kanaal" - -#: ../../Zotlabs/Access/PermissionRoles.php:254 -#: ../../include/permissions.php:946 -msgid "Community Forum" -msgstr "Groepsforum" - -#: ../../Zotlabs/Access/PermissionRoles.php:255 -#: ../../include/permissions.php:946 -msgid "Forum - Mostly Public" -msgstr "Forum - Vrijwel alles openbaar" - -#: ../../Zotlabs/Access/PermissionRoles.php:256 -#: ../../include/permissions.php:946 -msgid "Forum - Restricted" -msgstr "Forum - Beperkt zichtbaar" - -#: ../../Zotlabs/Access/PermissionRoles.php:257 -#: ../../include/permissions.php:946 -msgid "Forum - Private" -msgstr "Forum - Verborgen kanaal" - -#: ../../Zotlabs/Access/PermissionRoles.php:260 -#: ../../include/permissions.php:947 -msgid "Feed Republish" -msgstr "Feed herpubliceren" - -#: ../../Zotlabs/Access/PermissionRoles.php:261 -#: ../../include/permissions.php:947 -msgid "Feed - Mostly Public" -msgstr "Feed - Vrijwel alles openbaar" - -#: ../../Zotlabs/Access/PermissionRoles.php:262 -#: ../../include/permissions.php:947 -msgid "Feed - Restricted" -msgstr "Feed - Beperkt zichtbaar" - -#: ../../Zotlabs/Access/PermissionRoles.php:265 -#: ../../include/permissions.php:948 -msgid "Special Purpose" -msgstr "Speciaal doel" - -#: ../../Zotlabs/Access/PermissionRoles.php:266 -#: ../../include/permissions.php:948 -msgid "Special - Celebrity/Soapbox" -msgstr "Speciaal - Beroemdheid/alleen volgen" - -#: ../../Zotlabs/Access/PermissionRoles.php:267 -#: ../../include/permissions.php:948 -msgid "Special - Group Repository" -msgstr "Speciaal - Groepsopslag" - -#: ../../Zotlabs/Access/PermissionRoles.php:270 -#: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Connedit.php:925 -#: ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Settings/Channel.php:463 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1148 -#: ../../extend/addon/addon/cdav/cdav.php:277 -#: ../../extend/addon/addon/cdav/cdav.php:284 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/selectors.php:104 -#: ../../include/selectors.php:140 ../../include/connections.php:675 -#: ../../include/connections.php:682 ../../include/permissions.php:949 -msgid "Other" -msgstr "Anders" - -#: ../../Zotlabs/Access/PermissionRoles.php:271 -#: ../../include/permissions.php:949 -msgid "Custom/Expert Mode" -msgstr "Expertmodus/handmatig aanpassen" - -#: ../../Zotlabs/Access/Permissions.php:46 +#: ../../Zotlabs/Access/Permissions.php:56 msgid "Can view my channel stream and posts" msgstr "Kan mijn kanaal en berichten bekijken" -#: ../../Zotlabs/Access/Permissions.php:47 ../../include/permissions.php:42 +#: ../../Zotlabs/Access/Permissions.php:57 msgid "Can send me their channel stream and posts" msgstr "Kan mij de inhoud van hun kanaal en berichten sturen" -#: ../../Zotlabs/Access/Permissions.php:48 ../../include/permissions.php:36 +#: ../../Zotlabs/Access/Permissions.php:58 msgid "Can view my default channel profile" msgstr "Kan mijn standaard kanaalprofiel bekijken" -#: ../../Zotlabs/Access/Permissions.php:49 ../../include/permissions.php:37 +#: ../../Zotlabs/Access/Permissions.php:59 msgid "Can view my connections" msgstr "Kan een lijst met mijn connecties bekijken" -#: ../../Zotlabs/Access/Permissions.php:50 ../../include/permissions.php:38 +#: ../../Zotlabs/Access/Permissions.php:60 msgid "Can view my file storage and photos" msgstr "Kan mijn foto's en andere bestanden bekijken" -#: ../../Zotlabs/Access/Permissions.php:51 +#: ../../Zotlabs/Access/Permissions.php:61 msgid "Can upload/modify my file storage and photos" msgstr "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen" -#: ../../Zotlabs/Access/Permissions.php:52 +#: ../../Zotlabs/Access/Permissions.php:62 msgid "Can view my channel webpages" msgstr "Kan de webpagina's van mijn kanaal bekijken" -#: ../../Zotlabs/Access/Permissions.php:53 +#: ../../Zotlabs/Access/Permissions.php:63 msgid "Can view my wiki pages" msgstr "Kan mijn wiki-pagina's bekijken" -#: ../../Zotlabs/Access/Permissions.php:54 +#: ../../Zotlabs/Access/Permissions.php:64 msgid "Can create/edit my channel webpages" msgstr "Kan wegpagina's van mijn kanaal aanmaken en bewerken" -#: ../../Zotlabs/Access/Permissions.php:55 +#: ../../Zotlabs/Access/Permissions.php:65 msgid "Can write to my wiki pages" msgstr "Kan mijn wiki-pagina's bewerken" -#: ../../Zotlabs/Access/Permissions.php:56 +#: ../../Zotlabs/Access/Permissions.php:66 msgid "Can post on my channel (wall) page" msgstr "Kan een bericht in mijn kanaal plaatsen" -#: ../../Zotlabs/Access/Permissions.php:57 ../../include/permissions.php:44 +#: ../../Zotlabs/Access/Permissions.php:67 msgid "Can comment on or like my posts" msgstr "Kan op mijn berichten reageren of deze (niet) leuk vinden" -#: ../../Zotlabs/Access/Permissions.php:58 ../../include/permissions.php:45 +#: ../../Zotlabs/Access/Permissions.php:68 msgid "Can send me private mail messages" msgstr "Kan mij privéberichten sturen" -#: ../../Zotlabs/Access/Permissions.php:59 +#: ../../Zotlabs/Access/Permissions.php:69 msgid "Can like/dislike profiles and profile things" msgstr "Kan profielen en profieldingen leuk en niet leuk vinden " -#: ../../Zotlabs/Access/Permissions.php:60 +#: ../../Zotlabs/Access/Permissions.php:70 msgid "Can forward to all my channel connections via @+ mentions in posts" msgstr "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+" -#: ../../Zotlabs/Access/Permissions.php:61 +#: ../../Zotlabs/Access/Permissions.php:71 msgid "Can chat with me" msgstr "Kan met mij chatten" -#: ../../Zotlabs/Access/Permissions.php:62 ../../include/permissions.php:53 +#: ../../Zotlabs/Access/Permissions.php:72 msgid "Can source my public posts in derived channels" msgstr "Kan mijn openbare berichten als bron voor andere kanalen gebruiken" -#: ../../Zotlabs/Access/Permissions.php:63 +#: ../../Zotlabs/Access/Permissions.php:73 msgid "Can administer my channel" msgstr "Kan mijn kanaal beheren" -#: ../../Zotlabs/Storage/Browser.php:106 ../../Zotlabs/Storage/Browser.php:237 -msgid "parent" -msgstr "omhoog" - -#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2700 -msgid "Collection" -msgstr "map" - -#: ../../Zotlabs/Storage/Browser.php:133 -msgid "Principal" -msgstr "principal" - -#: ../../Zotlabs/Storage/Browser.php:136 -msgid "Addressbook" -msgstr "Adresboek" - -#: ../../Zotlabs/Storage/Browser.php:139 -msgid "Calendar" -msgstr "Agenda" - -#: ../../Zotlabs/Storage/Browser.php:142 -msgid "Schedule Inbox" -msgstr "Planning-postvak IN" - -#: ../../Zotlabs/Storage/Browser.php:145 -msgid "Schedule Outbox" -msgstr "Planning-postvak UIT" - -#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:784 -#: ../../Zotlabs/Module/Photos.php:1244 -#: ../../Zotlabs/Module/Embedphotos.php:145 ../../Zotlabs/Lib/Apps.php:561 -#: ../../Zotlabs/Lib/Apps.php:639 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:745 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:746 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:753 -#: ../../include/widgets.php:1757 ../../include/conversation.php:1177 -msgid "Unknown" -msgstr "Onbekend" - -#: ../../Zotlabs/Storage/Browser.php:224 ../../Zotlabs/Module/Fbrowser.php:85 -#: ../../Zotlabs/Lib/Apps.php:224 ../../include/conversation.php:1843 -msgid "Files" -msgstr "Bestanden" - -#: ../../Zotlabs/Storage/Browser.php:225 -msgid "Total" -msgstr "Totaal" +#: ../../Zotlabs/Access/PermissionRoles.php:283 +msgid "Social Networking" +msgstr "Sociaal netwerk" -#: ../../Zotlabs/Storage/Browser.php:227 -msgid "Shared" -msgstr "Gedeeld" +#: ../../Zotlabs/Access/PermissionRoles.php:284 +msgid "Social - Federation" +msgstr "Sociaal - Federatie" -#: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:330 -#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Connedit.php:928 -#: ../../Zotlabs/Module/New_channel.php:147 -#: ../../Zotlabs/Module/Webpages.php:243 ../../Zotlabs/Module/Blocks.php:159 -#: ../../Zotlabs/Module/Layouts.php:184 ../../Zotlabs/Module/Profiles.php:801 -#: ../../extend/addon/addon/cdav/include/widgets.php:127 -#: ../../extend/addon/addon/cdav/include/widgets.php:164 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1151 -msgid "Create" -msgstr "Aanmaken" +#: ../../Zotlabs/Access/PermissionRoles.php:285 +msgid "Social - Mostly Public" +msgstr "Sociaal - Vrijwel alles openbaar" -#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:332 -#: ../../Zotlabs/Module/Cover_photo.php:357 -#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1368 -#: ../../Zotlabs/Module/Profile_photo.php:421 -#: ../../Zotlabs/Module/Embedphotos.php:157 -#: ../../extend/addon/addon/cdav/include/widgets.php:132 -#: ../../extend/addon/addon/cdav/include/widgets.php:168 -#: ../../include/widgets.php:1770 -msgid "Upload" -msgstr "Uploaden" +#: ../../Zotlabs/Access/PermissionRoles.php:286 +msgid "Social - Restricted" +msgstr "Sociaal - Beperkt zichtbaar" -#: ../../Zotlabs/Storage/Browser.php:233 -#: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Connedit.php:913 -#: ../../Zotlabs/Module/Sharedwithme.php:99 -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -#: ../../Zotlabs/Module/Settings/Oauth.php:115 -#: ../../Zotlabs/Module/Wiki.php:171 ../../Zotlabs/Module/Chat.php:248 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1136 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:172 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156 -#: ../../include/widgets.php:976 -msgid "Name" -msgstr "Naam" +#: ../../Zotlabs/Access/PermissionRoles.php:287 +msgid "Social - Private" +msgstr "Sociaal - Verborgen kanaal" -#: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:172 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157 -msgid "Type" -msgstr "Type" +#: ../../Zotlabs/Access/PermissionRoles.php:290 +msgid "Community Forum" +msgstr "Groepsforum" -#: ../../Zotlabs/Storage/Browser.php:235 -#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1414 -msgid "Size" -msgstr "Grootte" +#: ../../Zotlabs/Access/PermissionRoles.php:291 +msgid "Forum - Mostly Public" +msgstr "Forum - Vrijwel alles openbaar" -#: ../../Zotlabs/Storage/Browser.php:236 -#: ../../Zotlabs/Module/Sharedwithme.php:102 -msgid "Last Modified" -msgstr "Laatst gewijzigd" +#: ../../Zotlabs/Access/PermissionRoles.php:292 +msgid "Forum - Restricted" +msgstr "Forum - Beperkt zichtbaar" -#: ../../Zotlabs/Storage/Browser.php:238 -#: ../../Zotlabs/Module/Editblock.php:109 -#: ../../Zotlabs/Module/Connections.php:300 -#: ../../Zotlabs/Module/Connections.php:320 -#: ../../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:85 ../../Zotlabs/Module/Webpages.php:244 -#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:192 -#: ../../Zotlabs/Module/Settings/Oauth.php:149 -#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Wiki.php:164 -#: ../../Zotlabs/Module/Wiki.php:271 ../../Zotlabs/Lib/ThreadItem.php:106 -#: ../../Zotlabs/Lib/Apps.php:357 -#: ../../extend/addon/addon/cdav/include/widgets.php:125 -#: ../../extend/addon/addon/cdav/include/widgets.php:161 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:149 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251 -#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39 -#: ../../include/menu.php:113 ../../include/channel.php:1044 -#: ../../include/channel.php:1048 -msgid "Edit" -msgstr "Bewerken" +#: ../../Zotlabs/Access/PermissionRoles.php:293 +msgid "Forum - Private" +msgstr "Forum - Verborgen kanaal" -#: ../../Zotlabs/Storage/Browser.php:239 -#: ../../Zotlabs/Module/Editblock.php:134 -#: ../../Zotlabs/Module/Connections.php:271 -#: ../../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/Connedit.php:661 ../../Zotlabs/Module/Connedit.php:930 -#: ../../Zotlabs/Module/Photos.php:1174 ../../Zotlabs/Module/Group.php:177 -#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Blocks.php:162 -#: ../../Zotlabs/Module/Profiles.php:803 -#: ../../Zotlabs/Module/Settings/Oauth.php:150 -#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/ThreadItem.php:126 -#: ../../Zotlabs/Lib/Apps.php:358 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:864 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1153 -#: ../../include/conversation.php:656 -msgid "Delete" -msgstr "Verwijderen" +#: ../../Zotlabs/Access/PermissionRoles.php:296 +msgid "Feed Republish" +msgstr "Feed herpubliceren" -#: ../../Zotlabs/Storage/Browser.php:299 -#, php-format -msgid "You are using %1$s of your available file storage." -msgstr "Je gebruikt %1$s van de beschikbare bestandsopslag." +#: ../../Zotlabs/Access/PermissionRoles.php:297 +msgid "Feed - Mostly Public" +msgstr "Feed - Vrijwel alles openbaar" -#: ../../Zotlabs/Storage/Browser.php:304 -#, php-format -msgid "You are using %1$s of %2$s available file storage. (%3$s%)" -msgstr "Je gebruikt %1$s van totaal %2$s beschikbare bestandsopslag. (%3$s%)" +#: ../../Zotlabs/Access/PermissionRoles.php:298 +msgid "Feed - Restricted" +msgstr "Feed - Beperkt zichtbaar" -#: ../../Zotlabs/Storage/Browser.php:315 -msgid "WARNING:" -msgstr "WAARSCHUWING:" +#: ../../Zotlabs/Access/PermissionRoles.php:301 +msgid "Special Purpose" +msgstr "Speciaal doel" -#: ../../Zotlabs/Storage/Browser.php:325 -msgid "" -"Please use DAV to upload large (video, audio) files.
    See Cloud Desktop " -"Clients" -msgstr "Gebruik DAV om grote (video-, audio-) bestanden te uploaden.
    Zie hiervoor de documentatie over de cloud en desktopclients." +#: ../../Zotlabs/Access/PermissionRoles.php:302 +msgid "Special - Celebrity/Soapbox" +msgstr "Speciaal - Beroemdheid/alleen volgen" -#: ../../Zotlabs/Storage/Browser.php:329 -msgid "Create new folder" -msgstr "Nieuwe map aanmaken" +#: ../../Zotlabs/Access/PermissionRoles.php:303 +msgid "Special - Group Repository" +msgstr "Speciaal - Groepsopslag" -#: ../../Zotlabs/Storage/Browser.php:331 -msgid "Upload file" -msgstr "Bestand uploaden" +#: ../../Zotlabs/Access/PermissionRoles.php:306 +#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:144 +#: ../../Zotlabs/Module/Settings/Channel.php:479 +#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795 +#: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49 +#: ../../include/selectors.php:66 ../../include/selectors.php:104 +#: ../../include/selectors.php:140 ../../include/event.php:1315 +#: ../../include/event.php:1322 ../../include/connections.php:697 +#: ../../include/connections.php:704 +msgid "Other" +msgstr "Anders" -#: ../../Zotlabs/Storage/Browser.php:345 -msgid "Drop files here to immediately upload" -msgstr "Sleep bestanden hierheen om ze onmiddellijk te uploaden" +#: ../../Zotlabs/Access/PermissionRoles.php:307 +msgid "Custom/Expert Mode" +msgstr "Expertmodus/handmatig aanpassen" -#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Group.php:72 -#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68 -#: ../../Zotlabs/Module/Import_items.php:114 -#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Like.php:283 -#: ../../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 "Toegang geweigerd" +#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Articles.php:29 +#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Connect.php:17 +#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12 +#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 +#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32 +#: ../../Zotlabs/Module/Cards.php:33 ../../Zotlabs/Module/Webpages.php:33 +#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1197 +msgid "Requested profile is not available." +msgstr "Opgevraagd profiel is niet beschikbaar" -#: ../../Zotlabs/Web/WebServer.php:128 -#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Appman.php:82 -#: ../../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/Cover_photo.php:277 -#: ../../Zotlabs/Module/Cover_photo.php:290 -#: ../../Zotlabs/Module/Editlayout.php:67 -#: ../../Zotlabs/Module/Editlayout.php:90 -#: ../../Zotlabs/Module/Editwebpage.php:68 -#: ../../Zotlabs/Module/Editwebpage.php:89 -#: ../../Zotlabs/Module/Editwebpage.php:104 -#: ../../Zotlabs/Module/Editwebpage.php:126 -#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Menu.php:78 -#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Connedit.php:388 -#: ../../Zotlabs/Module/Events.php:271 ../../Zotlabs/Module/Filestorage.php:23 -#: ../../Zotlabs/Module/Filestorage.php:78 -#: ../../Zotlabs/Module/Filestorage.php:93 -#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Photos.php:73 -#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13 -#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Block.php:26 -#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Manage.php:10 -#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mitem.php:115 -#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Api.php:24 +#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 #: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94 -#: ../../Zotlabs/Module/New_channel.php:77 -#: ../../Zotlabs/Module/New_channel.php:104 -#: ../../Zotlabs/Module/Webpages.php:116 -#: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137 -#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230 -#: ../../Zotlabs/Module/Item.php:1067 ../../Zotlabs/Module/Blocks.php:73 -#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Layouts.php:71 +#: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Editlayout.php:67 +#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:110 +#: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288 +#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 +#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271 +#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Article_edit.php:51 +#: ../../Zotlabs/Module/New_channel.php:91 +#: ../../Zotlabs/Module/New_channel.php:116 +#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 +#: ../../Zotlabs/Module/Moderate.php:13 +#: ../../Zotlabs/Module/Settings/Features.php:38 +#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280 +#: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341 +#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67 +#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101 +#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29 +#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64 +#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50 +#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404 +#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149 +#: ../../Zotlabs/Module/Profile_photo.php:302 +#: ../../Zotlabs/Module/Profile_photo.php:315 +#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229 +#: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256 +#: ../../Zotlabs/Module/Item.php:1106 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389 +#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 +#: ../../Zotlabs/Module/Menu.php:78 ../../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:278 -#: ../../Zotlabs/Module/Profile_photo.php:291 -#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Common.php:39 -#: ../../Zotlabs/Module/Channel.php:115 ../../Zotlabs/Module/Channel.php:245 -#: ../../Zotlabs/Module/Channel.php:285 ../../Zotlabs/Module/Mood.php:116 -#: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Pdledit.php:29 -#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100 -#: ../../Zotlabs/Module/Viewsrc.php:18 -#: ../../Zotlabs/Module/Service_limits.php:11 -#: ../../Zotlabs/Module/Sharedwithme.php:11 -#: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30 +#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:13 #: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 -#: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294 -#: ../../Zotlabs/Module/Thing.php:335 ../../Zotlabs/Module/Setup.php:212 +#: ../../Zotlabs/Module/Editwebpage.php:68 +#: ../../Zotlabs/Module/Editwebpage.php:89 +#: ../../Zotlabs/Module/Editwebpage.php:107 +#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10 +#: ../../Zotlabs/Module/Cards.php:72 ../../Zotlabs/Module/Webpages.php:118 +#: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 +#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:74 +#: ../../Zotlabs/Module/Like.php:185 ../../Zotlabs/Module/Suggest.php:28 +#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146 +#: ../../Zotlabs/Module/Register.php:77 +#: ../../Zotlabs/Module/Cover_photo.php:281 +#: ../../Zotlabs/Module/Cover_photo.php:294 +#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Filestorage.php:15 +#: ../../Zotlabs/Module/Filestorage.php:70 +#: ../../Zotlabs/Module/Filestorage.php:85 +#: ../../Zotlabs/Module/Filestorage.php:117 ../../Zotlabs/Module/Common.php:38 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 -#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:215 -#: ../../Zotlabs/Module/Wiki.php:311 ../../Zotlabs/Module/Chat.php:98 -#: ../../Zotlabs/Module/Chat.php:103 ../../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 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:194 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:291 -#: ../../include/items.php:3447 ../../include/attach.php:144 -#: ../../include/attach.php:191 ../../include/attach.php:255 -#: ../../include/attach.php:269 ../../include/attach.php:276 -#: ../../include/attach.php:343 ../../include/attach.php:357 -#: ../../include/attach.php:364 ../../include/attach.php:441 -#: ../../include/attach.php:908 ../../include/attach.php:979 -#: ../../include/attach.php:1137 ../../include/photos.php:27 +#: ../../Zotlabs/Module/Service_limits.php:11 +#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Card_edit.php:51 +#: ../../Zotlabs/Module/Notifications.php:11 +#: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:123 +#: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53 +#: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:150 +#: ../../include/attach.php:197 ../../include/attach.php:270 +#: ../../include/attach.php:284 ../../include/attach.php:293 +#: ../../include/attach.php:366 ../../include/attach.php:380 +#: ../../include/attach.php:387 ../../include/attach.php:469 +#: ../../include/attach.php:1029 ../../include/attach.php:1103 +#: ../../include/attach.php:1268 ../../include/items.php:3706 +#: ../../include/photos.php:27 msgid "Permission denied." msgstr "Toegang geweigerd." -#: ../../Zotlabs/Web/Router.php:146 ../../Zotlabs/Module/Page.php:94 -#: ../../Zotlabs/Module/Display.php:122 ../../Zotlabs/Module/Block.php:79 -#: ../../Zotlabs/Lib/NativeWikiPage.php:518 ../../include/help.php:68 -msgid "Page not found." -msgstr "Pagina niet gevonden." +#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155 +#: ../../Zotlabs/Module/Editblock.php:113 +msgid "Block Name" +msgstr "Bloknaam" -#: ../../Zotlabs/Zot/Auth.php:138 -msgid "" -"Remote authentication blocked. You are logged into this site locally. Please" -" logout and retry." -msgstr "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen." +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2422 +msgid "Blocks" +msgstr "Blokken" -#: ../../Zotlabs/Zot/Auth.php:250 -#: ../../extend/addon/addon/openid/Mod_Openid.php:76 -#: ../../extend/addon/addon/openid/Mod_Openid.php:178 -#, php-format -msgid "Welcome %s. Remote authentication successful." -msgstr "Welkom %s. Authenticatie op afstand geslaagd." +#: ../../Zotlabs/Module/Blocks.php:156 +msgid "Block Title" +msgstr "Bloktitel" -#: ../../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/Webpages.php:33 ../../Zotlabs/Module/Hcard.php:12 -#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Layouts.php:31 -#: ../../Zotlabs/Module/Profile.php:20 ../../include/channel.php:945 -msgid "Requested profile is not available." -msgstr "Opgevraagd profiel is niet beschikbaar" +#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114 +#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251 +msgid "Created" +msgstr "Aangemaakt" -#: ../../Zotlabs/Module/Achievements.php:38 -msgid "Some blurb about what to do when you're new here" -msgstr "Welkom op $Projectname. Klik op de tab ontdekken of klik rechtsboven op de kanalengids, om kanalen te vinden. Rechtsboven vind je ook apps, waar je vrijwel alle functies van $Projectname kunt vinden. Voor hulp met $Projectname klik je op het vraagteken." +#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115 +#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252 +msgid "Edited" +msgstr "Bewerkt" -#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55 -msgid "App installed." -msgstr "App geïnstalleerd" +#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96 +#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:160 +#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:118 +#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239 +#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:382 +#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165 +msgid "Create" +msgstr "Aanmaken" -#: ../../Zotlabs/Module/Appman.php:48 -msgid "Malformed app." -msgstr "Misvormde app." +#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 +#: ../../Zotlabs/Module/Article_edit.php:99 +#: ../../Zotlabs/Module/Admin/Profs.php:175 +#: ../../Zotlabs/Module/Settings/Oauth2.php:149 +#: ../../Zotlabs/Module/Settings/Oauth.php:150 +#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114 +#: ../../Zotlabs/Module/Connections.php:281 +#: ../../Zotlabs/Module/Connections.php:319 +#: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202 +#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:112 +#: ../../Zotlabs/Module/Layouts.php:193 +#: ../../Zotlabs/Module/Editwebpage.php:142 +#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99 +#: ../../Zotlabs/Lib/Apps.php:409 ../../Zotlabs/Lib/ThreadItem.php:121 +#: ../../Zotlabs/Storage/Browser.php:288 ../../Zotlabs/Widget/Cdav.php:126 +#: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296 +#: ../../include/channel.php:1300 ../../include/menu.php:113 +msgid "Edit" +msgstr "Bewerken" -#: ../../Zotlabs/Module/Appman.php:111 -msgid "Embed code" -msgstr "Insluitcode" +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102 +#: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124 +#: ../../include/conversation.php:1366 +msgid "Share" +msgstr "Delen" -#: ../../Zotlabs/Module/Appman.php:117 -msgid "Edit App" -msgstr "App bewerken" +#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 +#: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187 +#: ../../Zotlabs/Module/Article_edit.php:129 +#: ../../Zotlabs/Module/Admin/Accounts.php:175 +#: ../../Zotlabs/Module/Admin/Channels.php:149 +#: ../../Zotlabs/Module/Admin/Profs.php:176 +#: ../../Zotlabs/Module/Settings/Oauth2.php:150 +#: ../../Zotlabs/Module/Settings/Oauth.php:151 +#: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139 +#: ../../Zotlabs/Module/Connections.php:289 +#: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654 +#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Group.php:179 +#: ../../Zotlabs/Module/Profiles.php:800 +#: ../../Zotlabs/Module/Editwebpage.php:167 +#: ../../Zotlabs/Module/Webpages.php:242 +#: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:410 +#: ../../Zotlabs/Lib/ThreadItem.php:141 ../../Zotlabs/Storage/Browser.php:289 +#: ../../include/conversation.php:690 ../../include/conversation.php:733 +msgid "Delete" +msgstr "Verwijderen" -#: ../../Zotlabs/Module/Appman.php:117 -msgid "Create App" -msgstr "App maken" +#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694 +#: ../../Zotlabs/Module/Wiki.php:204 ../../Zotlabs/Module/Layouts.php:198 +#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:60 +msgid "View" +msgstr "Tonen" -#: ../../Zotlabs/Module/Appman.php:122 -msgid "Name of app" -msgstr "Naam van app" +#: ../../Zotlabs/Module/Invite.php:29 +msgid "Total invitation limit exceeded." +msgstr "Limiet voor aantal uitnodigingen overschreden." -#: ../../Zotlabs/Module/Appman.php:122 ../../Zotlabs/Module/Appman.php:123 -#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465 -#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752 -#: ../../include/datetime.php:259 -msgid "Required" -msgstr "Vereist" +#: ../../Zotlabs/Module/Invite.php:53 +#, php-format +msgid "%s : Not a valid email address." +msgstr "%s : Geen geldig e-mailadres." -#: ../../Zotlabs/Module/Appman.php:123 -msgid "Location (URL) of app" -msgstr "Locatie (URL) van app" +#: ../../Zotlabs/Module/Invite.php:67 +msgid "Please join us on $Projectname" +msgstr "Uitnodiging voor $Projectname" -#: ../../Zotlabs/Module/Appman.php:124 ../../Zotlabs/Module/Events.php:473 -#: ../../Zotlabs/Module/Rbmark.php:101 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:838 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:173 -msgid "Description" -msgstr "Omschrijving" +#: ../../Zotlabs/Module/Invite.php:77 +msgid "Invitation limit exceeded. Please contact your site administrator." +msgstr "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder." -#: ../../Zotlabs/Module/Appman.php:125 -msgid "Photo icon URL" -msgstr "URL van pictogram" +#: ../../Zotlabs/Module/Invite.php:82 +#: ../../addon/notifyadmin/notifyadmin.php:40 +#, php-format +msgid "%s : Message delivery failed." +msgstr "%s: Aflevering bericht mislukt." -#: ../../Zotlabs/Module/Appman.php:125 -msgid "80 x 80 pixels - optional" -msgstr "80 x 80 pixels (niet verplicht)" +#: ../../Zotlabs/Module/Invite.php:86 +#, php-format +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "%d bericht verzonden." +msgstr[1] "%d berichten verzonden." -#: ../../Zotlabs/Module/Appman.php:126 -msgid "Categories (optional, comma separated list)" -msgstr "Categorieën (niet verplicht, door komma's gescheiden lijst)" +#: ../../Zotlabs/Module/Invite.php:107 +msgid "You have no more invitations available" +msgstr "Je hebt geen uitnodigingen meer beschikbaar" -#: ../../Zotlabs/Module/Appman.php:127 -msgid "Version ID" -msgstr "Versie-ID" +#: ../../Zotlabs/Module/Invite.php:138 +msgid "Send invitations" +msgstr "Uitnodigingen verzenden" -#: ../../Zotlabs/Module/Appman.php:128 -msgid "Price of app" -msgstr "Prijs van de app" +#: ../../Zotlabs/Module/Invite.php:139 +msgid "Enter email addresses, one per line:" +msgstr "Voer e-mailadressen in, één per regel:" -#: ../../Zotlabs/Module/Appman.php:129 -msgid "Location (URL) to purchase app" -msgstr "Locatie (URL) om de app aan te schaffen" +#: ../../Zotlabs/Module/Invite.php:140 ../../Zotlabs/Module/Mail.php:285 +msgid "Your message:" +msgstr "Jouw bericht:" + +#: ../../Zotlabs/Module/Invite.php:141 +msgid "Please join my community on $Projectname." +msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op $Projectname te vergezellen. Lees meer over $Projectname op http://hubzilla.org" + +#: ../../Zotlabs/Module/Invite.php:143 +msgid "You will need to supply this invitation code:" +msgstr "Je moet deze uitnodigingscode opgeven:" + +#: ../../Zotlabs/Module/Invite.php:144 +msgid "" +"1. Register at any $Projectname location (they are all inter-connected)" +msgstr "1. Registreer je op een willekeurige $Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):" + +#: ../../Zotlabs/Module/Invite.php:146 +msgid "2. Enter my $Projectname network address into the site searchbar." +msgstr "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn $Projectname-kanaaladres in het zoekveld invullen:" + +#: ../../Zotlabs/Module/Invite.php:147 +msgid "or visit" +msgstr "of bezoek" + +#: ../../Zotlabs/Module/Invite.php:149 +msgid "3. Click [Connect]" +msgstr "3. Klik op [+ Verbinden]" -#: ../../Zotlabs/Module/Appman.php:134 ../../Zotlabs/Module/Import.php:507 +#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121 +#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493 +#: ../../Zotlabs/Module/Appman.php:153 +#: ../../Zotlabs/Module/Import_items.php:129 +#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349 #: ../../Zotlabs/Module/Connect.php:98 #: ../../Zotlabs/Module/Admin/Features.php:66 +#: ../../Zotlabs/Module/Admin/Plugins.php:438 +#: ../../Zotlabs/Module/Admin/Accounts.php:168 #: ../../Zotlabs/Module/Admin/Logs.php:84 -#: ../../Zotlabs/Module/Admin/Profs.php:157 -#: ../../Zotlabs/Module/Admin/Security.php:104 -#: ../../Zotlabs/Module/Admin/Account_edit.php:74 -#: ../../Zotlabs/Module/Admin/Accounts.php:166 #: ../../Zotlabs/Module/Admin/Channels.php:147 -#: ../../Zotlabs/Module/Admin/Site.php:268 -#: ../../Zotlabs/Module/Admin/Plugins.php:438 -#: ../../Zotlabs/Module/Admin/Themes.php:158 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Events.php:493 -#: ../../Zotlabs/Module/Filestorage.php:165 -#: ../../Zotlabs/Module/Photos.php:667 ../../Zotlabs/Module/Photos.php:1053 -#: ../../Zotlabs/Module/Photos.php:1093 ../../Zotlabs/Module/Photos.php:1211 -#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Mail.php:413 -#: ../../Zotlabs/Module/Import_items.php:122 -#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Cal.php:342 -#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Poke.php:186 -#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Rate.php:166 -#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Pdledit.php:74 -#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 -#: ../../Zotlabs/Module/Profiles.php:726 -#: ../../Zotlabs/Module/Settings/Features.php:47 -#: ../../Zotlabs/Module/Settings/Oauth.php:87 -#: ../../Zotlabs/Module/Settings/Account.php:118 -#: ../../Zotlabs/Module/Settings/Channel.php:476 -#: ../../Zotlabs/Module/Settings/Featured.php:50 -#: ../../Zotlabs/Module/Settings/Permcats.php:112 +#: ../../Zotlabs/Module/Admin/Themes.php:158 +#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Profs.php:178 +#: ../../Zotlabs/Module/Admin/Account_edit.php:74 +#: ../../Zotlabs/Module/Admin/Security.php:104 +#: ../../Zotlabs/Module/Settings/Permcats.php:115 +#: ../../Zotlabs/Module/Settings/Channel.php:495 +#: ../../Zotlabs/Module/Settings/Features.php:79 #: ../../Zotlabs/Module/Settings/Tokens.php:168 -#: ../../Zotlabs/Module/Settings/Display.php:203 -#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370 -#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:357 -#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Chat.php:194 -#: ../../Zotlabs/Module/Chat.php:239 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Lib/ThreadItem.php:731 -#: ../../extend/addon/addon/chords/Mod_Chords.php:60 -#: ../../extend/addon/addon/diaspora/diaspora.php:714 -#: ../../extend/addon/addon/dwpost/dwpost.php:89 -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124 -#: ../../extend/addon/addon/friendica/friendica.php:128 -#: ../../extend/addon/addon/frphotos/frphotos.php:96 -#: ../../extend/addon/addon/hubwall/hubwall.php:95 -#: ../../extend/addon/addon/ijpost/ijpost.php:89 -#: ../../extend/addon/addon/irc/irc.php:53 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:371 -#: ../../extend/addon/addon/libertree/libertree.php:85 -#: ../../extend/addon/addon/ljpost/ljpost.php:86 -#: ../../extend/addon/addon/logrot/logrot.php:35 -#: ../../extend/addon/addon/mailhost/mailhost.php:40 -#: ../../extend/addon/addon/nofed/nofed.php:80 -#: ../../extend/addon/addon/nsabait/nsabait.php:161 -#: ../../extend/addon/addon/nsfw/nsfw.php:92 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:53 -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:168 -#: ../../extend/addon/addon/pageheader/pageheader.php:48 -#: ../../extend/addon/addon/piwik/piwik.php:95 -#: ../../extend/addon/addon/planets/planets.php:157 -#: ../../extend/addon/addon/pumpio/pumpio.php:237 -#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85 -#: ../../extend/addon/addon/redfiles/redfiles.php:124 -#: ../../extend/addon/addon/redphotos/redphotos.php:136 -#: ../../extend/addon/addon/redred/redred.php:119 -#: ../../extend/addon/addon/rtof/rtof.php:101 -#: ../../extend/addon/addon/skeleton/skeleton.php:65 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:281 -#: ../../extend/addon/addon/startpage/startpage.php:113 -#: ../../extend/addon/addon/statusnet/statusnet.php:322 -#: ../../extend/addon/addon/statusnet/statusnet.php:380 -#: ../../extend/addon/addon/statusnet/statusnet.php:432 -#: ../../extend/addon/addon/statusnet/statusnet.php:899 -#: ../../extend/addon/addon/superblock/superblock.php:120 -#: ../../extend/addon/addon/twitter/twitter.php:217 -#: ../../extend/addon/addon/twitter/twitter.php:259 -#: ../../extend/addon/addon/visage/visage.php:170 -#: ../../extend/addon/addon/wppost/wppost.php:113 -#: ../../extend/addon/addon/xmpp/xmpp.php:69 -#: ../../extend/addon/addon/cdav/cdav.php:246 -#: ../../extend/addon/addon/likebanner/likebanner.php:57 -#: ../../extend/addon/addon/mailtest/mailtest.php:100 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153 -#: ../../extend/addon/addon/gnusoc/gnusoc.php:133 -#: ../../include/widgets.php:801 ../../include/js_strings.php:22 -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../Zotlabs/Module/Settings/Oauth2.php:84 +#: ../../Zotlabs/Module/Settings/Account.php:118 +#: ../../Zotlabs/Module/Settings/Featured.php:54 +#: ../../Zotlabs/Module/Settings/Display.php:192 +#: ../../Zotlabs/Module/Settings/Oauth.php:88 +#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379 +#: ../../Zotlabs/Module/Import.php:530 ../../Zotlabs/Module/Cal.php:345 +#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082 +#: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240 +#: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98 +#: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:887 +#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242 +#: ../../Zotlabs/Module/Email_validation.php:40 +#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249 +#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:723 +#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Sources.php:114 +#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15 +#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Lib/ThreadItem.php:752 +#: ../../Zotlabs/Widget/Eventstools.php:16 +#: ../../Zotlabs/Widget/Wiki_pages.php:40 +#: ../../Zotlabs/Widget/Wiki_pages.php:97 +#: ../../view/theme/redbasic_c/php/config.php:95 +#: ../../view/theme/redbasic/php/config.php:93 +#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:275 +#: ../../addon/planets/planets.php:153 +#: ../../addon/openclipatar/openclipatar.php:53 +#: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 +#: ../../addon/ijpost/ijpost.php:89 ../../addon/dwpost/dwpost.php:89 +#: ../../addon/likebanner/likebanner.php:57 +#: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 +#: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 +#: ../../addon/diaspora/diaspora.php:825 +#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84 +#: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161 +#: ../../addon/mailtest/mailtest.php:100 +#: ../../addon/openstreetmap/openstreetmap.php:168 +#: ../../addon/fuzzloc/fuzzloc.php:191 ../../addon/rtof/rtof.php:101 +#: ../../addon/jappixmini/jappixmini.php:371 +#: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 +#: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 +#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1072 +#: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 +#: ../../addon/flattrwidget/flattrwidget.php:124 +#: ../../addon/statusnet/statusnet.php:322 +#: ../../addon/statusnet/statusnet.php:380 +#: ../../addon/statusnet/statusnet.php:432 +#: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:218 +#: ../../addon/twitter/twitter.php:265 +#: ../../addon/smileybutton/smileybutton.php:219 +#: ../../addon/cart/cart.php:1104 ../../addon/piwik/piwik.php:95 +#: ../../addon/pageheader/pageheader.php:48 +#: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69 +#: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124 +#: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22 msgid "Submit" msgstr "Opslaan" -#: ../../Zotlabs/Module/Register.php:49 -msgid "Maximum daily site registrations exceeded. Please try again tomorrow." -msgstr "Maximum toegestane dagelijkse registraties op deze $Projectname-hub bereikt. Probeer het morgen (UTC) nogmaals." +#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191 +#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:133 +#: ../../include/nav.php:469 +msgid "Articles" +msgstr "Artikelen" -#: ../../Zotlabs/Module/Register.php:55 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." -msgstr "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden." +#: ../../Zotlabs/Module/Articles.php:95 +msgid "Add Article" +msgstr "Artikel toevoegen" -#: ../../Zotlabs/Module/Register.php:89 -msgid "Passwords do not match." -msgstr "Wachtwoorden komen niet met elkaar overeen." +#: ../../Zotlabs/Module/Editlayout.php:79 +#: ../../Zotlabs/Module/Article_edit.php:17 +#: ../../Zotlabs/Module/Article_edit.php:33 +#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 +#: ../../Zotlabs/Module/Editwebpage.php:80 +#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Card_edit.php:17 +#: ../../Zotlabs/Module/Card_edit.php:33 +msgid "Item not found" +msgstr "Item niet gevonden" -#: ../../Zotlabs/Module/Register.php:131 -msgid "" -"Registration successful. Please check your email for validation " -"instructions." -msgstr "Registratie geslaagd. Controleer je e-mail voor instructies." +#: ../../Zotlabs/Module/Editlayout.php:128 +#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189 +msgid "Layout Name" +msgstr "Naam lay-out" -#: ../../Zotlabs/Module/Register.php:137 -msgid "Your registration is pending approval by the site owner." -msgstr "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze $Projectname-hub." +#: ../../Zotlabs/Module/Editlayout.php:129 +#: ../../Zotlabs/Module/Layouts.php:132 +msgid "Layout Description (Optional)" +msgstr "Lay-out-omschrijving (niet verplicht)" -#: ../../Zotlabs/Module/Register.php:140 -msgid "Your registration can not be processed." -msgstr "Jouw registratie kan niet verwerkt worden." +#: ../../Zotlabs/Module/Editlayout.php:137 +msgid "Edit Layout" +msgstr "Lay-out bewerken" -#: ../../Zotlabs/Module/Register.php:184 -msgid "Registration on this hub is disabled." -msgstr "Registreren van nieuwe accounts is op deze hub uitgeschakeld." +#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86 +#: ../../Zotlabs/Module/Import_items.php:120 +#: ../../Zotlabs/Module/Cloud.php:117 ../../Zotlabs/Module/Group.php:74 +#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68 +#: ../../Zotlabs/Module/Like.php:296 ../../Zotlabs/Web/WebServer.php:122 +#: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73 +#: ../../addon/frphotos/frphotos.php:82 ../../addon/redfiles/redfiles.php:109 +#: ../../include/items.php:358 +msgid "Permission denied" +msgstr "Toegang geweigerd" -#: ../../Zotlabs/Module/Register.php:193 -msgid "Registration on this hub is by approval only." -msgstr "Registraties op deze hub moeten eerst worden goedgekeurd." +#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63 +msgid "Invalid profile identifier." +msgstr "Ongeldige profiel-identificator" -#: ../../Zotlabs/Module/Register.php:194 -msgid "Register at another affiliated hub." -msgstr "Registreer op een andere hub." +#: ../../Zotlabs/Module/Profperm.php:111 +msgid "Profile Visibility Editor" +msgstr "Zichtbaarheid profiel " -#: ../../Zotlabs/Module/Register.php:204 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "Deze $Projectname-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals." +#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1644 +msgid "Profile" +msgstr "Profiel" -#: ../../Zotlabs/Module/Register.php:221 ../../Zotlabs/Module/Siteinfo.php:27 -msgid "Terms of Service" -msgstr "Gebruiksvoorwaarden" +#: ../../Zotlabs/Module/Profperm.php:115 +msgid "Click on a contact to add or remove." +msgstr "Klik op een connectie om deze toe te voegen of te verwijderen" -#: ../../Zotlabs/Module/Register.php:227 -#, php-format -msgid "I accept the %s for this website" -msgstr "Ik accepteer de %s van deze $Projectname-hub" +#: ../../Zotlabs/Module/Profperm.php:124 +msgid "Visible To" +msgstr "Zichtbaar voor" -#: ../../Zotlabs/Module/Register.php:229 -#, php-format -msgid "I am over 13 years of age and accept the %s for this website" -msgstr "Ik ben 13 jaar of ouder en accepteer de %s van deze $Projectname-hub" +#: ../../Zotlabs/Module/Profperm.php:140 +#: ../../Zotlabs/Module/Connections.php:200 +msgid "All Connections" +msgstr "Alle connecties" -#: ../../Zotlabs/Module/Register.php:233 -msgid "Your email address" -msgstr "Jouw e-mailadres" +#: ../../Zotlabs/Module/Cdav.php:785 +msgid "INVALID EVENT DISMISSED!" +msgstr "ONGELDIGE GEBEURTENIS VERWIJDERD!" -#: ../../Zotlabs/Module/Register.php:234 -msgid "Choose a password" -msgstr "Geef een wachtwoord op" +#: ../../Zotlabs/Module/Cdav.php:786 +msgid "Summary: " +msgstr "Samenvatting: " -#: ../../Zotlabs/Module/Register.php:235 -msgid "Please re-enter your password" -msgstr "Geef het wachtwoord opnieuw op" +#: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787 +#: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146 +#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273 +#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833 +#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891 +#: ../../include/conversation.php:1160 +msgid "Unknown" +msgstr "Onbekend" -#: ../../Zotlabs/Module/Register.php:236 -msgid "Please enter your invitation code" -msgstr "Vul jouw uitnodigingscode in" +#: ../../Zotlabs/Module/Cdav.php:787 +msgid "Date: " +msgstr "Datum: " -#: ../../Zotlabs/Module/Register.php:237 -#: ../../Zotlabs/Module/New_channel.php:134 -msgid "Name or caption" -msgstr "Naam" +#: ../../Zotlabs/Module/Cdav.php:788 ../../Zotlabs/Module/Cdav.php:795 +msgid "Reason: " +msgstr "Reden: " -#: ../../Zotlabs/Module/Register.php:237 -#: ../../Zotlabs/Module/New_channel.php:134 -msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\"" -msgstr "Voorbeelden: \"Jan Pietersen\", \"Willems weblog\", \"Computerforum\"" +#: ../../Zotlabs/Module/Cdav.php:793 +msgid "INVALID CARD DISMISSED!" +msgstr "ONGELDIGE CONTACTKAART VERWIJDERD!" -#: ../../Zotlabs/Module/Register.php:239 -#: ../../Zotlabs/Module/New_channel.php:136 -msgid "Choose a short nickname" -msgstr "Korte bijnaam" +#: ../../Zotlabs/Module/Cdav.php:794 +msgid "Name: " +msgstr "Naam: " -#: ../../Zotlabs/Module/Register.php:239 -#: ../../Zotlabs/Module/New_channel.php:136 -#, php-format -msgid "" -"Your nickname will be used to create an easy to remember channel address " -"e.g. nickname%s" -msgstr "Deze bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres van jouw kanaal aan te maken, die je dan met anderen kunt delen. Bijvoorbeeld: bijnaam%s" +#: ../../Zotlabs/Module/Cdav.php:868 ../../Zotlabs/Module/Events.php:460 +msgid "Event title" +msgstr "Titel" -#: ../../Zotlabs/Module/Register.php:240 -#: ../../Zotlabs/Module/New_channel.php:137 -msgid "Channel role and privacy" -msgstr "Kanaaltype en privacy" +#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Events.php:466 +msgid "Start date and time" +msgstr "Begindatum en -tijd" -#: ../../Zotlabs/Module/Register.php:240 -#: ../../Zotlabs/Module/New_channel.php:137 -msgid "Select a channel role with your privacy requirements." -msgstr "Kies een kanaaltype met het door jou gewenste privacyniveau." +#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Cdav.php:870 +msgid "Example: YYYY-MM-DD HH:mm" +msgstr "Bijvoorbeeld: JJJJ-MM-DD UU:mm" -#: ../../Zotlabs/Module/Register.php:240 -#: ../../Zotlabs/Module/New_channel.php:137 -msgid "Read more about roles" -msgstr "Lees meer over kanaaltypes" +#: ../../Zotlabs/Module/Cdav.php:870 +msgid "End date and time" +msgstr "Einddatum en -tijd" -#: ../../Zotlabs/Module/Register.php:241 -msgid "no" -msgstr "Nee" +#: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473 +#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101 +#: ../../addon/rendezvous/rendezvous.php:173 +msgid "Description" +msgstr "Omschrijving" -#: ../../Zotlabs/Module/Register.php:241 -msgid "yes" -msgstr "Ja" +#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Locs.php:117 +#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509 +#: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52 +#: ../../include/js_strings.php:25 +msgid "Location" +msgstr "Locatie" -#: ../../Zotlabs/Module/Register.php:253 -#: ../../Zotlabs/Module/Admin/Site.php:269 -msgid "Registration" -msgstr "Registratie" +#: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Events.php:689 +#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:339 +#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:971 +msgid "Previous" +msgstr "Vorige" -#: ../../Zotlabs/Module/Register.php:258 -msgid "Membership on this site is by invitation only." -msgstr "Registreren op deze $Projectname-hub kan alleen op uitnodiging." +#: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Events.php:690 +#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263 +#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347 +#: ../../Zotlabs/Module/Photos.php:980 +msgid "Next" +msgstr "Volgende" -#: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:162 -#: ../../boot.php:1730 -msgid "Register" -msgstr "Registreren" +#: ../../Zotlabs/Module/Cdav.php:881 ../../Zotlabs/Module/Events.php:700 +#: ../../Zotlabs/Module/Cal.php:348 +msgid "Today" +msgstr "Vandaag" -#: ../../Zotlabs/Module/Register.php:271 -msgid "" -"This site may require email verification after submitting this form. If you " -"are returned to a login page, please check your email for instructions." -msgstr "Mogelijk moet op deze hub eerst jouw e-mail geverifieerd worden. Wanneer je na het indienen van dit formulier op de inlogpagina terecht komt, dan dien je jouw e-mail te controleren voor instructies. Controleer eventueel ook jouw spamfolder." +#: ../../Zotlabs/Module/Cdav.php:882 ../../Zotlabs/Module/Events.php:695 +msgid "Month" +msgstr "Maand" -#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32 -#, php-format -msgid "Fetching URL returns error: %1$s" -msgstr "Ophalen URL gaf een foutmelding terug: %1$s" +#: ../../Zotlabs/Module/Cdav.php:883 ../../Zotlabs/Module/Events.php:696 +msgid "Week" +msgstr "Week" -#: ../../Zotlabs/Module/Rmagic.php:35 -msgid "Authentication failed." -msgstr "Authenticatie mislukt." +#: ../../Zotlabs/Module/Cdav.php:884 ../../Zotlabs/Module/Events.php:697 +msgid "Day" +msgstr "Dag" -#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1989 -msgid "Remote Authentication" -msgstr "Authenticatie op afstand" +#: ../../Zotlabs/Module/Cdav.php:885 +msgid "List month" +msgstr "Maand tonen" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1990 -msgid "Enter your channel address (e.g. channel@example.com)" -msgstr "Vul jouw kanaaladres in (bijv. channel@example.com)" +#: ../../Zotlabs/Module/Cdav.php:886 +msgid "List week" +msgstr "Week tonen" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1991 -msgid "Authenticate" -msgstr "Authenticeren" +#: ../../Zotlabs/Module/Cdav.php:887 +msgid "List day" +msgstr "Dag tonen" -#: ../../Zotlabs/Module/Import.php:57 ../../Zotlabs/Module/Import_items.php:42 -msgid "Nothing to import." -msgstr "Niets gevonden om te importeren" +#: ../../Zotlabs/Module/Cdav.php:894 +msgid "More" +msgstr "Meer" -#: ../../Zotlabs/Module/Import.php:69 ../../Zotlabs/Module/Import.php:84 -#: ../../Zotlabs/Module/Import_items.php:66 -msgid "Unable to download data from old server" -msgstr "Niet in staat om gegevens van de oude hub te downloaden" +#: ../../Zotlabs/Module/Cdav.php:895 +msgid "Less" +msgstr "Minder" -#: ../../Zotlabs/Module/Import.php:91 ../../Zotlabs/Module/Import_items.php:72 -msgid "Imported file is empty." -msgstr "Geïmporteerde bestand is leeg" +#: ../../Zotlabs/Module/Cdav.php:896 +msgid "Select calendar" +msgstr "Kies agenda" -#: ../../Zotlabs/Module/Import.php:111 -#: ../../Zotlabs/Module/Import_items.php:88 -#, php-format -msgid "Warning: Database versions differ by %1$d updates." -msgstr "Waarschuwing: database-versies lopen %1$d updates achter." +#: ../../Zotlabs/Module/Cdav.php:898 +msgid "Delete all" +msgstr "Alles verwijderen" -#: ../../Zotlabs/Module/Import.php:134 -#, php-format -msgid "Your service plan only allows %d channels." -msgstr "Jouw abonnement staat maar %d kanalen toe." +#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188 +#: ../../Zotlabs/Module/Admin/Plugins.php:423 +#: ../../Zotlabs/Module/Settings/Oauth2.php:85 +#: ../../Zotlabs/Module/Settings/Oauth2.php:113 +#: ../../Zotlabs/Module/Settings/Oauth.php:89 +#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Wiki.php:347 ../../Zotlabs/Module/Wiki.php:379 +#: ../../Zotlabs/Module/Profile_photo.php:464 +#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66 +#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:366 +#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 +#: ../../include/conversation.php:1389 ../../include/conversation.php:1438 +msgid "Cancel" +msgstr "Annuleren" -#: ../../Zotlabs/Module/Import.php:149 -msgid "No channel. Import failed." -msgstr "Geen kanaal. Importeren mislukt." +#: ../../Zotlabs/Module/Cdav.php:900 +msgid "Sorry! Editing of recurrent events is not yet implemented." +msgstr "Excuses! Bewerken van herhalende gebeurtenissen is nog niet geïmplementeerd." -#: ../../Zotlabs/Module/Import.php:467 -#: ../../extend/addon/addon/diaspora/import_diaspora.php:142 -msgid "Import completed." -msgstr "Import voltooid." +#: ../../Zotlabs/Module/Cdav.php:1170 +#: ../../Zotlabs/Module/Sharedwithme.php:105 +#: ../../Zotlabs/Module/Admin/Channels.php:159 +#: ../../Zotlabs/Module/Settings/Oauth2.php:86 +#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth.php:90 +#: ../../Zotlabs/Module/Settings/Oauth.php:116 +#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906 +#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Storage/Browser.php:283 +#: ../../Zotlabs/Widget/Wiki_page_history.php:22 +#: ../../addon/rendezvous/rendezvous.php:172 +msgid "Name" +msgstr "Naam" -#: ../../Zotlabs/Module/Import.php:488 -msgid "You must be logged in to use this feature." -msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken." +#: ../../Zotlabs/Module/Cdav.php:1171 ../../Zotlabs/Module/Connedit.php:907 +msgid "Organisation" +msgstr "Organisatie" -#: ../../Zotlabs/Module/Import.php:493 -msgid "Import Channel" -msgstr "Kanaal importeren" +#: ../../Zotlabs/Module/Cdav.php:1172 ../../Zotlabs/Module/Connedit.php:908 +msgid "Title" +msgstr "Titel" -#: ../../Zotlabs/Module/Import.php:494 -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 "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken." +#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909 +#: ../../Zotlabs/Module/Profiles.php:786 +msgid "Phone" +msgstr "Telefoon" -#: ../../Zotlabs/Module/Import.php:495 -#: ../../Zotlabs/Module/Import_items.php:121 -msgid "File to Upload" -msgstr "Bestand om te uploaden" +#: ../../Zotlabs/Module/Cdav.php:1174 +#: ../../Zotlabs/Module/Admin/Accounts.php:171 +#: ../../Zotlabs/Module/Admin/Accounts.php:183 +#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787 +#: ../../addon/openid/MysqlProvider.php:56 +#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1770 +msgid "Email" +msgstr "E-mail" -#: ../../Zotlabs/Module/Import.php:496 -msgid "Or provide the old server/hub details" -msgstr "Of vul de gegevens van de oude hub in" +#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911 +#: ../../Zotlabs/Module/Profiles.php:788 +msgid "Instant messenger" +msgstr "Instant messenger" -#: ../../Zotlabs/Module/Import.php:497 -msgid "Your old identity address (xyz@example.com)" -msgstr "Jouw oude kanaaladres (xyz@example.com)" +#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912 +#: ../../Zotlabs/Module/Profiles.php:789 +msgid "Website" +msgstr "Website" -#: ../../Zotlabs/Module/Import.php:498 -msgid "Your old login email address" -msgstr "Het e-mailadres van je oude account" +#: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Admin/Channels.php:160 +#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:502 +#: ../../Zotlabs/Module/Profiles.php:790 +msgid "Address" +msgstr "Adres" -#: ../../Zotlabs/Module/Import.php:499 -msgid "Your old login password" -msgstr "Wachtwoord van jouw oude account" +#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914 +#: ../../Zotlabs/Module/Profiles.php:791 +msgid "Note" +msgstr "Opmerking" -#: ../../Zotlabs/Module/Import.php:500 -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 "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen." +#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915 +#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308 +#: ../../include/connections.php:690 +msgid "Mobile" +msgstr "Mobiel" -#: ../../Zotlabs/Module/Import.php:501 -msgid "Make this hub my primary location" -msgstr "Stel deze hub als mijn primaire locatie in" +#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916 +#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309 +#: ../../include/connections.php:691 +msgid "Home" +msgstr "Thuis" -#: ../../Zotlabs/Module/Import.php:502 -msgid "Move this channel (disable all previous locations)" -msgstr "Verplaats dit kanaal (schakelt alle voormalige locaties uit)" +#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917 +#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312 +#: ../../include/connections.php:694 +msgid "Work" +msgstr "Werk" -#: ../../Zotlabs/Module/Import.php:503 -msgid "Import a few months of posts if possible (limited by available memory" -msgstr "Importeer enkele maanden aan berichten wanneer mogelijk (afhankelijk van hoeveelheid geheugen hub)" +#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919 +#: ../../Zotlabs/Module/Profiles.php:796 +#: ../../addon/jappixmini/jappixmini.php:368 +msgid "Add Contact" +msgstr "Contact toevoegen" -#: ../../Zotlabs/Module/Import.php:504 -msgid "" -"This process may take several minutes to complete. Please submit the form " -"only once and leave this page open until finished." -msgstr "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid." +#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920 +#: ../../Zotlabs/Module/Profiles.php:797 +msgid "Add Field" +msgstr "Veld toevoegen" -#: ../../Zotlabs/Module/Chatsvc.php:131 -msgid "Away" -msgstr "Afwezig" +#: ../../Zotlabs/Module/Cdav.php:1186 +#: ../../Zotlabs/Module/Admin/Plugins.php:453 +#: ../../Zotlabs/Module/Settings/Oauth2.php:39 +#: ../../Zotlabs/Module/Settings/Oauth2.php:112 +#: ../../Zotlabs/Module/Settings/Oauth.php:43 +#: ../../Zotlabs/Module/Settings/Oauth.php:114 +#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799 +#: ../../Zotlabs/Lib/Apps.php:393 +msgid "Update" +msgstr "Bijwerken" -#: ../../Zotlabs/Module/Chatsvc.php:136 -msgid "Online" -msgstr "Online" +#: ../../Zotlabs/Module/Cdav.php:1189 ../../Zotlabs/Module/Connedit.php:925 +msgid "P.O. Box" +msgstr "Postbus" -#: ../../Zotlabs/Module/Help.php:23 -msgid "Documentation Search" -msgstr "Zoek documentatie" +#: ../../Zotlabs/Module/Cdav.php:1190 ../../Zotlabs/Module/Connedit.php:926 +msgid "Additional" +msgstr "Extra" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1827 -msgid "About" -msgstr "Over" +#: ../../Zotlabs/Module/Cdav.php:1191 ../../Zotlabs/Module/Connedit.php:927 +msgid "Street" +msgstr "Straat en huisnummer" -#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:197 -msgid "Members" -msgstr "Kanalen" +#: ../../Zotlabs/Module/Cdav.php:1192 ../../Zotlabs/Module/Connedit.php:928 +msgid "Locality" +msgstr "Plaats" -#: ../../Zotlabs/Module/Help.php:82 -msgid "Administrators" -msgstr "Beheerders" +#: ../../Zotlabs/Module/Cdav.php:1193 ../../Zotlabs/Module/Connedit.php:929 +msgid "Region" +msgstr "Provincie/staat/regio/enz." -#: ../../Zotlabs/Module/Help.php:83 -msgid "Developers" -msgstr "Ontwikkelaars" +#: ../../Zotlabs/Module/Cdav.php:1194 ../../Zotlabs/Module/Connedit.php:930 +msgid "ZIP Code" +msgstr "Postcode" -#: ../../Zotlabs/Module/Help.php:84 -msgid "Tutorials" -msgstr "Zelfstudie" +#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Profiles.php:757 +msgid "Country" +msgstr "Land" -#: ../../Zotlabs/Module/Help.php:93 -msgid "$Projectname Documentation" -msgstr "$Projectname-documentatie" +#: ../../Zotlabs/Module/Cdav.php:1242 +msgid "Default Calendar" +msgstr "Standaard agenda" -#: ../../Zotlabs/Module/Help.php:94 -msgid "Contents" -msgstr "Inhoud" +#: ../../Zotlabs/Module/Cdav.php:1252 +msgid "Default Addressbook" +msgstr "Standaard adresboek" -#: ../../Zotlabs/Module/Bookmarks.php:53 -msgid "Bookmark added" -msgstr "Bladwijzer toegevoegd" +#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25 +msgid "This site is not a directory server" +msgstr "Deze hub is geen kanalengidshub (directoryserver)" -#: ../../Zotlabs/Module/Bookmarks.php:75 -msgid "My Bookmarks" -msgstr "Mijn bladwijzers" +#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Ochannel.php:32 +#: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508 +msgid "You must be logged in to see this page." +msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken." -#: ../../Zotlabs/Module/Bookmarks.php:86 -msgid "My Connections Bookmarks" -msgstr "Bladwijzers van mijn connecties" +#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:37 +#: ../../Zotlabs/Module/Profile.php:45 +msgid "Posts and comments" +msgstr "Berichten en reacties" -#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 -msgid "Continue" -msgstr "Ga verder" +#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:44 +#: ../../Zotlabs/Module/Profile.php:52 +msgid "Only posts" +msgstr "Alleen berichten" -#: ../../Zotlabs/Module/Connect.php:90 -msgid "Premium Channel Setup" -msgstr "Instellen premiumkanaal " +#: ../../Zotlabs/Module/Channel.php:107 +msgid "Insufficient permissions. Request redirected to profile page." +msgstr "Onvoldoende permissies. Doorgestuurd naar profielpagina." -#: ../../Zotlabs/Module/Connect.php:92 -msgid "Enable premium channel connection restrictions" -msgstr "Restricties voor connecties van premiumkanaal toestaan" +#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58 +msgid "Export Channel" +msgstr "Kanaal exporteren" -#: ../../Zotlabs/Module/Connect.php:93 +#: ../../Zotlabs/Module/Uexport.php:59 msgid "" -"Please enter your restrictions or conditions, such as paypal receipt, usage " -"guidelines, etc." -msgstr "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, voorschriften voor leden, enz." +"Export your basic channel information to a file. This acts as a backup of " +"your connections, permissions, profile and basic data, which can be used to " +"import your data to a new server hub, but does not contain your content." +msgstr "Exporteer de basisinformatie van jouw kanaal naar een bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal." -#: ../../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 "Dit kanaal kan extra stappen of het accepteren van de volgende voorwaarden vereisen, voordat de connectie wordt geaccepteerd:" +#: ../../Zotlabs/Module/Uexport.php:60 +msgid "Export Content" +msgstr "Inhoud exporteren" -#: ../../Zotlabs/Module/Connect.php:96 +#: ../../Zotlabs/Module/Uexport.php:61 msgid "" -"Potential connections will then see the following text before proceeding:" -msgstr "Mogelijke connecties zullen dan de volgende tekst zien voordat ze verder kunnen:" +"Export your channel information and recent content to a JSON backup that can" +" be restored or imported to another server hub. This backs up all of your " +"connections, permissions, profile data and several months of posts. This " +"file may be VERY large. Please be patient - it may take several minutes for" +" this download to begin." +msgstr "Exporteer informatie en recente inhoud van jouw kanaal naar een JSON-back-up, wat kan worden gebruikt om jouw kanaal te herstellen of te importeren op een andere hub. Dit slaat al jouw connecties, permissies, profielgegevens en enkele maanden aan inhoud van jouw kanaal op. Dit bestand kan ZEER groot worden. Wees geduldig - het kan enkele minuten duren voordat de download begint." -#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118 +#: ../../Zotlabs/Module/Uexport.php:63 +msgid "Export your posts from a given year." +msgstr "Exporteer jouw berichten uit een bepaald jaar." + +#: ../../Zotlabs/Module/Uexport.php:65 msgid "" -"By continuing, I certify that I have complied with any instructions provided" -" on this page." -msgstr "Door verder te gaan ga ik automatisch akkoord met alle voorwaarden en aanwijzingen op deze pagina." +"You may also export your posts and conversations for a particular year or " +"month. Adjust the date in your browser location bar to select other dates. " +"If the export fails (possibly due to memory exhaustion on your server hub), " +"please try again selecting a more limited date range." +msgstr "Je kan ook berichten en conversaties uit een bepaald jaar of van een bepaalde maand exporteren. Verander de datum in de adresbalk van jouw webbrowser om andere jaren en maanden te selecteren. Wanneer het exporteren mislukt (waarschijnlijk door een gebrek aan beschikbaar servergeheugen), probeer het dan nogmaals met een beperkter tijdvak." -#: ../../Zotlabs/Module/Connect.php:106 -msgid "(No specific instructions have been provided by the channel owner.)" -msgstr "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaal-eigenaar verstrekt) " +#: ../../Zotlabs/Module/Uexport.php:66 +#, php-format +msgid "" +"To select all posts for a given year, such as this year, visit %2$s" +msgstr "Bezoek %2$s om alle berichten van bijvoorbeeld dit jaar te selecteren. " -#: ../../Zotlabs/Module/Connect.php:114 -msgid "Restricted or Premium Channel" -msgstr "Beperkt of premiumkanaal" +#: ../../Zotlabs/Module/Uexport.php:67 +#, php-format +msgid "" +"To select all posts for a given month, such as January of this year, visit " +"%2$s" +msgstr "Bezoek %2$s om alle berichten van bijvoorbeeld januari dit jaar te selecteren." -#: ../../Zotlabs/Module/Admin.php:60 -#: ../../Zotlabs/Module/Admin/Plugins.php:259 -#: ../../Zotlabs/Module/Admin/Themes.php:72 -#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:35 -#: ../../Zotlabs/Module/Viewsrc.php:24 ../../Zotlabs/Module/Thing.php:89 -#: ../../include/items.php:3368 -msgid "Item not found." -msgstr "Item niet gevonden." +#: ../../Zotlabs/Module/Uexport.php:68 +#, php-format +msgid "" +"These content files may be imported or restored by visiting %2$s on any site containing your channel. For best results" +" please import or restore these in date order (oldest first)." +msgstr "Deze back-up-bestanden kunnen geïmporteerd of hersteld worden door op jouw hub en met jouw kanaal %2$s te bezoeken. Voor het beste resultaat kan je de bestanden in chronologische volgorde importeren of herstellen." -#: ../../Zotlabs/Module/Admin.php:94 -msgid "# Accounts" -msgstr "# accounts" +#: ../../Zotlabs/Module/Hq.php:140 +msgid "Welcome to Hubzilla!" +msgstr "Welkom op Hubzilla!" -#: ../../Zotlabs/Module/Admin.php:95 -msgid "# blocked accounts" -msgstr "# geblokkeerde accounts" +#: ../../Zotlabs/Module/Hq.php:140 +msgid "You have got no unseen posts..." +msgstr "Je hebt geen ongeziene berichten..." -#: ../../Zotlabs/Module/Admin.php:96 -msgid "# expired accounts" -msgstr "# verlopen accounts" +#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:540 +#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63 +#: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30 +#: ../../Zotlabs/Module/Viewconnections.php:23 +msgid "Public access denied." +msgstr "Openbare toegang geweigerd." -#: ../../Zotlabs/Module/Admin.php:97 -msgid "# expiring accounts" -msgstr "# accounts die nog moeten verlopen" +#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335 +#: ../../Zotlabs/Lib/Apps.php:256 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../include/text.php:1051 ../../include/text.php:1063 +#: ../../include/acl_selectors.php:118 ../../include/nav.php:179 +msgid "Search" +msgstr "Zoeken" -#: ../../Zotlabs/Module/Admin.php:108 -msgid "# Channels" -msgstr "# Kanalen" +#: ../../Zotlabs/Module/Search.php:230 +#, php-format +msgid "Items tagged with: %s" +msgstr "Items getagd met %s" -#: ../../Zotlabs/Module/Admin.php:109 -msgid "# primary" -msgstr "# primair" +#: ../../Zotlabs/Module/Search.php:232 +#, php-format +msgid "Search results for: %s" +msgstr "Zoekresultaten voor %s" -#: ../../Zotlabs/Module/Admin.php:110 -msgid "# clones" -msgstr "# klonen" +#: ../../Zotlabs/Module/Pubstream.php:95 +#: ../../Zotlabs/Widget/Notifications.php:131 +msgid "Public Stream" +msgstr "Openbare tijdlijn" -#: ../../Zotlabs/Module/Admin.php:116 -msgid "Message queues" -msgstr "Berichtenwachtrij" +#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 +msgid "Location not found." +msgstr "Locatie niet gevonden." -#: ../../Zotlabs/Module/Admin.php:133 -msgid "Your software should be updated" -msgstr "Jouw software moet worden bijgewerkt " +#: ../../Zotlabs/Module/Locs.php:62 +msgid "Location lookup failed." +msgstr "Opzoeken locatie mislukt" -#: ../../Zotlabs/Module/Admin.php:137 ../../Zotlabs/Module/Admin/Logs.php:82 -#: ../../Zotlabs/Module/Admin/Security.php:86 -#: ../../Zotlabs/Module/Admin/Accounts.php:164 -#: ../../Zotlabs/Module/Admin/Channels.php:145 -#: ../../Zotlabs/Module/Admin/Site.php:266 -#: ../../Zotlabs/Module/Admin/Plugins.php:341 -#: ../../Zotlabs/Module/Admin/Plugins.php:436 -#: ../../Zotlabs/Module/Admin/Themes.php:122 -#: ../../Zotlabs/Module/Admin/Themes.php:156 -msgid "Administration" -msgstr "Beheer" +#: ../../Zotlabs/Module/Locs.php:66 +msgid "" +"Please select another location to become primary before removing the primary" +" location." +msgstr "Kies eerst een andere primaire locatie alvorens de huidige primaire locatie te verwijderen." -#: ../../Zotlabs/Module/Admin.php:138 -msgid "Summary" -msgstr "Samenvatting" +#: ../../Zotlabs/Module/Locs.php:95 +msgid "Syncing locations" +msgstr "Locaties synchronizeren" -#: ../../Zotlabs/Module/Admin.php:141 -msgid "Registered accounts" -msgstr "Geregistreerde accounts" +#: ../../Zotlabs/Module/Locs.php:105 +msgid "No locations found." +msgstr "Geen locaties gevonden." -#: ../../Zotlabs/Module/Admin.php:142 -msgid "Pending registrations" -msgstr "Accounts die op goedkeuring wachten" +#: ../../Zotlabs/Module/Locs.php:116 +msgid "Manage Channel Locations" +msgstr "Kanaallocaties beheren" -#: ../../Zotlabs/Module/Admin.php:143 -msgid "Registered channels" -msgstr "Geregistreerde kanalen" +#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:111 +msgid "Primary" +msgstr "Primair" -#: ../../Zotlabs/Module/Admin.php:144 -msgid "Active plugins" -msgstr "Ingeschakelde plugins" +#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113 +msgid "Drop" +msgstr "Verwijderen" -#: ../../Zotlabs/Module/Admin.php:145 -msgid "Version" -msgstr "Versie" +#: ../../Zotlabs/Module/Locs.php:122 +msgid "Sync Now" +msgstr "Nu synchroniseren" -#: ../../Zotlabs/Module/Admin.php:146 -msgid "Repository version (master)" -msgstr "Versie repository (master)" +#: ../../Zotlabs/Module/Locs.php:123 +msgid "Please wait several minutes between consecutive operations." +msgstr "Wacht enkele minuten tussen opeenvolgende handelingen." -#: ../../Zotlabs/Module/Admin.php:147 -msgid "Repository version (dev)" -msgstr "Versie repository (dev)" +#: ../../Zotlabs/Module/Locs.php:124 +msgid "" +"When possible, drop a location by logging into that website/hub and removing" +" your channel." +msgstr "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen door op de hub van de kloon in te loggen en het kanaal daar te verwijderen." -#: ../../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 "Item niet gevonden" +#: ../../Zotlabs/Module/Locs.php:125 +msgid "Use this form to drop the location if the hub is no longer operating." +msgstr "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is." -#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97 -#: ../../Zotlabs/Module/Blocks.php:155 -msgid "Block Name" -msgstr "Bloknaam" +#: ../../Zotlabs/Module/Apporder.php:44 +msgid "Change Order of Pinned Navbar Apps" +msgstr "Volgorde veranderen van apps op de navigatiebalk" -#: ../../Zotlabs/Module/Editblock.php:111 -#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:287 -#: ../../Zotlabs/Module/Mail.php:412 ../../Zotlabs/Module/Chat.php:205 -#: ../../include/conversation.php:1295 -msgid "Insert web link" -msgstr "Weblink invoegen" +#: ../../Zotlabs/Module/Apporder.php:44 +msgid "Change Order of App Tray Apps" +msgstr "Volgorde veranderen van apps in het appmenu" -#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1406 -msgid "Title (optional)" -msgstr "Titel (niet verplicht)" +#: ../../Zotlabs/Module/Apporder.php:45 +msgid "" +"Use arrows to move the corresponding app left (top) or right (bottom) in the" +" navbar" +msgstr "Gebruik de pijlen om de app naar links (omhoog) of naar recht (omlaag) op de navigatiebalk te verplaatsen" -#: ../../Zotlabs/Module/Editblock.php:133 -msgid "Edit Block" -msgstr "Blok bewerken" +#: ../../Zotlabs/Module/Apporder.php:45 +msgid "Use arrows to move the corresponding app up or down in the app tray" +msgstr "Gebruik de pijlen om de app hoger of lager in het appmenu te tonen" -#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31 -msgid "Invalid item." -msgstr "Ongeldig item." +#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144 +msgid "Menu not found." +msgstr "Menu niet gevonden." -#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Block.php:43 -#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96 -#: ../../Zotlabs/Module/Wall_upload.php:31 -msgid "Channel not found." -msgstr "Kanaal niet gevonden." +#: ../../Zotlabs/Module/Mitem.php:52 +msgid "Unable to create element." +msgstr "Niet in staat om onderdeel aan te maken." -#: ../../Zotlabs/Module/Page.php:131 -msgid "" -"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " -"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam," -" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " -"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " -"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " -"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." +#: ../../Zotlabs/Module/Mitem.php:76 +msgid "Unable to update menu element." +msgstr "Menu-onderdeel kan niet worden geüpdatet." -#: ../../Zotlabs/Module/Filer.php:52 -msgid "Save to Folder:" -msgstr "Bewaar in map: " +#: ../../Zotlabs/Module/Mitem.php:92 +msgid "Unable to add menu element." +msgstr "Menu-onderdeel kan niet worden toegevoegd." -#: ../../Zotlabs/Module/Filer.php:52 -msgid "- select -" -msgstr "- kies map -" +#: ../../Zotlabs/Module/Mitem.php:120 ../../Zotlabs/Module/Menu.php:166 +#: ../../Zotlabs/Module/Xchan.php:41 +msgid "Not found." +msgstr "Niet gevonden." -#: ../../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/widgets.php:188 -#: ../../include/text.php:1011 ../../include/text.php:1023 -msgid "Save" -msgstr "Opslaan" +#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230 +msgid "Menu Item Permissions" +msgstr "Permissies menu-item" -#: ../../Zotlabs/Module/Ping.php:254 -msgid "sent you a private message" -msgstr "stuurde jou een privébericht" +#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 +#: ../../Zotlabs/Module/Settings/Channel.php:528 +msgid "(click to open/close)" +msgstr "(klik om te openen/sluiten)" -#: ../../Zotlabs/Module/Ping.php:302 -msgid "added your channel" -msgstr "voegde jouw kanaal toe" +#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176 +msgid "Link Name" +msgstr "Linknaam" -#: ../../Zotlabs/Module/Ping.php:312 -msgid "g A l F d" -msgstr "G:i, l d F" +#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239 +msgid "Link or Submenu Target" +msgstr "Linkdoel of submenu-doel" -#: ../../Zotlabs/Module/Ping.php:330 -msgid "[today]" -msgstr "[vandaag]" +#: ../../Zotlabs/Module/Mitem.php:161 +msgid "Enter URL of the link or select a menu name to create a submenu" +msgstr "Geef de URL van de link of kies een menunaam om een submenu aan te maken" -#: ../../Zotlabs/Module/Ping.php:339 -msgid "posted an event" -msgstr "plaatste een gebeurtenis" +#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240 +msgid "Use magic-auth if available" +msgstr "Gebruik magic-auth wanneer beschikbaar" -#: ../../Zotlabs/Module/Connections.php:56 -#: ../../Zotlabs/Module/Connections.php:161 -#: ../../Zotlabs/Module/Connections.php:250 -msgid "Blocked" -msgstr "Geblokkeerd" +#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 +#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 +#: ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Admin/Site.php:259 +#: ../../Zotlabs/Module/Settings/Channel.php:307 +#: ../../Zotlabs/Module/Settings/Display.php:100 +#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:697 +#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 +#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Connedit.php:779 +#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Filestorage.php:155 +#: ../../Zotlabs/Module/Filestorage.php:163 +#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594 +#: ../../view/theme/redbasic_c/php/config.php:100 +#: ../../view/theme/redbasic_c/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:98 +#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82 +#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109 +#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 +#: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 +#: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 +#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 +#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 +#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 +#: ../../addon/jappixmini/jappixmini.php:313 +#: ../../addon/jappixmini/jappixmini.php:343 +#: ../../addon/jappixmini/jappixmini.php:351 +#: ../../addon/jappixmini/jappixmini.php:355 +#: ../../addon/jappixmini/jappixmini.php:359 ../../addon/nofed/nofed.php:72 +#: ../../addon/nofed/nofed.php:76 ../../addon/redred/redred.php:95 +#: ../../addon/redred/redred.php:99 ../../addon/libertree/libertree.php:69 +#: ../../addon/libertree/libertree.php:81 +#: ../../addon/flattrwidget/flattrwidget.php:120 +#: ../../addon/statusnet/statusnet.php:389 +#: ../../addon/statusnet/statusnet.php:411 +#: ../../addon/statusnet/statusnet.php:415 +#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:243 +#: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 +#: ../../addon/smileybutton/smileybutton.php:211 +#: ../../addon/smileybutton/smileybutton.php:215 +#: ../../addon/cart/cart.php:1075 ../../addon/cart/cart.php:1082 +#: ../../addon/cart/cart.php:1090 ../../addon/authchoose/authchoose.php:67 +#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 +#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 +#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 +msgid "No" +msgstr "Nee" -#: ../../Zotlabs/Module/Connections.php:61 -#: ../../Zotlabs/Module/Connections.php:168 -#: ../../Zotlabs/Module/Connections.php:249 -msgid "Ignored" -msgstr "Genegeerd" +#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 +#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 +#: ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Settings/Channel.php:307 +#: ../../Zotlabs/Module/Settings/Display.php:100 +#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:697 +#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 +#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Menu.php:100 +#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Defperms.php:180 +#: ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Filestorage.php:155 +#: ../../Zotlabs/Module/Filestorage.php:163 +#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594 +#: ../../view/theme/redbasic_c/php/config.php:100 +#: ../../view/theme/redbasic_c/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:98 +#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82 +#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109 +#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 +#: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 +#: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 +#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 +#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 +#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 +#: ../../addon/jappixmini/jappixmini.php:313 +#: ../../addon/jappixmini/jappixmini.php:343 +#: ../../addon/jappixmini/jappixmini.php:351 +#: ../../addon/jappixmini/jappixmini.php:355 +#: ../../addon/jappixmini/jappixmini.php:359 ../../addon/nofed/nofed.php:72 +#: ../../addon/nofed/nofed.php:76 ../../addon/redred/redred.php:95 +#: ../../addon/redred/redred.php:99 ../../addon/libertree/libertree.php:69 +#: ../../addon/libertree/libertree.php:81 +#: ../../addon/flattrwidget/flattrwidget.php:120 +#: ../../addon/statusnet/statusnet.php:389 +#: ../../addon/statusnet/statusnet.php:411 +#: ../../addon/statusnet/statusnet.php:415 +#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:243 +#: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 +#: ../../addon/smileybutton/smileybutton.php:211 +#: ../../addon/smileybutton/smileybutton.php:215 +#: ../../addon/cart/cart.php:1075 ../../addon/cart/cart.php:1082 +#: ../../addon/cart/cart.php:1090 ../../addon/authchoose/authchoose.php:67 +#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 +#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 +#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 +msgid "Yes" +msgstr "Ja" -#: ../../Zotlabs/Module/Connections.php:66 -#: ../../Zotlabs/Module/Connections.php:182 -#: ../../Zotlabs/Module/Connections.php:248 -msgid "Hidden" -msgstr "Verborgen" +#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241 +msgid "Open link in new window" +msgstr "Open link in nieuw venster" -#: ../../Zotlabs/Module/Connections.php:71 -#: ../../Zotlabs/Module/Connections.php:175 -#: ../../Zotlabs/Module/Connections.php:247 -msgid "Archived" -msgstr "Gearchiveerd" +#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +msgid "Order in list" +msgstr "Volgorde in lijst" -#: ../../Zotlabs/Module/Connections.php:76 -#: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116 -#: ../../include/conversation.php:1724 -msgid "New" -msgstr "Nieuw" +#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +msgid "Higher numbers will sink to bottom of listing" +msgstr "Hogere nummers komen onderaan de lijst terecht" -#: ../../Zotlabs/Module/Connections.php:92 -#: ../../Zotlabs/Module/Connections.php:107 -#: ../../Zotlabs/Module/Connedit.php:720 ../../include/widgets.php:530 -msgid "All" -msgstr "Alles" +#: ../../Zotlabs/Module/Mitem.php:165 +msgid "Submit and finish" +msgstr "Opslaan en afsluiten" -#: ../../Zotlabs/Module/Connections.php:138 -msgid "New Connections" -msgstr "Nieuwe connecties" +#: ../../Zotlabs/Module/Mitem.php:166 +msgid "Submit and continue" +msgstr "Opslaan en doorgaan" -#: ../../Zotlabs/Module/Connections.php:141 -msgid "Show pending (new) connections" -msgstr "Nog te accepteren (nieuwe) connecties weergeven" +#: ../../Zotlabs/Module/Mitem.php:174 +msgid "Menu:" +msgstr "Menu:" -#: ../../Zotlabs/Module/Connections.php:145 -#: ../../Zotlabs/Module/Profperm.php:140 -msgid "All Connections" -msgstr "Alle connecties" +#: ../../Zotlabs/Module/Mitem.php:177 +msgid "Link Target" +msgstr "Linkdoel" -#: ../../Zotlabs/Module/Connections.php:148 -msgid "Show all connections" -msgstr "Toon alle connecties" +#: ../../Zotlabs/Module/Mitem.php:180 +msgid "Edit menu" +msgstr "Menu bewerken" -#: ../../Zotlabs/Module/Connections.php:164 -msgid "Only show blocked connections" -msgstr "Toon alleen geblokkeerde connecties" +#: ../../Zotlabs/Module/Mitem.php:183 +msgid "Edit element" +msgstr "Onderdeel bewerken" -#: ../../Zotlabs/Module/Connections.php:171 -msgid "Only show ignored connections" -msgstr "Toon alleen genegeerde connecties" +#: ../../Zotlabs/Module/Mitem.php:184 +msgid "Drop element" +msgstr "Onderdeel verwijderen" -#: ../../Zotlabs/Module/Connections.php:178 -msgid "Only show archived connections" -msgstr "Toon alleen gearchiveerde connecties" +#: ../../Zotlabs/Module/Mitem.php:185 +msgid "New element" +msgstr "Nieuw element" -#: ../../Zotlabs/Module/Connections.php:185 -msgid "Only show hidden connections" -msgstr "Toon alleen verborgen connecties" +#: ../../Zotlabs/Module/Mitem.php:186 +msgid "Edit this menu container" +msgstr "Deze menu-container bewerken" -#: ../../Zotlabs/Module/Connections.php:246 -msgid "Pending approval" -msgstr "Moet nog geaccepteerd worden" +#: ../../Zotlabs/Module/Mitem.php:187 +msgid "Add menu element" +msgstr "Menu-element toevoegen" -#: ../../Zotlabs/Module/Connections.php:262 -#, php-format -msgid "%1$s [%2$s]" -msgstr "%1$s [%2$s]" +#: ../../Zotlabs/Module/Mitem.php:188 +msgid "Delete this menu item" +msgstr "Dit menu-item verwijderen" -#: ../../Zotlabs/Module/Connections.php:263 -msgid "Edit connection" -msgstr "Connectie bewerken" +#: ../../Zotlabs/Module/Mitem.php:189 +msgid "Edit this menu item" +msgstr "Dit menu-item bewerken" -#: ../../Zotlabs/Module/Connections.php:264 -msgid "Delete connection" -msgstr "Connectie verwijderen" +#: ../../Zotlabs/Module/Mitem.php:206 +msgid "Menu item not found." +msgstr "Menu-item niet gevonden." -#: ../../Zotlabs/Module/Connections.php:273 -msgid "Channel address" -msgstr "Kanaaladres" +#: ../../Zotlabs/Module/Mitem.php:219 +msgid "Menu item deleted." +msgstr "Menu-item verwijderd." -#: ../../Zotlabs/Module/Connections.php:275 -msgid "Network" -msgstr "Netwerk" +#: ../../Zotlabs/Module/Mitem.php:221 +msgid "Menu item could not be deleted." +msgstr "Menu-item kon niet worden verwijderd." -#: ../../Zotlabs/Module/Connections.php:278 -msgid "Call" -msgstr "Bellen" +#: ../../Zotlabs/Module/Mitem.php:228 +msgid "Edit Menu Element" +msgstr "Menu-element bewerken" -#: ../../Zotlabs/Module/Connections.php:280 -msgid "Status" -msgstr "Status" +#: ../../Zotlabs/Module/Mitem.php:238 +msgid "Link text" +msgstr "Linktekst" -#: ../../Zotlabs/Module/Connections.php:282 -msgid "Connected" -msgstr "Verbonden" +#: ../../Zotlabs/Module/Events.php:25 +msgid "Calendar entries imported." +msgstr "Agenda-items geïmporteerd." -#: ../../Zotlabs/Module/Connections.php:284 -msgid "Approve connection" -msgstr "Connectie accepteren" +#: ../../Zotlabs/Module/Events.php:27 +msgid "No calendar entries found." +msgstr "Geen agenda-items gevonden." -#: ../../Zotlabs/Module/Connections.php:285 -#: ../../Zotlabs/Module/Admin/Accounts.php:171 -msgid "Approve" -msgstr "Goedkeuren" - -#: ../../Zotlabs/Module/Connections.php:286 -msgid "Ignore connection" -msgstr "Connectie negeren" +#: ../../Zotlabs/Module/Events.php:110 +msgid "Event can not end before it has started." +msgstr "Gebeurtenis kan niet eindigen voordat het is begonnen" -#: ../../Zotlabs/Module/Connections.php:287 -#: ../../Zotlabs/Module/Connedit.php:637 -msgid "Ignore" -msgstr "Negeren" +#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121 +#: ../../Zotlabs/Module/Events.php:143 +msgid "Unable to generate preview." +msgstr "Niet in staat om voorvertoning te genereren" -#: ../../Zotlabs/Module/Connections.php:288 -msgid "Recent activity" -msgstr "Recente activiteit" +#: ../../Zotlabs/Module/Events.php:119 +msgid "Event title and start time are required." +msgstr "Titel en begintijd van gebeurtenis zijn vereist." -#: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Lib/Apps.php:216 -#: ../../include/nav.php:203 ../../include/text.php:940 -msgid "Connections" -msgstr "Connecties" +#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265 +msgid "Event not found." +msgstr "Gebeurtenis niet gevonden" -#: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Search.php:44 -#: ../../Zotlabs/Lib/Apps.php:237 ../../include/widgets.php:302 -#: ../../include/acl_selectors.php:213 ../../include/nav.php:180 -#: ../../include/text.php:1010 ../../include/text.php:1022 -msgid "Search" -msgstr "Zoeken" +#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73 +#: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119 +#: ../../include/text.php:2008 ../../include/event.php:1153 +msgid "event" +msgstr "gebeurtenis" -#: ../../Zotlabs/Module/Connections.php:317 -msgid "Search your connections" -msgstr "Doorzoek jouw connecties" +#: ../../Zotlabs/Module/Events.php:460 +msgid "Edit event title" +msgstr "Titel bewerken" -#: ../../Zotlabs/Module/Connections.php:318 -msgid "Connections search" -msgstr "Connecties zoeken" +#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465 +#: ../../Zotlabs/Module/Appman.php:141 ../../Zotlabs/Module/Appman.php:142 +#: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749 +#: ../../include/datetime.php:211 +msgid "Required" +msgstr "Vereist" -#: ../../Zotlabs/Module/Connections.php:319 -#: ../../Zotlabs/Module/Directory.php:392 -#: ../../Zotlabs/Module/Directory.php:397 ../../include/contact_widgets.php:23 -msgid "Find" -msgstr "Vinden" +#: ../../Zotlabs/Module/Events.php:462 +msgid "Categories (comma-separated list)" +msgstr "Categorieën (door komma's gescheiden lijst)" -#: ../../Zotlabs/Module/Cover_photo.php:58 -#: ../../Zotlabs/Module/Profile_photo.php:61 -msgid "Image uploaded but image cropping failed." -msgstr "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. " +#: ../../Zotlabs/Module/Events.php:463 +msgid "Edit Category" +msgstr "Categorie" -#: ../../Zotlabs/Module/Cover_photo.php:134 -#: ../../Zotlabs/Module/Cover_photo.php:181 -msgid "Cover Photos" -msgstr "Omslagfoto's" +#: ../../Zotlabs/Module/Events.php:463 +msgid "Category" +msgstr "Categorie" -#: ../../Zotlabs/Module/Cover_photo.php:154 -#: ../../Zotlabs/Module/Profile_photo.php:135 -msgid "Image resize failed." -msgstr "Afbeelding kon niet van grootte veranderd worden." +#: ../../Zotlabs/Module/Events.php:466 +msgid "Edit start date and time" +msgstr "Begindatum en -tijd bewerken" -#: ../../Zotlabs/Module/Cover_photo.php:168 -#: ../../Zotlabs/Module/Profile_photo.php:201 ../../include/photos.php:149 -msgid "Unable to process image" -msgstr "Afbeelding kan niet verwerkt worden" +#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470 +msgid "Finish date and time are not known or not relevant" +msgstr "Einddatum en -tijd zijn niet bekend of niet van toepassing" -#: ../../Zotlabs/Module/Cover_photo.php:192 -#: ../../Zotlabs/Module/Profile_photo.php:236 -msgid "Image upload failed." -msgstr "Uploaden afbeelding mislukt" +#: ../../Zotlabs/Module/Events.php:469 +msgid "Edit finish date and time" +msgstr "Einddatum en -tijd bewerken" -#: ../../Zotlabs/Module/Cover_photo.php:210 -#: ../../Zotlabs/Module/Profile_photo.php:255 -msgid "Unable to process image." -msgstr "Niet in staat om afbeelding te verwerken." +#: ../../Zotlabs/Module/Events.php:469 +msgid "Finish date and time" +msgstr "Einddatum en -tijd" -#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4278 -msgid "female" -msgstr "vrouw" +#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472 +msgid "Adjust for viewer timezone" +msgstr "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt" -#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4279 -#, php-format -msgid "%1$s updated her %2$s" -msgstr "%1$s heeft haar %2$s bijgewerkt" +#: ../../Zotlabs/Module/Events.php:471 +msgid "" +"Important for events that happen in a particular place. Not practical for " +"global holidays." +msgstr "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen." -#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4280 -msgid "male" -msgstr "man" +#: ../../Zotlabs/Module/Events.php:473 +msgid "Edit Description" +msgstr "Omschrijving bewerken" -#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4281 -#, php-format -msgid "%1$s updated his %2$s" -msgstr "%1$s heeft zijn %2$s bijgewerkt" +#: ../../Zotlabs/Module/Events.php:475 +msgid "Edit Location" +msgstr "Locatie bewerken" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4283 -#, php-format -msgid "%1$s updated their %2$s" -msgstr "De %2$s van %1$s is bijgewerkt" +#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:762 +#: ../../include/conversation.php:1333 +msgid "Preview" +msgstr "Voorvertoning" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1764 -msgid "cover photo" -msgstr "omslagfoto" +#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1405 +msgid "Permission settings" +msgstr "Permissies" -#: ../../Zotlabs/Module/Cover_photo.php:303 -#: ../../Zotlabs/Module/Cover_photo.php:318 -#: ../../Zotlabs/Module/Profile_photo.php:316 -#: ../../Zotlabs/Module/Profile_photo.php:363 -msgid "Photo not available." -msgstr "Foto niet beschikbaar." +#: ../../Zotlabs/Module/Events.php:489 +msgid "Timezone:" +msgstr "Tijdzone:" -#: ../../Zotlabs/Module/Cover_photo.php:354 -#: ../../Zotlabs/Module/Profile_photo.php:418 -msgid "Upload File:" -msgstr "Bestand uploaden:" +#: ../../Zotlabs/Module/Events.php:494 +msgid "Advanced Options" +msgstr "Geavanceerde opties" -#: ../../Zotlabs/Module/Cover_photo.php:355 -#: ../../Zotlabs/Module/Profile_photo.php:419 -msgid "Select a profile:" -msgstr "Kies een profiel:" +#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:266 +msgid "l, F j" +msgstr "l j F" -#: ../../Zotlabs/Module/Cover_photo.php:356 -msgid "Upload Cover Photo" -msgstr "Omslagfoto uploaden" +#: ../../Zotlabs/Module/Events.php:633 +msgid "Edit event" +msgstr "Gebeurtenis bewerken" -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:427 -#: ../../Zotlabs/Module/Settings/Channel.php:404 -msgid "or" -msgstr "of" +#: ../../Zotlabs/Module/Events.php:635 +msgid "Delete event" +msgstr "Gebeurtenis verwijderen" -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:427 -msgid "skip this step" -msgstr "sla deze stap over" +#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315 +#: ../../include/text.php:1827 +msgid "Link to Source" +msgstr "Originele locatie" -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:427 -msgid "select a photo from your photo albums" -msgstr "Kies een foto uit jouw fotoalbums" +#: ../../Zotlabs/Module/Events.php:669 +msgid "calendar" +msgstr "agenda" -#: ../../Zotlabs/Module/Cover_photo.php:377 -#: ../../Zotlabs/Module/Profile_photo.php:446 -msgid "Crop Image" -msgstr "Afbeelding bijsnijden" +#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338 +msgid "Edit Event" +msgstr "Gebeurtenis bewerken" -#: ../../Zotlabs/Module/Cover_photo.php:378 -#: ../../Zotlabs/Module/Profile_photo.php:447 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "Snij de afbeelding zo uit dat deze optimaal wordt weergegeven." +#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338 +msgid "Create Event" +msgstr "Gebeurtenis aanmaken" -#: ../../Zotlabs/Module/Cover_photo.php:380 -#: ../../Zotlabs/Module/Profile_photo.php:449 -msgid "Done Editing" -msgstr "Klaar met bewerken" +#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341 +#: ../../include/channel.php:1647 +msgid "Export" +msgstr "Exporteren" -#: ../../Zotlabs/Module/Admin/Features.php:55 -#: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:38 -msgid "Off" -msgstr "Uit" +#: ../../Zotlabs/Module/Events.php:731 +msgid "Event removed" +msgstr "Gebeurtenis verwijderd" -#: ../../Zotlabs/Module/Admin/Features.php:55 -#: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:38 -msgid "On" -msgstr "Aan" +#: ../../Zotlabs/Module/Events.php:734 +msgid "Failed to remove event" +msgstr "Verwijderen gebeurtenis mislukt" -#: ../../Zotlabs/Module/Admin/Features.php:56 -#, php-format -msgid "Lock feature %s" -msgstr " Vergrendel de functie '%s'" +#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56 +msgid "App installed." +msgstr "App geïnstalleerd" -#: ../../Zotlabs/Module/Admin/Features.php:64 -msgid "Manage Additional Features" -msgstr "Beheer - Extra functies" +#: ../../Zotlabs/Module/Appman.php:49 +msgid "Malformed app." +msgstr "Misvormde app." -#: ../../Zotlabs/Module/Admin/Logs.php:28 -msgid "Log settings updated." -msgstr "Logboek-instellingen bijgewerkt." +#: ../../Zotlabs/Module/Appman.php:130 +msgid "Embed code" +msgstr "Insluitcode" -#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../include/widgets.php:1661 -#: ../../include/widgets.php:1671 -msgid "Logs" -msgstr "Logboeken" +#: ../../Zotlabs/Module/Appman.php:136 +msgid "Edit App" +msgstr "App bewerken" -#: ../../Zotlabs/Module/Admin/Logs.php:85 -msgid "Clear" -msgstr "Leegmaken" +#: ../../Zotlabs/Module/Appman.php:136 +msgid "Create App" +msgstr "App maken" -#: ../../Zotlabs/Module/Admin/Logs.php:91 -msgid "Debugging" -msgstr "Debuggen" +#: ../../Zotlabs/Module/Appman.php:141 +msgid "Name of app" +msgstr "Naam van app" -#: ../../Zotlabs/Module/Admin/Logs.php:92 -msgid "Log file" -msgstr "Logbestand" +#: ../../Zotlabs/Module/Appman.php:142 +msgid "Location (URL) of app" +msgstr "Locatie (URL) van app" -#: ../../Zotlabs/Module/Admin/Logs.php:92 -msgid "" -"Must be writable by web server. Relative to your top-level webserver " -"directory." -msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je $Projectname-installatie." +#: ../../Zotlabs/Module/Appman.php:144 +msgid "Photo icon URL" +msgstr "URL van pictogram" -#: ../../Zotlabs/Module/Admin/Logs.php:93 -msgid "Log level" -msgstr "Logniveau" +#: ../../Zotlabs/Module/Appman.php:144 +msgid "80 x 80 pixels - optional" +msgstr "80 x 80 pixels (niet verplicht)" -#: ../../Zotlabs/Module/Admin/Profs.php:69 -msgid "New Profile Field" -msgstr "Nieuw profielveld" +#: ../../Zotlabs/Module/Appman.php:145 +msgid "Categories (optional, comma separated list)" +msgstr "Categorieën (niet verplicht, door komma's gescheiden lijst)" -#: ../../Zotlabs/Module/Admin/Profs.php:70 -#: ../../Zotlabs/Module/Admin/Profs.php:90 -msgid "Field nickname" -msgstr "Bijnaam voor veld" +#: ../../Zotlabs/Module/Appman.php:146 +msgid "Version ID" +msgstr "Versie-ID" -#: ../../Zotlabs/Module/Admin/Profs.php:70 -#: ../../Zotlabs/Module/Admin/Profs.php:90 -msgid "System name of field" -msgstr "Systeemnaam voor veld" +#: ../../Zotlabs/Module/Appman.php:147 +msgid "Price of app" +msgstr "Prijs van de app" -#: ../../Zotlabs/Module/Admin/Profs.php:71 -#: ../../Zotlabs/Module/Admin/Profs.php:91 -msgid "Input type" -msgstr "Invoertype" +#: ../../Zotlabs/Module/Appman.php:148 +msgid "Location (URL) to purchase app" +msgstr "Locatie (URL) om de app aan te schaffen" -#: ../../Zotlabs/Module/Admin/Profs.php:72 -#: ../../Zotlabs/Module/Admin/Profs.php:92 -msgid "Field Name" -msgstr "Veldnaam" +#: ../../Zotlabs/Module/Regmod.php:15 +msgid "Please login." +msgstr "Inloggen." -#: ../../Zotlabs/Module/Admin/Profs.php:72 -#: ../../Zotlabs/Module/Admin/Profs.php:92 -msgid "Label on profile pages" -msgstr "Tekstlabel voor op profielpagina's" +#: ../../Zotlabs/Module/Magic.php:72 +msgid "Hub not found." +msgstr "Hub niet gevonden." -#: ../../Zotlabs/Module/Admin/Profs.php:73 -#: ../../Zotlabs/Module/Admin/Profs.php:93 -msgid "Help text" -msgstr "Helptekst" +#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 +#: ../../Zotlabs/Module/Like.php:384 +#: ../../addon/redphotos/redphotohelper.php:71 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 +#: ../../include/conversation.php:116 ../../include/text.php:2005 +msgid "photo" +msgstr "foto" -#: ../../Zotlabs/Module/Admin/Profs.php:73 -#: ../../Zotlabs/Module/Admin/Profs.php:93 -msgid "Additional info (optional)" -msgstr "Extra informatie (niet verplicht)" +#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 +#: ../../include/conversation.php:144 ../../include/text.php:2011 +msgid "status" +msgstr "bericht" -#: ../../Zotlabs/Module/Admin/Profs.php:83 -msgid "Field definition not found" -msgstr "Velddefinitie niet gevonden" +#: ../../Zotlabs/Module/Subthread.php:142 +#, php-format +msgid "%1$s is following %2$s's %3$s" +msgstr "%1$s volgt het %3$s van %2$s" -#: ../../Zotlabs/Module/Admin/Profs.php:89 -msgid "Edit Profile Field" -msgstr "Profielveld bewerken" +#: ../../Zotlabs/Module/Subthread.php:144 +#, php-format +msgid "%1$s stopped following %2$s's %3$s" +msgstr "%1$s volgt het %3$s van %2$s niet meer" -#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../include/widgets.php:1642 -msgid "Profile Fields" -msgstr "Profielvelden" +#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:62 +#: ../../Zotlabs/Module/Chanview.php:96 ../../Zotlabs/Module/Page.php:75 +#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:41 +#: ../../Zotlabs/Module/Card_edit.php:44 +msgid "Channel not found." +msgstr "Kanaal niet gevonden." -#: ../../Zotlabs/Module/Admin/Profs.php:148 -msgid "Basic Profile Fields" -msgstr "Standaard profielvelden" +#: ../../Zotlabs/Module/Article_edit.php:101 +#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207 +#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 +#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101 +#: ../../include/conversation.php:1278 +msgid "Insert web link" +msgstr "Weblink invoegen" -#: ../../Zotlabs/Module/Admin/Profs.php:149 -msgid "Advanced Profile Fields" -msgstr "Geavanceerde profielvelden" +#: ../../Zotlabs/Module/Article_edit.php:117 +#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:698 +#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Card_edit.php:117 +#: ../../include/conversation.php:1401 +msgid "Title (optional)" +msgstr "Titel (niet verplicht)" -#: ../../Zotlabs/Module/Admin/Profs.php:149 -msgid "(In addition to basic fields)" -msgstr "(als toevoeging op de standaard velden)" +#: ../../Zotlabs/Module/Article_edit.php:128 +msgid "Edit Article" +msgstr "Artikel bewerken" -#: ../../Zotlabs/Module/Admin/Profs.php:151 -msgid "All available fields" -msgstr "Alle beschikbare velden" +#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64 +msgid "Nothing to import." +msgstr "Niets gevonden om te importeren" -#: ../../Zotlabs/Module/Admin/Profs.php:152 -msgid "Custom Fields" -msgstr "Extra (handmatig toegevoegde) velden" +#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79 +#: ../../Zotlabs/Module/Import.php:95 +msgid "Unable to download data from old server" +msgstr "Niet in staat om gegevens van de oude hub te downloaden" -#: ../../Zotlabs/Module/Admin/Profs.php:156 -msgid "Create Custom Field" -msgstr "Extra velden aanmaken" +#: ../../Zotlabs/Module/Import_items.php:77 +#: ../../Zotlabs/Module/Import.php:102 +msgid "Imported file is empty." +msgstr "Geïmporteerde bestand is leeg" -#: ../../Zotlabs/Module/Admin/Security.php:77 -msgid "" -"By default, unfiltered HTML is allowed in embedded media. This is inherently" -" insecure." -msgstr "Standaard is ongefilterde HTML in ingesloten (embedded) media toegestaan. Dit is inherent onveilig." +#: ../../Zotlabs/Module/Import_items.php:93 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." +msgstr "Waarschuwing: database-versies lopen %1$d updates achter." -#: ../../Zotlabs/Module/Admin/Security.php:80 -msgid "" -"The recommended setting is to only allow unfiltered HTML from the following " -"sites:" -msgstr "Het wordt aanbevolen om alleen ongefilterde HTML van de volgende websites toe te staan:" +#: ../../Zotlabs/Module/Import_items.php:108 +msgid "Import completed" +msgstr "Importeren voltooid" -#: ../../Zotlabs/Module/Admin/Security.php:81 -msgid "" -"https://youtube.com/
    https://www.youtube.com/
    https://youtu.be/https://vimeo.com/
    https://soundcloud.com/
    " -msgstr "https://youtube.com/
    https://www.youtube.com/
    https://youtu.be/
    https://vimeo.com/
    https://soundcloud.com/
    " +#: ../../Zotlabs/Module/Import_items.php:125 +msgid "Import Items" +msgstr "Importeer items" -#: ../../Zotlabs/Module/Admin/Security.php:82 +#: ../../Zotlabs/Module/Import_items.php:126 msgid "" -"All other embedded content will be filtered, unless " -"embedded content from that site is explicitly blocked." -msgstr "Alle andere ingesloten (embedded) inhoud wordt gefilterd, tenzij ingesloten (embedded) inhoud van een website expliciet wordt geblokkeerd." - -#: ../../Zotlabs/Module/Admin/Security.php:87 ../../include/widgets.php:1637 -msgid "Security" -msgstr "Beveiliging" +"Use this form to import existing posts and content from an export file." +msgstr "Gebruik dit formulier om bestaande berichten en andere inhoud vanuit een exportbestand te importeren." -#: ../../Zotlabs/Module/Admin/Security.php:89 -msgid "Block public" -msgstr "Openbare toegang blokkeren" +#: ../../Zotlabs/Module/Import_items.php:127 +#: ../../Zotlabs/Module/Import.php:517 +msgid "File to Upload" +msgstr "Bestand om te uploaden" -#: ../../Zotlabs/Module/Admin/Security.php:89 -msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently authenticated." -msgstr "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor leden die zich hebben geauthenticeerd." +#: ../../Zotlabs/Module/New_channel.php:133 +#: ../../Zotlabs/Module/Manage.php:138 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." +msgstr "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt." -#: ../../Zotlabs/Module/Admin/Security.php:90 -msgid "Set \"Transport Security\" HTTP header" -msgstr "\"Transport Security\" HTTP-header inschakelen" +#: ../../Zotlabs/Module/New_channel.php:146 +#: ../../Zotlabs/Module/Register.php:254 +msgid "Name or caption" +msgstr "Naam" -#: ../../Zotlabs/Module/Admin/Security.php:91 -msgid "Set \"Content Security Policy\" HTTP header" -msgstr " \"Content Security Policy\" HTTP-header inschakelen" +#: ../../Zotlabs/Module/New_channel.php:146 +#: ../../Zotlabs/Module/Register.php:254 +msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\"" +msgstr "Voorbeelden: \"Jan Pietersen\", \"Willems weblog\", \"Computerforum\"" -#: ../../Zotlabs/Module/Admin/Security.php:92 -msgid "Allowed email domains" -msgstr "Toegestane e-maildomeinen" +#: ../../Zotlabs/Module/New_channel.php:148 +#: ../../Zotlabs/Module/Register.php:256 +msgid "Choose a short nickname" +msgstr "Korte bijnaam" -#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/New_channel.php:148 +#: ../../Zotlabs/Module/Register.php:256 +#, php-format msgid "" -"Comma separated list of domains which are allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains" -msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te laten." +"Your nickname will be used to create an easy to remember channel address " +"e.g. nickname%s" +msgstr "Deze bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres van jouw kanaal aan te maken, die je dan met anderen kunt delen. Bijvoorbeeld: bijnaam%s" -#: ../../Zotlabs/Module/Admin/Security.php:93 -msgid "Not allowed email domains" -msgstr "Niet toegestane e-maildomeinen" +#: ../../Zotlabs/Module/New_channel.php:149 +#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Register.php:257 +msgid "Channel role and privacy" +msgstr "Kanaaltype en privacy" -#: ../../Zotlabs/Module/Admin/Security.php:93 -msgid "" -"Comma separated list of domains which are not allowed in email addresses for" -" registrations to this site. Wildcards are accepted. Empty to allow any " -"domains, unless allowed domains have been defined." -msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen niet op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te staan, tenzij er toegestane domeinen zijn ingesteld. " +#: ../../Zotlabs/Module/New_channel.php:149 +#: ../../Zotlabs/Module/Register.php:257 +msgid "Select a channel role with your privacy requirements." +msgstr "Kies een kanaaltype met het door jou gewenste privacyniveau." -#: ../../Zotlabs/Module/Admin/Security.php:94 -msgid "Allow communications only from these sites" -msgstr "Alleen communicatie met deze hubs toestaan" +#: ../../Zotlabs/Module/New_channel.php:149 +#: ../../Zotlabs/Module/Register.php:257 +msgid "Read more about roles" +msgstr "Lees meer over kanaaltypes" -#: ../../Zotlabs/Module/Admin/Security.php:94 -msgid "" -"One site per line. Leave empty to allow communication from anywhere by " -"default" -msgstr "Eén hub per regel. Laat leeg om communicatie standaard met alle hubs toe te staan" +#: ../../Zotlabs/Module/New_channel.php:152 +msgid "Create Channel" +msgstr "Kanaal aanmaken" -#: ../../Zotlabs/Module/Admin/Security.php:95 -msgid "Block communications from these sites" -msgstr "Communicatie met deze hubs blokkeren" +#: ../../Zotlabs/Module/New_channel.php:153 +msgid "" +"A channel is a unique network identity. It can represent a person (social " +"network profile), a forum (group), a business or celebrity page, a newsfeed," +" and many other things. Channels can make connections with other channels to" +" share information with each other." +msgstr "Een kanaal is een unieke netwerkidentiteit. Het kan een persoon (sociaal-netwerkprofiel), een forum (groep), een zakelijke of celebrity-pagina, een nieuwsfeed en vele andere dingen vertegenwoordigen. Kanalen kunnen met elkaar verbinden om informatie uit te wisselen." -#: ../../Zotlabs/Module/Admin/Security.php:96 -msgid "Allow communications only from these channels" -msgstr "Sta alleen communicatie toe met deze kanalen" +#: ../../Zotlabs/Module/New_channel.php:153 +msgid "" +"The type of channel you create affects the basic privacy settings, the " +"permissions that are granted to connections/friends, and also the channel's " +"visibility across the network." +msgstr "Het type kanaal dat jij aanmaakt beïnvloedt de standaard privacyinstellingen, de permissies die aan connecties/vrienden worden gegeven, en tevens de zichtbaarheid van het kanaal in het netwerk." -#: ../../Zotlabs/Module/Admin/Security.php:96 +#: ../../Zotlabs/Module/New_channel.php:154 msgid "" -"One channel (hash) per line. Leave empty to allow from any channel by " -"default" -msgstr "Eén kanaal (hash) per regel. Laat leeg om communicatie standaard met alle kanalen toe te staan" +"or import an existing channel from another location." +msgstr "Of importeer een bestaand kanaal vanaf een andere locatie" -#: ../../Zotlabs/Module/Admin/Security.php:97 -msgid "Block communications from these channels" -msgstr "Communicatie met deze kanalen blokkeren" +#: ../../Zotlabs/Module/New_channel.php:159 +msgid "Validate" +msgstr "Valideren" -#: ../../Zotlabs/Module/Admin/Security.php:98 -msgid "Only allow embeds from secure (SSL) websites and links." -msgstr "Alleen ingesloten (embedded) inhoud van veilige (SSL) websites en links toestaan." +#: ../../Zotlabs/Module/Removeme.php:35 +msgid "" +"Channel removals are not allowed within 48 hours of changing the account " +"password." +msgstr "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd." -#: ../../Zotlabs/Module/Admin/Security.php:99 -msgid "Allow unfiltered embedded HTML content only from these domains" -msgstr "Alleen ongefilterde ingesloten (embedded) HTML van deze websites toestaan" +#: ../../Zotlabs/Module/Removeme.php:60 +msgid "Remove This Channel" +msgstr "Verwijder dit kanaal" -#: ../../Zotlabs/Module/Admin/Security.php:99 -msgid "One site per line. By default embedded content is filtered." -msgstr "Eén website per regel. Standaard wordt ingesloten (embedded) inhoud gefilterd." +#: ../../Zotlabs/Module/Removeme.php:61 +#: ../../Zotlabs/Module/Removeaccount.php:58 +#: ../../Zotlabs/Module/Changeaddr.php:78 +msgid "WARNING: " +msgstr "WAARSCHUWING: " -#: ../../Zotlabs/Module/Admin/Security.php:100 -msgid "Block embedded HTML from these domains" -msgstr "Ingesloten (embedded) HTML vanaf deze domeinen blokkeren" +#: ../../Zotlabs/Module/Removeme.php:61 +msgid "This channel will be completely removed from the network. " +msgstr "Dit kanaal wordt volledig uit het $Projectname-netwerk verwijderd." -#: ../../Zotlabs/Module/Admin/Account_edit.php:29 -#, php-format -msgid "Password changed for account %d." -msgstr "Wachtwoord veranderd voor account %d." +#: ../../Zotlabs/Module/Removeme.php:61 +#: ../../Zotlabs/Module/Removeaccount.php:58 +msgid "This action is permanent and can not be undone!" +msgstr "Deze handeling is van permanente aard en kan niet meer worden teruggedraaid!" -#: ../../Zotlabs/Module/Admin/Account_edit.php:46 -msgid "Account settings updated." -msgstr "Account-instellingen bijgewerkt." +#: ../../Zotlabs/Module/Removeme.php:62 +#: ../../Zotlabs/Module/Removeaccount.php:59 +#: ../../Zotlabs/Module/Changeaddr.php:79 +msgid "Please enter your password for verification:" +msgstr "Vul je wachtwoord in ter verificatie:" -#: ../../Zotlabs/Module/Admin/Account_edit.php:61 -msgid "Account not found." -msgstr "Account niet gevonden." +#: ../../Zotlabs/Module/Removeme.php:63 +msgid "Remove this channel and all its clones from the network" +msgstr "Dit kanaal en alle klonen hiervan uit het $Projectname-netwerk verwijderen" -#: ../../Zotlabs/Module/Admin/Account_edit.php:68 -msgid "Account Edit" -msgstr "Account bewerken" +#: ../../Zotlabs/Module/Removeme.php:63 +msgid "" +"By default only the instance of the channel located on this hub will be " +"removed from the network" +msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het $Projectname-netwerk verwijderd" -#: ../../Zotlabs/Module/Admin/Account_edit.php:69 -msgid "New Password" -msgstr "Nieuw wachtwoord" +#: ../../Zotlabs/Module/Removeme.php:64 +#: ../../Zotlabs/Module/Settings/Channel.php:600 +msgid "Remove Channel" +msgstr "Kanaal verwijderen" -#: ../../Zotlabs/Module/Admin/Account_edit.php:70 -msgid "New Password again" -msgstr "Nieuw wachtwoord bevestigen" +#: ../../Zotlabs/Module/Sharedwithme.php:104 +msgid "Files: shared with me" +msgstr "Bestanden: met mij gedeeld" -#: ../../Zotlabs/Module/Admin/Account_edit.php:71 -msgid "Technical skill level" -msgstr "Technisch niveau" +#: ../../Zotlabs/Module/Sharedwithme.php:106 +msgid "NEW" +msgstr "NIEUW" -#: ../../Zotlabs/Module/Admin/Account_edit.php:72 -msgid "Account language (for emails)" -msgstr "Taal van account (voor e-mails)" +#: ../../Zotlabs/Module/Sharedwithme.php:107 +#: ../../Zotlabs/Storage/Browser.php:285 ../../include/text.php:1434 +msgid "Size" +msgstr "Grootte" -#: ../../Zotlabs/Module/Admin/Account_edit.php:73 -msgid "Service class" -msgstr "Abonnement" +#: ../../Zotlabs/Module/Sharedwithme.php:108 +#: ../../Zotlabs/Storage/Browser.php:286 +msgid "Last Modified" +msgstr "Laatst gewijzigd" -#: ../../Zotlabs/Module/Admin/Accounts.php:36 -#, php-format -msgid "%s account blocked/unblocked" -msgid_plural "%s account blocked/unblocked" -msgstr[0] "%s account geblokkeerd/gedeblokkeerd" -msgstr[1] "%s accounts geblokkeerd/gedeblokkeerd" +#: ../../Zotlabs/Module/Sharedwithme.php:109 +msgid "Remove all files" +msgstr "Verwijder alle bestanden" -#: ../../Zotlabs/Module/Admin/Accounts.php:43 -#, php-format -msgid "%s account deleted" -msgid_plural "%s accounts deleted" -msgstr[0] "%s account verwijderd" -msgstr[1] "%s accounts verwijderd" +#: ../../Zotlabs/Module/Sharedwithme.php:110 +msgid "Remove this file" +msgstr "Verwijder dit bestand" -#: ../../Zotlabs/Module/Admin/Accounts.php:79 -msgid "Account not found" -msgstr "Account niet gevonden" +#: ../../Zotlabs/Module/Setup.php:170 +msgid "$Projectname Server - Setup" +msgstr "$Projectname Hub - Setup" -#: ../../Zotlabs/Module/Admin/Accounts.php:90 -#, php-format -msgid "Account '%s' deleted" -msgstr "Account '%s' verwijderd" +#: ../../Zotlabs/Module/Setup.php:174 +msgid "Could not connect to database." +msgstr "Could not connect to database." -#: ../../Zotlabs/Module/Admin/Accounts.php:98 -#, php-format -msgid "Account '%s' blocked" -msgstr "Account '%s' geblokkeerd" +#: ../../Zotlabs/Module/Setup.php:178 +msgid "" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." +msgstr "Could not connect to specified hub URL. Possible SSL certificate or DNS issue." -#: ../../Zotlabs/Module/Admin/Accounts.php:106 +#: ../../Zotlabs/Module/Setup.php:185 +msgid "Could not create table." +msgstr "Could not create table." + +#: ../../Zotlabs/Module/Setup.php:191 +msgid "Your site database has been installed." +msgstr "Your hub database has been installed." + +#: ../../Zotlabs/Module/Setup.php:197 +msgid "" +"You may need to import the file \"install/schema_xxx.sql\" manually using a " +"database client." +msgstr "You may need to import the file \"install/schema_xxx.sql\" manually using a database client." + +#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262 +#: ../../Zotlabs/Module/Setup.php:749 +msgid "Please see the file \"install/INSTALL.txt\"." +msgstr "Please see the file \"install/INSTALL.txt\"." + +#: ../../Zotlabs/Module/Setup.php:259 +msgid "System check" +msgstr "System check" + +#: ../../Zotlabs/Module/Setup.php:264 +msgid "Check again" +msgstr "Check again" + +#: ../../Zotlabs/Module/Setup.php:286 +msgid "Database connection" +msgstr "Database connection" + +#: ../../Zotlabs/Module/Setup.php:287 +msgid "" +"In order to install $Projectname we need to know how to connect to your " +"database." +msgstr "In order to install $Projectname we need to know how to connect to your database." + +#: ../../Zotlabs/Module/Setup.php:288 +msgid "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." +msgstr "Please contact your hosting provider or server administrator if you have questions about these settings." + +#: ../../Zotlabs/Module/Setup.php:289 +msgid "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." +msgstr "The database you specify below should already exist. If it does not, please create it before continuing." + +#: ../../Zotlabs/Module/Setup.php:293 +msgid "Database Server Name" +msgstr "Database Server Name" + +#: ../../Zotlabs/Module/Setup.php:293 +msgid "Default is 127.0.0.1" +msgstr "Default is 127.0.0.1" + +#: ../../Zotlabs/Module/Setup.php:294 +msgid "Database Port" +msgstr "Database Port" + +#: ../../Zotlabs/Module/Setup.php:294 +msgid "Communication port number - use 0 for default" +msgstr "Communication port number - use 0 for default" + +#: ../../Zotlabs/Module/Setup.php:295 +msgid "Database Login Name" +msgstr "Database Login Name" + +#: ../../Zotlabs/Module/Setup.php:296 +msgid "Database Login Password" +msgstr "Database Login Password" + +#: ../../Zotlabs/Module/Setup.php:297 +msgid "Database Name" +msgstr "Database Name" + +#: ../../Zotlabs/Module/Setup.php:298 +msgid "Database Type" +msgstr "Database Type" + +#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341 +msgid "Site administrator email address" +msgstr "Hub administrator email address" + +#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341 +msgid "" +"Your account email address must match this in order to use the web admin " +"panel." +msgstr "Your account email address must match this in order to use the web admin panel." + +#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343 +msgid "Website URL" +msgstr "Hub URL" + +#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343 +msgid "Please use SSL (https) URL if available." +msgstr "Please use SSL (https) URL if available." + +#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345 +msgid "Please select a default timezone for your website" +msgstr "Please select a default timezone for your hub" + +#: ../../Zotlabs/Module/Setup.php:330 +msgid "Site settings" +msgstr "Hub settings" + +#: ../../Zotlabs/Module/Setup.php:384 +msgid "PHP version 5.5 or greater is required." +msgstr "PHP version 5.5 or greater is required." + +#: ../../Zotlabs/Module/Setup.php:385 +msgid "PHP version" +msgstr "PHP version" + +#: ../../Zotlabs/Module/Setup.php:401 +msgid "Could not find a command line version of PHP in the web server PATH." +msgstr "Could not find a command line version of PHP in the web server PATH." + +#: ../../Zotlabs/Module/Setup.php:402 +msgid "" +"If you don't have a command line version of PHP installed on server, you " +"will not be able to run background polling via cron." +msgstr "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron." + +#: ../../Zotlabs/Module/Setup.php:406 +msgid "PHP executable path" +msgstr "PHP executable path" + +#: ../../Zotlabs/Module/Setup.php:406 +msgid "" +"Enter full path to php executable. You can leave this blank to continue the " +"installation." +msgstr "Enter full path to php executable. You can leave this blank to continue the installation." + +#: ../../Zotlabs/Module/Setup.php:411 +msgid "Command line PHP" +msgstr "Command line PHP" + +#: ../../Zotlabs/Module/Setup.php:421 +msgid "" +"Unable to check command line PHP, as shell_exec() is disabled. This is " +"required." +msgstr "Unable to check command line PHP, as shell_exec() is disabled. This is required." + +#: ../../Zotlabs/Module/Setup.php:424 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." +msgstr "The command line version of PHP on your system does not have \"register_argc_argv\" enabled." + +#: ../../Zotlabs/Module/Setup.php:425 +msgid "This is required for message delivery to work." +msgstr "This is required for message delivery to work." + +#: ../../Zotlabs/Module/Setup.php:428 +msgid "PHP register_argc_argv" +msgstr "PHP register_argc_argv" + +#: ../../Zotlabs/Module/Setup.php:446 +#, php-format +msgid "" +"Your max allowed total upload size is set to %s. Maximum size of one file to" +" upload is set to %s. You are allowed to upload up to %d files at once." +msgstr "Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once." + +#: ../../Zotlabs/Module/Setup.php:451 +msgid "You can adjust these settings in the server php.ini file." +msgstr "You can adjust these settings in the server php.ini file." + +#: ../../Zotlabs/Module/Setup.php:453 +msgid "PHP upload limits" +msgstr "PHP upload limits" + +#: ../../Zotlabs/Module/Setup.php:476 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" +msgstr "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys" + +#: ../../Zotlabs/Module/Setup.php:477 +msgid "" +"If running under Windows, please see " +"\"http://www.php.net/manual/en/openssl.installation.php\"." +msgstr "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"." + +#: ../../Zotlabs/Module/Setup.php:480 +msgid "Generate encryption keys" +msgstr "Generate encryption keys" + +#: ../../Zotlabs/Module/Setup.php:497 +msgid "libCurl PHP module" +msgstr "libCurl PHP module" + +#: ../../Zotlabs/Module/Setup.php:498 +msgid "GD graphics PHP module" +msgstr "GD graphics PHP module" + +#: ../../Zotlabs/Module/Setup.php:499 +msgid "OpenSSL PHP module" +msgstr "OpenSSL PHP module" + +#: ../../Zotlabs/Module/Setup.php:500 +msgid "PDO database PHP module" +msgstr "PDO database PHP module" + +#: ../../Zotlabs/Module/Setup.php:501 +msgid "mb_string PHP module" +msgstr "mb_string PHP module" + +#: ../../Zotlabs/Module/Setup.php:502 +msgid "xml PHP module" +msgstr "xml PHP module" + +#: ../../Zotlabs/Module/Setup.php:503 +msgid "zip PHP module" +msgstr "zip PHP module" + +#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509 +msgid "Apache mod_rewrite module" +msgstr "Apache mod_rewrite module" + +#: ../../Zotlabs/Module/Setup.php:507 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." +msgstr "Error: Apache webserver mod-rewrite module is required but not installed." + +#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516 +msgid "exec" +msgstr "exec" + +#: ../../Zotlabs/Module/Setup.php:513 +msgid "" +"Error: exec is required but is either not installed or has been disabled in " +"php.ini" +msgstr "Error: exec is required but is either not installed or has been disabled in php.ini" + +#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522 +msgid "shell_exec" +msgstr "shell_exec" + +#: ../../Zotlabs/Module/Setup.php:519 +msgid "" +"Error: shell_exec is required but is either not installed or has been " +"disabled in php.ini" +msgstr "Error: shell_exec is required but is either not installed or has been disabled in php.ini" + +#: ../../Zotlabs/Module/Setup.php:527 +msgid "Error: libCURL PHP module required but not installed." +msgstr "Error: libCURL PHP module required but not installed." + +#: ../../Zotlabs/Module/Setup.php:531 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." +msgstr "Error: GD graphics PHP module with JPEG support required but not installed." + +#: ../../Zotlabs/Module/Setup.php:535 +msgid "Error: openssl PHP module required but not installed." +msgstr "Error: openssl PHP module required but not installed." + +#: ../../Zotlabs/Module/Setup.php:539 +msgid "Error: PDO database PHP module required but not installed." +msgstr "Error: PDO database PHP module required but not installed." + +#: ../../Zotlabs/Module/Setup.php:543 +msgid "Error: mb_string PHP module required but not installed." +msgstr "Error: mb_string PHP module required but not installed." + +#: ../../Zotlabs/Module/Setup.php:547 +msgid "Error: xml PHP module required for DAV but not installed." +msgstr "Error: xml PHP module required for DAV but not installed." + +#: ../../Zotlabs/Module/Setup.php:551 +msgid "Error: zip PHP module required but not installed." +msgstr "Error: zip PHP module required but not installed." + +#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579 +msgid ".htconfig.php is writable" +msgstr ".htconfig.php is writable" + +#: ../../Zotlabs/Module/Setup.php:575 +msgid "" +"The web installer needs to be able to create a file called \".htconfig.php\"" +" in the top folder of your web server and it is unable to do so." +msgstr "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so." + +#: ../../Zotlabs/Module/Setup.php:576 +msgid "" +"This is most often a permission setting, as the web server may not be able " +"to write files in your folder - even if you can." +msgstr "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can." + +#: ../../Zotlabs/Module/Setup.php:577 +msgid "Please see install/INSTALL.txt for additional information." +msgstr "Please see install/INSTALL.txt for additional information." + +#: ../../Zotlabs/Module/Setup.php:593 +msgid "" +"This software uses the Smarty3 template engine to render its web views. " +"Smarty3 compiles templates to PHP to speed up rendering." +msgstr "This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering." + +#: ../../Zotlabs/Module/Setup.php:594 +#, php-format +msgid "" +"In order to store these compiled templates, the web server needs to have " +"write access to the directory %s under the top level web folder." +msgstr "In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder." + +#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616 +msgid "" +"Please ensure that the user that your web server runs as (e.g. www-data) has" +" write access to this folder." +msgstr "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder." + +#: ../../Zotlabs/Module/Setup.php:596 +#, php-format +msgid "" +"Note: as a security measure, you should give the web server write access to " +"%s only--not the template files (.tpl) that it contains." +msgstr "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains." + +#: ../../Zotlabs/Module/Setup.php:599 +#, php-format +msgid "%s is writable" +msgstr "%s is writable" + +#: ../../Zotlabs/Module/Setup.php:615 +msgid "" +"This software uses the store directory to save uploaded files. The web " +"server needs to have write access to the store directory under the top level" +" web folder" +msgstr "This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder" + +#: ../../Zotlabs/Module/Setup.php:619 +msgid "store is writable" +msgstr "store is writable" + +#: ../../Zotlabs/Module/Setup.php:651 +msgid "" +"SSL certificate cannot be validated. Fix certificate or disable https access" +" to this site." +msgstr "SSL certificate cannot be validated. Fix certificate or disable https access to this hub." + +#: ../../Zotlabs/Module/Setup.php:652 +msgid "" +"If you have https access to your website or allow connections to TCP port " +"443 (the https: port), you MUST use a browser-valid certificate. You MUST " +"NOT use self-signed certificates!" +msgstr "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!" + +#: ../../Zotlabs/Module/Setup.php:653 +msgid "" +"This restriction is incorporated because public posts from you may for " +"example contain references to images on your own hub." +msgstr "This restriction is incorporated because public posts from you may for example contain references to images on your own hub." + +#: ../../Zotlabs/Module/Setup.php:654 +msgid "" +"If your certificate is not recognized, members of other sites (who may " +"themselves have valid certificates) will get a warning message on their own " +"site complaining about security issues." +msgstr "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues." + +#: ../../Zotlabs/Module/Setup.php:655 +msgid "" +"This can cause usability issues elsewhere (not just on your own site) so we " +"must insist on this requirement." +msgstr "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement." + +#: ../../Zotlabs/Module/Setup.php:656 +msgid "" +"Providers are available that issue free certificates which are browser-" +"valid." +msgstr "Providers are available that issue free certificates which are browser-valid." + +#: ../../Zotlabs/Module/Setup.php:658 +msgid "" +"If you are confident that the certificate is valid and signed by a trusted " +"authority, check to see if you have failed to install an intermediate cert. " +"These are not normally required by browsers, but are required for server-to-" +"server communications." +msgstr "If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications." + +#: ../../Zotlabs/Module/Setup.php:660 +msgid "SSL certificate validation" +msgstr "SSL certificate validation" + +#: ../../Zotlabs/Module/Setup.php:666 +msgid "" +"Url rewrite in .htaccess is not working. Check your server " +"configuration.Test: " +msgstr "Url rewrite in .htaccess is not working. Check your server configuration.Test: " + +#: ../../Zotlabs/Module/Setup.php:669 +msgid "Url rewrite is working" +msgstr "Url rewrite is working" + +#: ../../Zotlabs/Module/Setup.php:683 +msgid "" +"The database configuration file \".htconfig.php\" could not be written. " +"Please use the enclosed text to create a configuration file in your web " +"server root." +msgstr "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root." + +#: ../../Zotlabs/Module/Setup.php:707 +#: ../../addon/rendezvous/rendezvous.php:401 +msgid "Errors encountered creating database tables." +msgstr "Errors encountered creating database tables." + +#: ../../Zotlabs/Module/Setup.php:747 +msgid "

    What next?

    " +msgstr "

    What next?

    " + +#: ../../Zotlabs/Module/Setup.php:748 +msgid "" +"IMPORTANT: You will need to [manually] setup a scheduled task for the " +"poller." +msgstr "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." + +#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 +msgid "Continue" +msgstr "Ga verder" + +#: ../../Zotlabs/Module/Connect.php:90 +msgid "Premium Channel Setup" +msgstr "Instellen premiumkanaal " + +#: ../../Zotlabs/Module/Connect.php:92 +msgid "Enable premium channel connection restrictions" +msgstr "Restricties voor connecties van premiumkanaal toestaan" + +#: ../../Zotlabs/Module/Connect.php:93 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." +msgstr "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, voorschriften voor leden, enz." + +#: ../../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 "Dit kanaal kan extra stappen of het accepteren van de volgende voorwaarden vereisen, voordat de connectie wordt geaccepteerd:" + +#: ../../Zotlabs/Module/Connect.php:96 +msgid "" +"Potential connections will then see the following text before proceeding:" +msgstr "Mogelijke connecties zullen dan de volgende tekst zien voordat ze verder kunnen:" + +#: ../../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 "Door verder te gaan ga ik automatisch akkoord met alle voorwaarden en aanwijzingen op deze pagina." + +#: ../../Zotlabs/Module/Connect.php:106 +msgid "(No specific instructions have been provided by the channel owner.)" +msgstr "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaaleigenaar verstrekt) " + +#: ../../Zotlabs/Module/Connect.php:114 +msgid "Restricted or Premium Channel" +msgstr "Beperkt of premiumkanaal" + +#: ../../Zotlabs/Module/Admin/Queue.php:35 +msgid "Queue Statistics" +msgstr "Wachtrij-statistieken" + +#: ../../Zotlabs/Module/Admin/Queue.php:36 +msgid "Total Entries" +msgstr "Aantal vermeldingen" + +#: ../../Zotlabs/Module/Admin/Queue.php:37 +msgid "Priority" +msgstr "Prioriteit" + +#: ../../Zotlabs/Module/Admin/Queue.php:38 +msgid "Destination URL" +msgstr "Doel-URL" + +#: ../../Zotlabs/Module/Admin/Queue.php:39 +msgid "Mark hub permanently offline" +msgstr "Hub als permanent offline markeren" + +#: ../../Zotlabs/Module/Admin/Queue.php:40 +msgid "Empty queue for this hub" +msgstr "Berichtenwachtrij voor deze hub legen" + +#: ../../Zotlabs/Module/Admin/Queue.php:41 +msgid "Last known contact" +msgstr "Voor het laatst contact" + +#: ../../Zotlabs/Module/Admin/Features.php:55 +#: ../../Zotlabs/Module/Admin/Features.php:56 +#: ../../Zotlabs/Module/Settings/Features.php:65 +msgid "Off" +msgstr "Uit" + +#: ../../Zotlabs/Module/Admin/Features.php:55 +#: ../../Zotlabs/Module/Admin/Features.php:56 +#: ../../Zotlabs/Module/Settings/Features.php:65 +msgid "On" +msgstr "Aan" + +#: ../../Zotlabs/Module/Admin/Features.php:56 +#, php-format +msgid "Lock feature %s" +msgstr " Vergrendel de functie '%s'" + +#: ../../Zotlabs/Module/Admin/Features.php:64 +msgid "Manage Additional Features" +msgstr "Beheer - Extra functies" + +#: ../../Zotlabs/Module/Admin/Dbsync.php:19 +msgid "Update has been marked successful" +msgstr "Update is als succesvol gemarkeerd" + +#: ../../Zotlabs/Module/Admin/Dbsync.php:31 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "Uitvoeren van %s is mislukt. Controleer systeemlogboek." + +#: ../../Zotlabs/Module/Admin/Dbsync.php:34 +#, php-format +msgid "Update %s was successfully applied." +msgstr "Update %s was geslaagd." + +#: ../../Zotlabs/Module/Admin/Dbsync.php:38 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is." + +#: ../../Zotlabs/Module/Admin/Dbsync.php:41 +#, php-format +msgid "Update function %s could not be found." +msgstr "Update-functie %s kon niet gevonden worden." + +#: ../../Zotlabs/Module/Admin/Dbsync.php:59 +msgid "Failed Updates" +msgstr "Mislukte updates" + +#: ../../Zotlabs/Module/Admin/Dbsync.php:61 +msgid "Mark success (if update was manually applied)" +msgstr "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)" + +#: ../../Zotlabs/Module/Admin/Dbsync.php:62 +msgid "Attempt to execute this update step automatically" +msgstr "Poging om deze stap van de update automatisch uit te voeren." + +#: ../../Zotlabs/Module/Admin/Dbsync.php:67 +msgid "No failed updates." +msgstr "Geen mislukte updates." + +#: ../../Zotlabs/Module/Admin/Plugins.php:259 +#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94 +#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 +#: ../../Zotlabs/Module/Display.php:453 +#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62 +#: ../../include/items.php:3619 +msgid "Item not found." +msgstr "Item niet gevonden." + +#: ../../Zotlabs/Module/Admin/Plugins.php:289 +#, php-format +msgid "Plugin %s disabled." +msgstr "Plug-in %s uitgeschakeld." + +#: ../../Zotlabs/Module/Admin/Plugins.php:294 +#, php-format +msgid "Plugin %s enabled." +msgstr "Plug-in %s ingeschakeld" + +#: ../../Zotlabs/Module/Admin/Plugins.php:310 +#: ../../Zotlabs/Module/Admin/Themes.php:95 +msgid "Disable" +msgstr "Uitschakelen" + +#: ../../Zotlabs/Module/Admin/Plugins.php:313 +#: ../../Zotlabs/Module/Admin/Themes.php:97 +msgid "Enable" +msgstr "Inschakelen" + +#: ../../Zotlabs/Module/Admin/Plugins.php:341 +#: ../../Zotlabs/Module/Admin/Plugins.php:436 +#: ../../Zotlabs/Module/Admin/Accounts.php:166 +#: ../../Zotlabs/Module/Admin/Logs.php:82 +#: ../../Zotlabs/Module/Admin/Channels.php:145 +#: ../../Zotlabs/Module/Admin/Themes.php:122 +#: ../../Zotlabs/Module/Admin/Themes.php:156 +#: ../../Zotlabs/Module/Admin/Site.php:294 +#: ../../Zotlabs/Module/Admin/Security.php:86 +#: ../../Zotlabs/Module/Admin.php:136 +msgid "Administration" +msgstr "Beheer" + +#: ../../Zotlabs/Module/Admin/Plugins.php:342 +#: ../../Zotlabs/Module/Admin/Plugins.php:437 +#: ../../Zotlabs/Widget/Admin.php:27 +msgid "Plugins" +msgstr "Plug-ins" + +#: ../../Zotlabs/Module/Admin/Plugins.php:343 +#: ../../Zotlabs/Module/Admin/Themes.php:124 +msgid "Toggle" +msgstr "Omschakelen" + +#: ../../Zotlabs/Module/Admin/Plugins.php:344 +#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242 +#: ../../Zotlabs/Widget/Newmember.php:46 +#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:105 +#: ../../include/nav.php:192 +msgid "Settings" +msgstr "Instellingen" + +#: ../../Zotlabs/Module/Admin/Plugins.php:351 +#: ../../Zotlabs/Module/Admin/Themes.php:134 +msgid "Author: " +msgstr "Auteur: " + +#: ../../Zotlabs/Module/Admin/Plugins.php:352 +#: ../../Zotlabs/Module/Admin/Themes.php:135 +msgid "Maintainer: " +msgstr "Beheerder: " + +#: ../../Zotlabs/Module/Admin/Plugins.php:353 +msgid "Minimum project version: " +msgstr "Minimum versie Hubzilla: " + +#: ../../Zotlabs/Module/Admin/Plugins.php:354 +msgid "Maximum project version: " +msgstr "Maximum versie Hubzilla:" + +#: ../../Zotlabs/Module/Admin/Plugins.php:355 +msgid "Minimum PHP version: " +msgstr "Minimum versie PHP: " + +#: ../../Zotlabs/Module/Admin/Plugins.php:356 +msgid "Compatible Server Roles: " +msgstr "Werkt met configuratietypes: " + +#: ../../Zotlabs/Module/Admin/Plugins.php:357 +msgid "Requires: " +msgstr "Vereist: " + +#: ../../Zotlabs/Module/Admin/Plugins.php:358 +#: ../../Zotlabs/Module/Admin/Plugins.php:442 +msgid "Disabled - version incompatibility" +msgstr "Uitgeschakeld - versie is incompatibel" + +#: ../../Zotlabs/Module/Admin/Plugins.php:411 +msgid "Enter the public git repository URL of the plugin repo." +msgstr "Vul de openbare Git-URL in van de plug-in-repository." + +#: ../../Zotlabs/Module/Admin/Plugins.php:412 +msgid "Plugin repo git URL" +msgstr "Git-URL plug-in-repository" + +#: ../../Zotlabs/Module/Admin/Plugins.php:413 +msgid "Custom repo name" +msgstr "Handmatige repository-naam" + +#: ../../Zotlabs/Module/Admin/Plugins.php:413 +msgid "(optional)" +msgstr "(niet verplicht)" + +#: ../../Zotlabs/Module/Admin/Plugins.php:414 +msgid "Download Plugin Repo" +msgstr "Plug-in-repository downloaden" + +#: ../../Zotlabs/Module/Admin/Plugins.php:421 +msgid "Install new repo" +msgstr "Nieuwe repository installeren" + +#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:393 +msgid "Install" +msgstr "Installeren" + +#: ../../Zotlabs/Module/Admin/Plugins.php:445 +msgid "Manage Repos" +msgstr "Repositories beheren" + +#: ../../Zotlabs/Module/Admin/Plugins.php:446 +msgid "Installed Plugin Repositories" +msgstr "Toegevoegde plug-in-repositories" + +#: ../../Zotlabs/Module/Admin/Plugins.php:447 +msgid "Install a New Plugin Repository" +msgstr "Nieuwe plug-in-repository toevoegen" + +#: ../../Zotlabs/Module/Admin/Plugins.php:454 +msgid "Switch branch" +msgstr "Branch veranderen" + +#: ../../Zotlabs/Module/Admin/Plugins.php:455 +#: ../../Zotlabs/Module/Photos.php:1020 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../addon/superblock/superblock.php:116 +msgid "Remove" +msgstr "Verwijderen" + +#: ../../Zotlabs/Module/Admin/Accounts.php:37 +#, php-format +msgid "%s account blocked/unblocked" +msgid_plural "%s account blocked/unblocked" +msgstr[0] "%s account geblokkeerd/gedeblokkeerd" +msgstr[1] "%s accounts geblokkeerd/gedeblokkeerd" + +#: ../../Zotlabs/Module/Admin/Accounts.php:44 +#, php-format +msgid "%s account deleted" +msgid_plural "%s accounts deleted" +msgstr[0] "%s account verwijderd" +msgstr[1] "%s accounts verwijderd" + +#: ../../Zotlabs/Module/Admin/Accounts.php:80 +msgid "Account not found" +msgstr "Account niet gevonden" + +#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2473 +#, php-format +msgid "Account '%s' deleted" +msgstr "Account '%s' verwijderd" + +#: ../../Zotlabs/Module/Admin/Accounts.php:99 +#, php-format +msgid "Account '%s' blocked" +msgstr "Account '%s' geblokkeerd" + +#: ../../Zotlabs/Module/Admin/Accounts.php:107 #, php-format msgid "Account '%s' unblocked" msgstr "Account '%s' gedeblokkeerd" -#: ../../Zotlabs/Module/Admin/Accounts.php:165 -#: ../../Zotlabs/Module/Admin/Accounts.php:178 ../../include/widgets.php:1635 +#: ../../Zotlabs/Module/Admin/Accounts.php:167 +#: ../../Zotlabs/Module/Admin/Accounts.php:180 +#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23 msgid "Accounts" msgstr "Accounts" -#: ../../Zotlabs/Module/Admin/Accounts.php:167 +#: ../../Zotlabs/Module/Admin/Accounts.php:169 #: ../../Zotlabs/Module/Admin/Channels.php:148 msgid "select all" msgstr "alles selecteren" -#: ../../Zotlabs/Module/Admin/Accounts.php:168 +#: ../../Zotlabs/Module/Admin/Accounts.php:170 msgid "Registrations waiting for confirm" msgstr "Accounts die op goedkeuring wachten" -#: ../../Zotlabs/Module/Admin/Accounts.php:169 +#: ../../Zotlabs/Module/Admin/Accounts.php:171 msgid "Request date" msgstr "Tijd/datum verzoek" -#: ../../Zotlabs/Module/Admin/Accounts.php:169 -#: ../../Zotlabs/Module/Admin/Accounts.php:181 -#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Profiles.php:790 -#: ../../extend/addon/addon/redred/redred.php:107 -#: ../../extend/addon/addon/rtof/rtof.php:93 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1140 -#: ../../extend/addon/addon/openid/MysqlProvider.php:56 -#: ../../extend/addon/addon/openid/MysqlProvider.php:57 -#: ../../include/network.php:2270 -msgid "Email" -msgstr "E-mail" - -#: ../../Zotlabs/Module/Admin/Accounts.php:170 +#: ../../Zotlabs/Module/Admin/Accounts.php:172 msgid "No registrations." msgstr "Geen verzoeken." -#: ../../Zotlabs/Module/Admin/Accounts.php:172 +#: ../../Zotlabs/Module/Admin/Accounts.php:173 +#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:732 +msgid "Approve" +msgstr "Goedkeuren" + +#: ../../Zotlabs/Module/Admin/Accounts.php:174 +#: ../../Zotlabs/Module/Authorize.php:26 msgid "Deny" msgstr "Afkeuren" -#: ../../Zotlabs/Module/Admin/Accounts.php:174 -#: ../../Zotlabs/Module/Connedit.php:629 +#: ../../Zotlabs/Module/Admin/Accounts.php:176 +#: ../../Zotlabs/Module/Connedit.php:622 msgid "Block" msgstr "Blokkeren" -#: ../../Zotlabs/Module/Admin/Accounts.php:175 -#: ../../Zotlabs/Module/Connedit.php:629 +#: ../../Zotlabs/Module/Admin/Accounts.php:177 +#: ../../Zotlabs/Module/Connedit.php:622 msgid "Unblock" msgstr "Deblokkeren" -#: ../../Zotlabs/Module/Admin/Accounts.php:180 +#: ../../Zotlabs/Module/Admin/Accounts.php:182 msgid "ID" msgstr "ID" -#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287 +#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/group.php:284 msgid "All Channels" msgstr "Alle kanalen" -#: ../../Zotlabs/Module/Admin/Accounts.php:183 +#: ../../Zotlabs/Module/Admin/Accounts.php:185 msgid "Register date" msgstr "Geregistreerd" -#: ../../Zotlabs/Module/Admin/Accounts.php:184 +#: ../../Zotlabs/Module/Admin/Accounts.php:186 msgid "Last login" msgstr "Laatste keer ingelogd" -#: ../../Zotlabs/Module/Admin/Accounts.php:185 +#: ../../Zotlabs/Module/Admin/Accounts.php:187 msgid "Expires" msgstr "Verloopt" -#: ../../Zotlabs/Module/Admin/Accounts.php:186 +#: ../../Zotlabs/Module/Admin/Accounts.php:188 msgid "Service Class" msgstr "Abonnement" -#: ../../Zotlabs/Module/Admin/Accounts.php:188 +#: ../../Zotlabs/Module/Admin/Accounts.php:190 +msgid "" +"Selected accounts will be deleted!\\n\\nEverything these accounts had posted" +" on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?" + +#: ../../Zotlabs/Module/Admin/Accounts.php:191 +msgid "" +"The account {0} will be deleted!\\n\\nEverything this account has posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" + +#: ../../Zotlabs/Module/Admin/Logs.php:28 +msgid "Log settings updated." +msgstr "Logboek-instellingen bijgewerkt." + +#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48 +#: ../../Zotlabs/Widget/Admin.php:58 +msgid "Logs" +msgstr "Logboeken" + +#: ../../Zotlabs/Module/Admin/Logs.php:85 +msgid "Clear" +msgstr "Leegmaken" + +#: ../../Zotlabs/Module/Admin/Logs.php:91 +msgid "Debugging" +msgstr "Debuggen" + +#: ../../Zotlabs/Module/Admin/Logs.php:92 +msgid "Log file" +msgstr "Logbestand" + +#: ../../Zotlabs/Module/Admin/Logs.php:92 msgid "" -"Selected accounts will be deleted!\\n\\nEverything these accounts had posted" -" on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?" +"Must be writable by web server. Relative to your top-level webserver " +"directory." +msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je $Projectname-installatie." -#: ../../Zotlabs/Module/Admin/Accounts.php:189 -msgid "" -"The account {0} will be deleted!\\n\\nEverything this account has posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" +#: ../../Zotlabs/Module/Admin/Logs.php:93 +msgid "Log level" +msgstr "Logniveau" #: ../../Zotlabs/Module/Admin/Channels.php:31 #, php-format @@ -1860,7 +2594,8 @@ msgstr "Scripts toegestaan voor kanaal '%s'" msgid "Channel '%s' code disallowed" msgstr "Scripts niet toegestaan voor kanaal '%s'" -#: ../../Zotlabs/Module/Admin/Channels.php:146 ../../include/widgets.php:1636 +#: ../../Zotlabs/Module/Admin/Channels.php:146 +#: ../../Zotlabs/Module/Admin.php:110 ../../Zotlabs/Widget/Admin.php:24 msgid "Channels" msgstr "Kanalen" @@ -1881,7 +2616,7 @@ msgid "Disallow Code" msgstr "Scripts niet toestaan" #: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1815 +#: ../../include/conversation.php:1811 ../../include/nav.php:378 msgid "Channel" msgstr "Kanaal" @@ -1889,13 +2624,6 @@ msgstr "Kanaal" msgid "UID" msgstr "UID" -#: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:920 -#: ../../Zotlabs/Module/Profiles.php:502 ../../Zotlabs/Module/Profiles.php:793 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143 -msgid "Address" -msgstr "Adres" - #: ../../Zotlabs/Module/Admin/Channels.php:162 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " @@ -1908,3587 +2636,3479 @@ msgid "" "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../Zotlabs/Module/Admin/Dbsync.php:19 -msgid "Update has been marked successful" -msgstr "Update is als succesvol gemarkeerd" - -#: ../../Zotlabs/Module/Admin/Dbsync.php:29 -#, php-format -msgid "Executing %s failed. Check system logs." -msgstr "Uitvoeren van %s is mislukt. Controleer systeemlogboek." - -#: ../../Zotlabs/Module/Admin/Dbsync.php:32 -#, php-format -msgid "Update %s was successfully applied." -msgstr "Update %s was geslaagd." - -#: ../../Zotlabs/Module/Admin/Dbsync.php:36 -#, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." -msgstr "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is." - -#: ../../Zotlabs/Module/Admin/Dbsync.php:39 -#, php-format -msgid "Update function %s could not be found." -msgstr "Update-functie %s kon niet gevonden worden." - -#: ../../Zotlabs/Module/Admin/Dbsync.php:55 -msgid "No failed updates." -msgstr "Geen mislukte updates." - -#: ../../Zotlabs/Module/Admin/Dbsync.php:59 -msgid "Failed Updates" -msgstr "Mislukte updates" - -#: ../../Zotlabs/Module/Admin/Dbsync.php:61 -msgid "Mark success (if update was manually applied)" -msgstr "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)" - -#: ../../Zotlabs/Module/Admin/Dbsync.php:62 -msgid "Attempt to execute this update step automatically" -msgstr "Poging om deze stap van de update automatisch uit te voeren." - -#: ../../Zotlabs/Module/Admin/Queue.php:35 -msgid "Queue Statistics" -msgstr "Wachtrij-statistieken" - -#: ../../Zotlabs/Module/Admin/Queue.php:36 -msgid "Total Entries" -msgstr "Aantal vermeldingen" +#: ../../Zotlabs/Module/Admin/Themes.php:26 +msgid "Theme settings updated." +msgstr "Thema-instellingen bijgewerkt." -#: ../../Zotlabs/Module/Admin/Queue.php:37 -msgid "Priority" -msgstr "Prioriteit" +#: ../../Zotlabs/Module/Admin/Themes.php:61 +msgid "No themes found." +msgstr "Geen thema's gevonden" -#: ../../Zotlabs/Module/Admin/Queue.php:38 -msgid "Destination URL" -msgstr "Doel-URL" +#: ../../Zotlabs/Module/Admin/Themes.php:116 +msgid "Screenshot" +msgstr "Schermafdruk" -#: ../../Zotlabs/Module/Admin/Queue.php:39 -msgid "Mark hub permanently offline" -msgstr "Hub als permanent offline markeren" +#: ../../Zotlabs/Module/Admin/Themes.php:123 +#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28 +msgid "Themes" +msgstr "Thema's" -#: ../../Zotlabs/Module/Admin/Queue.php:40 -msgid "Empty queue for this hub" -msgstr "Berichtenwachtrij voor deze hub legen" +#: ../../Zotlabs/Module/Admin/Themes.php:162 +msgid "[Experimental]" +msgstr "[Experimenteel]" -#: ../../Zotlabs/Module/Admin/Queue.php:41 -msgid "Last known contact" -msgstr "Voor het laatst contact" +#: ../../Zotlabs/Module/Admin/Themes.php:163 +msgid "[Unsupported]" +msgstr "[Niet ondersteund]" -#: ../../Zotlabs/Module/Admin/Site.php:133 +#: ../../Zotlabs/Module/Admin/Site.php:165 msgid "Site settings updated." msgstr "Hub-instellingen bijgewerkt." -#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2936 +#: ../../Zotlabs/Module/Admin/Site.php:191 +#: ../../view/theme/redbasic_c/php/config.php:15 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3106 msgid "Default" msgstr "Standaard" -#: ../../Zotlabs/Module/Admin/Site.php:170 -#: ../../Zotlabs/Module/Settings/Display.php:137 +#: ../../Zotlabs/Module/Admin/Site.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:130 #, php-format msgid "%s - (Incompatible)" msgstr "%s - (niet compatible)" -#: ../../Zotlabs/Module/Admin/Site.php:177 -#: ../../Zotlabs/Module/Settings/Display.php:151 +#: ../../Zotlabs/Module/Admin/Site.php:209 msgid "mobile" msgstr "mobiel" -#: ../../Zotlabs/Module/Admin/Site.php:179 +#: ../../Zotlabs/Module/Admin/Site.php:211 msgid "experimental" msgstr "experimenteel" -#: ../../Zotlabs/Module/Admin/Site.php:181 +#: ../../Zotlabs/Module/Admin/Site.php:213 msgid "unsupported" msgstr "Niet ondersteund" -#: ../../Zotlabs/Module/Admin/Site.php:226 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Connedit.php:402 -#: ../../Zotlabs/Module/Connedit.php:786 ../../Zotlabs/Module/Events.php:470 -#: ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Filestorage.php:168 -#: ../../Zotlabs/Module/Photos.php:652 ../../Zotlabs/Module/Mitem.php:162 -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 -#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:97 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Settings/Channel.php:294 -#: ../../Zotlabs/Module/Settings/Display.php:103 -#: ../../Zotlabs/Module/Wiki.php:179 -#: ../../extend/addon/addon/dwpost/dwpost.php:73 -#: ../../extend/addon/addon/dwpost/dwpost.php:85 -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120 -#: ../../extend/addon/addon/friendica/dfrn_request.php:865 -#: ../../extend/addon/addon/ijpost/ijpost.php:73 -#: ../../extend/addon/addon/ijpost/ijpost.php:85 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:309 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:313 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:343 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:351 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:355 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:359 -#: ../../extend/addon/addon/libertree/libertree.php:69 -#: ../../extend/addon/addon/libertree/libertree.php:81 -#: ../../extend/addon/addon/ljpost/ljpost.php:70 -#: ../../extend/addon/addon/ljpost/ljpost.php:82 -#: ../../extend/addon/addon/nofed/nofed.php:72 -#: ../../extend/addon/addon/nofed/nofed.php:76 -#: ../../extend/addon/addon/nsabait/nsabait.php:157 -#: ../../extend/addon/addon/nsfw/nsfw.php:84 -#: ../../extend/addon/addon/planets/planets.php:153 -#: ../../extend/addon/addon/pumpio/pumpio.php:219 -#: ../../extend/addon/addon/pumpio/pumpio.php:223 -#: ../../extend/addon/addon/pumpio/pumpio.php:227 -#: ../../extend/addon/addon/pumpio/pumpio.php:231 -#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81 -#: ../../extend/addon/addon/redred/redred.php:95 -#: ../../extend/addon/addon/redred/redred.php:99 -#: ../../extend/addon/addon/rtof/rtof.php:81 -#: ../../extend/addon/addon/rtof/rtof.php:85 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:273 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:277 -#: ../../extend/addon/addon/statusnet/statusnet.php:389 -#: ../../extend/addon/addon/statusnet/statusnet.php:411 -#: ../../extend/addon/addon/statusnet/statusnet.php:415 -#: ../../extend/addon/addon/statusnet/statusnet.php:424 -#: ../../extend/addon/addon/twitter/twitter.php:242 -#: ../../extend/addon/addon/twitter/twitter.php:246 -#: ../../extend/addon/addon/twitter/twitter.php:255 -#: ../../extend/addon/addon/visage/visage.php:166 -#: ../../extend/addon/addon/wppost/wppost.php:82 -#: ../../extend/addon/addon/wppost/wppost.php:105 -#: ../../extend/addon/addon/wppost/wppost.php:109 -#: ../../extend/addon/addon/xmpp/xmpp.php:53 -#: ../../extend/addon/addon/cdav/cdav.php:234 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164 -#: ../../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:1753 -msgid "No" -msgstr "Nee" - -#: ../../Zotlabs/Module/Admin/Site.php:227 +#: ../../Zotlabs/Module/Admin/Site.php:260 msgid "Yes - with approval" msgstr "Ja - met goedkeuring" -#: ../../Zotlabs/Module/Admin/Site.php:228 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Connedit.php:402 -#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Filestorage.php:168 -#: ../../Zotlabs/Module/Photos.php:652 ../../Zotlabs/Module/Mitem.php:162 -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 -#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:96 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Settings/Channel.php:294 -#: ../../Zotlabs/Module/Settings/Display.php:103 -#: ../../Zotlabs/Module/Wiki.php:179 -#: ../../extend/addon/addon/dwpost/dwpost.php:73 -#: ../../extend/addon/addon/dwpost/dwpost.php:85 -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120 -#: ../../extend/addon/addon/friendica/dfrn_request.php:865 -#: ../../extend/addon/addon/ijpost/ijpost.php:73 -#: ../../extend/addon/addon/ijpost/ijpost.php:85 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:309 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:313 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:343 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:351 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:355 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:359 -#: ../../extend/addon/addon/libertree/libertree.php:69 -#: ../../extend/addon/addon/libertree/libertree.php:81 -#: ../../extend/addon/addon/ljpost/ljpost.php:70 -#: ../../extend/addon/addon/ljpost/ljpost.php:82 -#: ../../extend/addon/addon/nofed/nofed.php:72 -#: ../../extend/addon/addon/nofed/nofed.php:76 -#: ../../extend/addon/addon/nsabait/nsabait.php:157 -#: ../../extend/addon/addon/nsfw/nsfw.php:84 -#: ../../extend/addon/addon/planets/planets.php:153 -#: ../../extend/addon/addon/pumpio/pumpio.php:219 -#: ../../extend/addon/addon/pumpio/pumpio.php:223 -#: ../../extend/addon/addon/pumpio/pumpio.php:227 -#: ../../extend/addon/addon/pumpio/pumpio.php:231 -#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81 -#: ../../extend/addon/addon/redred/redred.php:95 -#: ../../extend/addon/addon/redred/redred.php:99 -#: ../../extend/addon/addon/rtof/rtof.php:81 -#: ../../extend/addon/addon/rtof/rtof.php:85 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:273 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:277 -#: ../../extend/addon/addon/statusnet/statusnet.php:389 -#: ../../extend/addon/addon/statusnet/statusnet.php:411 -#: ../../extend/addon/addon/statusnet/statusnet.php:415 -#: ../../extend/addon/addon/statusnet/statusnet.php:424 -#: ../../extend/addon/addon/twitter/twitter.php:242 -#: ../../extend/addon/addon/twitter/twitter.php:246 -#: ../../extend/addon/addon/twitter/twitter.php:255 -#: ../../extend/addon/addon/visage/visage.php:166 -#: ../../extend/addon/addon/wppost/wppost.php:82 -#: ../../extend/addon/addon/wppost/wppost.php:105 -#: ../../extend/addon/addon/wppost/wppost.php:109 -#: ../../extend/addon/addon/xmpp/xmpp.php:53 -#: ../../extend/addon/addon/cdav/cdav.php:234 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164 -#: ../../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:1753 -msgid "Yes" -msgstr "Ja" - -#: ../../Zotlabs/Module/Admin/Site.php:233 +#: ../../Zotlabs/Module/Admin/Site.php:266 msgid "My site is not a public server" msgstr "Mijn $Projectname-hub is niet openbaar" -#: ../../Zotlabs/Module/Admin/Site.php:234 +#: ../../Zotlabs/Module/Admin/Site.php:267 msgid "My site has paid access only" msgstr "Mijn $Projectname-hub kent alleen betaalde toegang" -#: ../../Zotlabs/Module/Admin/Site.php:235 +#: ../../Zotlabs/Module/Admin/Site.php:268 msgid "My site has free access only" msgstr "Mijn $Projectname-hub kent alleen gratis toegang" -#: ../../Zotlabs/Module/Admin/Site.php:236 +#: ../../Zotlabs/Module/Admin/Site.php:269 msgid "My site offers free accounts with optional paid upgrades" msgstr "Mijn $Projectname-hub biedt gratis accounts aan met betaalde uitbreidingen als optie" -#: ../../Zotlabs/Module/Admin/Site.php:247 ../../Zotlabs/Module/Setup.php:328 -msgid "Basic/Minimal Social Networking" -msgstr "Basic/eenvoudig sociaal netwerk" - -#: ../../Zotlabs/Module/Admin/Site.php:248 ../../Zotlabs/Module/Setup.php:329 -msgid "Standard Configuration (default)" -msgstr "Standaard (standaard)" - -#: ../../Zotlabs/Module/Admin/Site.php:249 ../../Zotlabs/Module/Setup.php:330 -msgid "Professional" -msgstr "Professioneel " - -#: ../../Zotlabs/Module/Admin/Site.php:253 ../../Zotlabs/Lib/Techlevels.php:10 +#: ../../Zotlabs/Module/Admin/Site.php:281 msgid "Beginner/Basic" msgstr "Beginner/basic" -#: ../../Zotlabs/Module/Admin/Site.php:254 ../../Zotlabs/Lib/Techlevels.php:11 +#: ../../Zotlabs/Module/Admin/Site.php:282 msgid "Novice - not skilled but willing to learn" msgstr "Onervaren - niet bekwaam, maar wil graag leren" -#: ../../Zotlabs/Module/Admin/Site.php:255 ../../Zotlabs/Lib/Techlevels.php:12 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "Intermediate - somewhat comfortable" msgstr "Ervaren - voelt zich enigszins comfortabel" -#: ../../Zotlabs/Module/Admin/Site.php:256 ../../Zotlabs/Lib/Techlevels.php:13 +#: ../../Zotlabs/Module/Admin/Site.php:284 msgid "Advanced - very comfortable" msgstr "Gevorderd - voelt zich comfortabel" -#: ../../Zotlabs/Module/Admin/Site.php:257 ../../Zotlabs/Lib/Techlevels.php:14 +#: ../../Zotlabs/Module/Admin/Site.php:285 msgid "Expert - I can write computer code" msgstr "Expert - kan programmeren" -#: ../../Zotlabs/Module/Admin/Site.php:258 ../../Zotlabs/Lib/Techlevels.php:15 +#: ../../Zotlabs/Module/Admin/Site.php:286 msgid "Wizard - I probably know more than you do" msgstr "Tovenaar - ik weet waarschijnlijk meer dan jij" -#: ../../Zotlabs/Module/Admin/Site.php:267 ../../include/widgets.php:1634 +#: ../../Zotlabs/Module/Admin/Site.php:295 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "Hub-instellingen" -#: ../../Zotlabs/Module/Admin/Site.php:270 +#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Register.php:269 +msgid "Registration" +msgstr "Registratie" + +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "File upload" msgstr "Bestand uploaden" -#: ../../Zotlabs/Module/Admin/Site.php:271 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "Policies" msgstr "Beleid" -#: ../../Zotlabs/Module/Admin/Site.php:272 +#: ../../Zotlabs/Module/Admin/Site.php:300 #: ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "Geavanceerd" -#: ../../Zotlabs/Module/Admin/Site.php:276 -#: ../../extend/addon/addon/statusnet/statusnet.php:890 +#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../addon/statusnet/statusnet.php:891 msgid "Site name" msgstr "Hubnaam" -#: ../../Zotlabs/Module/Admin/Site.php:278 ../../Zotlabs/Module/Setup.php:351 -msgid "Server Configuration/Role" -msgstr "Configuratietype hub" - -#: ../../Zotlabs/Module/Admin/Site.php:280 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Site default technical skill level" msgstr "Standaard technisch niveau voor deze hub" -#: ../../Zotlabs/Module/Admin/Site.php:280 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Used to provide a member experience matched to technical comfort level" msgstr "Wordt gebruikt om leden een gebruikerservaring te bieden die met hun technisch niveau overeenkomt" -#: ../../Zotlabs/Module/Admin/Site.php:282 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Lock the technical skill level setting" msgstr "Vergrendel de functie 'Standaard technisch niveau voor deze hub'" -#: ../../Zotlabs/Module/Admin/Site.php:282 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Members can set their own technical comfort level by default" msgstr "Leden kunnen hun eigen technisch niveau standaard instellen" -#: ../../Zotlabs/Module/Admin/Site.php:284 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Banner/Logo" msgstr "Banner/logo" -#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../Zotlabs/Module/Admin/Site.php:310 +msgid "Unfiltered HTML/CSS/JS is allowed" +msgstr "Ongefilterd HTML/CSS/JS is toegestaan" + +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "Administrator Information" msgstr "Informatie over de beheerder" -#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden." -#: ../../Zotlabs/Module/Admin/Site.php:286 -#: ../../Zotlabs/Module/Siteinfo.php:23 +#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Siteinfo.php:21 msgid "Site Information" msgstr "Hub-informatie" -#: ../../Zotlabs/Module/Admin/Site.php:286 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Openbaar zichtbare beschrijving van deze hub. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden." -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "System language" msgstr "Standaardtaal" -#: ../../Zotlabs/Module/Admin/Site.php:288 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "System theme" msgstr "Standaardthema" -#: ../../Zotlabs/Module/Admin/Site.php:288 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Standaardthema voor $Projectname-hub (kan door lid veranderd worden) - verander thema-instellingen" -#: ../../Zotlabs/Module/Admin/Site.php:289 -msgid "Mobile system theme" -msgstr "Standaardthema voor mobiel" - -#: ../../Zotlabs/Module/Admin/Site.php:289 -msgid "Theme for mobile devices" -msgstr "Thema voor mobiele apparaten" - -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "Allow Feeds as Connections" msgstr "Sta feeds toe als connecties" -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "(Heavy system resource usage)" msgstr "(sterk negatieve invloed op systeembronnen hub)" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Maximum image size" msgstr "Maximale grootte van afbeeldingen" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend." -#: ../../Zotlabs/Module/Admin/Site.php:293 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Does this site allow new member registration?" msgstr "Staat deze hub nieuwe accounts toe?" -#: ../../Zotlabs/Module/Admin/Site.php:294 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Invitation only" msgstr "Alleen op uitnodiging" -#: ../../Zotlabs/Module/Admin/Site.php:294 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "Sta alleen nieuwe registraties toe van mensen die een uitnodigingscode hebben. Bovenstaand accountbeleid moet op Ja staan." -#: ../../Zotlabs/Module/Admin/Site.php:295 +#: ../../Zotlabs/Module/Admin/Site.php:321 +msgid "Minimum age" +msgstr "Minimum leeftijd" + +#: ../../Zotlabs/Module/Admin/Site.php:321 +msgid "Minimum age (in years) for who may register on this site." +msgstr "Minimum leeftijd (in jaren) voor wie zich op deze hub mag registreren." + +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Which best describes the types of account offered by this hub?" msgstr "Wat voor soort accounts biedt deze $Projectname-hub aan? Kies wat het meest in de buurt komt." -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Register text" msgstr "Tekst tijdens registratie" -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Will be displayed prominently on the registration page." msgstr "Tekst dat op de pagina voor het registreren van nieuwe accounts wordt getoond." -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Site homepage to show visitors (default: login box)" msgstr "Homepagina van deze hub die aan bezoekers wordt getoond (standaard: inlogformulier)" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." -msgstr "voorbeeld: 'public' om de openbare stream te tonen, 'page/sys/home' om de webpagina 'home' van het systeemkanaal te tonen of 'include:home.html' om een gewoon bestand te gebruiken." +msgstr "voorbeeld: 'public' om de openbare tijdlijn te tonen, 'page/sys/home' om de webpagina 'home' van het systeemkanaal te tonen of 'include:home.html' om een gewoon bestand te gebruiken." -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "Preserve site homepage URL" msgstr "Behoudt de URL van de hub (/)" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "Toon de homepagina van de hub in een frame op de oorspronkelijke locatie (/), i.p.v. een doorverwijzing naar een andere locatie (bv. .../home.html)" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "Accounts abandoned after x days" msgstr "Accounts als verlaten beschouwen na zoveel aantal dagen:" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet." -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "Allowed friend domains" msgstr "Toegestane domeinen" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze $Projectname-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "Verify Email Addresses" msgstr "E-mailadres verifieren" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "Inschakelen om e-mailadressen te verifiëren die tijdens de accountregistratie worden gebruikt (aanbevolen)." -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "Force publish" msgstr "Dwing kanaalvermelding af" -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld." -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "Import Public Streams" -msgstr "Openbare streams importeren" +msgstr "Openbare tijdlijnen importeren" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "Toegang verlenen tot openbare berichten die vanuit andere hubs worden geïmporteerd. Waarschuwing: de inhoud van deze berichten wordt niet gemodereerd." -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:331 +msgid "Site only Public Streams" +msgstr "Alleen openbare tijdlijnen van deze hub" + +#: ../../Zotlabs/Module/Admin/Site.php:331 +msgid "" +"Allow access to public content originating only from this site if Imported " +"Public Streams are disabled." +msgstr "Alleen toegang verlenen tot openbare berichten van deze hub, wanneer 'Openbare tijdlijnen importeren' is uitgeschakeld." + +#: ../../Zotlabs/Module/Admin/Site.php:332 +msgid "Allow anybody on the internet to access the Public streams" +msgstr "Aan iedereen op het internet toegang tot openbare tijdlijnen verlenen" + +#: ../../Zotlabs/Module/Admin/Site.php:332 +msgid "" +"Disable to require authentication before viewing. Warning: this content is " +"unmoderated." +msgstr "Uitschakelen wanneer authenticatie is vereist om de berichten te kunnen zien. Waarschuwing: de inhoud van deze berichten wordt niet gemodereerd." + +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "Login on Homepage" msgstr "Inlogformulier op de homepagina" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "Toon een inlogformulier voor bezoekers op de homepagina wanneer geen andere inhoud is geconfigureerd. " -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Enable context help" msgstr "Schakel contextuele hulp in" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "" "Display contextual help for the current page when the help button is " "pressed." msgstr "Toon hulp en documentatie voor de op dat moment getoonde pagina, wanneer op de hulp-knop wordt geklikt." -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:336 +msgid "Reply-to email address for system generated email." +msgstr "Antwoordadres voor door de hub verzonden e-mail." + +#: ../../Zotlabs/Module/Admin/Site.php:337 +msgid "Sender (From) email address for system generated email." +msgstr "Afzenderadres voor door de hub verzonden e-mail." + +#: ../../Zotlabs/Module/Admin/Site.php:338 +msgid "Name of email sender for system generated email." +msgstr "Volledige naam van afzenderadres voor door de hub verzonden e-mail." + +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Directory Server URL" msgstr "Server-URL voor de kanalengids" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Default directory server" msgstr "Standaardserver voor de kanalengids" -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "Proxy user" msgstr "Gebruikersnaam proxy" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "Proxy URL" msgstr "Proxy-URL" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Network timeout" msgstr "Netwerktimeout" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "Delivery interval" msgstr "Afleveringsinterval" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers." -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "Deliveries per process" msgstr "Leveringen per serverproces" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust" " if necessary to tune system performance. Recommend: 1-5." msgstr "Aantal leveringen die aan één serverproces worden meegegeven. Pas dit aan wanneer het nodig is om systeemprestaties te verbeteren. Aangeraden: 1-5" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:347 +msgid "Queue Threshold" +msgstr "Wachtrijgrens" + +#: ../../Zotlabs/Module/Admin/Site.php:347 +msgid "" +"Always defer immediate delivery if queue contains more than this number of " +"entries." +msgstr "Stel onmiddellijke leveringen uit wanneer de wachtrij meer dan dit aantal vermeldingen bevat." + +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "Poll interval" msgstr "Poll-interval" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken." -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:349 +msgid "Path to ImageMagick convert program" +msgstr "Locatie van het conversieprogramma van ImageMagick" + +#: ../../Zotlabs/Module/Admin/Site.php:349 +msgid "" +"If set, use this program to generate photo thumbnails for huge images ( > " +"4000 pixels in either dimension), otherwise memory exhaustion may occur. " +"Example: /usr/bin/convert" +msgstr "Wanneer dit is ingesteld wordt dit programma gebruikt om fotominiaturen voor enorme afbeeldingen (> 4000 pixels hoogte/breedte) aan te maken, anders kunnen er geheugenproblemen optreden. Bijvoorbeeld: /usr/bin/convert" + +#: ../../Zotlabs/Module/Admin/Site.php:350 +msgid "Allow SVG thumbnails in file browser" +msgstr "SVG-miniaturen in bestandsbeheerder toestaan" + +#: ../../Zotlabs/Module/Admin/Site.php:350 +msgid "WARNING: SVG images may contain malicious code." +msgstr "LET OP: SVG-afbeeldingen kunnen kwaadwillige code bevatten." + +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "Maximum Load Average" msgstr "Maximaal gemiddelde systeembelasting" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50." -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "Expiration period in days for imported (grid/network) content" -msgstr "Aantal dagen waarna geïmporteerde inhoud uit iemands grid/netwerk-pagina wordt verwijderd." - -#: ../../Zotlabs/Module/Admin/Site.php:316 -msgid "0 for no expiration of imported content" -msgstr "Dit geldt alleen voor inhoud van andere kanalen, dus niet voor iemands eigen kanaal. 0 voor het niet verwijderen van geïmporteerde inhoud." - -#: ../../Zotlabs/Module/Admin/Plugins.php:289 -#, php-format -msgid "Plugin %s disabled." -msgstr "Plugin %s uitgeschakeld." - -#: ../../Zotlabs/Module/Admin/Plugins.php:294 -#, php-format -msgid "Plugin %s enabled." -msgstr "Plugin %s ingeschakeld" - -#: ../../Zotlabs/Module/Admin/Plugins.php:310 -#: ../../Zotlabs/Module/Admin/Themes.php:95 -msgid "Disable" -msgstr "Uitschakelen" - -#: ../../Zotlabs/Module/Admin/Plugins.php:313 -#: ../../Zotlabs/Module/Admin/Themes.php:97 -msgid "Enable" -msgstr "Inschakelen" - -#: ../../Zotlabs/Module/Admin/Plugins.php:342 -#: ../../Zotlabs/Module/Admin/Plugins.php:437 ../../include/widgets.php:1639 -msgid "Plugins" -msgstr "Plugins" - -#: ../../Zotlabs/Module/Admin/Plugins.php:343 -#: ../../Zotlabs/Module/Admin/Themes.php:124 -msgid "Toggle" -msgstr "Omschakelen" - -#: ../../Zotlabs/Module/Admin/Plugins.php:344 -#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223 -#: ../../include/widgets.php:685 ../../include/nav.php:225 -msgid "Settings" -msgstr "Instellingen" - -#: ../../Zotlabs/Module/Admin/Plugins.php:351 -#: ../../Zotlabs/Module/Admin/Themes.php:134 -msgid "Author: " -msgstr "Auteur: " - -#: ../../Zotlabs/Module/Admin/Plugins.php:352 -#: ../../Zotlabs/Module/Admin/Themes.php:135 -msgid "Maintainer: " -msgstr "Beheerder: " - -#: ../../Zotlabs/Module/Admin/Plugins.php:353 -msgid "Minimum project version: " -msgstr "Minimum versie Hubzilla: " - -#: ../../Zotlabs/Module/Admin/Plugins.php:354 -msgid "Maximum project version: " -msgstr "Maximum versie Hubzilla:" - -#: ../../Zotlabs/Module/Admin/Plugins.php:355 -msgid "Minimum PHP version: " -msgstr "Minimum versie PHP: " - -#: ../../Zotlabs/Module/Admin/Plugins.php:356 -msgid "Compatible Server Roles: " -msgstr "Werkt met configuratietypes: " - -#: ../../Zotlabs/Module/Admin/Plugins.php:357 -msgid "Requires: " -msgstr "Vereist: " - -#: ../../Zotlabs/Module/Admin/Plugins.php:358 -#: ../../Zotlabs/Module/Admin/Plugins.php:442 -msgid "Disabled - version incompatibility" -msgstr "Uitgeschakeld - versie is incompatibel" - -#: ../../Zotlabs/Module/Admin/Plugins.php:411 -msgid "Enter the public git repository URL of the plugin repo." -msgstr "Vul de openbare Git-URL in van de plugin-repository." +msgstr "Aantal dagen waarna geïmporteerde inhoud uit iemands tijdlijn/netwerk-pagina wordt verwijderd." -#: ../../Zotlabs/Module/Admin/Plugins.php:412 -msgid "Plugin repo git URL" -msgstr "Git-URL plugin-repository" +#: ../../Zotlabs/Module/Admin/Site.php:352 +msgid "0 for no expiration of imported content" +msgstr "Dit geldt alleen voor inhoud van andere kanalen, dus niet voor iemands eigen kanaal. 0 voor het niet verwijderen van geïmporteerde inhoud." -#: ../../Zotlabs/Module/Admin/Plugins.php:413 -msgid "Custom repo name" -msgstr "Handmatige repository-naam" +#: ../../Zotlabs/Module/Admin/Site.php:353 +msgid "" +"Do not expire any posts which have comments less than this many days ago" +msgstr "Laat geen berichten verlopen die minder dan dit aantal dagen reacties hebben" -#: ../../Zotlabs/Module/Admin/Plugins.php:413 -msgid "(optional)" -msgstr "(niet verplicht)" +#: ../../Zotlabs/Module/Admin/Site.php:355 +msgid "" +"Public servers: Optional landing (marketing) webpage for new registrants" +msgstr "Openbare hubs: Optionele landingpage (marketing) voor nieuwe registraties" -#: ../../Zotlabs/Module/Admin/Plugins.php:414 -msgid "Download Plugin Repo" -msgstr "Plugin-repository downloaden" +#: ../../Zotlabs/Module/Admin/Site.php:355 +#, php-format +msgid "Create this page first. Default is %s/register" +msgstr "Maak eerst deze pagina aan. Standaard wordt %s/register gebruikt" -#: ../../Zotlabs/Module/Admin/Plugins.php:421 -msgid "Install new repo" -msgstr "Nieuwe repository installeren" +#: ../../Zotlabs/Module/Admin/Site.php:356 +msgid "Page to display after creating a new channel" +msgstr "Pagina die na het aanmaken van een nieuw kanaal moet worden getoond" -#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:348 -msgid "Install" -msgstr "Installeren" +#: ../../Zotlabs/Module/Admin/Site.php:356 +msgid "Recommend: profiles, go, or settings" +msgstr "Aanbevolen: profiles, go of settings" -#: ../../Zotlabs/Module/Admin/Plugins.php:423 -#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Fbrowser.php:66 -#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804 -#: ../../Zotlabs/Module/Settings/Oauth.php:88 -#: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 -#: ../../Zotlabs/Module/Wiki.php:261 ../../Zotlabs/Module/Wiki.php:286 -#: ../../extend/addon/addon/friendica/dfrn_request.php:879 -#: ../../extend/addon/addon/js_upload/js_upload.php:46 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:866 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266 -#: ../../include/conversation.php:1394 ../../include/conversation.php:1443 -msgid "Cancel" -msgstr "Annuleren" +#: ../../Zotlabs/Module/Admin/Site.php:358 +msgid "Optional: site location" +msgstr "Niet verplicht: locatie van deze hub" -#: ../../Zotlabs/Module/Admin/Plugins.php:445 -msgid "Manage Repos" -msgstr "Repositories beheren" +#: ../../Zotlabs/Module/Admin/Site.php:358 +msgid "Region or country" +msgstr "Regio of land" -#: ../../Zotlabs/Module/Admin/Plugins.php:446 -msgid "Installed Plugin Repositories" -msgstr "Toegevoegde plugin-repositories" +#: ../../Zotlabs/Module/Admin/Profs.php:89 +msgid "New Profile Field" +msgstr "Nieuw profielveld" -#: ../../Zotlabs/Module/Admin/Plugins.php:447 -msgid "Install a New Plugin Repository" -msgstr "Nieuwe plugin-repository toevoegen" +#: ../../Zotlabs/Module/Admin/Profs.php:90 +#: ../../Zotlabs/Module/Admin/Profs.php:110 +msgid "Field nickname" +msgstr "Bijnaam voor veld" -#: ../../Zotlabs/Module/Admin/Plugins.php:453 -#: ../../Zotlabs/Module/Connedit.php:929 ../../Zotlabs/Module/Profiles.php:802 -#: ../../Zotlabs/Module/Settings/Oauth.php:42 -#: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:348 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152 -msgid "Update" -msgstr "Bijwerken" +#: ../../Zotlabs/Module/Admin/Profs.php:90 +#: ../../Zotlabs/Module/Admin/Profs.php:110 +msgid "System name of field" +msgstr "Systeemnaam voor veld" -#: ../../Zotlabs/Module/Admin/Plugins.php:454 -msgid "Switch branch" -msgstr "Branch veranderen" +#: ../../Zotlabs/Module/Admin/Profs.php:91 +#: ../../Zotlabs/Module/Admin/Profs.php:111 +msgid "Input type" +msgstr "Invoertype" -#: ../../Zotlabs/Module/Admin/Plugins.php:455 -#: ../../Zotlabs/Module/Photos.php:984 ../../Zotlabs/Module/Tagrm.php:137 -#: ../../extend/addon/addon/superblock/superblock.php:116 -msgid "Remove" -msgstr "Verwijderen" +#: ../../Zotlabs/Module/Admin/Profs.php:92 +#: ../../Zotlabs/Module/Admin/Profs.php:112 +msgid "Field Name" +msgstr "Veldnaam" -#: ../../Zotlabs/Module/Admin/Themes.php:26 -msgid "Theme settings updated." -msgstr "Thema-instellingen bijgewerkt." +#: ../../Zotlabs/Module/Admin/Profs.php:92 +#: ../../Zotlabs/Module/Admin/Profs.php:112 +msgid "Label on profile pages" +msgstr "Tekstlabel voor op profielpagina's" -#: ../../Zotlabs/Module/Admin/Themes.php:61 -msgid "No themes found." -msgstr "Geen thema's gevonden" +#: ../../Zotlabs/Module/Admin/Profs.php:93 +#: ../../Zotlabs/Module/Admin/Profs.php:113 +msgid "Help text" +msgstr "Helptekst" -#: ../../Zotlabs/Module/Admin/Themes.php:116 -msgid "Screenshot" -msgstr "Schermafdruk" +#: ../../Zotlabs/Module/Admin/Profs.php:93 +#: ../../Zotlabs/Module/Admin/Profs.php:113 +msgid "Additional info (optional)" +msgstr "Extra informatie (niet verplicht)" -#: ../../Zotlabs/Module/Admin/Themes.php:123 -#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../include/widgets.php:1640 -msgid "Themes" -msgstr "Thema's" +#: ../../Zotlabs/Module/Admin/Profs.php:94 +#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32 +#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 +#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1052 +#: ../../include/text.php:1064 +msgid "Save" +msgstr "Opslaan" -#: ../../Zotlabs/Module/Admin/Themes.php:162 -msgid "[Experimental]" -msgstr "[Experimenteel]" +#: ../../Zotlabs/Module/Admin/Profs.php:103 +msgid "Field definition not found" +msgstr "Velddefinitie niet gevonden" -#: ../../Zotlabs/Module/Admin/Themes.php:163 -msgid "[Unsupported]" -msgstr "[Niet ondersteund]" +#: ../../Zotlabs/Module/Admin/Profs.php:109 +msgid "Edit Profile Field" +msgstr "Profielveld bewerken" -#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58 -msgid "Export Channel" -msgstr "Kanaal exporteren" +#: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:30 +msgid "Profile Fields" +msgstr "Profielvelden" -#: ../../Zotlabs/Module/Uexport.php:59 -msgid "" -"Export your basic channel information to a file. This acts as a backup of " -"your connections, permissions, profile and basic data, which can be used to " -"import your data to a new server hub, but does not contain your content." -msgstr "Exporteer de basisinformatie van jouw kanaal naar een bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal." +#: ../../Zotlabs/Module/Admin/Profs.php:169 +msgid "Basic Profile Fields" +msgstr "Standaard profielvelden" -#: ../../Zotlabs/Module/Uexport.php:60 -msgid "Export Content" -msgstr "Inhoud exporteren" +#: ../../Zotlabs/Module/Admin/Profs.php:170 +msgid "Advanced Profile Fields" +msgstr "Geavanceerde profielvelden" -#: ../../Zotlabs/Module/Uexport.php:61 -msgid "" -"Export your channel information and recent content to a JSON backup that can" -" be restored or imported to another server hub. This backs up all of your " -"connections, permissions, profile data and several months of posts. This " -"file may be VERY large. Please be patient - it may take several minutes for" -" this download to begin." -msgstr "Exporteer informatie en recente inhoud van jouw kanaal naar een JSON-back-up, wat kan worden gebruikt om jouw kanaal te herstellen of te importeren op een andere hub. Dit slaat al jouw connecties, permissies, profielgegevens en enkele maanden aan inhoud van jouw kanaal op. Dit bestand kan ZEER groot worden. Wees geduldig - het kan enkele minuten duren voordat de download begint." +#: ../../Zotlabs/Module/Admin/Profs.php:170 +msgid "(In addition to basic fields)" +msgstr "(als toevoeging op de standaard velden)" -#: ../../Zotlabs/Module/Uexport.php:63 -msgid "Export your posts from a given year." -msgstr "Exporteer jouw berichten uit een bepaald jaar." +#: ../../Zotlabs/Module/Admin/Profs.php:172 +msgid "All available fields" +msgstr "Alle beschikbare velden" -#: ../../Zotlabs/Module/Uexport.php:65 -msgid "" -"You may also export your posts and conversations for a particular year or " -"month. Adjust the date in your browser location bar to select other dates. " -"If the export fails (possibly due to memory exhaustion on your server hub), " -"please try again selecting a more limited date range." -msgstr "Je kan ook berichten en conversaties uit een bepaald jaar of van een bepaalde maand exporteren. Verander de datum in de adresbalk van jouw webbrowser om andere jaren en maanden te selecteren. Wanneer het exporteren mislukt (waarschijnlijk door een gebrek aan beschikbaar servergeheugen), probeer het dan nogmaals met een beperkter tijdvak." +#: ../../Zotlabs/Module/Admin/Profs.php:173 +msgid "Custom Fields" +msgstr "Extra (handmatig toegevoegde) velden" -#: ../../Zotlabs/Module/Uexport.php:66 -#, php-format -msgid "" -"To select all posts for a given year, such as this year, visit %2$s" -msgstr "Bezoek %2$s om alle berichten van bijvoorbeeld dit jaar te selecteren. " +#: ../../Zotlabs/Module/Admin/Profs.php:177 +msgid "Create Custom Field" +msgstr "Extra velden aanmaken" -#: ../../Zotlabs/Module/Uexport.php:67 +#: ../../Zotlabs/Module/Admin/Account_edit.php:29 #, php-format -msgid "" -"To select all posts for a given month, such as January of this year, visit " -"%2$s" -msgstr "Bezoek %2$s om alle berichten van bijvoorbeeld januari dit jaar te selecteren." +msgid "Password changed for account %d." +msgstr "Wachtwoord veranderd voor account %d." -#: ../../Zotlabs/Module/Uexport.php:68 -#, php-format -msgid "" -"These content files may be imported or restored by visiting %2$s on any site containing your channel. For best results" -" please import or restore these in date order (oldest first)." -msgstr "Deze back-up-bestanden kunnen geïmporteerd of hersteld worden door op jouw hub en met jouw kanaal %2$s te bezoeken. Voor het beste resultaat kan je de bestanden in chronologische volgorde importeren of herstellen." +#: ../../Zotlabs/Module/Admin/Account_edit.php:46 +msgid "Account settings updated." +msgstr "Account-instellingen bijgewerkt." -#: ../../Zotlabs/Module/Editlayout.php:127 -#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188 -msgid "Layout Name" -msgstr "Naam lay-out" +#: ../../Zotlabs/Module/Admin/Account_edit.php:61 +msgid "Account not found." +msgstr "Account niet gevonden." -#: ../../Zotlabs/Module/Editlayout.php:128 -#: ../../Zotlabs/Module/Layouts.php:131 -msgid "Layout Description (Optional)" -msgstr "Lay-out-omschrijving (niet verplicht)" +#: ../../Zotlabs/Module/Admin/Account_edit.php:68 +msgid "Account Edit" +msgstr "Account bewerken" -#: ../../Zotlabs/Module/Editlayout.php:136 -msgid "Edit Layout" -msgstr "Lay-out bewerken" +#: ../../Zotlabs/Module/Admin/Account_edit.php:69 +msgid "New Password" +msgstr "Nieuw wachtwoord" -#: ../../Zotlabs/Module/Editwebpage.php:142 -msgid "Page link" -msgstr "Paginalink" +#: ../../Zotlabs/Module/Admin/Account_edit.php:70 +msgid "New Password again" +msgstr "Nieuw wachtwoord bevestigen" -#: ../../Zotlabs/Module/Editwebpage.php:169 -msgid "Edit Webpage" -msgstr "Webpagina bewerken" +#: ../../Zotlabs/Module/Admin/Account_edit.php:71 +msgid "Technical skill level" +msgstr "Technisch niveau" -#: ../../Zotlabs/Module/Apps.php:45 ../../include/nav.php:178 -msgid "Apps" -msgstr "Apps" +#: ../../Zotlabs/Module/Admin/Account_edit.php:72 +msgid "Account language (for emails)" +msgstr "Taal van account (voor e-mails)" -#: ../../Zotlabs/Module/Apps.php:48 -msgid "Manage apps" -msgstr "Apps beheren" +#: ../../Zotlabs/Module/Admin/Account_edit.php:73 +msgid "Service class" +msgstr "Abonnement" -#: ../../Zotlabs/Module/Apps.php:49 -msgid "Create new app" -msgstr "Nieuwe app aanmaken" +#: ../../Zotlabs/Module/Admin/Security.php:77 +msgid "" +"By default, unfiltered HTML is allowed in embedded media. This is inherently" +" insecure." +msgstr "Standaard is ongefilterde HTML in ingesloten (embedded) media toegestaan. Dit is inherent onveilig." -#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49 -msgid "This site is not a directory server" -msgstr "Deze hub is geen kanalengidshub (directoryserver)" +#: ../../Zotlabs/Module/Admin/Security.php:80 +msgid "" +"The recommended setting is to only allow unfiltered HTML from the following " +"sites:" +msgstr "Het wordt aanbevolen om alleen ongefilterde HTML van de volgende websites toe te staan:" -#: ../../Zotlabs/Module/Dirsearch.php:33 -msgid "This directory server requires an access token" -msgstr "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig" +#: ../../Zotlabs/Module/Admin/Security.php:81 +msgid "" +"https://youtube.com/
    https://www.youtube.com/
    https://youtu.be/https://vimeo.com/
    https://soundcloud.com/
    " +msgstr "https://youtube.com/
    https://www.youtube.com/
    https://youtu.be/
    https://vimeo.com/
    https://soundcloud.com/
    " -#: ../../Zotlabs/Module/Network.php:96 -msgid "No such group" -msgstr "Collectie niet gevonden" +#: ../../Zotlabs/Module/Admin/Security.php:82 +msgid "" +"All other embedded content will be filtered, unless " +"embedded content from that site is explicitly blocked." +msgstr "Alle andere ingesloten (embedded) inhoud wordt gefilterd, tenzij ingesloten (embedded) inhoud van een website expliciet wordt geblokkeerd." -#: ../../Zotlabs/Module/Network.php:136 -msgid "No such channel" -msgstr "Niet zo'n kanaal" +#: ../../Zotlabs/Module/Admin/Security.php:87 +#: ../../Zotlabs/Widget/Admin.php:25 +msgid "Security" +msgstr "Beveiliging" -#: ../../Zotlabs/Module/Network.php:141 -msgid "forum" -msgstr "forum" +#: ../../Zotlabs/Module/Admin/Security.php:89 +msgid "Block public" +msgstr "Openbare toegang blokkeren" -#: ../../Zotlabs/Module/Network.php:153 -msgid "Search Results For:" -msgstr "Zoekresultaten voor:" +#: ../../Zotlabs/Module/Admin/Security.php:89 +msgid "" +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently authenticated." +msgstr "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor leden die zich hebben geauthenticeerd." + +#: ../../Zotlabs/Module/Admin/Security.php:90 +msgid "Set \"Transport Security\" HTTP header" +msgstr "\"Transport Security\" HTTP-header inschakelen" + +#: ../../Zotlabs/Module/Admin/Security.php:91 +msgid "Set \"Content Security Policy\" HTTP header" +msgstr " \"Content Security Policy\" HTTP-header inschakelen" + +#: ../../Zotlabs/Module/Admin/Security.php:92 +msgid "Allowed email domains" +msgstr "Toegestane e-maildomeinen" + +#: ../../Zotlabs/Module/Admin/Security.php:92 +msgid "" +"Comma separated list of domains which are allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains" +msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te laten." -#: ../../Zotlabs/Module/Network.php:221 -msgid "Privacy group is empty" -msgstr "Privacygroep is leeg" +#: ../../Zotlabs/Module/Admin/Security.php:93 +msgid "Not allowed email domains" +msgstr "Niet toegestane e-maildomeinen" -#: ../../Zotlabs/Module/Network.php:230 -msgid "Privacy group: " -msgstr "Privacygroep: " +#: ../../Zotlabs/Module/Admin/Security.php:93 +msgid "" +"Comma separated list of domains which are not allowed in email addresses for" +" registrations to this site. Wildcards are accepted. Empty to allow any " +"domains, unless allowed domains have been defined." +msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen niet op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te staan, tenzij er toegestane domeinen zijn ingesteld. " -#: ../../Zotlabs/Module/Network.php:256 -msgid "Invalid connection." -msgstr "Ongeldige connectie." +#: ../../Zotlabs/Module/Admin/Security.php:94 +msgid "Allow communications only from these sites" +msgstr "Alleen communicatie met deze hubs toestaan" -#: ../../Zotlabs/Module/Network.php:275 -#: ../../extend/addon/addon/redred/redred.php:65 -msgid "Invalid channel." -msgstr "Onbekend kanaal." +#: ../../Zotlabs/Module/Admin/Security.php:94 +msgid "" +"One site per line. Leave empty to allow communication from anywhere by " +"default" +msgstr "Eén hub per regel. Laat leeg om communicatie standaard met alle hubs toe te staan" -#: ../../Zotlabs/Module/Menu.php:49 -msgid "Unable to update menu." -msgstr "Niet in staat om menu aan te passen" +#: ../../Zotlabs/Module/Admin/Security.php:95 +msgid "Block communications from these sites" +msgstr "Communicatie met deze hubs blokkeren" -#: ../../Zotlabs/Module/Menu.php:60 -msgid "Unable to create menu." -msgstr "Niet in staat om menu aan te maken." +#: ../../Zotlabs/Module/Admin/Security.php:96 +msgid "Allow communications only from these channels" +msgstr "Sta alleen communicatie toe met deze kanalen" -#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 -msgid "Menu Name" -msgstr "Menunaam" +#: ../../Zotlabs/Module/Admin/Security.php:96 +msgid "" +"One channel (hash) per line. Leave empty to allow from any channel by " +"default" +msgstr "Eén kanaal (hash) per regel. Laat leeg om communicatie standaard met alle kanalen toe te staan" -#: ../../Zotlabs/Module/Menu.php:98 -msgid "Unique name (not visible on webpage) - required" -msgstr "Unieke naam vereist (niet zichtbaar op webpagina)" +#: ../../Zotlabs/Module/Admin/Security.php:97 +msgid "Block communications from these channels" +msgstr "Communicatie met deze kanalen blokkeren" -#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 -msgid "Menu Title" -msgstr "Menutitel" +#: ../../Zotlabs/Module/Admin/Security.php:98 +msgid "Only allow embeds from secure (SSL) websites and links." +msgstr "Alleen ingesloten (embedded) inhoud van veilige (SSL) websites en links toestaan." -#: ../../Zotlabs/Module/Menu.php:99 -msgid "Visible on webpage - leave empty for no title" -msgstr "Zichtbaar op webpagina (leeg laten voor geen titel)" +#: ../../Zotlabs/Module/Admin/Security.php:99 +msgid "Allow unfiltered embedded HTML content only from these domains" +msgstr "Alleen ongefilterde ingesloten (embedded) HTML van deze websites toestaan" -#: ../../Zotlabs/Module/Menu.php:100 -msgid "Allow Bookmarks" -msgstr "Bladwijzers toestaan" +#: ../../Zotlabs/Module/Admin/Security.php:99 +msgid "One site per line. By default embedded content is filtered." +msgstr "Eén website per regel. Standaard wordt ingesloten (embedded) inhoud gefilterd." -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -msgid "Menu may be used to store saved bookmarks" -msgstr "Menu kan gebruikt worden om bladwijzers in op te slaan" +#: ../../Zotlabs/Module/Admin/Security.php:100 +msgid "Block embedded HTML from these domains" +msgstr "Ingesloten (embedded) HTML vanaf deze domeinen blokkeren" -#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159 -msgid "Submit and proceed" -msgstr "Opslaan en doorgaan" +#: ../../Zotlabs/Module/Lockview.php:75 +msgid "Remote privacy information not available." +msgstr "Privacy-informatie op afstand niet beschikbaar." -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2289 -msgid "Menus" -msgstr "Menu's" +#: ../../Zotlabs/Module/Lockview.php:96 +msgid "Visible to:" +msgstr "Zichtbaar voor:" -#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120 -msgid "Drop" -msgstr "Verwijderen" +#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 +#: ../../Zotlabs/Module/Acl.php:121 ../../include/acl_selectors.php:88 +msgctxt "acl" +msgid "Profile" +msgstr "Profiel" -#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:255 -#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190 -#: ../../include/page_widgets.php:47 -msgid "Created" -msgstr "Aangemaakt" +#: ../../Zotlabs/Module/Moderate.php:65 +msgid "Comment approved" +msgstr "Reactie goedgekeurd" -#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:256 -#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191 -#: ../../include/page_widgets.php:48 -msgid "Edited" -msgstr "Bewerkt" +#: ../../Zotlabs/Module/Moderate.php:69 +msgid "Comment deleted" +msgstr "Reactie verwijderd" -#: ../../Zotlabs/Module/Menu.php:117 -msgid "Bookmarks allowed" -msgstr "Bladwijzers toegestaan" +#: ../../Zotlabs/Module/Settings/Permcats.php:23 +msgid "Permission Name is required." +msgstr "Permissienaam is vereist" -#: ../../Zotlabs/Module/Menu.php:119 -msgid "Delete this menu" -msgstr "Menu verwijderen" +#: ../../Zotlabs/Module/Settings/Permcats.php:42 +msgid "Permission category saved." +msgstr "Permissiegroep opgeslagen." -#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154 -msgid "Edit menu contents" -msgstr "Bewerk de inhoud van het menu" +#: ../../Zotlabs/Module/Settings/Permcats.php:66 +msgid "" +"Use this form to create permission rules for various classes of people or " +"connections." +msgstr "Gebruik dit formulier om permissieregels voor diverse soorten mensen en connecties aan te maken." -#: ../../Zotlabs/Module/Menu.php:121 -msgid "Edit this menu" -msgstr "Dit menu bewerken" +#: ../../Zotlabs/Module/Settings/Permcats.php:99 +msgid "Permission Categories" +msgstr "Permissiegroepen" -#: ../../Zotlabs/Module/Menu.php:136 -msgid "Menu could not be deleted." -msgstr "Menu kon niet verwijderd worden." +#: ../../Zotlabs/Module/Settings/Permcats.php:107 +msgid "Permission Name" +msgstr "Permissienaam" -#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28 -msgid "Menu not found." -msgstr "Menu niet gevonden." +#: ../../Zotlabs/Module/Settings/Permcats.php:108 +#: ../../Zotlabs/Module/Settings/Tokens.php:161 +#: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250 +msgid "My Settings" +msgstr "Mijn instellingen" -#: ../../Zotlabs/Module/Menu.php:149 -msgid "Edit Menu" -msgstr "Menu bewerken" +#: ../../Zotlabs/Module/Settings/Permcats.php:110 +#: ../../Zotlabs/Module/Settings/Tokens.php:163 +#: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248 +msgid "inherited" +msgstr "geërfd" -#: ../../Zotlabs/Module/Menu.php:153 -msgid "Add or remove entries to this menu" -msgstr "Items aan dit menu toevoegen of verwijder" +#: ../../Zotlabs/Module/Settings/Permcats.php:113 +#: ../../Zotlabs/Module/Settings/Tokens.php:166 +#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253 +msgid "Individual Permissions" +msgstr "Individuele permissies" -#: ../../Zotlabs/Module/Menu.php:155 -msgid "Menu name" -msgstr "Naam van menu" +#: ../../Zotlabs/Module/Settings/Permcats.php:114 +#: ../../Zotlabs/Module/Settings/Tokens.php:167 +#: ../../Zotlabs/Module/Connedit.php:894 +msgid "" +"Some permissions may be inherited from your channel's privacy settings, which have higher " +"priority than individual settings. You can not change those" +" settings here." +msgstr "Sommige permissies worden mogelijk overgeërfd van de privacyinstellingen van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier niet veranderen." + +#: ../../Zotlabs/Module/Settings/Channel.php:64 +#: ../../Zotlabs/Module/Settings/Channel.php:68 +#: ../../Zotlabs/Module/Settings/Channel.php:69 +#: ../../Zotlabs/Module/Settings/Channel.php:72 +#: ../../Zotlabs/Module/Settings/Channel.php:83 +#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:24 +#: ../../include/selectors.php:123 ../../include/channel.php:437 +#: ../../include/channel.php:438 ../../include/channel.php:445 +msgid "Friends" +msgstr "Vrienden" -#: ../../Zotlabs/Module/Menu.php:155 -msgid "Must be unique, only seen by you" -msgstr "Moet uniek zijn en is alleen zichtbaar voor jou." +#: ../../Zotlabs/Module/Settings/Channel.php:264 +#: ../../Zotlabs/Module/Defperms.php:103 +#: ../../addon/rendezvous/rendezvous.php:82 +#: ../../addon/openstreetmap/openstreetmap.php:184 +#: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54 +#: ../../addon/twitter/twitter.php:772 ../../addon/piwik/piwik.php:116 +#: ../../addon/xmpp/xmpp.php:102 +msgid "Settings updated." +msgstr "Instellingen bijgewerkt." -#: ../../Zotlabs/Module/Menu.php:156 -msgid "Menu title" -msgstr "Titel van menu" +#: ../../Zotlabs/Module/Settings/Channel.php:325 +msgid "Nobody except yourself" +msgstr "Niemand, behalve jezelf" -#: ../../Zotlabs/Module/Menu.php:156 -msgid "Menu title as seen by others" -msgstr "Titel van menu zoals anderen dat zien." +#: ../../Zotlabs/Module/Settings/Channel.php:326 +msgid "Only those you specifically allow" +msgstr "Alleen connecties met uitdrukkelijke toestemming" -#: ../../Zotlabs/Module/Menu.php:157 -msgid "Allow bookmarks" -msgstr "Bladwijzers toestaan" +#: ../../Zotlabs/Module/Settings/Channel.php:327 +msgid "Approved connections" +msgstr "Geaccepteerde connecties" -#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120 -#: ../../Zotlabs/Module/Xchan.php:41 -msgid "Not found." -msgstr "Niet gevonden." +#: ../../Zotlabs/Module/Settings/Channel.php:328 +msgid "Any connections" +msgstr "Alle connecties" -#: ../../Zotlabs/Module/Rpost.php:138 ../../Zotlabs/Module/Editpost.php:108 -msgid "Edit post" -msgstr "Bericht bewerken" +#: ../../Zotlabs/Module/Settings/Channel.php:329 +msgid "Anybody on this website" +msgstr "Iedereen op deze hub" -#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 -msgid "Location not found." -msgstr "Locatie niet gevonden." +#: ../../Zotlabs/Module/Settings/Channel.php:330 +msgid "Anybody in this network" +msgstr "Iedereen in dit netwerk" -#: ../../Zotlabs/Module/Locs.php:62 -msgid "Location lookup failed." -msgstr "Opzoeken locatie mislukt" +#: ../../Zotlabs/Module/Settings/Channel.php:331 +msgid "Anybody authenticated" +msgstr "Geauthenticeerd" -#: ../../Zotlabs/Module/Locs.php:66 -msgid "" -"Please select another location to become primary before removing the primary" -" location." -msgstr "Kies eerst een andere primaire locatie alvorens de huidige primaire locatie te verwijderen." +#: ../../Zotlabs/Module/Settings/Channel.php:332 +msgid "Anybody on the internet" +msgstr "Iedereen op het internet" -#: ../../Zotlabs/Module/Locs.php:95 -msgid "Syncing locations" -msgstr "Locaties synchronizeren" +#: ../../Zotlabs/Module/Settings/Channel.php:407 +msgid "Publish your default profile in the network directory" +msgstr "Publiceer je standaardprofiel in de kanalengids" -#: ../../Zotlabs/Module/Locs.php:105 -msgid "No locations found." -msgstr "Geen locaties gevonden." +#: ../../Zotlabs/Module/Settings/Channel.php:412 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen" -#: ../../Zotlabs/Module/Locs.php:116 -msgid "Manage Channel Locations" -msgstr "Kanaallocaties beheren" +#: ../../Zotlabs/Module/Settings/Channel.php:416 +msgid "or" +msgstr "of" -#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51 -#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509 -#: ../../Zotlabs/Module/Profiles.php:737 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839 -#: ../../include/js_strings.php:25 -msgid "Location" -msgstr "Locatie" +#: ../../Zotlabs/Module/Settings/Channel.php:425 +msgid "Your channel address is" +msgstr "Jouw kanaaladres is" -#: ../../Zotlabs/Module/Locs.php:119 -msgid "Primary" -msgstr "Primair" +#: ../../Zotlabs/Module/Settings/Channel.php:428 +msgid "Your files/photos are accessible via WebDAV at" +msgstr "Jouw bestanden/foto's zijn beschikbaar via WebDAV op" -#: ../../Zotlabs/Module/Locs.php:122 -msgid "Sync Now" -msgstr "Nu synchroniseren" +#: ../../Zotlabs/Module/Settings/Channel.php:493 +msgid "Channel Settings" +msgstr "Kanaalinstellingen" -#: ../../Zotlabs/Module/Locs.php:123 -msgid "Please wait several minutes between consecutive operations." -msgstr "Wacht enkele minuten tussen opeenvolgende handelingen." +#: ../../Zotlabs/Module/Settings/Channel.php:500 +msgid "Basic Settings" +msgstr "Basis-instellingen" -#: ../../Zotlabs/Module/Locs.php:124 -msgid "" -"When possible, drop a location by logging into that website/hub and removing" -" your channel." -msgstr "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen door op de hub van de kloon in te loggen en het kanaal daar te verwijderen." +#: ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../include/channel.php:1521 +msgid "Full Name:" +msgstr "Volledige naam:" -#: ../../Zotlabs/Module/Locs.php:125 -msgid "Use this form to drop the location if the hub is no longer operating." -msgstr "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is." +#: ../../Zotlabs/Module/Settings/Channel.php:502 +#: ../../Zotlabs/Module/Settings/Account.php:119 +msgid "Email Address:" +msgstr "E-mailadres:" -#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1401 -msgid "Public Hubs" -msgstr "Openbare hubs" +#: ../../Zotlabs/Module/Settings/Channel.php:503 +msgid "Your Timezone:" +msgstr "Jouw tijdzone:" -#: ../../Zotlabs/Module/Pubsites.php:27 -msgid "" -"The listed hubs allow public registration for the $Projectname network. All " -"hubs in the network are interlinked so membership on any of them conveys " -"membership in the network as a whole. Some hubs may require subscription or " -"provide tiered service plans. The hub itself may provide " -"additional details." -msgstr "Op de hier weergegeven hubs kan iedereen zich voor het $Projectname-netwerk aanmelden. Alle hubs in het netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen een financiële tegemoetkoming voor bepaalde uitbreidingen. Mogelijk wordt hierover op de hub zelf meer informatie gegeven." +#: ../../Zotlabs/Module/Settings/Channel.php:504 +msgid "Default Post Location:" +msgstr "Standaardlocatie bericht:" -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Hub URL" -msgstr "Hub-URL" +#: ../../Zotlabs/Module/Settings/Channel.php:504 +msgid "Geographical location to display on your posts" +msgstr "Geografische locatie die bij het bericht moet worden vermeld" -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Access Type" -msgstr "Toegangs-
     type" +#: ../../Zotlabs/Module/Settings/Channel.php:505 +msgid "Use Browser Location:" +msgstr "Locatie van webbrowser gebruiken:" -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Registration Policy" -msgstr "Registratie-
     beleid" +#: ../../Zotlabs/Module/Settings/Channel.php:507 +msgid "Adult Content" +msgstr "Inhoud voor volwassenen" -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Stats" -msgstr "Stats" +#: ../../Zotlabs/Module/Settings/Channel.php:507 +msgid "" +"This channel frequently or regularly publishes adult content. (Please tag " +"any adult material and/or nudity with #NSFW)" +msgstr "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassenen. (Gebruik de tag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)" -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Software" -msgstr "Software" +#: ../../Zotlabs/Module/Settings/Channel.php:509 +msgid "Security and Privacy Settings" +msgstr "Veiligheids- en privacyinstellingen " -#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97 -#: ../../include/conversation.php:941 ../../include/conversation.php:1099 -msgid "Ratings" -msgstr "Beoordelingen" +#: ../../Zotlabs/Module/Settings/Channel.php:511 +msgid "Your permissions are already configured. Click to view/adjust" +msgstr "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen." -#: ../../Zotlabs/Module/Pubsites.php:48 -msgid "Rate" -msgstr "Beoordeel" +#: ../../Zotlabs/Module/Settings/Channel.php:513 +msgid "Hide my online presence" +msgstr "Verberg mijn aanwezigheid" -#: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Events.php:694 -#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Blocks.php:166 -#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Wiki.php:166 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151 -#: ../../include/page_widgets.php:42 -msgid "View" -msgstr "Weergeven" +#: ../../Zotlabs/Module/Settings/Channel.php:513 +msgid "Prevents displaying in your profile that you are online" +msgstr "Voorkomt dat op je kanaalpagina te zien valt dat je momenteel op $Projectname aanwezig bent" -#: ../../Zotlabs/Module/Connedit.php:82 -msgid "Could not access contact record." -msgstr "Kon geen toegang krijgen tot de connectie-gegevens." +#: ../../Zotlabs/Module/Settings/Channel.php:515 +msgid "Simple Privacy Settings:" +msgstr "Eenvoudige privacyinstellingen:" -#: ../../Zotlabs/Module/Connedit.php:112 -msgid "Could not locate selected profile." -msgstr "Kon het gekozen profiel niet vinden." +#: ../../Zotlabs/Module/Settings/Channel.php:516 +msgid "" +"Very Public - extremely permissive (should be used with caution)" +msgstr "Zeer openbaar (kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)" -#: ../../Zotlabs/Module/Connedit.php:249 -msgid "Connection updated." -msgstr "Connectie bijgewerkt." +#: ../../Zotlabs/Module/Settings/Channel.php:517 +msgid "" +"Typical - default public, privacy when desired (similar to social " +"network permissions but with improved privacy)" +msgstr "Normaal (standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)" -#: ../../Zotlabs/Module/Connedit.php:251 -msgid "Failed to update connection record." -msgstr "Bijwerken van connectie-gegevens mislukt." +#: ../../Zotlabs/Module/Settings/Channel.php:518 +msgid "Private - default private, never open or public" +msgstr "Privé (standaard privé en nooit openbaar)" -#: ../../Zotlabs/Module/Connedit.php:301 -msgid "is now connected to" -msgstr "is nu verbonden met" +#: ../../Zotlabs/Module/Settings/Channel.php:519 +msgid "Blocked - default blocked to/from everybody" +msgstr "Geblokkeerd (standaard geblokkeerd naar/van iedereen)" -#: ../../Zotlabs/Module/Connedit.php:434 -msgid "Could not access address book record." -msgstr "Kon geen toegang krijgen tot de record van de connectie." +#: ../../Zotlabs/Module/Settings/Channel.php:521 +msgid "Allow others to tag your posts" +msgstr "Anderen toestaan om je berichten te taggen" -#: ../../Zotlabs/Module/Connedit.php:482 -msgid "Refresh failed - channel is currently unavailable." -msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar" +#: ../../Zotlabs/Module/Settings/Channel.php:521 +msgid "" +"Often used by the community to retro-actively flag inappropriate content" +msgstr "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren" -#: ../../Zotlabs/Module/Connedit.php:497 ../../Zotlabs/Module/Connedit.php:506 -#: ../../Zotlabs/Module/Connedit.php:515 ../../Zotlabs/Module/Connedit.php:524 -#: ../../Zotlabs/Module/Connedit.php:537 -msgid "Unable to set address book parameters." -msgstr "Niet in staat om de parameters van connecties in te stellen." +#: ../../Zotlabs/Module/Settings/Channel.php:523 +msgid "Channel Permission Limits" +msgstr "Geavanceerde permissies" -#: ../../Zotlabs/Module/Connedit.php:561 -msgid "Connection has been removed." -msgstr "Connectie is verwijderd" +#: ../../Zotlabs/Module/Settings/Channel.php:525 +msgid "Expire other channel content after this many days" +msgstr "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:" -#: ../../Zotlabs/Module/Connedit.php:601 ../../Zotlabs/Lib/Apps.php:228 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:57 -#: ../../include/conversation.php:936 ../../include/conversation.php:1049 -#: ../../include/nav.php:103 -msgid "View Profile" -msgstr "Profiel weergeven" +#: ../../Zotlabs/Module/Settings/Channel.php:525 +msgid "0 or blank to use the website limit." +msgstr "0 of leeg om het standaard aantal dagen van deze hub te gebruiken." -#: ../../Zotlabs/Module/Connedit.php:604 +#: ../../Zotlabs/Module/Settings/Channel.php:525 #, php-format -msgid "View %s's profile" -msgstr "Profiel van %s weergeven" - -#: ../../Zotlabs/Module/Connedit.php:608 -msgid "Refresh Permissions" -msgstr "Permissies vernieuwen" +msgid "This website expires after %d days." +msgstr "Deze hub laat de inhoud van andere kanalen na %d dagen verlopen." -#: ../../Zotlabs/Module/Connedit.php:611 -msgid "Fetch updated permissions" -msgstr "Aangepaste permissies ophalen" +#: ../../Zotlabs/Module/Settings/Channel.php:525 +msgid "This website does not expire imported content." +msgstr "Deze hub laat de inhoud van andere kanalen niet verlopen." -#: ../../Zotlabs/Module/Connedit.php:615 -msgid "Refresh Photo" -msgstr "Foto vernieuwen" +#: ../../Zotlabs/Module/Settings/Channel.php:525 +msgid "The website limit takes precedence if lower than your limit." +msgstr "Wanneer de standaard aantal dagen van deze hub lager ligt dan jouw aantal, dan heeft de limiet van deze hub voorrang." -#: ../../Zotlabs/Module/Connedit.php:618 -msgid "Fetch updated photo" -msgstr "Aangepaste foto ophalen" +#: ../../Zotlabs/Module/Settings/Channel.php:526 +msgid "Maximum Friend Requests/Day:" +msgstr "Maximum aantal connectieverzoeken per dag:" -#: ../../Zotlabs/Module/Connedit.php:622 -msgid "Recent Activity" -msgstr "Recente activiteit/berichten" +#: ../../Zotlabs/Module/Settings/Channel.php:526 +msgid "May reduce spam activity" +msgstr "Kan eventuele spam verminderen" -#: ../../Zotlabs/Module/Connedit.php:625 -msgid "View recent posts and comments" -msgstr "Recente berichten en reacties weergeven" +#: ../../Zotlabs/Module/Settings/Channel.php:527 +msgid "Default Privacy Group" +msgstr "Standaard privacygroep" -#: ../../Zotlabs/Module/Connedit.php:632 -msgid "Block (or Unblock) all communications with this connection" -msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie" +#: ../../Zotlabs/Module/Settings/Channel.php:529 +msgid "Use my default audience setting for the type of object published" +msgstr "Gebruik mijn standaard privacyinstelling voor dit type publicatie" -#: ../../Zotlabs/Module/Connedit.php:633 -msgid "This connection is blocked!" -msgstr "Deze connectie is geblokkeerd!" +#: ../../Zotlabs/Module/Settings/Channel.php:530 +msgid "Profile to assign new connections" +msgstr "Profiel om aan nieuwe connecties toe te wijzen" -#: ../../Zotlabs/Module/Connedit.php:637 -msgid "Unignore" -msgstr "Niet meer negeren" +#: ../../Zotlabs/Module/Settings/Channel.php:540 +msgid "Default Permissions Group" +msgstr "Standaard permissiegroep" -#: ../../Zotlabs/Module/Connedit.php:640 -msgid "Ignore (or Unignore) all inbound communications from this connection" -msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie" +#: ../../Zotlabs/Module/Settings/Channel.php:546 +msgid "Maximum private messages per day from unknown people:" +msgstr "Maximum aantal privé-berichten per dag van onbekende personen:" -#: ../../Zotlabs/Module/Connedit.php:641 -msgid "This connection is ignored!" -msgstr "Deze connectie wordt genegeerd!" +#: ../../Zotlabs/Module/Settings/Channel.php:546 +msgid "Useful to reduce spamming" +msgstr "Kan eventuele spam verminderen" -#: ../../Zotlabs/Module/Connedit.php:645 -msgid "Unarchive" -msgstr "Niet meer archiveren" +#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Lib/Enotify.php:68 +msgid "Notification Settings" +msgstr "Meldingen" -#: ../../Zotlabs/Module/Connedit.php:645 -msgid "Archive" -msgstr "Archiveren" +#: ../../Zotlabs/Module/Settings/Channel.php:550 +msgid "By default post a status message when:" +msgstr "Plaats automatisch een bericht wanneer:" -#: ../../Zotlabs/Module/Connedit.php:648 -msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" -msgstr "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud" +#: ../../Zotlabs/Module/Settings/Channel.php:551 +msgid "accepting a friend request" +msgstr "Een connectieverzoek wordt geaccepteerd" -#: ../../Zotlabs/Module/Connedit.php:649 -msgid "This connection is archived!" -msgstr "Deze connectie is gearchiveerd!" +#: ../../Zotlabs/Module/Settings/Channel.php:552 +msgid "joining a forum/community" +msgstr "Je lid wordt van een forum/groep" -#: ../../Zotlabs/Module/Connedit.php:653 -msgid "Unhide" -msgstr "Niet meer verbergen" +#: ../../Zotlabs/Module/Settings/Channel.php:553 +msgid "making an interesting profile change" +msgstr "Er sprake is van een interessante profielwijziging" -#: ../../Zotlabs/Module/Connedit.php:653 -msgid "Hide" -msgstr "Verbergen" +#: ../../Zotlabs/Module/Settings/Channel.php:554 +msgid "Send a notification email when:" +msgstr "Verzend een melding per e-mail wanneer:" -#: ../../Zotlabs/Module/Connedit.php:656 -msgid "Hide or Unhide this connection from your other connections" -msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties" +#: ../../Zotlabs/Module/Settings/Channel.php:555 +msgid "You receive a connection request" +msgstr "Je een connectieverzoek ontvangt" -#: ../../Zotlabs/Module/Connedit.php:657 -msgid "This connection is hidden!" -msgstr "Deze connectie is verborgen!" +#: ../../Zotlabs/Module/Settings/Channel.php:556 +msgid "Your connections are confirmed" +msgstr "Jouw connecties zijn bevestigd" -#: ../../Zotlabs/Module/Connedit.php:664 -msgid "Delete this connection" -msgstr "Deze connectie verwijderen" +#: ../../Zotlabs/Module/Settings/Channel.php:557 +msgid "Someone writes on your profile wall" +msgstr "Iemand iets op jouw kanaal heeft geschreven" -#: ../../Zotlabs/Module/Connedit.php:672 -msgid "Fetch Vcard" -msgstr "Vcard ophalen" +#: ../../Zotlabs/Module/Settings/Channel.php:558 +msgid "Someone writes a followup comment" +msgstr "Iemand een reactie schrijft" -#: ../../Zotlabs/Module/Connedit.php:675 -msgid "Fetch electronic calling card for this connection" -msgstr "Visitekaartje van deze connectie ophalen" +#: ../../Zotlabs/Module/Settings/Channel.php:559 +msgid "You receive a private message" +msgstr "Je een privé-bericht ontvangt" -#: ../../Zotlabs/Module/Connedit.php:683 -#: ../../Zotlabs/Module/Filestorage.php:152 -#: ../../Zotlabs/Module/Photos.php:657 ../../Zotlabs/Module/Photos.php:1042 -#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363 -#: ../../Zotlabs/Module/Chat.php:232 ../../include/acl_selectors.php:218 -msgid "Permissions" -msgstr "Permissies" +#: ../../Zotlabs/Module/Settings/Channel.php:560 +msgid "You receive a friend suggestion" +msgstr "Je een kanaalvoorstel ontvangt" -#: ../../Zotlabs/Module/Connedit.php:686 -msgid "Open Individual Permissions section by default" -msgstr "Sectie met individuele permissies standaard openen" +#: ../../Zotlabs/Module/Settings/Channel.php:561 +msgid "You are tagged in a post" +msgstr "Je expliciet in een bericht bent genoemd" -#: ../../Zotlabs/Module/Connedit.php:709 -msgid "Affinity" -msgstr "Affiniteit" +#: ../../Zotlabs/Module/Settings/Channel.php:562 +msgid "You are poked/prodded/etc. in a post" +msgstr "Je bent in een bericht aangestoten/gepord/etc." -#: ../../Zotlabs/Module/Connedit.php:712 -msgid "Open Set Affinity section by default" -msgstr "Sectie met de affiniteitsinstelling standaard openen" +#: ../../Zotlabs/Module/Settings/Channel.php:564 +msgid "Someone likes your post/comment" +msgstr "Iemand jouw bericht/reactie leuk vindt" -#: ../../Zotlabs/Module/Connedit.php:716 ../../include/widgets.php:526 -msgid "Me" -msgstr "Ik" +#: ../../Zotlabs/Module/Settings/Channel.php:567 +msgid "Show visual notifications including:" +msgstr "Toon de volgende zichtbare meldingen:" -#: ../../Zotlabs/Module/Connedit.php:717 ../../include/widgets.php:527 -msgid "Family" -msgstr "Familie" +#: ../../Zotlabs/Module/Settings/Channel.php:569 +msgid "Unseen grid activity" +msgstr "Niet bekeken tijdlijnactiviteit" -#: ../../Zotlabs/Module/Connedit.php:718 -#: ../../Zotlabs/Module/Settings/Channel.php:62 -#: ../../Zotlabs/Module/Settings/Channel.php:66 -#: ../../Zotlabs/Module/Settings/Channel.php:67 -#: ../../Zotlabs/Module/Settings/Channel.php:70 -#: ../../Zotlabs/Module/Settings/Channel.php:81 ../../include/widgets.php:528 -#: ../../include/selectors.php:123 ../../include/channel.php:408 -#: ../../include/channel.php:409 ../../include/channel.php:416 -msgid "Friends" -msgstr "Vrienden" +#: ../../Zotlabs/Module/Settings/Channel.php:570 +msgid "Unseen channel activity" +msgstr "Niet bekeken kanaalactiviteit" -#: ../../Zotlabs/Module/Connedit.php:719 ../../include/widgets.php:529 -msgid "Acquaintances" -msgstr "Kennissen" +#: ../../Zotlabs/Module/Settings/Channel.php:571 +msgid "Unseen private messages" +msgstr "Niet bekeken privéberichten" -#: ../../Zotlabs/Module/Connedit.php:746 -msgid "Filter" -msgstr "Filter" +#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../addon/jappixmini/jappixmini.php:343 +msgid "Recommended" +msgstr "Aanbevolen" -#: ../../Zotlabs/Module/Connedit.php:749 -msgid "Open Custom Filter section by default" -msgstr "Sectie met de berichtenfilter standaard openen" +#: ../../Zotlabs/Module/Settings/Channel.php:572 +msgid "Upcoming events" +msgstr "Aankomende gebeurtenissen" -#: ../../Zotlabs/Module/Connedit.php:786 -msgid "Approve this connection" -msgstr "Deze connectie accepteren" +#: ../../Zotlabs/Module/Settings/Channel.php:573 +msgid "Events today" +msgstr "Gebeurtenissen van vandaag" -#: ../../Zotlabs/Module/Connedit.php:786 -msgid "Accept connection to allow communication" -msgstr "Keur deze connectie goed om communicatie toe te staan" +#: ../../Zotlabs/Module/Settings/Channel.php:574 +msgid "Upcoming birthdays" +msgstr "Aankomende verjaardagen" -#: ../../Zotlabs/Module/Connedit.php:791 -msgid "Set Affinity" -msgstr "Affiniteit instellen" +#: ../../Zotlabs/Module/Settings/Channel.php:574 +msgid "Not available in all themes" +msgstr "Niet in alle thema's beschikbaar" -#: ../../Zotlabs/Module/Connedit.php:794 -msgid "Set Profile" -msgstr "Profiel instellen" +#: ../../Zotlabs/Module/Settings/Channel.php:575 +msgid "System (personal) notifications" +msgstr "(Persoonlijke) systeemmeldingen" -#: ../../Zotlabs/Module/Connedit.php:797 -msgid "Set Affinity & Profile" -msgstr "Affiniteit en profiel instellen" +#: ../../Zotlabs/Module/Settings/Channel.php:576 +msgid "System info messages" +msgstr "Systeemmededelingen" -#: ../../Zotlabs/Module/Connedit.php:855 -msgid "none" -msgstr "geen" +#: ../../Zotlabs/Module/Settings/Channel.php:577 +msgid "System critical alerts" +msgstr "Kritische systeemwaarschuwingen" -#: ../../Zotlabs/Module/Connedit.php:858 ../../include/widgets.php:661 -msgid "Connection Default Permissions" -msgstr "Standaard permissies voor connecties" +#: ../../Zotlabs/Module/Settings/Channel.php:578 +msgid "New connections" +msgstr "Nieuwe connecties" -#: ../../Zotlabs/Module/Connedit.php:858 ../../include/items.php:3934 -#, php-format -msgid "Connection: %s" -msgstr "Connectie: %s" +#: ../../Zotlabs/Module/Settings/Channel.php:579 +msgid "System Registrations" +msgstr "Nieuwe accountregistraties op deze hub" -#: ../../Zotlabs/Module/Connedit.php:859 -msgid "Apply these permissions automatically" -msgstr "Deze permissies automatisch toepassen" +#: ../../Zotlabs/Module/Settings/Channel.php:580 +msgid "Unseen shared files" +msgstr "Niet bekeken gedeelde bestanden" -#: ../../Zotlabs/Module/Connedit.php:859 -msgid "Connection requests will be approved without your interaction" -msgstr "Connectieverzoeken zullen automatisch worden geaccepteerd" +#: ../../Zotlabs/Module/Settings/Channel.php:581 +msgid "Unseen public activity" +msgstr "Niet bekeken openbare activiteit" -#: ../../Zotlabs/Module/Connedit.php:860 -msgid "Permission role" -msgstr "Permissietype" +#: ../../Zotlabs/Module/Settings/Channel.php:582 +msgid "Unseen likes and dislikes" +msgstr "Niet bekeken vind-ik-leuks en vind-ik-niet-leuks" -#: ../../Zotlabs/Module/Connedit.php:861 -msgid "Add permission role" -msgstr "Permissietype toevoegen" +#: ../../Zotlabs/Module/Settings/Channel.php:583 +msgid "Email notification hub (hostname)" +msgstr "Hub voor e-mailmeldingen (hostnaam)" -#: ../../Zotlabs/Module/Connedit.php:867 -msgid "This connection's primary address is" -msgstr "Het primaire kanaaladres van deze connectie is" +#: ../../Zotlabs/Module/Settings/Channel.php:583 +#, php-format +msgid "" +"If your channel is mirrored to multiple hubs, set this to your preferred " +"location. This will prevent duplicate email notifications. Example: %s" +msgstr "Wanneer jouw kanaal naar een of meerdere hubs is gekloond, kun je hier bepalen welke hub je voor e-mailmeldingen wilt gebruiken. Dit voorkomt dubbele e-mailmeldingen. Voorbeeld:%s" -#: ../../Zotlabs/Module/Connedit.php:868 -msgid "Available locations:" -msgstr "Beschikbare locaties:" +#: ../../Zotlabs/Module/Settings/Channel.php:584 +msgid "Show new wall posts, private messages and connections under Notices" +msgstr "Toon nieuwe kanaalberichten, privéberichten en connecties onder Meldingen" -#: ../../Zotlabs/Module/Connedit.php:872 -msgid "" -"The permissions indicated on this page will be applied to all new " -"connections." -msgstr "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast." +#: ../../Zotlabs/Module/Settings/Channel.php:586 +msgid "Notify me of events this many days in advance" +msgstr "Herinner mij zoveel dagen van te voren aan gebeurtenissen" -#: ../../Zotlabs/Module/Connedit.php:873 -msgid "Connection Tools" -msgstr "Hulpmiddelen" +#: ../../Zotlabs/Module/Settings/Channel.php:586 +msgid "Must be greater than 0" +msgstr "Moet hoger dan 0 zijn" -#: ../../Zotlabs/Module/Connedit.php:875 -msgid "Slide to adjust your degree of friendship" -msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag" +#: ../../Zotlabs/Module/Settings/Channel.php:592 +msgid "Advanced Account/Page Type Settings" +msgstr "Instellingen geavanceerd account/paginatype" -#: ../../Zotlabs/Module/Connedit.php:876 ../../Zotlabs/Module/Rate.php:155 -#: ../../include/js_strings.php:20 -msgid "Rating" -msgstr "Beoordeling" +#: ../../Zotlabs/Module/Settings/Channel.php:593 +msgid "Change the behaviour of this account for special situations" +msgstr "Verander het gedrag van dit account voor speciale situaties" -#: ../../Zotlabs/Module/Connedit.php:877 -msgid "Slide to adjust your rating" -msgstr "Gebruik de schuif om je beoordeling te geven" +#: ../../Zotlabs/Module/Settings/Channel.php:595 +msgid "Miscellaneous Settings" +msgstr "Diverse instellingen" -#: ../../Zotlabs/Module/Connedit.php:878 ../../Zotlabs/Module/Connedit.php:883 -msgid "Optionally explain your rating" -msgstr "Verklaar jouw beoordeling (niet verplicht)" +#: ../../Zotlabs/Module/Settings/Channel.php:596 +msgid "Default photo upload folder" +msgstr "Standaard fotoalbum voor uploads" -#: ../../Zotlabs/Module/Connedit.php:880 -msgid "Custom Filter" -msgstr "Berichtenfilter" +#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:597 +msgid "%Y - current year, %m - current month" +msgstr "%Y - dit jaar, %m - deze maand" -#: ../../Zotlabs/Module/Connedit.php:881 -msgid "Only import posts with this text" -msgstr "Importeer alleen berichten met deze tekst" +#: ../../Zotlabs/Module/Settings/Channel.php:597 +msgid "Default file upload folder" +msgstr "Standaard bestandsmap voor uploads" -#: ../../Zotlabs/Module/Connedit.php:881 ../../Zotlabs/Module/Connedit.php:882 -msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" -msgstr "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1) - laat leeg om alle berichten te importeren" +#: ../../Zotlabs/Module/Settings/Channel.php:599 +msgid "Personal menu to display in your channel pages" +msgstr "Persoonlijk menu om op je kanaalpagina's te tonen" -#: ../../Zotlabs/Module/Connedit.php:882 -msgid "Do not import posts with this text" -msgstr "Importeer geen berichten met deze tekst" +#: ../../Zotlabs/Module/Settings/Channel.php:601 +msgid "Remove this channel." +msgstr "Verwijder dit kanaal." -#: ../../Zotlabs/Module/Connedit.php:884 -msgid "This information is public!" -msgstr "Deze informatie is openbaar!" +#: ../../Zotlabs/Module/Settings/Channel.php:602 +msgid "Firefox Share $Projectname provider" +msgstr "$Projectname-service voor Firefox Share" -#: ../../Zotlabs/Module/Connedit.php:889 -msgid "Connection Pending Approval" -msgstr "Connectie moet nog geaccepteerd worden" +#: ../../Zotlabs/Module/Settings/Channel.php:603 +msgid "Start calendar week on Monday" +msgstr "Begin kalenderweek op maandag" -#: ../../Zotlabs/Module/Connedit.php:892 -#: ../../Zotlabs/Module/Settings/Permcats.php:107 -#: ../../Zotlabs/Module/Settings/Tokens.php:163 -msgid "inherited" -msgstr "geërfd" +#: ../../Zotlabs/Module/Settings/Features.php:73 +msgid "Additional Features" +msgstr "Extra functies" -#: ../../Zotlabs/Module/Connedit.php:894 -#, php-format +#: ../../Zotlabs/Module/Settings/Features.php:74 +#: ../../Zotlabs/Module/Settings/Account.php:116 +msgid "Your technical skill level" +msgstr "Jouw technisch niveau" + +#: ../../Zotlabs/Module/Settings/Features.php:74 +#: ../../Zotlabs/Module/Settings/Account.php:116 msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken." +"Used to provide a member experience and additional features consistent with " +"your comfort level" +msgstr "Wordt gebruikt om je een gebruikerservaring en extra functies te bieden die met jouw technisch niveau overeenkomt" -#: ../../Zotlabs/Module/Connedit.php:896 -#: ../../Zotlabs/Module/Settings/Tokens.php:160 -msgid "Their Settings" -msgstr "Hun instellingen" +#: ../../Zotlabs/Module/Settings/Tokens.php:31 +#, php-format +msgid "This channel is limited to %d tokens" +msgstr "Dit kanaal heeft een limiet van %d tokens" -#: ../../Zotlabs/Module/Connedit.php:897 -#: ../../Zotlabs/Module/Settings/Permcats.php:105 -#: ../../Zotlabs/Module/Settings/Tokens.php:161 -msgid "My Settings" -msgstr "Mijn instellingen" +#: ../../Zotlabs/Module/Settings/Tokens.php:37 +msgid "Name and Password are required." +msgstr "Naam en wachtwoord zijn vereist" -#: ../../Zotlabs/Module/Connedit.php:899 -#: ../../Zotlabs/Module/Settings/Permcats.php:110 -#: ../../Zotlabs/Module/Settings/Tokens.php:166 -msgid "Individual Permissions" -msgstr "Individuele permissies" +#: ../../Zotlabs/Module/Settings/Tokens.php:77 +msgid "Token saved." +msgstr "Token opgeslagen." -#: ../../Zotlabs/Module/Connedit.php:900 -#: ../../Zotlabs/Module/Settings/Permcats.php:111 -#: ../../Zotlabs/Module/Settings/Tokens.php:167 +#: ../../Zotlabs/Module/Settings/Tokens.php:113 msgid "" -"Some permissions may be inherited from your channel's privacy settings, which have higher " -"priority than individual settings. You can not change those" -" settings here." -msgstr "Sommige permissies worden mogelijk overgeërfd van de privacy-instellingen van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier niet veranderen." +"Use this form to create temporary access identifiers to share things with " +"non-members. These identities may be used in Access Control Lists and " +"visitors may login using these credentials to access private content." +msgstr "Gebruik dit formulier om tijdelijke identiteiten aan te maken, waarmee je bepaalde informatie met niet-leden kan delen. Deze identiteiten kunnen onder Permissies (handmatige selectie) worden gebruikt. Gasten kunnen inloggen met onderstaande gegevens om zo toegang te krijgen tot privéinhoud." -#: ../../Zotlabs/Module/Connedit.php:901 +#: ../../Zotlabs/Module/Settings/Tokens.php:115 msgid "" -"Some permissions may be inherited from your channel's privacy settings, 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 "Sommige permissies worden mogelijk overgeërfd van de privacy-instellingen van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. " +"You may also provide dropbox style access links to friends and " +"associates by adding the Login Password to any specific site URL as shown. " +"Examples:" +msgstr "Je kan ook dropbox-achtige links aan mensen geven door bovenstaand wachtwoord op onderstaande manier aan een hub-URL toe te voegen. Voorbeelden:" -#: ../../Zotlabs/Module/Connedit.php:902 -msgid "Last update:" -msgstr "Laatste wijziging:" +#: ../../Zotlabs/Module/Settings/Tokens.php:150 +#: ../../Zotlabs/Widget/Settings_menu.php:100 +msgid "Guest Access Tokens" +msgstr "Gasttoegang" -#: ../../Zotlabs/Module/Connedit.php:911 -msgid "Details" -msgstr "Details" +#: ../../Zotlabs/Module/Settings/Tokens.php:157 +msgid "Login Name" +msgstr "Inlognaam" -#: ../../Zotlabs/Module/Connedit.php:914 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137 -msgid "Organisation" -msgstr "Organisatie" +#: ../../Zotlabs/Module/Settings/Tokens.php:158 +msgid "Login Password" +msgstr "Wachtwoord:" -#: ../../Zotlabs/Module/Connedit.php:915 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138 -#: ../../include/page_widgets.php:46 -msgid "Title" -msgstr "Titel" +#: ../../Zotlabs/Module/Settings/Tokens.php:159 +msgid "Expires (yyyy-mm-dd)" +msgstr "Geldig t/m (yyyy-mm-dd)" -#: ../../Zotlabs/Module/Connedit.php:916 ../../Zotlabs/Module/Profiles.php:789 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139 -msgid "Phone" -msgstr "Telefoon" +#: ../../Zotlabs/Module/Settings/Tokens.php:160 +#: ../../Zotlabs/Module/Connedit.php:890 +msgid "Their Settings" +msgstr "Hun instellingen" -#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:791 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141 -msgid "Instant messenger" -msgstr "Instant messenger" +#: ../../Zotlabs/Module/Settings/Oauth2.php:35 +msgid "Name and Secret are required" +msgstr "Naam en secret zijn vereist" -#: ../../Zotlabs/Module/Connedit.php:919 ../../Zotlabs/Module/Profiles.php:792 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142 -msgid "Website" -msgstr "Website" +#: ../../Zotlabs/Module/Settings/Oauth2.php:83 +msgid "Add OAuth2 application" +msgstr "OAuth2-applicatie toevoegen" -#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Profiles.php:794 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144 -msgid "Note" -msgstr "Opmerking" +#: ../../Zotlabs/Module/Settings/Oauth2.php:86 +#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth.php:90 +msgid "Name of application" +msgstr "Naam van applicatie" -#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:795 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145 -#: ../../extend/addon/addon/cdav/cdav.php:270 -#: ../../include/connections.php:668 -msgid "Mobile" -msgstr "Mobiel" +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth.php:92 +#: ../../Zotlabs/Module/Settings/Oauth.php:118 +#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782 +msgid "Consumer Secret" +msgstr "Consumer secret" -#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Profiles.php:796 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146 -#: ../../extend/addon/addon/cdav/cdav.php:271 -#: ../../include/connections.php:669 -msgid "Home" -msgstr "Thuis" +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth.php:91 +#: ../../Zotlabs/Module/Settings/Oauth.php:92 +msgid "Automatically generated - change if desired. Max length 20" +msgstr "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20" -#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Profiles.php:797 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147 -#: ../../extend/addon/addon/cdav/cdav.php:274 -#: ../../include/connections.php:672 -msgid "Work" -msgstr "Werk" +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth.php:93 +#: ../../Zotlabs/Module/Settings/Oauth.php:119 +msgid "Redirect" +msgstr "Redirect/doorverwijzing" -#: ../../Zotlabs/Module/Connedit.php:926 ../../Zotlabs/Module/Profiles.php:799 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:368 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149 -msgid "Add Contact" -msgstr "Contact toevoegen" +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth.php:93 +msgid "" +"Redirect URI - leave blank unless your application specifically requires " +"this" +msgstr "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist" -#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:800 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150 -msgid "Add Field" -msgstr "Veld toevoegen" +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +msgid "Grant Types" +msgstr "Grant-types" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +msgid "leave blank unless your application sepcifically requires this" +msgstr "laat leeg, behalve wanneer de applicatie dit vereist" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +msgid "Authorization scope" +msgstr "Autorisatie-scope " + +#: ../../Zotlabs/Module/Settings/Oauth2.php:102 +msgid "OAuth2 Application not found." +msgstr "OAuth2-applicatie niet gevonden." + +#: ../../Zotlabs/Module/Settings/Oauth2.php:111 +#: ../../Zotlabs/Module/Settings/Oauth2.php:148 +#: ../../Zotlabs/Module/Settings/Oauth.php:87 +#: ../../Zotlabs/Module/Settings/Oauth.php:113 +#: ../../Zotlabs/Module/Settings/Oauth.php:149 +msgid "Add application" +msgstr "Applicatie toevoegen" -#: ../../Zotlabs/Module/Connedit.php:932 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155 -msgid "P.O. Box" -msgstr "Postbus" +#: ../../Zotlabs/Module/Settings/Oauth2.php:147 +msgid "Connected OAuth2 Apps" +msgstr "Verbonden OAuth2-applicaties" -#: ../../Zotlabs/Module/Connedit.php:933 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156 -msgid "Additional" -msgstr "Extra" +#: ../../Zotlabs/Module/Settings/Oauth2.php:151 +#: ../../Zotlabs/Module/Settings/Oauth.php:152 +msgid "Client key starts with" +msgstr "Client key begint met" -#: ../../Zotlabs/Module/Connedit.php:934 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157 -msgid "Street" -msgstr "Straat en huisnummer" +#: ../../Zotlabs/Module/Settings/Oauth2.php:152 +#: ../../Zotlabs/Module/Settings/Oauth.php:153 +msgid "No name" +msgstr "Geen naam" -#: ../../Zotlabs/Module/Connedit.php:935 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158 -msgid "Locality" -msgstr "Plaats" +#: ../../Zotlabs/Module/Settings/Oauth2.php:153 +#: ../../Zotlabs/Module/Settings/Oauth.php:154 +msgid "Remove authorization" +msgstr "Autorisatie verwijderen" -#: ../../Zotlabs/Module/Connedit.php:936 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159 -msgid "Region" -msgstr "Provincie/staat/regio/enz." +#: ../../Zotlabs/Module/Settings/Account.php:20 +msgid "Not valid email." +msgstr "Geen geldig e-mailadres." -#: ../../Zotlabs/Module/Connedit.php:937 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160 -msgid "ZIP Code" -msgstr "Postcode" +#: ../../Zotlabs/Module/Settings/Account.php:23 +msgid "Protected email address. Cannot change to that email." +msgstr "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken." + +#: ../../Zotlabs/Module/Settings/Account.php:32 +msgid "System failure storing new email. Please try again." +msgstr "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer." + +#: ../../Zotlabs/Module/Settings/Account.php:40 +msgid "Technical skill level updated" +msgstr "Technisch niveau bijgewerkt" -#: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Profiles.php:760 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161 -msgid "Country" -msgstr "Land" +#: ../../Zotlabs/Module/Settings/Account.php:56 +msgid "Password verification failed." +msgstr "Wachtwoordverificatie mislukt" -#: ../../Zotlabs/Module/Events.php:25 -msgid "Calendar entries imported." -msgstr "Agenda-items geïmporteerd." +#: ../../Zotlabs/Module/Settings/Account.php:63 +msgid "Passwords do not match. Password unchanged." +msgstr "Wachtwoorden komen niet overeen. Wachtwoord onveranderd." -#: ../../Zotlabs/Module/Events.php:27 -msgid "No calendar entries found." -msgstr "Geen agenda-items gevonden." +#: ../../Zotlabs/Module/Settings/Account.php:67 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd." -#: ../../Zotlabs/Module/Events.php:110 -msgid "Event can not end before it has started." -msgstr "Gebeurtenis kan niet eindigen voordat het is begonnen" +#: ../../Zotlabs/Module/Settings/Account.php:81 +msgid "Password changed." +msgstr "Wachtwoord veranderd." -#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121 -#: ../../Zotlabs/Module/Events.php:143 -msgid "Unable to generate preview." -msgstr "Niet in staat om voorvertoning te genereren" +#: ../../Zotlabs/Module/Settings/Account.php:83 +msgid "Password update failed. Please try again." +msgstr "Bijwerken wachtwoord mislukt. Probeer opnieuw." -#: ../../Zotlabs/Module/Events.php:119 -msgid "Event title and start time are required." -msgstr "Titel en begintijd van gebeurtenis zijn vereist." +#: ../../Zotlabs/Module/Settings/Account.php:112 +msgid "Account Settings" +msgstr "Account-instellingen" -#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265 -msgid "Event not found." -msgstr "Gebeurtenis niet gevonden" +#: ../../Zotlabs/Module/Settings/Account.php:113 +msgid "Current Password" +msgstr "Huidig wachtwoord" -#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Like.php:372 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:1141 -#: ../../include/conversation.php:123 ../../include/text.php:1961 -msgid "event" -msgstr "gebeurtenis" +#: ../../Zotlabs/Module/Settings/Account.php:114 +msgid "Enter New Password" +msgstr "Nieuw wachtwoord invoeren" -#: ../../Zotlabs/Module/Events.php:460 -msgid "Edit event title" -msgstr "Titel bewerken" +#: ../../Zotlabs/Module/Settings/Account.php:115 +msgid "Confirm New Password" +msgstr "Nieuw wachtwoord bevestigen" -#: ../../Zotlabs/Module/Events.php:460 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835 -msgid "Event title" -msgstr "Titel" +#: ../../Zotlabs/Module/Settings/Account.php:115 +msgid "Leave password fields blank unless changing" +msgstr "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen" -#: ../../Zotlabs/Module/Events.php:462 -msgid "Categories (comma-separated list)" -msgstr "Categorieën (door komma's gescheiden lijst)" +#: ../../Zotlabs/Module/Settings/Account.php:120 +#: ../../Zotlabs/Module/Removeaccount.php:61 +msgid "Remove Account" +msgstr "Account verwijderen" -#: ../../Zotlabs/Module/Events.php:463 -msgid "Edit Category" -msgstr "Categorie" +#: ../../Zotlabs/Module/Settings/Account.php:121 +msgid "Remove this account including all its channels" +msgstr "Dit account en al zijn kanalen verwijderen" -#: ../../Zotlabs/Module/Events.php:463 -msgid "Category" -msgstr "Categorie" +#: ../../Zotlabs/Module/Settings/Featured.php:23 +msgid "Affinity Slider settings updated." +msgstr "Affiniteitsinstellingen bijgewerkt." -#: ../../Zotlabs/Module/Events.php:466 -msgid "Edit start date and time" -msgstr "Begindatum en -tijd bewerken" +#: ../../Zotlabs/Module/Settings/Featured.php:38 +msgid "No feature settings configured" +msgstr "Geen plug-in-instellingen aanwezig" -#: ../../Zotlabs/Module/Events.php:466 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836 -msgid "Start date and time" -msgstr "Begindatum en -tijd" +#: ../../Zotlabs/Module/Settings/Featured.php:45 +msgid "Default maximum affinity level" +msgstr "Standaard hoogste affiniteitsniveau" -#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470 -msgid "Finish date and time are not known or not relevant" -msgstr "Einddatum en -tijd zijn niet bekend of niet van toepassing" +#: ../../Zotlabs/Module/Settings/Featured.php:45 +msgid "0-99 default 99" +msgstr "0-99 - standaard 99" -#: ../../Zotlabs/Module/Events.php:469 -msgid "Edit finish date and time" -msgstr "Einddatum en -tijd bewerken" +#: ../../Zotlabs/Module/Settings/Featured.php:50 +msgid "Default minimum affinity level" +msgstr "Standaard laagste affiniteitsniveau" -#: ../../Zotlabs/Module/Events.php:469 -msgid "Finish date and time" -msgstr "Einddatum en -tijd" +#: ../../Zotlabs/Module/Settings/Featured.php:50 +msgid "0-99 - default 0" +msgstr "0-99 - standaard 0" -#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472 -msgid "Adjust for viewer timezone" -msgstr "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt" +#: ../../Zotlabs/Module/Settings/Featured.php:54 +msgid "Affinity Slider Settings" +msgstr "Affiniteitsinstellingen" -#: ../../Zotlabs/Module/Events.php:471 -msgid "" -"Important for events that happen in a particular place. Not practical for " -"global holidays." -msgstr "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen." +#: ../../Zotlabs/Module/Settings/Featured.php:67 +msgid "Addon Settings" +msgstr "Plug-ins" -#: ../../Zotlabs/Module/Events.php:473 -msgid "Edit Description" -msgstr "Omschrijving bewerken" +#: ../../Zotlabs/Module/Settings/Featured.php:68 +msgid "Please save/submit changes to any panel before opening another." +msgstr "Gewijzigde instellingen van een plug-in opslaan alvorens een nieuwe plug-in te openen." -#: ../../Zotlabs/Module/Events.php:475 -msgid "Edit Location" -msgstr "Locatie bewerken" +#: ../../Zotlabs/Module/Settings/Display.php:139 +#, php-format +msgid "%s - (Experimental)" +msgstr "%s - (experimenteel)" -#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1094 -#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/ThreadItem.php:740 -#: ../../include/page_widgets.php:43 ../../include/conversation.php:1347 -msgid "Preview" -msgstr "Voorvertoning" +#: ../../Zotlabs/Module/Settings/Display.php:187 +msgid "Display Settings" +msgstr "Weergave-instellingen" -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1410 -msgid "Permission settings" -msgstr "Permissies" +#: ../../Zotlabs/Module/Settings/Display.php:188 +msgid "Theme Settings" +msgstr "Thema-instellingen" -#: ../../Zotlabs/Module/Events.php:489 -msgid "Timezone:" -msgstr "Tijdzone:" +#: ../../Zotlabs/Module/Settings/Display.php:189 +msgid "Custom Theme Settings" +msgstr "Handmatige thema-instellingen" -#: ../../Zotlabs/Module/Events.php:494 -msgid "Advanced Options" -msgstr "Geavanceerde opties" +#: ../../Zotlabs/Module/Settings/Display.php:190 +msgid "Content Settings" +msgstr "Inhoudsinstellingen" -#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:263 -msgid "l, F j" -msgstr "l j F" +#: ../../Zotlabs/Module/Settings/Display.php:196 +msgid "Display Theme:" +msgstr "Gebruik thema:" -#: ../../Zotlabs/Module/Events.php:633 -msgid "Edit event" -msgstr "Gebeurtenis bewerken" +#: ../../Zotlabs/Module/Settings/Display.php:197 +msgid "Select scheme" +msgstr "Kies schema van thema" -#: ../../Zotlabs/Module/Events.php:635 -msgid "Delete event" -msgstr "Gebeurtenis verwijderen" +#: ../../Zotlabs/Module/Settings/Display.php:199 +msgid "Preload images before rendering the page" +msgstr "Afbeeldingen laden voordat de pagina wordt getoond" -#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:312 -#: ../../include/text.php:1766 -msgid "Link to Source" -msgstr "Originele locatie" +#: ../../Zotlabs/Module/Settings/Display.php:199 +msgid "" +"The subjective page load time will be longer but the page will be ready when" +" displayed" +msgstr "De laadtijd van een pagina lijkt langer, maar de pagina is wel meteen helemaal geladen wanneer deze wordt getoond" -#: ../../Zotlabs/Module/Events.php:669 -msgid "calendar" -msgstr "agenda" +#: ../../Zotlabs/Module/Settings/Display.php:200 +msgid "Enable user zoom on mobile devices" +msgstr "Inzoomen op smartphones en tablets toestaan" -#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:335 -msgid "Edit Event" -msgstr "Gebeurtenis bewerken" +#: ../../Zotlabs/Module/Settings/Display.php:201 +msgid "Update browser every xx seconds" +msgstr "Ververs de webbrowser om de zoveel seconde" -#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:335 -msgid "Create Event" -msgstr "Gebeurtenis aanmaken" +#: ../../Zotlabs/Module/Settings/Display.php:201 +msgid "Minimum of 10 seconds, no maximum" +msgstr "Minimaal 10 seconde, geen maximum" -#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698 -#: ../../Zotlabs/Module/Photos.php:935 ../../Zotlabs/Module/Cal.php:336 -#: ../../Zotlabs/Module/Cal.php:343 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846 -msgid "Previous" -msgstr "Vorige" +#: ../../Zotlabs/Module/Settings/Display.php:202 +msgid "Maximum number of conversations to load at any time:" +msgstr "Maximaal aantal conversaties die per keer geladen worden:" -#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Events.php:699 -#: ../../Zotlabs/Module/Photos.php:944 ../../Zotlabs/Module/Cal.php:337 -#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Setup.php:264 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847 -msgid "Next" -msgstr "Volgende" +#: ../../Zotlabs/Module/Settings/Display.php:202 +msgid "Maximum of 100 items" +msgstr "Maximaal 100 conversaties" -#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:338 -#: ../../include/channel.php:1370 -msgid "Export" -msgstr "Exporteren" +#: ../../Zotlabs/Module/Settings/Display.php:203 +msgid "Show emoticons (smilies) as images" +msgstr "Toon emoticons (smilies) als afbeeldingen" -#: ../../Zotlabs/Module/Events.php:695 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849 -msgid "Month" -msgstr "Maand" +#: ../../Zotlabs/Module/Settings/Display.php:204 +msgid "Provide channel menu in navigation bar" +msgstr "Kanaalmenu op navigatiebalk tonen" -#: ../../Zotlabs/Module/Events.php:696 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850 -msgid "Week" -msgstr "Week" +#: ../../Zotlabs/Module/Settings/Display.php:204 +msgid "Default: channel menu located in app menu" +msgstr "Standaard valt het kanaalmenu in het appmenu te vinden" -#: ../../Zotlabs/Module/Events.php:697 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851 -msgid "Day" -msgstr "Dag" +#: ../../Zotlabs/Module/Settings/Display.php:205 +msgid "Manual conversation updates" +msgstr "Handmatige conversatie-updates" -#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Cal.php:345 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848 -msgid "Today" -msgstr "Vandaag" +#: ../../Zotlabs/Module/Settings/Display.php:205 +msgid "Default is on, turning this off may increase screen jumping" +msgstr "Dit is standaard ingeschakeld en door dit uit te schakelen kunnen items soms verspringen." -#: ../../Zotlabs/Module/Events.php:731 -msgid "Event removed" -msgstr "Gebeurtenis verwijderd" +#: ../../Zotlabs/Module/Settings/Display.php:206 +msgid "Link post titles to source" +msgstr "Berichtkoppen naar originele locatie linken" -#: ../../Zotlabs/Module/Events.php:734 -msgid "Failed to remove event" -msgstr "Verwijderen gebeurtenis mislukt" +#: ../../Zotlabs/Module/Settings/Display.php:207 +msgid "System Page Layout Editor - (advanced)" +msgstr "Lay-out bewerken van systeempagina's (geavanceerd)" -#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82 -#: ../../extend/addon/addon/opensearch/opensearch.php:42 -msgid "$Projectname" -msgstr "$Projectname" +#: ../../Zotlabs/Module/Settings/Display.php:210 +msgid "Use blog/list mode on channel page" +msgstr "Gebruik blog/lijst-modus op kanaalpagina" -#: ../../Zotlabs/Module/Home.php:92 -#, php-format -msgid "Welcome to %s" -msgstr "Welkom op %s" +#: ../../Zotlabs/Module/Settings/Display.php:210 +#: ../../Zotlabs/Module/Settings/Display.php:211 +msgid "(comments displayed separately)" +msgstr "(reacties worden afzonderlijk getoond)" -#: ../../Zotlabs/Module/Filestorage.php:87 -msgid "Permission Denied." -msgstr "Toegang geweigerd" +#: ../../Zotlabs/Module/Settings/Display.php:211 +msgid "Use blog/list mode on grid page" +msgstr "Gebruik blog/lijst-modus op jouw kanaalpagina" -#: ../../Zotlabs/Module/Filestorage.php:103 -msgid "File not found." -msgstr "Bestand niet gevonden." +#: ../../Zotlabs/Module/Settings/Display.php:212 +msgid "Channel page max height of content (in pixels)" +msgstr "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)" -#: ../../Zotlabs/Module/Filestorage.php:146 -msgid "Edit file permissions" -msgstr "Bestandsrechten bewerken" +#: ../../Zotlabs/Module/Settings/Display.php:212 +#: ../../Zotlabs/Module/Settings/Display.php:213 +msgid "click to expand content exceeding this height" +msgstr "klik om inhoud uit te klappen die deze hoogte overschrijdt" -#: ../../Zotlabs/Module/Filestorage.php:159 -msgid "Set/edit permissions" -msgstr "Rechten instellen/bewerken" +#: ../../Zotlabs/Module/Settings/Display.php:213 +msgid "Grid page max height of content (in pixels)" +msgstr "Maximale hoogte berichtinhoud (in pixels)" -#: ../../Zotlabs/Module/Filestorage.php:160 -msgid "Include all files and sub folders" -msgstr "Toepassen op alle bestanden en submappen" +#: ../../Zotlabs/Module/Settings/Oauth.php:35 +msgid "Name is required" +msgstr "Naam is vereist" -#: ../../Zotlabs/Module/Filestorage.php:161 -msgid "Return to file list" -msgstr "Terugkeren naar bestandlijst " +#: ../../Zotlabs/Module/Settings/Oauth.php:39 +msgid "Key and Secret are required" +msgstr "Key en secret zijn vereist" -#: ../../Zotlabs/Module/Filestorage.php:163 -msgid "Copy/paste this code to attach file to a post" -msgstr "Kopieer/plak deze code om het bestand aan een bericht te koppelen" +#: ../../Zotlabs/Module/Settings/Oauth.php:91 +#: ../../Zotlabs/Module/Settings/Oauth.php:117 +#: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781 +msgid "Consumer Key" +msgstr "Consumer key" -#: ../../Zotlabs/Module/Filestorage.php:164 -msgid "Copy/paste this URL to link file from a web page" -msgstr "Kopieer/plak deze URL om het bestand aan een externe webpagina te koppelen" +#: ../../Zotlabs/Module/Settings/Oauth.php:94 +#: ../../Zotlabs/Module/Settings/Oauth.php:120 +msgid "Icon url" +msgstr "Pictogram-URL" -#: ../../Zotlabs/Module/Filestorage.php:166 -msgid "Share this file" -msgstr "Dit bestand delen" +#: ../../Zotlabs/Module/Settings/Oauth.php:94 +#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 +msgid "Optional" +msgstr "Niet verplicht" -#: ../../Zotlabs/Module/Filestorage.php:167 -msgid "Show URL to this file" -msgstr "Toon URL van dit bestand" +#: ../../Zotlabs/Module/Settings/Oauth.php:105 +msgid "Application not found." +msgstr "Applicatie niet gevonden." -#: ../../Zotlabs/Module/Filestorage.php:168 -msgid "Notify your contacts about this file" -msgstr "Jouw connecties over dit bestand berichten" +#: ../../Zotlabs/Module/Settings/Oauth.php:148 +msgid "Connected Apps" +msgstr "Verbonden applicaties" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229 -#: ../../include/conversation.php:1836 -msgid "Photos" -msgstr "Foto's" +#: ../../Zotlabs/Module/Embedphotos.php:140 +#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1350 +#: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78 +msgid "View Photo" +msgstr "Foto tonen" -#: ../../Zotlabs/Module/Photos.php:82 -msgid "Page owner information could not be retrieved." -msgstr "Informatie over de pagina-eigenaar werd niet ontvangen." +#: ../../Zotlabs/Module/Embedphotos.php:156 +#: ../../Zotlabs/Module/Photos.php:842 ../../Zotlabs/Widget/Portfolio.php:108 +#: ../../Zotlabs/Widget/Album.php:95 +msgid "Edit Album" +msgstr "Album bewerken" -#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:729 -#: ../../Zotlabs/Module/Profile_photo.php:115 -#: ../../Zotlabs/Module/Profile_photo.php:224 -#: ../../include/photo/photo_driver.php:730 -msgid "Profile Photos" -msgstr "Profielfoto's" +#: ../../Zotlabs/Module/Embedphotos.php:158 +#: ../../Zotlabs/Module/Photos.php:712 +#: ../../Zotlabs/Module/Profile_photo.php:458 +#: ../../Zotlabs/Module/Cover_photo.php:362 +#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Widget/Cdav.php:133 +#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110 +#: ../../Zotlabs/Widget/Album.php:97 +msgid "Upload" +msgstr "Uploaden" -#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:129 -msgid "Album not found." -msgstr "Album niet gevonden." +#: ../../Zotlabs/Module/Achievements.php:38 +msgid "Some blurb about what to do when you're new here" +msgstr "Welkom op $Projectname. Klik op de tab ontdekken of klik rechtsboven op de kanalengids, om kanalen te vinden. Rechtsboven vind je ook apps, waar je vrijwel alle functies van $Projectname kunt vinden. Voor hulp met $Projectname klik je op het vraagteken." -#: ../../Zotlabs/Module/Photos.php:112 -msgid "Delete Album" -msgstr "Verwijder album" +#: ../../Zotlabs/Module/Thing.php:120 +msgid "Thing updated" +msgstr "Ding bijgewerkt" -#: ../../Zotlabs/Module/Photos.php:133 -msgid "" -"Multiple storage folders exist with this album name, but within different " -"directories. Please remove the desired folder or folders using the Files " -"manager" -msgstr "Er bestaan meerdere submappen met deze albumnaam, maar verspreidt over verschillende mappen. Verwijder de gewenste map(pen) met de bestandsbeheerder." +#: ../../Zotlabs/Module/Thing.php:172 +msgid "Object store: failed" +msgstr "Opslaan van ding mislukt" -#: ../../Zotlabs/Module/Photos.php:190 ../../Zotlabs/Module/Photos.php:1054 -msgid "Delete Photo" -msgstr "Verwijder foto" +#: ../../Zotlabs/Module/Thing.php:176 +msgid "Thing added" +msgstr "Ding toegevoegd" -#: ../../Zotlabs/Module/Photos.php:508 ../../Zotlabs/Module/Display.php:22 -#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Search.php:17 -#: ../../Zotlabs/Module/Directory.php:64 -#: ../../Zotlabs/Module/Viewconnections.php:23 -#: ../../extend/addon/addon/friendica/dfrn_request.php:794 -msgid "Public access denied." -msgstr "Openbare toegang geweigerd." +#: ../../Zotlabs/Module/Thing.php:202 +#, php-format +msgid "OBJ: %1$s %2$s %3$s" +msgstr "OBJ: %1$s %2$s %3$s" -#: ../../Zotlabs/Module/Photos.php:519 -msgid "No photos selected" -msgstr "Geen foto's geselecteerd" +#: ../../Zotlabs/Module/Thing.php:265 +msgid "Show Thing" +msgstr "Ding tonen" -#: ../../Zotlabs/Module/Photos.php:568 -msgid "Access to this item is restricted." -msgstr "Toegang tot dit item is beperkt." +#: ../../Zotlabs/Module/Thing.php:272 +msgid "item not found." +msgstr "Item niet gevonden" -#: ../../Zotlabs/Module/Photos.php:607 -#, php-format -msgid "%1$.2f MB of %2$.2f MB photo storage used." -msgstr "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt." +#: ../../Zotlabs/Module/Thing.php:305 +msgid "Edit Thing" +msgstr "Ding bewerken" -#: ../../Zotlabs/Module/Photos.php:610 -#, php-format -msgid "%1$.2f MB photo storage used." -msgstr "%1$.2f MB aan foto-opslag gebruikt." +#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364 +msgid "Select a profile" +msgstr "Kies een profiel" -#: ../../Zotlabs/Module/Photos.php:646 -msgid "Upload Photos" -msgstr "Foto's uploaden" +#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 +msgid "Post an activity" +msgstr "Plaats een bericht" -#: ../../Zotlabs/Module/Photos.php:650 -msgid "Enter an album name" -msgstr "Vul een albumnaam in" +#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 +msgid "Only sends to viewers of the applicable profile" +msgstr "Toont dit alleen aan diegene die het gekozen profiel mogen zien." -#: ../../Zotlabs/Module/Photos.php:651 -msgid "or select an existing album (doubleclick)" -msgstr "of kies een bestaand album (dubbelklikken)" +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 +msgid "Name of thing e.g. something" +msgstr "Naam van ding" -#: ../../Zotlabs/Module/Photos.php:652 -msgid "Create a status post for this upload" -msgstr "Plaats een bericht voor deze upload." +#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370 +msgid "URL of thing (optional)" +msgstr "URL van ding (niet verplicht)" -#: ../../Zotlabs/Module/Photos.php:653 -msgid "Caption (optional):" -msgstr "Bijschrift (niet verplicht):" +#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371 +msgid "URL for photo of thing (optional)" +msgstr "URL voor foto van ding (niet verplicht)" -#: ../../Zotlabs/Module/Photos.php:654 -msgid "Description (optional):" -msgstr "Omschrijving (niet verplicht):" +#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372 +#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071 +#: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235 +#: ../../Zotlabs/Module/Filestorage.php:147 +#: ../../include/acl_selectors.php:123 +msgid "Permissions" +msgstr "Permissies" -#: ../../Zotlabs/Module/Photos.php:685 -msgid "Album name could not be decoded" -msgstr "Albumnaam kon niet gedecodeerd worden" +#: ../../Zotlabs/Module/Thing.php:362 +msgid "Add Thing to your Profile" +msgstr "Ding aan je profiel toevoegen" -#: ../../Zotlabs/Module/Photos.php:729 -msgid "Contact Photos" -msgstr "Connectiefoto's" +#: ../../Zotlabs/Module/Notify.php:61 +#: ../../Zotlabs/Module/Notifications.php:57 +msgid "No more system notifications." +msgstr "Geen systeemmeldingen meer." -#: ../../Zotlabs/Module/Photos.php:752 -msgid "Show Newest First" -msgstr "Nieuwste eerst weergeven" +#: ../../Zotlabs/Module/Notify.php:65 +#: ../../Zotlabs/Module/Notifications.php:61 +msgid "System Notifications" +msgstr "Systeemmeldingen" -#: ../../Zotlabs/Module/Photos.php:754 -msgid "Show Oldest First" -msgstr "Oudste eerst weergeven" +#: ../../Zotlabs/Module/Follow.php:36 +msgid "Connection added." +msgstr "Connectie toegevoegd." -#: ../../Zotlabs/Module/Photos.php:778 ../../Zotlabs/Module/Photos.php:1335 -#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1751 -msgid "View Photo" -msgstr "Foto weergeven" +#: ../../Zotlabs/Module/Import.php:144 +#, php-format +msgid "Your service plan only allows %d channels." +msgstr "Jouw abonnement staat maar %d kanalen toe." -#: ../../Zotlabs/Module/Photos.php:809 -#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1768 -msgid "Edit Album" -msgstr "Album bewerken" +#: ../../Zotlabs/Module/Import.php:158 +msgid "No channel. Import failed." +msgstr "Geen kanaal. Importeren mislukt." -#: ../../Zotlabs/Module/Photos.php:856 -msgid "Permission denied. Access to this item may be restricted." -msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt." +#: ../../Zotlabs/Module/Import.php:482 +#: ../../addon/diaspora/import_diaspora.php:139 +msgid "Import completed." +msgstr "Import voltooid." -#: ../../Zotlabs/Module/Photos.php:858 -msgid "Photo not available" -msgstr "Foto niet aanwezig" +#: ../../Zotlabs/Module/Import.php:510 +msgid "You must be logged in to use this feature." +msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken." -#: ../../Zotlabs/Module/Photos.php:916 -msgid "Use as profile photo" -msgstr "Als profielfoto gebruiken" +#: ../../Zotlabs/Module/Import.php:515 +msgid "Import Channel" +msgstr "Kanaal importeren" -#: ../../Zotlabs/Module/Photos.php:917 -msgid "Use as cover photo" -msgstr "Als omslagfoto gebruiken" +#: ../../Zotlabs/Module/Import.php:516 +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 "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaalidentiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken." -#: ../../Zotlabs/Module/Photos.php:924 -msgid "Private Photo" -msgstr "Privéfoto" +#: ../../Zotlabs/Module/Import.php:518 +msgid "Or provide the old server/hub details" +msgstr "Of vul de gegevens van de oude hub in" -#: ../../Zotlabs/Module/Photos.php:939 -msgid "View Full Size" -msgstr "Volledige grootte weergeven" +#: ../../Zotlabs/Module/Import.php:519 +msgid "Your old identity address (xyz@example.com)" +msgstr "Jouw oude kanaaladres (xyz@example.com)" -#: ../../Zotlabs/Module/Photos.php:1028 -msgid "Edit photo" -msgstr "Foto bewerken" +#: ../../Zotlabs/Module/Import.php:520 +msgid "Your old login email address" +msgstr "Het e-mailadres van je oude account" -#: ../../Zotlabs/Module/Photos.php:1030 -msgid "Rotate CW (right)" -msgstr "Draai met de klok mee (naar rechts)" +#: ../../Zotlabs/Module/Import.php:521 +msgid "Your old login password" +msgstr "Wachtwoord van jouw oude account" -#: ../../Zotlabs/Module/Photos.php:1031 -msgid "Rotate CCW (left)" -msgstr "Draai tegen de klok in (naar links)" +#: ../../Zotlabs/Module/Import.php:522 +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 "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen." -#: ../../Zotlabs/Module/Photos.php:1034 -msgid "Move photo to album" -msgstr "Verplaatst foto naar album" +#: ../../Zotlabs/Module/Import.php:523 +msgid "Make this hub my primary location" +msgstr "Stel deze hub als mijn primaire locatie in" -#: ../../Zotlabs/Module/Photos.php:1035 -msgid "Enter a new album name" -msgstr "Vul een nieuwe albumnaam in" +#: ../../Zotlabs/Module/Import.php:524 +msgid "Move this channel (disable all previous locations)" +msgstr "Verplaats dit kanaal (schakelt alle voormalige locaties uit)" -#: ../../Zotlabs/Module/Photos.php:1036 -msgid "or select an existing one (doubleclick)" -msgstr "of kies een bestaand album (dubbelklikken)" +#: ../../Zotlabs/Module/Import.php:525 +msgid "Import a few months of posts if possible (limited by available memory" +msgstr "Importeer enkele maanden aan berichten wanneer mogelijk (afhankelijk van hoeveelheid geheugen hub)" -#: ../../Zotlabs/Module/Photos.php:1039 -msgid "Caption" -msgstr "Bijschrift" +#: ../../Zotlabs/Module/Import.php:526 +msgid "" +"This process may take several minutes to complete. Please submit the form " +"only once and leave this page open until finished." +msgstr "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid." -#: ../../Zotlabs/Module/Photos.php:1041 -msgid "Add a Tag" -msgstr "Tag toevoegen" +#: ../../Zotlabs/Module/Rmagic.php:35 +msgid "Authentication failed." +msgstr "Authenticatie mislukt." -#: ../../Zotlabs/Module/Photos.php:1049 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" -msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl" +#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1590 +#: ../../include/channel.php:2318 +msgid "Remote Authentication" +msgstr "Authenticatie op afstand" -#: ../../Zotlabs/Module/Photos.php:1052 -msgid "Flag as adult in album view" -msgstr "Markeer als voor volwassenen in albumweergave" +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2319 +msgid "Enter your channel address (e.g. channel@example.com)" +msgstr "Vul jouw kanaaladres in (bijv. channel@example.com)" -#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:268 -msgid "I like this (toggle)" -msgstr "Vind ik leuk" +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2320 +msgid "Authenticate" +msgstr "Authenticeren" -#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Lib/ThreadItem.php:269 -msgid "I don't like this (toggle)" -msgstr "Vind ik niet leuk" +#: ../../Zotlabs/Module/Cal.php:69 +msgid "Permissions denied." +msgstr "Permissies niet toegestaan" -#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Webpages.php:245 -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193 -#: ../../extend/addon/addon/cdav/include/widgets.php:123 -#: ../../include/conversation.php:1378 -msgid "Share" -msgstr "Delen" +#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2446 +msgid "Import" +msgstr "Importeren" -#: ../../Zotlabs/Module/Photos.php:1074 ../../Zotlabs/Lib/ThreadItem.php:411 -#: ../../include/conversation.php:738 -msgid "Please wait" -msgstr "Even wachten" +#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95 +msgid "Authorize application connection" +msgstr "Geef toestemming voor applicatiekoppeling" -#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208 -#: ../../Zotlabs/Lib/ThreadItem.php:728 -msgid "This is you" -msgstr "Dit ben jij" +#: ../../Zotlabs/Module/Api.php:75 +msgid "Return to your app and insert this Security Code:" +msgstr "Ga terug naar je app en voeg deze beveiligingscode in:" -#: ../../Zotlabs/Module/Photos.php:1092 ../../Zotlabs/Module/Photos.php:1210 -#: ../../Zotlabs/Lib/ThreadItem.php:730 ../../include/js_strings.php:6 -msgid "Comment" -msgstr "Reactie" +#: ../../Zotlabs/Module/Api.php:85 +msgid "Please login to continue." +msgstr "Inloggen om verder te kunnen gaan." -#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577 -msgctxt "title" -msgid "Likes" -msgstr "vinden dit leuk" +#: ../../Zotlabs/Module/Api.php:97 +msgid "" +"Do you want to authorize this application to access your posts and contacts," +" and/or create new posts for you?" +msgstr "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?" -#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577 -msgctxt "title" -msgid "Dislikes" -msgstr "vinden dit niet leuk" +#: ../../Zotlabs/Module/Attach.php:13 +msgid "Item not available." +msgstr "Item is niet aanwezig." -#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578 -msgctxt "title" -msgid "Agree" -msgstr "eens" +#: ../../Zotlabs/Module/Editblock.php:138 +msgid "Edit Block" +msgstr "Blok bewerken" -#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578 -msgctxt "title" -msgid "Disagree" -msgstr "oneens" +#: ../../Zotlabs/Module/Profile.php:93 +msgid "vcard" +msgstr "vcard" -#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578 -msgctxt "title" -msgid "Abstain" -msgstr "onthoudingen" +#: ../../Zotlabs/Module/Apps.php:48 ../../Zotlabs/Lib/Apps.php:228 +msgid "Apps" +msgstr "Apps" -#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579 -msgctxt "title" -msgid "Attending" -msgstr "aanwezig" +#: ../../Zotlabs/Module/Apps.php:51 +msgid "Manage apps" +msgstr "Apps beheren" -#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579 -msgctxt "title" -msgid "Not attending" -msgstr "niet aanwezig" +#: ../../Zotlabs/Module/Apps.php:52 +msgid "Create new app" +msgstr "Nieuwe app aanmaken" -#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579 -msgctxt "title" -msgid "Might attend" -msgstr "mogelijk aanwezig" +#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:268 +#, php-format +msgctxt "mood" +msgid "%1$s is %2$s" +msgstr "%1$s is %2$s" -#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1139 -#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198 -#: ../../include/conversation.php:1928 -msgid "View all" -msgstr "Toon alles" +#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:253 +msgid "Mood" +msgstr "Stemming" -#: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Lib/ThreadItem.php:190 -#: ../../include/taxonomy.php:403 ../../include/conversation.php:1952 -#: ../../include/channel.php:1273 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "vindt dit leuk" -msgstr[1] "vinden dit leuk" +#: ../../Zotlabs/Module/Mood.php:136 +msgid "Set your current mood and tell your friends" +msgstr "Noteer je huidige stemming en toon het aan je connecties" -#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:195 -#: ../../include/conversation.php:1955 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "vindt dit niet leuk" -msgstr[1] "vinden dit niet leuk" +#: ../../Zotlabs/Module/Connections.php:55 +#: ../../Zotlabs/Module/Connections.php:112 +#: ../../Zotlabs/Module/Connections.php:256 +msgid "Active" +msgstr "Actief" -#: ../../Zotlabs/Module/Photos.php:1236 -msgid "Photo Tools" -msgstr "Hulpmiddelen" +#: ../../Zotlabs/Module/Connections.php:60 +#: ../../Zotlabs/Module/Connections.php:164 +#: ../../Zotlabs/Module/Connections.php:261 +msgid "Blocked" +msgstr "Geblokkeerd" -#: ../../Zotlabs/Module/Photos.php:1245 -msgid "In This Photo:" -msgstr "Op deze foto:" +#: ../../Zotlabs/Module/Connections.php:65 +#: ../../Zotlabs/Module/Connections.php:171 +#: ../../Zotlabs/Module/Connections.php:260 +msgid "Ignored" +msgstr "Genegeerd" -#: ../../Zotlabs/Module/Photos.php:1250 -msgid "Map" -msgstr "Kaart" +#: ../../Zotlabs/Module/Connections.php:70 +#: ../../Zotlabs/Module/Connections.php:185 +#: ../../Zotlabs/Module/Connections.php:259 +msgid "Hidden" +msgstr "Verborgen" -#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:400 -msgctxt "noun" -msgid "Likes" -msgstr "vinden dit leuk" +#: ../../Zotlabs/Module/Connections.php:75 +#: ../../Zotlabs/Module/Connections.php:178 +msgid "Archived/Unreachable" +msgstr "Gearchiveerd/onbereikbaar" -#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/ThreadItem.php:401 -msgctxt "noun" -msgid "Dislikes" -msgstr "vinden dit niet leuk" +#: ../../Zotlabs/Module/Connections.php:80 +#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:116 +#: ../../Zotlabs/Module/Notifications.php:52 +#: ../../include/conversation.php:1717 +msgid "New" +msgstr "Nieuw" -#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:406 -#: ../../include/acl_selectors.php:220 -msgid "Close" -msgstr "Sluiten" +#: ../../Zotlabs/Module/Connections.php:94 +#: ../../Zotlabs/Module/Connections.php:108 +#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26 +msgid "All" +msgstr "Alles" -#: ../../Zotlabs/Module/Photos.php:1341 -msgid "View Album" -msgstr "Album weergeven" +#: ../../Zotlabs/Module/Connections.php:140 +msgid "Active Connections" +msgstr "Actieve connecties" -#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Module/Photos.php:1365 -#: ../../Zotlabs/Module/Photos.php:1366 -msgid "Recent Photos" -msgstr "Recente foto's" +#: ../../Zotlabs/Module/Connections.php:143 +msgid "Show active connections" +msgstr "Actieve connecties tonen" -#: ../../Zotlabs/Module/Group.php:24 -msgid "Privacy group created." -msgstr "Privacygroep aangemaakt" +#: ../../Zotlabs/Module/Connections.php:147 +#: ../../Zotlabs/Widget/Notifications.php:84 +msgid "New Connections" +msgstr "Nieuwe connecties" -#: ../../Zotlabs/Module/Group.php:30 -msgid "Could not create privacy group." -msgstr "Kon privacygroep niet aanmaken" +#: ../../Zotlabs/Module/Connections.php:150 +msgid "Show pending (new) connections" +msgstr "Nog te accepteren (nieuwe) connecties tonen" -#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 -#: ../../include/items.php:3901 -msgid "Privacy group not found." -msgstr "Privacygroep niet gevonden" +#: ../../Zotlabs/Module/Connections.php:167 +msgid "Only show blocked connections" +msgstr "Toon alleen geblokkeerde connecties" -#: ../../Zotlabs/Module/Group.php:58 -msgid "Privacy group updated." -msgstr "Privacygroep bijgewerkt" +#: ../../Zotlabs/Module/Connections.php:174 +msgid "Only show ignored connections" +msgstr "Toon alleen genegeerde connecties" -#: ../../Zotlabs/Module/Group.php:90 -msgid "Create a group of channels." -msgstr "Privacygroep met kanalen aanmaken" +#: ../../Zotlabs/Module/Connections.php:181 +msgid "Only show archived/unreachable connections" +msgstr "Alleen gearchiveerde/onbereikbare connecties tonen" -#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184 -msgid "Privacy group name: " -msgstr "Naam privacygroep: " +#: ../../Zotlabs/Module/Connections.php:188 +msgid "Only show hidden connections" +msgstr "Toon alleen verborgen connecties" -#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187 -msgid "Members are visible to other channels" -msgstr "Kanalen in deze privacygroep zijn zichtbaar voor andere kanalen" +#: ../../Zotlabs/Module/Connections.php:203 +msgid "Show all connections" +msgstr "Toon alle connecties" -#: ../../Zotlabs/Module/Group.php:111 -msgid "Privacy group removed." -msgstr "Privacygroep verwijderd." +#: ../../Zotlabs/Module/Connections.php:257 +msgid "Pending approval" +msgstr "Moet nog geaccepteerd worden" -#: ../../Zotlabs/Module/Group.php:113 -msgid "Unable to remove privacy group." -msgstr "Verwijderen privacygroep mislukt" +#: ../../Zotlabs/Module/Connections.php:258 +msgid "Archived" +msgstr "Gearchiveerd" -#: ../../Zotlabs/Module/Group.php:183 -msgid "Privacy group editor" -msgstr "Privacygroep bewerken" +#: ../../Zotlabs/Module/Connections.php:262 +msgid "Not connected at this location" +msgstr "Niet op deze locatie verbonden" -#: ../../Zotlabs/Module/Group.php:199 -msgid "All Connected Channels" -msgstr "Alle kanaalconnecties" +#: ../../Zotlabs/Module/Connections.php:279 +#, php-format +msgid "%1$s [%2$s]" +msgstr "%1$s [%2$s]" -#: ../../Zotlabs/Module/Group.php:231 -msgid "Click on a channel to add or remove." -msgstr "Klik op een kanaal om deze toe te voegen of te verwijderen." +#: ../../Zotlabs/Module/Connections.php:280 +msgid "Edit connection" +msgstr "Connectie bewerken" -#: ../../Zotlabs/Module/Dreport.php:45 -msgid "Invalid message" -msgstr "Ongeldig bericht" +#: ../../Zotlabs/Module/Connections.php:282 +msgid "Delete connection" +msgstr "Connectie verwijderen" -#: ../../Zotlabs/Module/Dreport.php:78 -msgid "no results" -msgstr "geen resultaten" +#: ../../Zotlabs/Module/Connections.php:291 +msgid "Channel address" +msgstr "Kanaaladres" -#: ../../Zotlabs/Module/Dreport.php:93 -msgid "channel sync processed" -msgstr "kanaalsync verwerkt" +#: ../../Zotlabs/Module/Connections.php:293 +msgid "Network" +msgstr "Netwerk" -#: ../../Zotlabs/Module/Dreport.php:97 -msgid "queued" -msgstr "in wachtrij" +#: ../../Zotlabs/Module/Connections.php:296 +msgid "Call" +msgstr "Bellen" -#: ../../Zotlabs/Module/Dreport.php:101 -msgid "posted" -msgstr "verstuurd" +#: ../../Zotlabs/Module/Connections.php:298 +msgid "Status" +msgstr "Status" -#: ../../Zotlabs/Module/Dreport.php:105 -msgid "accepted for delivery" -msgstr "geaccepteerd om afgeleverd te worden" +#: ../../Zotlabs/Module/Connections.php:300 +msgid "Connected" +msgstr "Verbonden" -#: ../../Zotlabs/Module/Dreport.php:109 -msgid "updated" -msgstr "geüpdatet" +#: ../../Zotlabs/Module/Connections.php:302 +msgid "Approve connection" +msgstr "Connectie accepteren" -#: ../../Zotlabs/Module/Dreport.php:112 -msgid "update ignored" -msgstr "update genegeerd" +#: ../../Zotlabs/Module/Connections.php:304 +msgid "Ignore connection" +msgstr "Connectie negeren" -#: ../../Zotlabs/Module/Dreport.php:115 -msgid "permission denied" -msgstr "toegang geweigerd" +#: ../../Zotlabs/Module/Connections.php:305 +#: ../../Zotlabs/Module/Connedit.php:630 +msgid "Ignore" +msgstr "Negeren" -#: ../../Zotlabs/Module/Dreport.php:119 -msgid "recipient not found" -msgstr "ontvanger niet gevonden" +#: ../../Zotlabs/Module/Connections.php:306 +msgid "Recent activity" +msgstr "Recente activiteit" -#: ../../Zotlabs/Module/Dreport.php:122 -msgid "mail recalled" -msgstr "Privébericht ingetrokken" +#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:235 +#: ../../include/text.php:973 +msgid "Connections" +msgstr "Connecties" -#: ../../Zotlabs/Module/Dreport.php:125 -msgid "duplicate mail received" -msgstr "dubbel privébericht ontvangen" +#: ../../Zotlabs/Module/Connections.php:336 +msgid "Search your connections" +msgstr "Doorzoek jouw connecties" -#: ../../Zotlabs/Module/Dreport.php:128 -msgid "mail delivered" -msgstr "privébericht afgeleverd" +#: ../../Zotlabs/Module/Connections.php:337 +msgid "Connections search" +msgstr "Connecties zoeken" -#: ../../Zotlabs/Module/Dreport.php:148 -#, php-format -msgid "Delivery report for %1$s" -msgstr "Afleveringsrapport voor %1$s" +#: ../../Zotlabs/Module/Connections.php:338 +#: ../../Zotlabs/Module/Directory.php:401 +#: ../../Zotlabs/Module/Directory.php:406 ../../include/contact_widgets.php:23 +msgid "Find" +msgstr "Vinden" -#: ../../Zotlabs/Module/Dreport.php:151 -msgid "Options" -msgstr "Opties" +#: ../../Zotlabs/Module/Viewsrc.php:43 +msgid "item" +msgstr "item" -#: ../../Zotlabs/Module/Dreport.php:152 -msgid "Redeliver" -msgstr "Opnieuw afleveren" +#: ../../Zotlabs/Module/Viewsrc.php:55 +msgid "Source of Item" +msgstr "Bron van item" -#: ../../Zotlabs/Module/Mail.php:65 -msgid "Unable to lookup recipient." -msgstr "Niet in staat om ontvanger op te zoeken." +#: ../../Zotlabs/Module/Bookmarks.php:56 +msgid "Bookmark added" +msgstr "Bladwijzer toegevoegd" -#: ../../Zotlabs/Module/Mail.php:72 -msgid "Unable to communicate with requested channel." -msgstr "Niet in staat om met het aangevraagde kanaal te communiceren." +#: ../../Zotlabs/Module/Bookmarks.php:79 +msgid "My Bookmarks" +msgstr "Mijn bladwijzers" -#: ../../Zotlabs/Module/Mail.php:79 -msgid "Cannot verify requested channel." -msgstr "Kan opgevraagd kanaal niet verifieren" +#: ../../Zotlabs/Module/Bookmarks.php:90 +msgid "My Connections Bookmarks" +msgstr "Bladwijzers van mijn connecties" -#: ../../Zotlabs/Module/Mail.php:97 -msgid "Selected channel has private message restrictions. Send failed." -msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt." +#: ../../Zotlabs/Module/Removeaccount.php:35 +msgid "" +"Account removals are not allowed within 48 hours of changing the account " +"password." +msgstr "Het verwijderen van een account is niet toegestaan binnen 48 uur nadat het wachtwoord is veranderd." -#: ../../Zotlabs/Module/Mail.php:178 -msgid "Messages" -msgstr "Berichten" +#: ../../Zotlabs/Module/Removeaccount.php:57 +msgid "Remove This Account" +msgstr "Verwijder dit account" -#: ../../Zotlabs/Module/Mail.php:213 -msgid "Message recalled." -msgstr "Bericht ingetrokken." +#: ../../Zotlabs/Module/Removeaccount.php:58 +msgid "" +"This account and all its channels will be completely removed from the " +"network. " +msgstr "Dit account en al zijn kanalen worden volledig uit het $Projectname-netwerk verwijderd." -#: ../../Zotlabs/Module/Mail.php:226 -msgid "Conversation removed." -msgstr "Conversatie verwijderd" +#: ../../Zotlabs/Module/Removeaccount.php:60 +msgid "" +"Remove this account, all its channels and all its channel clones from the " +"network" +msgstr "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het $Projectname-netwerk verwijderen" -#: ../../Zotlabs/Module/Mail.php:240 ../../Zotlabs/Module/Mail.php:349 -#: ../../Zotlabs/Module/Chat.php:203 ../../include/conversation.php:1330 -msgid "Please enter a link URL:" -msgstr "Vul een URL in:" +#: ../../Zotlabs/Module/Removeaccount.php:60 +msgid "" +"By default only the instances of the channels located on this hub will be " +"removed from the network" +msgstr "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het $Projectname-netwerk verwijderd" -#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:350 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "Verloopt op DD-MM-YYYY om HH:MM" +#: ../../Zotlabs/Module/Photos.php:78 +msgid "Page owner information could not be retrieved." +msgstr "Informatie over de pagina-eigenaar werd niet ontvangen." -#: ../../Zotlabs/Module/Mail.php:269 -msgid "Requested channel is not in this network" -msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar" +#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120 +msgid "Album not found." +msgstr "Album niet gevonden." -#: ../../Zotlabs/Module/Mail.php:277 -msgid "Send Private Message" -msgstr "Privébericht versturen" +#: ../../Zotlabs/Module/Photos.php:103 +msgid "Delete Album" +msgstr "Verwijder album" -#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:403 -msgid "To:" -msgstr "Aan:" +#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1083 +msgid "Delete Photo" +msgstr "Verwijder foto" -#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:405 -msgid "Subject:" -msgstr "Onderwerp:" +#: ../../Zotlabs/Module/Photos.php:551 +msgid "No photos selected" +msgstr "Geen foto's geselecteerd" -#: ../../Zotlabs/Module/Mail.php:284 ../../Zotlabs/Module/Invite.php:138 -msgid "Your message:" -msgstr "Jouw bericht:" +#: ../../Zotlabs/Module/Photos.php:600 +msgid "Access to this item is restricted." +msgstr "Toegang tot dit item is beperkt." -#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:411 -#: ../../include/conversation.php:1390 -msgid "Attach file" -msgstr "Bestand toevoegen" +#: ../../Zotlabs/Module/Photos.php:646 +#, php-format +msgid "%1$.2f MB of %2$.2f MB photo storage used." +msgstr "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt." -#: ../../Zotlabs/Module/Mail.php:288 -msgid "Send" -msgstr "Verzenden" +#: ../../Zotlabs/Module/Photos.php:649 +#, php-format +msgid "%1$.2f MB photo storage used." +msgstr "%1$.2f MB aan foto-opslag gebruikt." -#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:416 -#: ../../include/conversation.php:1435 -msgid "Set expiration date" -msgstr "Verloopdatum instellen" +#: ../../Zotlabs/Module/Photos.php:691 +msgid "Upload Photos" +msgstr "Foto's uploaden" + +#: ../../Zotlabs/Module/Photos.php:695 +msgid "Enter an album name" +msgstr "Vul een albumnaam in" -#: ../../Zotlabs/Module/Mail.php:293 ../../Zotlabs/Module/Mail.php:418 -#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Lib/ThreadItem.php:743 -#: ../../include/conversation.php:1440 -msgid "Encrypt text" -msgstr "Tekst versleutelen" +#: ../../Zotlabs/Module/Photos.php:696 +msgid "or select an existing album (doubleclick)" +msgstr "of kies een bestaand album (dubbelklikken)" -#: ../../Zotlabs/Module/Mail.php:375 -msgid "Delete message" -msgstr "Bericht verwijderen" +#: ../../Zotlabs/Module/Photos.php:697 +msgid "Create a status post for this upload" +msgstr "Plaats een bericht voor deze upload." -#: ../../Zotlabs/Module/Mail.php:376 -msgid "Delivery report" -msgstr "Afleveringsrapport" +#: ../../Zotlabs/Module/Photos.php:699 +msgid "Description (optional)" +msgstr "Omschrijving (niet verplicht)" -#: ../../Zotlabs/Module/Mail.php:377 -msgid "Recall message" -msgstr "Bericht intrekken" +#: ../../Zotlabs/Module/Photos.php:785 +msgid "Show Newest First" +msgstr "Nieuwste eerst tonen" -#: ../../Zotlabs/Module/Mail.php:379 -msgid "Message has been recalled." -msgstr "Bericht is ingetrokken." +#: ../../Zotlabs/Module/Photos.php:787 +msgid "Show Oldest First" +msgstr "Oudste eerst tonen" -#: ../../Zotlabs/Module/Mail.php:396 -msgid "Delete Conversation" -msgstr "Verwijder conversatie" +#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381 +msgid "Add Photos" +msgstr "Foto's toevoegen" -#: ../../Zotlabs/Module/Mail.php:398 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." -msgstr "Geen veilige communicatie beschikbaar. Mogelijk kan je reageren op de kanaalpagina van de afzender." +#: ../../Zotlabs/Module/Photos.php:892 +msgid "Permission denied. Access to this item may be restricted." +msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt." -#: ../../Zotlabs/Module/Mail.php:402 -msgid "Send Reply" -msgstr "Antwoord versturen" +#: ../../Zotlabs/Module/Photos.php:894 +msgid "Photo not available" +msgstr "Foto niet aanwezig" -#: ../../Zotlabs/Module/Mail.php:407 -#, php-format -msgid "Your message for %s (%s):" -msgstr "Jouw privébericht aan %s (%s):" +#: ../../Zotlabs/Module/Photos.php:952 +msgid "Use as profile photo" +msgstr "Als profielfoto gebruiken" -#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203 -msgid "webpage" -msgstr "Webpagina" +#: ../../Zotlabs/Module/Photos.php:953 +msgid "Use as cover photo" +msgstr "Als omslagfoto gebruiken" -#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209 -msgid "block" -msgstr "blok" +#: ../../Zotlabs/Module/Photos.php:960 +msgid "Private Photo" +msgstr "Privéfoto" -#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206 -msgid "layout" -msgstr "lay-out" +#: ../../Zotlabs/Module/Photos.php:975 +msgid "View Full Size" +msgstr "Volledige grootte tonen" -#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212 -msgid "menu" -msgstr "menu" +#: ../../Zotlabs/Module/Photos.php:1057 +msgid "Edit photo" +msgstr "Foto bewerken" -#: ../../Zotlabs/Module/Impel.php:191 -#, php-format -msgid "%s element installed" -msgstr "%s onderdeel geïnstalleerd" +#: ../../Zotlabs/Module/Photos.php:1059 +msgid "Rotate CW (right)" +msgstr "Draai met de klok mee (naar rechts)" -#: ../../Zotlabs/Module/Impel.php:194 -#, php-format -msgid "%s element installation failed" -msgstr "Installatie %s-element mislukt" +#: ../../Zotlabs/Module/Photos.php:1060 +msgid "Rotate CCW (left)" +msgstr "Draai tegen de klok in (naar links)" -#: ../../Zotlabs/Module/Import_items.php:104 -msgid "Import completed" -msgstr "Importeren voltooid" +#: ../../Zotlabs/Module/Photos.php:1063 +msgid "Move photo to album" +msgstr "Verplaatst foto naar album" -#: ../../Zotlabs/Module/Import_items.php:119 -msgid "Import Items" -msgstr "Importeer items" +#: ../../Zotlabs/Module/Photos.php:1064 +msgid "Enter a new album name" +msgstr "Vul een nieuwe albumnaam in" -#: ../../Zotlabs/Module/Import_items.php:120 -msgid "" -"Use this form to import existing posts and content from an export file." -msgstr "Gebruik dit formulier om bestaande berichten en andere inhoud vanuit een exportbestand te importeren." +#: ../../Zotlabs/Module/Photos.php:1065 +msgid "or select an existing one (doubleclick)" +msgstr "of kies een bestaand album (dubbelklikken)" -#: ../../Zotlabs/Module/Manage.php:136 -#: ../../Zotlabs/Module/New_channel.php:121 -#, php-format -msgid "You have created %1$.0f of %2$.0f allowed channels." -msgstr "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt." +#: ../../Zotlabs/Module/Photos.php:1070 +msgid "Add a Tag" +msgstr "Tag toevoegen" -#: ../../Zotlabs/Module/Manage.php:143 -msgid "Create a new channel" -msgstr "Nieuw kanaal aanmaken" +#: ../../Zotlabs/Module/Photos.php:1078 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" +msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl" -#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Profiles.php:834 -#: ../../Zotlabs/Module/Wiki.php:167 ../../Zotlabs/Module/Chat.php:253 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152 -msgid "Create New" -msgstr "Nieuwe aanmaken" +#: ../../Zotlabs/Module/Photos.php:1081 +msgid "Flag as adult in album view" +msgstr "Markeer als voor volwassenen in albumweergave" -#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:221 -#: ../../include/nav.php:223 -msgid "Channel Manager" -msgstr "Kanaalbeheer" +#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:281 +msgid "I like this (toggle)" +msgstr "Vind ik leuk" -#: ../../Zotlabs/Module/Manage.php:165 -msgid "Current Channel" -msgstr "Huidig kanaal" +#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Lib/ThreadItem.php:282 +msgid "I don't like this (toggle)" +msgstr "Vind ik niet leuk" -#: ../../Zotlabs/Module/Manage.php:167 -msgid "Switch to one of your channels by selecting it." -msgstr "Activeer een van jouw andere kanalen door er op te klikken." +#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Lib/ThreadItem.php:427 +#: ../../include/conversation.php:785 +msgid "Please wait" +msgstr "Even wachten" -#: ../../Zotlabs/Module/Manage.php:168 -msgid "Default Channel" -msgstr "Standaardkanaal" +#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237 +#: ../../Zotlabs/Lib/ThreadItem.php:749 +msgid "This is you" +msgstr "Dit ben jij" -#: ../../Zotlabs/Module/Manage.php:169 -msgid "Make Default" -msgstr "Als standaard instellen" +#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239 +#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/js_strings.php:6 +msgid "Comment" +msgstr "Reactie" -#: ../../Zotlabs/Module/Manage.php:172 -#, php-format -msgid "%d new messages" -msgstr "%d nieuwe berichten" +#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618 +msgctxt "title" +msgid "Likes" +msgstr "vinden dit leuk" -#: ../../Zotlabs/Module/Manage.php:173 -#, php-format -msgid "%d new introductions" -msgstr "%d nieuwe connectieverzoeken" +#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618 +msgctxt "title" +msgid "Dislikes" +msgstr "vinden dit niet leuk" -#: ../../Zotlabs/Module/Manage.php:175 -msgid "Delegated Channel" -msgstr "Uitbesteed kanaal" +#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 +msgctxt "title" +msgid "Agree" +msgstr "eens" -#: ../../Zotlabs/Module/Magic.php:71 -msgid "Hub not found." -msgstr "Hub niet gevonden." +#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 +msgctxt "title" +msgid "Disagree" +msgstr "oneens" -#: ../../Zotlabs/Module/Mitem.php:52 -msgid "Unable to create element." -msgstr "Niet in staat om onderdeel aan te maken." +#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 +msgctxt "title" +msgid "Abstain" +msgstr "onthoudingen" -#: ../../Zotlabs/Module/Mitem.php:76 -msgid "Unable to update menu element." -msgstr "Menu-onderdeel kan niet worden geüpdatet." +#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 +msgctxt "title" +msgid "Attending" +msgstr "aanwezig" -#: ../../Zotlabs/Module/Mitem.php:92 -msgid "Unable to add menu element." -msgstr "Menu-onderdeel kan niet worden toegevoegd." +#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 +msgctxt "title" +msgid "Not attending" +msgstr "niet aanwezig" -#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230 -msgid "Menu Item Permissions" -msgstr "Permissies menu-item" +#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 +msgctxt "title" +msgid "Might attend" +msgstr "mogelijk aanwezig" -#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 -#: ../../Zotlabs/Module/Settings/Channel.php:510 -msgid "(click to open/close)" -msgstr "(klik om te openen/sluiten)" +#: ../../Zotlabs/Module/Photos.php:1156 ../../Zotlabs/Module/Photos.php:1168 +#: ../../Zotlabs/Lib/ThreadItem.php:201 ../../Zotlabs/Lib/ThreadItem.php:213 +msgid "View all" +msgstr "Toon alles" -#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176 -msgid "Link Name" -msgstr "Linknaam" +#: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205 +#: ../../include/conversation.php:1981 ../../include/channel.php:1539 +#: ../../include/taxonomy.php:661 +msgctxt "noun" +msgid "Like" +msgid_plural "Likes" +msgstr[0] "vindt dit leuk" +msgstr[1] "vinden dit leuk" -#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239 -msgid "Link or Submenu Target" -msgstr "Linkdoel of submenu-doel" +#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210 +#: ../../include/conversation.php:1984 +msgctxt "noun" +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "vindt dit niet leuk" +msgstr[1] "vinden dit niet leuk" -#: ../../Zotlabs/Module/Mitem.php:161 -msgid "Enter URL of the link or select a menu name to create a submenu" -msgstr "Geef de URL van de link of kies een menunaam om een submenu aan te maken" +#: ../../Zotlabs/Module/Photos.php:1265 +msgid "Photo Tools" +msgstr "Hulpmiddelen" -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240 -msgid "Use magic-auth if available" -msgstr "Gebruik magic-auth wanneer beschikbaar" +#: ../../Zotlabs/Module/Photos.php:1274 +msgid "In This Photo:" +msgstr "Op deze foto:" -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241 -msgid "Open link in new window" -msgstr "Open link in nieuw venster" +#: ../../Zotlabs/Module/Photos.php:1279 +msgid "Map" +msgstr "Kaart" -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 -msgid "Order in list" -msgstr "Volgorde in lijst" +#: ../../Zotlabs/Module/Photos.php:1287 ../../Zotlabs/Lib/ThreadItem.php:415 +msgctxt "noun" +msgid "Likes" +msgstr "vinden dit leuk" -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 -msgid "Higher numbers will sink to bottom of listing" -msgstr "Hogere nummers komen onderaan de lijst terecht" +#: ../../Zotlabs/Module/Photos.php:1288 ../../Zotlabs/Lib/ThreadItem.php:416 +msgctxt "noun" +msgid "Dislikes" +msgstr "vinden dit niet leuk" -#: ../../Zotlabs/Module/Mitem.php:165 -msgid "Submit and finish" -msgstr "Opslaan en afsluiten" +#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421 +#: ../../include/acl_selectors.php:125 +msgid "Close" +msgstr "Sluiten" -#: ../../Zotlabs/Module/Mitem.php:166 -msgid "Submit and continue" -msgstr "Opslaan en doorgaan" +#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378 +#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:667 +msgid "Recent Photos" +msgstr "Recente foto's" -#: ../../Zotlabs/Module/Mitem.php:174 -msgid "Menu:" -msgstr "Menu:" +#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1135 +msgid "Profile Unavailable." +msgstr "Profiel niet beschikbaar." -#: ../../Zotlabs/Module/Mitem.php:177 -msgid "Link Target" -msgstr "Linkdoel" +#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:114 +msgid "Not found" +msgstr "Niet gevonden" -#: ../../Zotlabs/Module/Mitem.php:180 -msgid "Edit menu" -msgstr "Menu bewerken" +#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:114 +#: ../../addon/cart/cart.php:1204 ../../addon/cart/manual_payments.php:58 +msgid "Invalid channel" +msgstr "Onbekend kanaal" -#: ../../Zotlabs/Module/Mitem.php:183 -msgid "Edit element" -msgstr "Onderdeel bewerken" +#: ../../Zotlabs/Module/Wiki.php:124 +msgid "Error retrieving wiki" +msgstr "Fout tijdens ophalen wiki" -#: ../../Zotlabs/Module/Mitem.php:184 -msgid "Drop element" -msgstr "Onderdeel verwijderen" +#: ../../Zotlabs/Module/Wiki.php:131 +msgid "Error creating zip file export folder" +msgstr "Fout tijdens aanmaken exportmap zipbestand" -#: ../../Zotlabs/Module/Mitem.php:185 -msgid "New element" -msgstr "Nieuw element" +#: ../../Zotlabs/Module/Wiki.php:182 +msgid "Error downloading wiki: " +msgstr "Fout tijdens downloaden wiki: " -#: ../../Zotlabs/Module/Mitem.php:186 -msgid "Edit this menu container" -msgstr "Deze menu-container bewerken" +#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1928 +#: ../../include/nav.php:494 +msgid "Wikis" +msgstr "Wiki's" -#: ../../Zotlabs/Module/Mitem.php:187 -msgid "Add menu element" -msgstr "Menu-element toevoegen" +#: ../../Zotlabs/Module/Wiki.php:203 +msgid "Download" +msgstr "Download" -#: ../../Zotlabs/Module/Mitem.php:188 -msgid "Delete this menu item" -msgstr "Dit menu-item verwijderen" +#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Chat.php:256 +#: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Manage.php:145 +msgid "Create New" +msgstr "Nieuwe aanmaken" -#: ../../Zotlabs/Module/Mitem.php:189 -msgid "Edit this menu item" -msgstr "Dit menu-item bewerken" +#: ../../Zotlabs/Module/Wiki.php:207 +msgid "Wiki name" +msgstr "Naam wiki" -#: ../../Zotlabs/Module/Mitem.php:206 -msgid "Menu item not found." -msgstr "Menu-item niet gevonden." +#: ../../Zotlabs/Module/Wiki.php:208 +msgid "Content type" +msgstr "Opmaaktype" -#: ../../Zotlabs/Module/Mitem.php:219 -msgid "Menu item deleted." -msgstr "Menu-item verwijderd." +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 +#: ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40 +#: ../../include/text.php:1869 +msgid "Markdown" +msgstr "Markdown" + +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 +#: ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1867 +msgid "BBcode" +msgstr "BBcode" + +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1870 +msgid "Text" +msgstr "Tekst" + +#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:284 +msgid "Type" +msgstr "Type" -#: ../../Zotlabs/Module/Mitem.php:221 -msgid "Menu item could not be deleted." -msgstr "Menu-item kon niet worden verwijderd." +#: ../../Zotlabs/Module/Wiki.php:211 +msgid "Any type" +msgstr "Elk type" -#: ../../Zotlabs/Module/Mitem.php:228 -msgid "Edit Menu Element" -msgstr "Menu-element bewerken" +#: ../../Zotlabs/Module/Wiki.php:218 +msgid "Lock content type" +msgstr "Opmaaktype vastzetten" -#: ../../Zotlabs/Module/Mitem.php:238 -msgid "Link text" -msgstr "Linktekst" +#: ../../Zotlabs/Module/Wiki.php:219 +msgid "Create a status post for this wiki" +msgstr "Plaats een bericht over deze wiki" -#: ../../Zotlabs/Module/Editpost.php:35 -msgid "Item is not editable" -msgstr "Item is niet te bewerken" +#: ../../Zotlabs/Module/Wiki.php:220 +msgid "Edit Wiki Name" +msgstr "Naam wiki bewerken" -#: ../../Zotlabs/Module/Ratings.php:70 -msgid "No ratings" -msgstr "Geen beoordelingen" +#: ../../Zotlabs/Module/Wiki.php:262 +msgid "Wiki not found" +msgstr "Wiki is niet gevonden" -#: ../../Zotlabs/Module/Ratings.php:98 -msgid "Rating: " -msgstr "Beoordeling: " +#: ../../Zotlabs/Module/Wiki.php:286 +msgid "Rename page" +msgstr "Pagina hernoemen" -#: ../../Zotlabs/Module/Ratings.php:99 -msgid "Website: " -msgstr "Website: " +#: ../../Zotlabs/Module/Wiki.php:307 +msgid "Error retrieving page content" +msgstr "Fout tijdens ophalen inhoud pagina" -#: ../../Zotlabs/Module/Ratings.php:101 -msgid "Description: " -msgstr "Omschrijving: " +#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317 +msgid "New page" +msgstr "Nieuwe pagina" -#: ../../Zotlabs/Module/Attach.php:13 -msgid "Item not available." -msgstr "Item is niet aanwezig." +#: ../../Zotlabs/Module/Wiki.php:345 +msgid "Revision Comparison" +msgstr "Revisies vergelijken" -#: ../../Zotlabs/Module/Cal.php:69 -msgid "Permissions denied." -msgstr "Permissies niet toegestaan" +#: ../../Zotlabs/Module/Wiki.php:346 +msgid "Revert" +msgstr "Ongedaan maken" -#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2312 -msgid "Import" -msgstr "Importeren" +#: ../../Zotlabs/Module/Wiki.php:353 +msgid "Short description of your changes (optional)" +msgstr "Korte omschrijving van jouw wijzigingen (niet verplicht)" -#: ../../Zotlabs/Module/Notify.php:57 -#: ../../Zotlabs/Module/Notifications.php:38 -msgid "No more system notifications." -msgstr "Geen systeemnotificaties meer." +#: ../../Zotlabs/Module/Wiki.php:362 +msgid "Source" +msgstr "Bron" -#: ../../Zotlabs/Module/Notify.php:61 -#: ../../Zotlabs/Module/Notifications.php:42 -msgid "System Notifications" -msgstr "Systeemnotificaties" +#: ../../Zotlabs/Module/Wiki.php:372 +msgid "New page name" +msgstr "Nieuwe paginanaam" -#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93 -msgid "Authorize application connection" -msgstr "Geef toestemming voor applicatiekoppeling" +#: ../../Zotlabs/Module/Wiki.php:377 ../../include/conversation.php:1282 +msgid "Embed image from photo albums" +msgstr "Afbeelding uit een fotoalbum invoegen" -#: ../../Zotlabs/Module/Api.php:73 -msgid "Return to your app and insert this Security Code:" -msgstr "Ga terug naar je app en voeg deze beveiligingscode in:" +#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1388 +msgid "Embed an image from your albums" +msgstr "Afbeelding uit jouw albums invoegen" -#: ../../Zotlabs/Module/Api.php:83 -msgid "Please login to continue." -msgstr "Inloggen om verder te kunnen gaan." +#: ../../Zotlabs/Module/Wiki.php:380 +#: ../../Zotlabs/Module/Profile_photo.php:465 +#: ../../Zotlabs/Module/Cover_photo.php:367 +#: ../../include/conversation.php:1390 ../../include/conversation.php:1437 +msgid "OK" +msgstr "OK" -#: ../../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?" -msgstr "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?" +#: ../../Zotlabs/Module/Wiki.php:381 +#: ../../Zotlabs/Module/Profile_photo.php:466 +#: ../../Zotlabs/Module/Cover_photo.php:368 +#: ../../include/conversation.php:1320 +msgid "Choose images to embed" +msgstr "Kies afbeeldingen om in te voegen" -#: ../../Zotlabs/Module/Invite.php:29 -msgid "Total invitation limit exceeded." -msgstr "Limiet voor aantal uitnodigingen overschreden." +#: ../../Zotlabs/Module/Wiki.php:382 +#: ../../Zotlabs/Module/Profile_photo.php:467 +#: ../../Zotlabs/Module/Cover_photo.php:369 +#: ../../include/conversation.php:1321 +msgid "Choose an album" +msgstr "Kies een album" -#: ../../Zotlabs/Module/Invite.php:53 -#, php-format -msgid "%s : Not a valid email address." -msgstr "%s : Geen geldig e-mailadres." +#: ../../Zotlabs/Module/Wiki.php:383 +#: ../../Zotlabs/Module/Profile_photo.php:468 +#: ../../Zotlabs/Module/Cover_photo.php:370 +msgid "Choose a different album" +msgstr "Kies een ander album" -#: ../../Zotlabs/Module/Invite.php:67 -msgid "Please join us on $Projectname" -msgstr "Uitnodiging voor $Projectname" +#: ../../Zotlabs/Module/Wiki.php:384 +#: ../../Zotlabs/Module/Profile_photo.php:469 +#: ../../Zotlabs/Module/Cover_photo.php:371 +#: ../../include/conversation.php:1323 +msgid "Error getting album list" +msgstr "Fout tijdens ophalen albumlijst" -#: ../../Zotlabs/Module/Invite.php:77 -msgid "Invitation limit exceeded. Please contact your site administrator." -msgstr "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder." +#: ../../Zotlabs/Module/Wiki.php:385 +#: ../../Zotlabs/Module/Profile_photo.php:470 +#: ../../Zotlabs/Module/Cover_photo.php:372 +#: ../../include/conversation.php:1324 +msgid "Error getting photo link" +msgstr "Fout tijdens ophalen fotolink" -#: ../../Zotlabs/Module/Invite.php:82 -#, php-format -msgid "%s : Message delivery failed." -msgstr "%s: Aflevering bericht mislukt." +#: ../../Zotlabs/Module/Wiki.php:386 +#: ../../Zotlabs/Module/Profile_photo.php:471 +#: ../../Zotlabs/Module/Cover_photo.php:373 +#: ../../include/conversation.php:1325 +msgid "Error getting album" +msgstr "Fout tijdens ophalen album" -#: ../../Zotlabs/Module/Invite.php:86 -#, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "%d bericht verzonden." -msgstr[1] "%d berichten verzonden." +#: ../../Zotlabs/Module/Wiki.php:462 +msgid "Error creating wiki. Invalid name." +msgstr "Fout tijdens aanmaken wiki. Ongeldige naam." -#: ../../Zotlabs/Module/Invite.php:105 -msgid "You have no more invitations available" -msgstr "Je hebt geen uitnodigingen meer beschikbaar" +#: ../../Zotlabs/Module/Wiki.php:469 +msgid "A wiki with this name already exists." +msgstr "Er bestaat al een wiki onder deze naam" -#: ../../Zotlabs/Module/Invite.php:136 -msgid "Send invitations" -msgstr "Uitnodigingen verzenden" +#: ../../Zotlabs/Module/Wiki.php:482 +msgid "Wiki created, but error creating Home page." +msgstr "Wiki aangemaakt, maar fout tijdens aanmaken homepagina." -#: ../../Zotlabs/Module/Invite.php:137 -msgid "Enter email addresses, one per line:" -msgstr "Voer e-mailadressen in, één per regel:" +#: ../../Zotlabs/Module/Wiki.php:489 +msgid "Error creating wiki" +msgstr "Fout tijdens aanmaken wiki." -#: ../../Zotlabs/Module/Invite.php:139 -msgid "Please join my community on $Projectname." -msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op $Projectname te vergezellen. Lees meer over $Projectname op http://hubzilla.org" +#: ../../Zotlabs/Module/Wiki.php:512 +msgid "Error updating wiki. Invalid name." +msgstr "Fout tijdens bijwerken wiki. Ongeldige naam." -#: ../../Zotlabs/Module/Invite.php:141 -msgid "You will need to supply this invitation code:" -msgstr "Je moet deze uitnodigingscode opgeven:" +#: ../../Zotlabs/Module/Wiki.php:532 +msgid "Error updating wiki" +msgstr "Fout tijdens bijwerken wiki" -#: ../../Zotlabs/Module/Invite.php:142 -msgid "" -"1. Register at any $Projectname location (they are all inter-connected)" -msgstr "1. Registreer je op een willekeurige $Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):" +#: ../../Zotlabs/Module/Wiki.php:547 +msgid "Wiki delete permission denied." +msgstr "Toegang geweigerd tijdens verwijderen wiki." -#: ../../Zotlabs/Module/Invite.php:144 -msgid "2. Enter my $Projectname network address into the site searchbar." -msgstr "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn $Projectname-kanaaladres in het zoekveld invullen:" +#: ../../Zotlabs/Module/Wiki.php:557 +msgid "Error deleting wiki" +msgstr "Fout tijdens verwijderen wiki" -#: ../../Zotlabs/Module/Invite.php:145 -msgid "or visit" -msgstr "of bezoek" +#: ../../Zotlabs/Module/Wiki.php:590 +msgid "New page created" +msgstr "Nieuwe pagina aangemaakt" -#: ../../Zotlabs/Module/Invite.php:147 -msgid "3. Click [Connect]" -msgstr "3. Klik op [+ Verbinden]" +#: ../../Zotlabs/Module/Wiki.php:711 +msgid "Cannot delete Home" +msgstr "Kan Home niet verwijderen" -#: ../../Zotlabs/Module/Siteinfo.php:20 -msgid "About this site" -msgstr "Over deze hub" +#: ../../Zotlabs/Module/Wiki.php:775 +msgid "Current Revision" +msgstr "Huidige revisie" -#: ../../Zotlabs/Module/Siteinfo.php:21 -msgid "Site Name" -msgstr "Hubnaam" +#: ../../Zotlabs/Module/Wiki.php:775 +msgid "Selected Revision" +msgstr "Geselecteerde revisie" -#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1995 -msgid "Administrator" -msgstr "Beheerder" +#: ../../Zotlabs/Module/Wiki.php:825 +msgid "You must be authenticated." +msgstr "Je moet geauthenticeerd zijn" -#: ../../Zotlabs/Module/Siteinfo.php:28 -msgid "Software and Project information" -msgstr "Software- en projectinformatie" +#: ../../Zotlabs/Module/Chanview.php:139 +msgid "toggle full screen mode" +msgstr "Volledig scherm" -#: ../../Zotlabs/Module/Siteinfo.php:29 -msgid "This site is powered by $Projectname" -msgstr "Dit is een $Projectname-hub" +#: ../../Zotlabs/Module/Pdledit.php:21 +msgid "Layout updated." +msgstr "Lay-out bijgewerkt." -#: ../../Zotlabs/Module/Siteinfo.php:30 -msgid "" -"Federated and decentralised networking and identity services provided by Zot" -msgstr "Federatieve en gedecentraliseerde netwerk- en identiteitsdiensten, mogelijk gemaakt door Zot" +#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219 +msgid "Feature disabled." +msgstr "Functie uitgeschakeld." -#: ../../Zotlabs/Module/Siteinfo.php:32 -#, php-format -msgid "Version %s" -msgstr "Versie %s" +#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:90 +msgid "Edit System Page Description" +msgstr "Systeempagina's bewerken" -#: ../../Zotlabs/Module/Siteinfo.php:33 -msgid "Project homepage" -msgstr "Projectwebsite" +#: ../../Zotlabs/Module/Pdledit.php:68 +msgid "(modified)" +msgstr "(aangepast)" -#: ../../Zotlabs/Module/Siteinfo.php:34 -msgid "Developer homepage" -msgstr "Ontwikkelaarswebsite" +#: ../../Zotlabs/Module/Pdledit.php:68 ../../Zotlabs/Module/Lostpass.php:133 +msgid "Reset" +msgstr "Opnieuw instellen" -#: ../../Zotlabs/Module/New_channel.php:140 -msgid "Create Channel" -msgstr "Kanaal aanmaken" +#: ../../Zotlabs/Module/Pdledit.php:85 +msgid "Layout not found." +msgstr "Lay-out niet gevonden." -#: ../../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 "Een kanaal is jouw identiteit in dit netwerk. Het kan bijvoorbeeld een persoon, een blog of een forum vertegenwoordigen. Door met elkaar te verbinden kunnen kanalen, met behulp van uitgebreide permissies, informatie uitwisselen." +#: ../../Zotlabs/Module/Pdledit.php:91 +msgid "Module Name:" +msgstr "Modulenaam:" -#: ../../Zotlabs/Module/New_channel.php:142 -msgid "" -"or import an existing channel from another location." -msgstr "Of importeer een bestaand kanaal vanaf een andere locatie" +#: ../../Zotlabs/Module/Pdledit.php:92 +msgid "Layout Help" +msgstr "Lay-out-hulp" -#: ../../Zotlabs/Module/Webpages.php:52 -msgid "Import Webpage Elements" -msgstr "Webpagina-elementen importeren" +#: ../../Zotlabs/Module/Pdledit.php:93 +msgid "Edit another layout" +msgstr "Andere systeempagina bewerken" -#: ../../Zotlabs/Module/Webpages.php:53 -msgid "Import selected" -msgstr "Importbestand geselecteerd" +#: ../../Zotlabs/Module/Pdledit.php:94 +msgid "System layout" +msgstr "Systeemlay-out" -#: ../../Zotlabs/Module/Webpages.php:76 -msgid "Export Webpage Elements" -msgstr "Webpagina-elementen exporteren" +#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:254 +#: ../../include/conversation.php:1092 +msgid "Poke" +msgstr "Aanstoten" -#: ../../Zotlabs/Module/Webpages.php:77 -msgid "Export selected" -msgstr "Selectie exporteren" +#: ../../Zotlabs/Module/Poke.php:183 +msgid "Poke somebody" +msgstr "Iemand aanstoten" -#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Lib/Apps.php:225 -#: ../../include/conversation.php:1889 -msgid "Webpages" -msgstr "Webpagina's" +#: ../../Zotlabs/Module/Poke.php:186 +msgid "Poke/Prod" +msgstr "Aanstoten/porren" -#: ../../Zotlabs/Module/Webpages.php:252 ../../include/page_widgets.php:44 -msgid "Actions" -msgstr "Acties" +#: ../../Zotlabs/Module/Poke.php:187 +msgid "Poke, prod or do other things to somebody" +msgstr "Iemand bijvoorbeeld aanstoten of poren" -#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:45 -msgid "Page Link" -msgstr "Paginalink" +#: ../../Zotlabs/Module/Poke.php:194 +msgid "Recipient" +msgstr "Ontvanger" -#: ../../Zotlabs/Module/Webpages.php:254 -msgid "Page Title" -msgstr "Paginatitel" +#: ../../Zotlabs/Module/Poke.php:195 +msgid "Choose what you wish to do to recipient" +msgstr "Kies wat je met de ontvanger wil doen" -#: ../../Zotlabs/Module/Webpages.php:284 -msgid "Invalid file type." -msgstr "Ongeldig bestandsformaat" +#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199 +msgid "Make this post private" +msgstr "Maak dit bericht privé" -#: ../../Zotlabs/Module/Webpages.php:296 -msgid "Error opening zip file" -msgstr "Fout tijdens openen zipbestand" +#: ../../Zotlabs/Module/Profile_photo.php:66 +#: ../../Zotlabs/Module/Cover_photo.php:56 +msgid "Image uploaded but image cropping failed." +msgstr "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. " -#: ../../Zotlabs/Module/Webpages.php:307 -msgid "Invalid folder path." -msgstr "Ongeldige maplocatie" +#: ../../Zotlabs/Module/Profile_photo.php:120 +#: ../../Zotlabs/Module/Profile_photo.php:248 +#: ../../include/photo/photo_driver.php:741 +msgid "Profile Photos" +msgstr "Profielfoto's" -#: ../../Zotlabs/Module/Webpages.php:334 -msgid "No webpage elements detected." -msgstr "Geen webpagina-elementen gedecteerd" +#: ../../Zotlabs/Module/Profile_photo.php:142 +#: ../../Zotlabs/Module/Cover_photo.php:159 +msgid "Image resize failed." +msgstr "Afbeelding kon niet van grootte veranderd worden." + +#: ../../Zotlabs/Module/Profile_photo.php:218 +#: ../../addon/openclipatar/openclipatar.php:298 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt getoond." -#: ../../Zotlabs/Module/Webpages.php:409 -msgid "Import complete." -msgstr "Importeren voltooid." +#: ../../Zotlabs/Module/Profile_photo.php:225 +#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:195 +msgid "Unable to process image" +msgstr "Afbeelding kan niet verwerkt worden" -#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:208 -msgid "Mark all system notifications seen" -msgstr "Markeer alle systeemnotificaties als bekeken" +#: ../../Zotlabs/Module/Profile_photo.php:260 +#: ../../Zotlabs/Module/Cover_photo.php:197 +msgid "Image upload failed." +msgstr "Uploaden afbeelding mislukt" -#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235 -#: ../../include/conversation.php:942 ../../include/conversation.php:1109 -msgid "Poke" -msgstr "Aanstoten" +#: ../../Zotlabs/Module/Profile_photo.php:279 +#: ../../Zotlabs/Module/Cover_photo.php:214 +msgid "Unable to process image." +msgstr "Niet in staat om afbeelding te verwerken." -#: ../../Zotlabs/Module/Poke.php:169 -msgid "Poke somebody" -msgstr "Iemand aanstoten" +#: ../../Zotlabs/Module/Profile_photo.php:343 +#: ../../Zotlabs/Module/Profile_photo.php:390 +#: ../../Zotlabs/Module/Cover_photo.php:307 +#: ../../Zotlabs/Module/Cover_photo.php:322 +msgid "Photo not available." +msgstr "Foto niet beschikbaar." -#: ../../Zotlabs/Module/Poke.php:172 -msgid "Poke/Prod" -msgstr "Aanstoten/porren" +#: ../../Zotlabs/Module/Profile_photo.php:455 +#: ../../Zotlabs/Module/Cover_photo.php:359 +msgid "Upload File:" +msgstr "Bestand uploaden:" -#: ../../Zotlabs/Module/Poke.php:173 -msgid "Poke, prod or do other things to somebody" -msgstr "Iemand bijvoorbeeld aanstoten of poren" +#: ../../Zotlabs/Module/Profile_photo.php:456 +#: ../../Zotlabs/Module/Cover_photo.php:360 +msgid "Select a profile:" +msgstr "Kies een profiel:" -#: ../../Zotlabs/Module/Poke.php:180 -msgid "Recipient" -msgstr "Ontvanger" +#: ../../Zotlabs/Module/Profile_photo.php:457 +msgid "Use Photo for Profile" +msgstr "Als profielfoto gebruiken" -#: ../../Zotlabs/Module/Poke.php:181 -msgid "Choose what you wish to do to recipient" -msgstr "Kies wat je met de ontvanger wil doen" +#: ../../Zotlabs/Module/Profile_photo.php:457 +msgid "Change Profile Photo" +msgstr "Profielfoto wijzigen" -#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185 -msgid "Make this post private" -msgstr "Maak dit bericht privé" +#: ../../Zotlabs/Module/Profile_photo.php:458 +msgid "Use" +msgstr "Gebruiken" -#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63 -msgid "Invalid profile identifier." -msgstr "Ongeldige profiel-identificator" +#: ../../Zotlabs/Module/Profile_photo.php:462 +#: ../../Zotlabs/Module/Profile_photo.php:463 +#: ../../Zotlabs/Module/Cover_photo.php:364 +#: ../../Zotlabs/Module/Cover_photo.php:365 +msgid "Use a photo from your albums" +msgstr "Gebruik een foto uit jouw albums" -#: ../../Zotlabs/Module/Profperm.php:111 -msgid "Profile Visibility Editor" -msgstr "Zichtbaarheid profiel " +#: ../../Zotlabs/Module/Profile_photo.php:473 +#: ../../Zotlabs/Module/Cover_photo.php:376 +msgid "Select existing photo" +msgstr "Kies een bestaande foto" -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1367 -msgid "Profile" -msgstr "Profiel" +#: ../../Zotlabs/Module/Profile_photo.php:492 +#: ../../Zotlabs/Module/Cover_photo.php:393 +msgid "Crop Image" +msgstr "Afbeelding bijsnijden" -#: ../../Zotlabs/Module/Profperm.php:115 -msgid "Click on a contact to add or remove." -msgstr "Klik op een connectie om deze toe te voegen of te verwijderen" +#: ../../Zotlabs/Module/Profile_photo.php:493 +#: ../../Zotlabs/Module/Cover_photo.php:394 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "Snij de afbeelding zo uit dat deze optimaal wordt getoond." -#: ../../Zotlabs/Module/Profperm.php:124 -msgid "Visible To" -msgstr "Zichtbaar voor" +#: ../../Zotlabs/Module/Profile_photo.php:495 +#: ../../Zotlabs/Module/Cover_photo.php:396 +msgid "Done Editing" +msgstr "Klaar met bewerken" -#: ../../Zotlabs/Module/Hcard.php:35 ../../Zotlabs/Module/Channel.php:47 -#: ../../Zotlabs/Module/Profile.php:43 -msgid "Posts and comments" -msgstr "Berichten en reacties" +#: ../../Zotlabs/Module/Chatsvc.php:131 +msgid "Away" +msgstr "Afwezig" -#: ../../Zotlabs/Module/Hcard.php:42 ../../Zotlabs/Module/Channel.php:54 -#: ../../Zotlabs/Module/Profile.php:50 -msgid "Only posts" -msgstr "Alleen berichten" +#: ../../Zotlabs/Module/Chatsvc.php:136 +msgid "Online" +msgstr "Online" -#: ../../Zotlabs/Module/Item.php:184 +#: ../../Zotlabs/Module/Item.php:194 msgid "Unable to locate original post." msgstr "Niet in staat om de originele locatie van het bericht te vinden. " -#: ../../Zotlabs/Module/Item.php:450 +#: ../../Zotlabs/Module/Item.php:477 msgid "Empty post discarded." msgstr "Leeg bericht geannuleerd" -#: ../../Zotlabs/Module/Item.php:492 -msgid "Executable content type not permitted to this channel." -msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal." - -#: ../../Zotlabs/Module/Item.php:842 +#: ../../Zotlabs/Module/Item.php:874 msgid "Duplicate post suppressed." msgstr "Dubbel bericht tegengehouden." -#: ../../Zotlabs/Module/Item.php:984 +#: ../../Zotlabs/Module/Item.php:1019 msgid "System error. Post not saved." msgstr "Systeemfout. Bericht niet opgeslagen." -#: ../../Zotlabs/Module/Item.php:1114 +#: ../../Zotlabs/Module/Item.php:1055 +msgid "Your comment is awaiting approval." +msgstr "Jouw reactie moet nog worden goedgekeurd" + +#: ../../Zotlabs/Module/Item.php:1160 msgid "Unable to obtain post information from database." msgstr "Niet in staat om informatie over dit bericht uit de database te verkrijgen." -#: ../../Zotlabs/Module/Item.php:1121 +#: ../../Zotlabs/Module/Item.php:1189 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt." -#: ../../Zotlabs/Module/Item.php:1128 +#: ../../Zotlabs/Module/Item.php:1196 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt." -#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 -msgid "This setting requires special processing and editing has been blocked." -msgstr "Deze instelling vereist een speciaal proces en bewerken is geblokkeerd." +#: ../../Zotlabs/Module/Ping.php:330 +msgid "sent you a private message" +msgstr "stuurde jou een privébericht" -#: ../../Zotlabs/Module/Pconfig.php:48 -msgid "Configuration Editor" -msgstr "Configuratiebewerker" +#: ../../Zotlabs/Module/Ping.php:383 +msgid "added your channel" +msgstr "voegde jouw kanaal toe" -#: ../../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 "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. " +#: ../../Zotlabs/Module/Ping.php:407 +msgid "requires approval" +msgstr "vereist goedkeuring" -#: ../../Zotlabs/Module/Search.php:224 -#, php-format -msgid "Items tagged with: %s" -msgstr "Items getagd met %s" +#: ../../Zotlabs/Module/Ping.php:417 +msgid "g A l F d" +msgstr "G:i, l d F" -#: ../../Zotlabs/Module/Search.php:226 -#, php-format -msgid "Search results for: %s" -msgstr "Zoekresultaten voor %s" +#: ../../Zotlabs/Module/Ping.php:435 +msgid "[today]" +msgstr "[vandaag]" -#: ../../Zotlabs/Module/Lockview.php:75 -msgid "Remote privacy information not available." -msgstr "Privacy-informatie op afstand niet beschikbaar." +#: ../../Zotlabs/Module/Ping.php:444 +msgid "posted an event" +msgstr "plaatste een gebeurtenis" -#: ../../Zotlabs/Module/Lockview.php:96 -msgid "Visible to:" -msgstr "Zichtbaar voor:" +#: ../../Zotlabs/Module/Ping.php:477 +msgid "shared a file with you" +msgstr "deelde een bestand met jou" -#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 -#: ../../Zotlabs/Module/Acl.php:117 ../../include/acl_selectors.php:183 -msgctxt "acl" -msgid "Profile" -msgstr "Profiel" +#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29 +msgid "Invalid item." +msgstr "Ongeldig item." -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2288 -msgid "Blocks" -msgstr "Blokken" +#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 +#: ../../Zotlabs/Module/Display.php:141 ../../Zotlabs/Module/Display.php:158 +#: ../../Zotlabs/Module/Display.php:175 +#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:167 +#: ../../include/help.php:81 +msgid "Page not found." +msgstr "Pagina niet gevonden." -#: ../../Zotlabs/Module/Blocks.php:156 -msgid "Block Title" -msgstr "Bloktitel" +#: ../../Zotlabs/Module/Page.php:173 +msgid "" +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam," +" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " +"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " +"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " +"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." +msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2290 -msgid "Layouts" -msgstr "Lay-outs" +#: ../../Zotlabs/Module/Connedit.php:79 ../../Zotlabs/Module/Defperms.php:59 +msgid "Could not access contact record." +msgstr "Kon geen toegang krijgen tot de connectie-gegevens." -#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:232 -#: ../../include/help.php:55 ../../include/help.php:61 -#: ../../include/nav.php:174 ../../include/nav.php:288 -msgid "Help" -msgstr "Hulp" +#: ../../Zotlabs/Module/Connedit.php:109 +msgid "Could not locate selected profile." +msgstr "Kon het gekozen profiel niet vinden." -#: ../../Zotlabs/Module/Layouts.php:185 -msgid "Comanche page description language help" -msgstr "Hulp met de paginabeschrijvingstaal Comanche" +#: ../../Zotlabs/Module/Connedit.php:246 +msgid "Connection updated." +msgstr "Connectie bijgewerkt." -#: ../../Zotlabs/Module/Layouts.php:189 -msgid "Layout Description" -msgstr "Lay-out-omschrijving" +#: ../../Zotlabs/Module/Connedit.php:248 +msgid "Failed to update connection record." +msgstr "Bijwerken van connectie-gegevens mislukt." -#: ../../Zotlabs/Module/Layouts.php:194 -msgid "Download PDL file" -msgstr "Download PDL-bestand" +#: ../../Zotlabs/Module/Connedit.php:302 +msgid "is now connected to" +msgstr "is nu verbonden met" -#: ../../Zotlabs/Module/Rate.php:156 -msgid "Website:" -msgstr "Website:" +#: ../../Zotlabs/Module/Connedit.php:427 +msgid "Could not access address book record." +msgstr "Kon geen toegang krijgen tot de record van de connectie." -#: ../../Zotlabs/Module/Rate.php:159 -#, php-format -msgid "Remote Channel [%s] (not yet known on this site)" -msgstr "Kanaal op afstand [%s] (nog niet op deze hub bekend)" +#: ../../Zotlabs/Module/Connedit.php:475 +msgid "Refresh failed - channel is currently unavailable." +msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar" -#: ../../Zotlabs/Module/Rate.php:160 -msgid "Rating (this information is public)" -msgstr "Beoordeling (deze informatie is openbaar)" +#: ../../Zotlabs/Module/Connedit.php:490 ../../Zotlabs/Module/Connedit.php:499 +#: ../../Zotlabs/Module/Connedit.php:508 ../../Zotlabs/Module/Connedit.php:517 +#: ../../Zotlabs/Module/Connedit.php:530 +msgid "Unable to set address book parameters." +msgstr "Niet in staat om de parameters van connecties in te stellen." -#: ../../Zotlabs/Module/Rate.php:161 -msgid "Optionally explain your rating (this information is public)" -msgstr "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)" +#: ../../Zotlabs/Module/Connedit.php:554 +msgid "Connection has been removed." +msgstr "Connectie is verwijderd" -#: ../../Zotlabs/Module/Profile_photo.php:194 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:298 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven." +#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:247 +#: ../../addon/openclipatar/openclipatar.php:57 +#: ../../include/conversation.php:1032 ../../include/nav.php:114 +msgid "View Profile" +msgstr "Profiel tonen" -#: ../../Zotlabs/Module/Profile_photo.php:420 -msgid "Use Photo for Profile" -msgstr "Als profielfoto gebruiken" +#: ../../Zotlabs/Module/Connedit.php:597 +#, php-format +msgid "View %s's profile" +msgstr "Profiel van %s tonen" -#: ../../Zotlabs/Module/Profile_photo.php:420 -msgid "Upload Profile Photo" -msgstr "Profielfoto uploaden" +#: ../../Zotlabs/Module/Connedit.php:601 +msgid "Refresh Permissions" +msgstr "Permissies vernieuwen" -#: ../../Zotlabs/Module/Profile_photo.php:421 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:182 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:194 -msgid "Use" -msgstr "Gebruiken" +#: ../../Zotlabs/Module/Connedit.php:604 +msgid "Fetch updated permissions" +msgstr "Aangepaste permissies ophalen" -#: ../../Zotlabs/Module/Like.php:19 -msgid "Like/Dislike" -msgstr "Leuk/niet leuk" +#: ../../Zotlabs/Module/Connedit.php:608 +msgid "Refresh Photo" +msgstr "Foto vernieuwen" -#: ../../Zotlabs/Module/Like.php:24 -msgid "This action is restricted to members." -msgstr "Deze actie kan alleen door $Projectname-leden worden uitgevoerd." +#: ../../Zotlabs/Module/Connedit.php:611 +msgid "Fetch updated photo" +msgstr "Aangepaste foto ophalen" -#: ../../Zotlabs/Module/Like.php:25 -msgid "" -"Please login with your $Projectname ID or register as a new $Projectname member to continue." -msgstr "Je dient in te loggen met je $Projectname-account of een nieuw $Projectname-account aan te maken om verder te kunnen gaan." +#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1042 +msgid "Recent Activity" +msgstr "Recente activiteit/berichten" -#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 -#: ../../Zotlabs/Module/Like.php:169 -msgid "Invalid request." -msgstr "Ongeldig verzoek" +#: ../../Zotlabs/Module/Connedit.php:618 +msgid "View recent posts and comments" +msgstr "Recente berichten en reacties tonen" -#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 -msgid "channel" -msgstr "kanaal" +#: ../../Zotlabs/Module/Connedit.php:625 +msgid "Block (or Unblock) all communications with this connection" +msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie" -#: ../../Zotlabs/Module/Like.php:146 -msgid "thing" -msgstr "ding" +#: ../../Zotlabs/Module/Connedit.php:626 +msgid "This connection is blocked!" +msgstr "Deze connectie is geblokkeerd!" -#: ../../Zotlabs/Module/Like.php:192 -msgid "Channel unavailable." -msgstr "Kanaal niet beschikbaar." +#: ../../Zotlabs/Module/Connedit.php:630 +msgid "Unignore" +msgstr "Niet meer negeren" -#: ../../Zotlabs/Module/Like.php:240 -msgid "Previous action reversed." -msgstr "Vorige actie omgedraaid" +#: ../../Zotlabs/Module/Connedit.php:633 +msgid "Ignore (or Unignore) all inbound communications from this connection" +msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie" -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../Zotlabs/Module/Tagger.php:47 -#: ../../extend/addon/addon/diaspora/inbound.php:1794 -#: ../../extend/addon/addon/redphotos/redphotohelper.php:74 -#: ../../include/conversation.php:120 ../../include/text.php:1958 -msgid "photo" -msgstr "foto" +#: ../../Zotlabs/Module/Connedit.php:634 +msgid "This connection is ignored!" +msgstr "Deze connectie wordt genegeerd!" -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../extend/addon/addon/diaspora/inbound.php:1794 -#: ../../include/conversation.php:148 ../../include/text.php:1964 -msgid "status" -msgstr "bericht" +#: ../../Zotlabs/Module/Connedit.php:638 +msgid "Unarchive" +msgstr "Niet meer archiveren" -#: ../../Zotlabs/Module/Like.php:419 -#: ../../extend/addon/addon/diaspora/inbound.php:1823 -#: ../../include/conversation.php:164 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "%1$s vindt %3$s van %2$s leuk" +#: ../../Zotlabs/Module/Connedit.php:638 +msgid "Archive" +msgstr "Archiveren" -#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "%1$s vindt %3$s van %2$s niet leuk" +#: ../../Zotlabs/Module/Connedit.php:641 +msgid "" +"Archive (or Unarchive) this connection - mark channel dead but keep content" +msgstr "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud" -#: ../../Zotlabs/Module/Like.php:423 -#, php-format -msgid "%1$s agrees with %2$s's %3$s" -msgstr "%1$s is het eens met %2$s's %3$s" +#: ../../Zotlabs/Module/Connedit.php:642 +msgid "This connection is archived!" +msgstr "Deze connectie is gearchiveerd!" -#: ../../Zotlabs/Module/Like.php:425 -#, php-format -msgid "%1$s doesn't agree with %2$s's %3$s" -msgstr "%1$s is het niet eens met %2$s's %3$s" +#: ../../Zotlabs/Module/Connedit.php:646 +msgid "Unhide" +msgstr "Niet meer verbergen" + +#: ../../Zotlabs/Module/Connedit.php:646 +msgid "Hide" +msgstr "Verbergen" + +#: ../../Zotlabs/Module/Connedit.php:649 +msgid "Hide or Unhide this connection from your other connections" +msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties" + +#: ../../Zotlabs/Module/Connedit.php:650 +msgid "This connection is hidden!" +msgstr "Deze connectie is verborgen!" -#: ../../Zotlabs/Module/Like.php:427 -#, php-format -msgid "%1$s abstains from a decision on %2$s's %3$s" -msgstr "%1$s onthoudt zich van een besluit over %2$s's %3$s" +#: ../../Zotlabs/Module/Connedit.php:657 +msgid "Delete this connection" +msgstr "Deze connectie verwijderen" -#: ../../Zotlabs/Module/Like.php:429 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "%1$s is aanwezig op %2$s's %3$s" +#: ../../Zotlabs/Module/Connedit.php:665 +msgid "Fetch Vcard" +msgstr "Vcard ophalen" -#: ../../Zotlabs/Module/Like.php:431 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "%1$s is niet aanwezig op %2$s's %3$s" +#: ../../Zotlabs/Module/Connedit.php:668 +msgid "Fetch electronic calling card for this connection" +msgstr "Visitekaartje van deze connectie ophalen" -#: ../../Zotlabs/Module/Like.php:433 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "%1$s is mogelijk aanwezig op %2$s's %3$s" +#: ../../Zotlabs/Module/Connedit.php:679 +msgid "Open Individual Permissions section by default" +msgstr "Sectie met individuele permissies standaard openen" -#: ../../Zotlabs/Module/Like.php:538 -msgid "Action completed." -msgstr "Actie voltooid" +#: ../../Zotlabs/Module/Connedit.php:702 +msgid "Affinity" +msgstr "Affiniteit" -#: ../../Zotlabs/Module/Like.php:539 -msgid "Thank you." -msgstr "Bedankt" +#: ../../Zotlabs/Module/Connedit.php:705 +msgid "Open Set Affinity section by default" +msgstr "Sectie met de affiniteitsinstelling standaard openen" -#: ../../Zotlabs/Module/Common.php:14 -msgid "No channel." -msgstr "Geen kanaal." +#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:22 +msgid "Me" +msgstr "Ik" -#: ../../Zotlabs/Module/Common.php:43 -msgid "Common connections" -msgstr "Veel voorkomende connecties" +#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:23 +msgid "Family" +msgstr "Familie" -#: ../../Zotlabs/Module/Common.php:48 -msgid "No connections in common." -msgstr "Geen gemeenschappelijke connecties." +#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:25 +msgid "Acquaintances" +msgstr "Kennissen" -#: ../../Zotlabs/Module/Chanview.php:134 -msgid "toggle full screen mode" -msgstr "Volledig scherm" +#: ../../Zotlabs/Module/Connedit.php:739 +msgid "Filter" +msgstr "Filter" -#: ../../Zotlabs/Module/Subthread.php:118 -#, php-format -msgid "%1$s is following %2$s's %3$s" -msgstr "%1$s volgt het %3$s van %2$s" +#: ../../Zotlabs/Module/Connedit.php:742 +msgid "Open Custom Filter section by default" +msgstr "Sectie met de berichtenfilter standaard openen" -#: ../../Zotlabs/Module/Subthread.php:120 -#, php-format -msgid "%1$s stopped following %2$s's %3$s" -msgstr "%1$s volgt het %3$s van %2$s niet meer" +#: ../../Zotlabs/Module/Connedit.php:779 +msgid "Approve this connection" +msgstr "Deze connectie accepteren" -#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25 -#: ../../extend/addon/addon/chess/chess.php:403 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:26 -msgid "You must be logged in to see this page." -msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken." +#: ../../Zotlabs/Module/Connedit.php:779 +msgid "Accept connection to allow communication" +msgstr "Keur deze connectie goed om communicatie toe te staan" -#: ../../Zotlabs/Module/Channel.php:112 -msgid "Insufficient permissions. Request redirected to profile page." -msgstr "Onvoldoende permissies. Doorgestuurd naar profielpagina." +#: ../../Zotlabs/Module/Connedit.php:784 +msgid "Set Affinity" +msgstr "Affiniteit instellen" -#: ../../Zotlabs/Module/Lostpass.php:19 -msgid "No valid account found." -msgstr "Geen geldige account gevonden." +#: ../../Zotlabs/Module/Connedit.php:787 +msgid "Set Profile" +msgstr "Profiel instellen" -#: ../../Zotlabs/Module/Lostpass.php:33 -msgid "Password reset request issued. Check your email." -msgstr "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail." +#: ../../Zotlabs/Module/Connedit.php:790 +msgid "Set Affinity & Profile" +msgstr "Affiniteit en profiel instellen" -#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108 -#, php-format -msgid "Site Member (%s)" -msgstr "Lid van hub (%s)" +#: ../../Zotlabs/Module/Connedit.php:838 +msgid "This connection is unreachable from this location." +msgstr "Deze connectie is onbereikbaar vanaf deze locatie" -#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49 -#, php-format -msgid "Password reset requested at %s" -msgstr "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend" +#: ../../Zotlabs/Module/Connedit.php:839 +msgid "This connection may be unreachable from other channel locations." +msgstr "Deze connectie is mogelijk onbereikbaar vanaf andere kanaallocaties." -#: ../../Zotlabs/Module/Lostpass.php:68 +#: ../../Zotlabs/Module/Connedit.php:841 +msgid "Location independence is not supported by their network." +msgstr "Het netwerk van deze connectie ondersteund geen locatieonafhankelijkheid." + +#: ../../Zotlabs/Module/Connedit.php:847 msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." -msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt." +"This connection is unreachable from this location. Location independence is " +"not supported by their network." +msgstr "Deze connectie is onbereikbaar vanaf deze locatie. Het netwerk van deze connectie ondersteunt geen locatieonafhankelijkheid." -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1757 -msgid "Password Reset" -msgstr "Wachtwoord vergeten?" +#: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238 +#: ../../Zotlabs/Widget/Settings_menu.php:117 +msgid "Connection Default Permissions" +msgstr "Standaard permissies voor connecties" -#: ../../Zotlabs/Module/Lostpass.php:92 -msgid "Your password has been reset as requested." -msgstr "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht." +#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4214 +#, php-format +msgid "Connection: %s" +msgstr "Connectie: %s" -#: ../../Zotlabs/Module/Lostpass.php:93 -msgid "Your new password is" -msgstr "Jouw nieuwe wachtwoord is" +#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:239 +msgid "Apply these permissions automatically" +msgstr "Deze permissies automatisch toepassen" -#: ../../Zotlabs/Module/Lostpass.php:94 -msgid "Save or copy your new password - and then" -msgstr "Kopieer of sla je nieuwe wachtwoord op - en" +#: ../../Zotlabs/Module/Connedit.php:851 +msgid "Connection requests will be approved without your interaction" +msgstr "Connectieverzoeken zullen automatisch worden geaccepteerd" -#: ../../Zotlabs/Module/Lostpass.php:95 -msgid "click here to login" -msgstr "klik dan hier om in te loggen" +#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240 +msgid "Permission role" +msgstr "Permissietype" -#: ../../Zotlabs/Module/Lostpass.php:96 -msgid "" -"Your password may be changed from the Settings page after " -"successful login." -msgstr "Jouw wachtwoord kan worden veranderd onder instellingen, nadat je succesvol bent ingelogd." +#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240 +#: ../../Zotlabs/Widget/Notifications.php:151 ../../include/nav.php:284 +msgid "Loading" +msgstr "Aan het laden" -#: ../../Zotlabs/Module/Lostpass.php:117 -#, php-format -msgid "Your password has changed at %s" -msgstr "Jouw wachtwoord op %s is veranderd" +#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241 +msgid "Add permission role" +msgstr "Permissietype toevoegen" -#: ../../Zotlabs/Module/Lostpass.php:130 -msgid "Forgot your Password?" -msgstr "Wachtwoord vergeten?" +#: ../../Zotlabs/Module/Connedit.php:860 +msgid "This connection's primary address is" +msgstr "Het primaire kanaaladres van deze connectie is" -#: ../../Zotlabs/Module/Lostpass.php:131 +#: ../../Zotlabs/Module/Connedit.php:861 +msgid "Available locations:" +msgstr "Beschikbare locaties:" + +#: ../../Zotlabs/Module/Connedit.php:866 ../../Zotlabs/Module/Defperms.php:245 msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." -msgstr "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies." +"The permissions indicated on this page will be applied to all new " +"connections." +msgstr "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast." -#: ../../Zotlabs/Module/Lostpass.php:132 -msgid "Email Address" -msgstr "E-mailadres" +#: ../../Zotlabs/Module/Connedit.php:867 +msgid "Connection Tools" +msgstr "Hulpmiddelen" -#: ../../Zotlabs/Module/Lostpass.php:133 -msgid "Reset" -msgstr "Opnieuw instellen" +#: ../../Zotlabs/Module/Connedit.php:869 +msgid "Slide to adjust your degree of friendship" +msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag" -#: ../../Zotlabs/Module/Rbmark.php:94 -msgid "Select a bookmark folder" -msgstr "Kies een bladwijzermap" +#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Rate.php:155 +#: ../../include/js_strings.php:20 +msgid "Rating" +msgstr "Beoordeling" -#: ../../Zotlabs/Module/Rbmark.php:99 -msgid "Save Bookmark" -msgstr "Bladwijzer opslaan" +#: ../../Zotlabs/Module/Connedit.php:871 +msgid "Slide to adjust your rating" +msgstr "Gebruik de schuif om je beoordeling te geven" -#: ../../Zotlabs/Module/Rbmark.php:100 -msgid "URL of bookmark" -msgstr "URL van bladwijzer" +#: ../../Zotlabs/Module/Connedit.php:872 ../../Zotlabs/Module/Connedit.php:877 +msgid "Optionally explain your rating" +msgstr "Verklaar jouw beoordeling (niet verplicht)" -#: ../../Zotlabs/Module/Rbmark.php:105 -msgid "Or enter new bookmark folder name" -msgstr "Of geef de naam op van een nieuwe bladwijzermap" +#: ../../Zotlabs/Module/Connedit.php:874 +msgid "Custom Filter" +msgstr "Berichtenfilter" -#: ../../Zotlabs/Module/Follow.php:31 -msgid "Channel added." -msgstr "Kanaal toegevoegd." +#: ../../Zotlabs/Module/Connedit.php:875 +msgid "Only import posts with this text" +msgstr "Importeer alleen berichten met deze tekst" -#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260 -#, php-format -msgctxt "mood" -msgid "%1$s is %2$s" -msgstr "%1$s is %2$s" +#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" +msgstr "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1) - laat leeg om alle berichten te importeren" -#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234 -msgid "Mood" -msgstr "Stemming" +#: ../../Zotlabs/Module/Connedit.php:876 +msgid "Do not import posts with this text" +msgstr "Importeer geen berichten met deze tekst" -#: ../../Zotlabs/Module/Mood.php:136 -msgid "Set your current mood and tell your friends" -msgstr "Noteer je huidige stemming en toon het aan je connecties" +#: ../../Zotlabs/Module/Connedit.php:878 +msgid "This information is public!" +msgstr "Deze informatie is openbaar!" -#: ../../Zotlabs/Module/Regmod.php:15 -msgid "Please login." -msgstr "Inloggen." +#: ../../Zotlabs/Module/Connedit.php:883 +msgid "Connection Pending Approval" +msgstr "Connectie moet nog geaccepteerd worden" -#: ../../Zotlabs/Module/Removeaccount.php:35 +#: ../../Zotlabs/Module/Connedit.php:888 +#, php-format msgid "" -"Account removals are not allowed within 48 hours of changing the account " -"password." -msgstr "Het verwijderen van een account is niet toegestaan binnen 48 uur nadat het wachtwoord is veranderd." +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken." -#: ../../Zotlabs/Module/Removeaccount.php:57 -msgid "Remove This Account" -msgstr "Verwijder dit account" +#: ../../Zotlabs/Module/Connedit.php:895 +msgid "" +"Some permissions may be inherited from your channel's privacy settings, 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 "Sommige permissies worden mogelijk overgeërfd van de privacyinstellingen van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. " -#: ../../Zotlabs/Module/Removeaccount.php:58 -#: ../../Zotlabs/Module/Removeme.php:61 -msgid "WARNING: " -msgstr "WAARSCHUWING: " +#: ../../Zotlabs/Module/Connedit.php:896 +msgid "Last update:" +msgstr "Laatste wijziging:" -#: ../../Zotlabs/Module/Removeaccount.php:58 -msgid "" -"This account and all its channels will be completely removed from the " -"network. " -msgstr "Dit account en al zijn kanalen worden volledig uit het $Projectname-netwerk verwijderd." +#: ../../Zotlabs/Module/Connedit.php:904 +msgid "Details" +msgstr "Details" -#: ../../Zotlabs/Module/Removeaccount.php:58 -#: ../../Zotlabs/Module/Removeme.php:61 -msgid "This action is permanent and can not be undone!" -msgstr "Deze handeling is van permanente aard en kan niet meer worden teruggedraaid!" +#: ../../Zotlabs/Module/Chat.php:181 +msgid "Room not found" +msgstr "Chatkanaal niet gevonden" -#: ../../Zotlabs/Module/Removeaccount.php:59 -#: ../../Zotlabs/Module/Removeme.php:62 -msgid "Please enter your password for verification:" -msgstr "Vul je wachtwoord in ter verificatie:" +#: ../../Zotlabs/Module/Chat.php:197 +msgid "Leave Room" +msgstr "Chatkanaal verlaten" -#: ../../Zotlabs/Module/Removeaccount.php:60 -msgid "" -"Remove this account, all its channels and all its channel clones from the " -"network" -msgstr "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het $Projectname-netwerk verwijderen" +#: ../../Zotlabs/Module/Chat.php:198 +msgid "Delete Room" +msgstr "Chatkanaal verwijderen" -#: ../../Zotlabs/Module/Removeaccount.php:60 -msgid "" -"By default only the instances of the channels located on this hub will be " -"removed from the network" -msgstr "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het $Projectname-netwerk verwijderd" +#: ../../Zotlabs/Module/Chat.php:199 +msgid "I am away right now" +msgstr "Ik ben momenteel afwezig" -#: ../../Zotlabs/Module/Removeaccount.php:61 -#: ../../Zotlabs/Module/Settings/Account.php:120 -msgid "Remove Account" -msgstr "Account verwijderen" +#: ../../Zotlabs/Module/Chat.php:200 +msgid "I am online" +msgstr "Ik ben online" -#: ../../Zotlabs/Module/Pdledit.php:21 -msgid "Layout updated." -msgstr "Lay-out bijgewerkt." +#: ../../Zotlabs/Module/Chat.php:202 +msgid "Bookmark this room" +msgstr "Chatkanaal aan bladwijzers toevoegen" -#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:216 -msgid "Feature disabled." -msgstr "Functie uitgeschakeld." +#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 +#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1315 +msgid "Please enter a link URL:" +msgstr "Vul een URL in:" -#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69 -msgid "Edit System Page Description" -msgstr "Systeempagina's bewerken" +#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:766 +#: ../../include/conversation.php:1435 +msgid "Encrypt text" +msgstr "Tekst versleutelen" -#: ../../Zotlabs/Module/Pdledit.php:64 -msgid "Layout not found." -msgstr "Lay-out niet gevonden." +#: ../../Zotlabs/Module/Chat.php:232 +msgid "New Chatroom" +msgstr "Nieuw chatkanaal" -#: ../../Zotlabs/Module/Pdledit.php:70 -msgid "Module Name:" -msgstr "Modulenaam:" +#: ../../Zotlabs/Module/Chat.php:233 +msgid "Chatroom name" +msgstr "Naam chatkanaal" -#: ../../Zotlabs/Module/Pdledit.php:71 -msgid "Layout Help" -msgstr "Lay-out-hulp" +#: ../../Zotlabs/Module/Chat.php:234 +msgid "Expiration of chats (minutes)" +msgstr "Aantal minuten voordat chatberichten worden verwijderd" -#: ../../Zotlabs/Module/Directory.php:246 +#: ../../Zotlabs/Module/Chat.php:250 #, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "%d beoordeling" -msgstr[1] "%d beoordelingen" +msgid "%1$s's Chatrooms" +msgstr "Chatkanalen van %1$s" -#: ../../Zotlabs/Module/Directory.php:257 -msgid "Gender: " -msgstr "Geslacht:" +#: ../../Zotlabs/Module/Chat.php:255 +msgid "No chatrooms available" +msgstr "Geen chatkanalen beschikbaar" -#: ../../Zotlabs/Module/Directory.php:259 -msgid "Status: " -msgstr "Status: " +#: ../../Zotlabs/Module/Chat.php:259 +msgid "Expiration" +msgstr "Verloopt na" -#: ../../Zotlabs/Module/Directory.php:261 -msgid "Homepage: " -msgstr "Homepage: " +#: ../../Zotlabs/Module/Chat.php:260 +msgid "min" +msgstr "min" -#: ../../Zotlabs/Module/Directory.php:310 ../../include/channel.php:1298 -msgid "Age:" -msgstr "Leeftijd:" +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:248 +#: ../../include/conversation.php:1834 ../../include/nav.php:401 +msgid "Photos" +msgstr "Foto's" -#: ../../Zotlabs/Module/Directory.php:315 ../../include/event.php:52 -#: ../../include/event.php:84 ../../include/markdown.php:562 -#: ../../include/channel.php:1134 -msgid "Location:" -msgstr "Plaats:" +#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:243 +#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1842 +#: ../../include/nav.php:409 +msgid "Files" +msgstr "Bestanden" -#: ../../Zotlabs/Module/Directory.php:321 -msgid "Description:" -msgstr "Omschrijving:" +#: ../../Zotlabs/Module/Menu.php:49 +msgid "Unable to update menu." +msgstr "Niet in staat om menu aan te passen" -#: ../../Zotlabs/Module/Directory.php:326 ../../include/channel.php:1314 -msgid "Hometown:" -msgstr "Oorspronkelijk uit:" +#: ../../Zotlabs/Module/Menu.php:60 +msgid "Unable to create menu." +msgstr "Niet in staat om menu aan te maken." -#: ../../Zotlabs/Module/Directory.php:328 ../../include/channel.php:1322 -msgid "About:" -msgstr "Over:" +#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 +msgid "Menu Name" +msgstr "Menunaam" -#: ../../Zotlabs/Module/Directory.php:329 ../../Zotlabs/Module/Suggest.php:56 -#: ../../include/widgets.php:134 ../../include/widgets.php:171 -#: ../../include/connections.php:110 ../../include/conversation.php:938 -#: ../../include/conversation.php:1069 ../../include/channel.php:1119 -msgid "Connect" -msgstr "Verbinden" +#: ../../Zotlabs/Module/Menu.php:98 +msgid "Unique name (not visible on webpage) - required" +msgstr "Unieke naam vereist (niet zichtbaar op webpagina)" -#: ../../Zotlabs/Module/Directory.php:330 -msgid "Public Forum:" -msgstr "Openbaar forum:" +#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 +msgid "Menu Title" +msgstr "Menutitel" -#: ../../Zotlabs/Module/Directory.php:333 -msgid "Keywords: " -msgstr "Trefwoorden: " +#: ../../Zotlabs/Module/Menu.php:99 +msgid "Visible on webpage - leave empty for no title" +msgstr "Zichtbaar op webpagina (leeg laten voor geen titel)" -#: ../../Zotlabs/Module/Directory.php:336 -msgid "Don't suggest" -msgstr "Niet voorstellen" +#: ../../Zotlabs/Module/Menu.php:100 +msgid "Allow Bookmarks" +msgstr "Bladwijzers toestaan" -#: ../../Zotlabs/Module/Directory.php:338 -msgid "Common connections:" -msgstr "Gemeenschappelijke connecties:" +#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +msgid "Menu may be used to store saved bookmarks" +msgstr "Menu kan gebruikt worden om bladwijzers in op te slaan" -#: ../../Zotlabs/Module/Directory.php:387 -msgid "Global Directory" -msgstr "Volledige kanalengids" +#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159 +msgid "Submit and proceed" +msgstr "Opslaan en doorgaan" -#: ../../Zotlabs/Module/Directory.php:387 -msgid "Local Directory" -msgstr "Lokale kanalengids" +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2423 +msgid "Menus" +msgstr "Menu's" -#: ../../Zotlabs/Module/Directory.php:393 -msgid "Finding:" -msgstr "Gezocht naar:" +#: ../../Zotlabs/Module/Menu.php:117 +msgid "Bookmarks allowed" +msgstr "Bladwijzers toegestaan" -#: ../../Zotlabs/Module/Directory.php:396 ../../Zotlabs/Module/Suggest.php:64 -#: ../../include/contact_widgets.php:24 -msgid "Channel Suggestions" -msgstr "Voorgestelde kanalen" +#: ../../Zotlabs/Module/Menu.php:119 +msgid "Delete this menu" +msgstr "Menu verwijderen" -#: ../../Zotlabs/Module/Directory.php:398 -msgid "next page" -msgstr "volgende pagina" +#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154 +msgid "Edit menu contents" +msgstr "Bewerk de inhoud van het menu" -#: ../../Zotlabs/Module/Directory.php:398 -msgid "previous page" -msgstr "vorige pagina" +#: ../../Zotlabs/Module/Menu.php:121 +msgid "Edit this menu" +msgstr "Dit menu bewerken" -#: ../../Zotlabs/Module/Directory.php:399 -msgid "Sort options" -msgstr "Sorteeropties" +#: ../../Zotlabs/Module/Menu.php:136 +msgid "Menu could not be deleted." +msgstr "Menu kon niet verwijderd worden." -#: ../../Zotlabs/Module/Directory.php:400 -msgid "Alphabetic" -msgstr "Alfabetisch" +#: ../../Zotlabs/Module/Menu.php:149 +msgid "Edit Menu" +msgstr "Menu bewerken" -#: ../../Zotlabs/Module/Directory.php:401 -msgid "Reverse Alphabetic" -msgstr "Omgekeerd alfabetisch" +#: ../../Zotlabs/Module/Menu.php:153 +msgid "Add or remove entries to this menu" +msgstr "Items aan dit menu toevoegen of verwijder" -#: ../../Zotlabs/Module/Directory.php:402 -msgid "Newest to Oldest" -msgstr "Nieuw naar oud" +#: ../../Zotlabs/Module/Menu.php:155 +msgid "Menu name" +msgstr "Naam van menu" -#: ../../Zotlabs/Module/Directory.php:403 -msgid "Oldest to Newest" -msgstr "Oud naar nieuw" +#: ../../Zotlabs/Module/Menu.php:155 +msgid "Must be unique, only seen by you" +msgstr "Moet uniek zijn en is alleen zichtbaar voor jou." -#: ../../Zotlabs/Module/Directory.php:420 -msgid "No entries (some entries may be hidden)." -msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)." +#: ../../Zotlabs/Module/Menu.php:156 +msgid "Menu title" +msgstr "Titel van menu" -#: ../../Zotlabs/Module/Profile.php:91 -msgid "vcard" -msgstr "vcard" +#: ../../Zotlabs/Module/Menu.php:156 +msgid "Menu title as seen by others" +msgstr "Titel van menu zoals anderen dat zien." -#: ../../Zotlabs/Module/Oexchange.php:27 -msgid "Unable to find your hub." -msgstr "Niet in staat om je hub te vinden" +#: ../../Zotlabs/Module/Menu.php:157 +msgid "Allow bookmarks" +msgstr "Bladwijzers toestaan" -#: ../../Zotlabs/Module/Oexchange.php:41 -msgid "Post successful." -msgstr "Verzenden bericht geslaagd." +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2424 +msgid "Layouts" +msgstr "Lay-outs" -#: ../../Zotlabs/Module/Viewsrc.php:46 -msgid "Source of Item" -msgstr "Bron van item" +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:251 +#: ../../include/nav.php:176 ../../include/nav.php:280 +#: ../../include/help.php:68 ../../include/help.php:74 +msgid "Help" +msgstr "Hulp" -#: ../../Zotlabs/Module/Service_limits.php:23 -msgid "No service class restrictions found." -msgstr "Geen abonnementsbeperkingen gevonden." +#: ../../Zotlabs/Module/Layouts.php:186 +msgid "Comanche page description language help" +msgstr "Hulp met de paginabeschrijvingstaal Comanche" -#: ../../Zotlabs/Module/Acl.php:344 -msgid "network" -msgstr "netwerk" +#: ../../Zotlabs/Module/Layouts.php:190 +msgid "Layout Description" +msgstr "Lay-out-omschrijving" -#: ../../Zotlabs/Module/Acl.php:354 -msgid "RSS" -msgstr "RSS" +#: ../../Zotlabs/Module/Layouts.php:195 +msgid "Download PDL file" +msgstr "Download PDL-bestand" -#: ../../Zotlabs/Module/Removeme.php:35 -msgid "" -"Channel removals are not allowed within 48 hours of changing the account " -"password." -msgstr "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd." +#: ../../Zotlabs/Module/Cloud.php:120 +msgid "Please refresh page" +msgstr "Vernieuw de pagina" -#: ../../Zotlabs/Module/Removeme.php:60 -msgid "Remove This Channel" -msgstr "Verwijder dit kanaal" +#: ../../Zotlabs/Module/Cloud.php:123 +msgid "Unknown error" +msgstr "Onbekende fout" -#: ../../Zotlabs/Module/Removeme.php:61 -msgid "This channel will be completely removed from the network. " -msgstr "Dit kanaal wordt volledig uit het $Projectname-netwerk verwijderd." +#: ../../Zotlabs/Module/Email_validation.php:24 +#: ../../Zotlabs/Module/Email_resend.php:12 +msgid "Token verification failed." +msgstr "Tokenverificatie mislukt" -#: ../../Zotlabs/Module/Removeme.php:63 -msgid "Remove this channel and all its clones from the network" -msgstr "Dit kanaal en alle klonen hiervan uit het $Projectname-netwerk verwijderen" +#: ../../Zotlabs/Module/Email_validation.php:36 +msgid "Email Verification Required" +msgstr "E-mailverificatie vereist" -#: ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Email_validation.php:37 +#, php-format msgid "" -"By default only the instance of the channel located on this hub will be " -"removed from the network" -msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het $Projectname-netwerk verwijderd" - -#: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:575 -msgid "Remove Channel" -msgstr "Kanaal verwijderen" - -#: ../../Zotlabs/Module/Sharedwithme.php:98 -msgid "Files: shared with me" -msgstr "Bestanden: met mij gedeeld" +"A verification token was sent to your email address [%s]. Enter that token " +"here to complete the account verification step. Please allow a few minutes " +"for delivery, and check your spam folder if you do not see the message." +msgstr "Er is een verificatietoken naar jouw e-mailadres verstuurd [%s]. Vul deze token hier in om de accountverificatie te voltooien. Wanneer het e-mailbericht niet is aangekomen, wacht dan nog een paar minuten en controleer jouw spamfolder." -#: ../../Zotlabs/Module/Sharedwithme.php:100 -msgid "NEW" -msgstr "NIEUW" +#: ../../Zotlabs/Module/Email_validation.php:38 +msgid "Resend Email" +msgstr "E-mail opnieuw versturen" -#: ../../Zotlabs/Module/Sharedwithme.php:103 -msgid "Remove all files" -msgstr "Verwijder alle bestanden" +#: ../../Zotlabs/Module/Email_validation.php:41 +msgid "Validation token" +msgstr "Verificatie-token" -#: ../../Zotlabs/Module/Sharedwithme.php:104 -msgid "Remove this file" -msgstr "Verwijder dit bestand" +#: ../../Zotlabs/Module/Tagger.php:48 +msgid "Post not found." +msgstr "Bericht niet gevonden." -#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:274 +#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160 +#: ../../include/bbcode.php:352 msgid "post" msgstr "bericht" -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150 -#: ../../include/text.php:1966 +#: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146 +#: ../../include/text.php:2013 msgid "comment" msgstr "reactie" -#: ../../Zotlabs/Module/Tagger.php:95 +#: ../../Zotlabs/Module/Tagger.php:119 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "%1$s heeft het %3$s van %2$s getagd met %4$s" -#: ../../Zotlabs/Module/Sources.php:37 -msgid "Failed to create source. No channel selected." -msgstr "Aanmaken bron mislukt. Geen kanaal geselecteerd." +#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 +msgid "This setting requires special processing and editing has been blocked." +msgstr "Deze instelling vereist een speciaal proces en bewerken is geblokkeerd." -#: ../../Zotlabs/Module/Sources.php:51 -msgid "Source created." -msgstr "Bron aangemaakt." +#: ../../Zotlabs/Module/Pconfig.php:48 +msgid "Configuration Editor" +msgstr "Configuratiebewerker" -#: ../../Zotlabs/Module/Sources.php:64 -msgid "Source updated." -msgstr "Bron aangemaakt." +#: ../../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 "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. " -#: ../../Zotlabs/Module/Sources.php:90 -msgid "*" -msgstr "*" +#: ../../Zotlabs/Module/Defperms.php:239 +msgid "" +"If enabled, connection requests will be approved without your interaction" +msgstr "Wanneer ingeschakeld worden connectieverzoeken automatisch geaccepteerd" -#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:677 -#: ../../include/features.php:213 -msgid "Channel Sources" -msgstr "Kanaalbronnen" +#: ../../Zotlabs/Module/Defperms.php:246 +msgid "Automatic approval settings" +msgstr "Instellingen automatisch accepteren" -#: ../../Zotlabs/Module/Sources.php:97 -msgid "Manage remote sources of content for your channel." -msgstr "Beheer externe bronnen met inhoud voor jouw kanaal" +#: ../../Zotlabs/Module/Defperms.php:254 +msgid "" +"Some individual permissions may have been preset or locked based on your " +"channel type and privacy settings." +msgstr "Sommige individuele permissies kunnen een standaardinstelling hebben of zijn vergrendeld, afhankelijk van je kanaaltype of privacyinstellingen." + +#: ../../Zotlabs/Module/Authorize.php:17 +msgid "Unknown App" +msgstr "Onbekende applicatie" + +#: ../../Zotlabs/Module/Authorize.php:22 +msgid "Authorize" +msgstr "Autoriseren" + +#: ../../Zotlabs/Module/Authorize.php:23 +#, php-format +msgid "Do you authorize the app %s to access your channel data?" +msgstr "Geef je toestemming aan de app %s om toegang te krijgen tot jouw kanaalgegevens?" -#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108 -msgid "New Source" -msgstr "Nieuwe bron" +#: ../../Zotlabs/Module/Authorize.php:25 +msgid "Allow" +msgstr "Toestaan" -#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143 -msgid "" -"Import all or selected content from the following channel into this channel " -"and distribute it according to your channel settings." -msgstr "Importeer complete of gedeelde inhoud vanuit het volgende kanaal naar dit kanaal, en verdeel het vervolgens volgens jouw kanaalinstellingen." +#: ../../Zotlabs/Module/Group.php:24 +msgid "Privacy group created." +msgstr "Privacygroep aangemaakt" -#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 -msgid "Only import content with these words (one per line)" -msgstr "Importeer alleen inhoud met deze woorden (één per regel)" +#: ../../Zotlabs/Module/Group.php:30 +msgid "Could not create privacy group." +msgstr "Kon privacygroep niet aanmaken" -#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 -msgid "Leave blank to import all public content" -msgstr "Laat leeg om alle openbare inhoud te importeren" +#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143 +#: ../../include/items.php:4181 +msgid "Privacy group not found." +msgstr "Privacygroep niet gevonden" -#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148 -msgid "Channel Name" -msgstr "Kanaalnaam" +#: ../../Zotlabs/Module/Group.php:58 +msgid "Privacy group updated." +msgstr "Privacygroep bijgewerkt" -#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 -msgid "" -"Add the following categories to posts imported from this source (comma " -"separated)" -msgstr "De volgende categorieën aan berichten toevoegen die uit deze bron zijn geïmporteerd (door komma's gescheiden)" +#: ../../Zotlabs/Module/Group.php:92 +msgid "Create a group of channels." +msgstr "Privacygroep met kanalen aanmaken" -#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 -#: ../../Zotlabs/Module/Settings/Oauth.php:93 -msgid "Optional" -msgstr "Niet verplicht" +#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:186 +msgid "Privacy group name: " +msgstr "Naam privacygroep: " -#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161 -msgid "Source not found." -msgstr "Bron niet gevonden" +#: ../../Zotlabs/Module/Group.php:95 ../../Zotlabs/Module/Group.php:189 +msgid "Members are visible to other channels" +msgstr "Kanalen in deze privacygroep zijn zichtbaar voor andere kanalen" -#: ../../Zotlabs/Module/Sources.php:140 -msgid "Edit Source" -msgstr "Bron bewerken" +#: ../../Zotlabs/Module/Group.php:113 +msgid "Privacy group removed." +msgstr "Privacygroep verwijderd." -#: ../../Zotlabs/Module/Sources.php:141 -msgid "Delete Source" -msgstr "Bron verwijderen" +#: ../../Zotlabs/Module/Group.php:115 +msgid "Unable to remove privacy group." +msgstr "Verwijderen privacygroep mislukt" -#: ../../Zotlabs/Module/Sources.php:169 -msgid "Source removed" -msgstr "Bron verwijderd" +#: ../../Zotlabs/Module/Group.php:185 +msgid "Privacy group editor" +msgstr "Privacygroep bewerken" -#: ../../Zotlabs/Module/Sources.php:171 -msgid "Unable to remove source." -msgstr "Verwijderen bron mislukt." +#: ../../Zotlabs/Module/Group.php:199 ../../Zotlabs/Module/Help.php:81 +msgid "Members" +msgstr "Kanalen" -#: ../../Zotlabs/Module/Suggest.php:39 -msgid "" -"No suggestions available. If this is a new site, please try again in 24 " -"hours." -msgstr "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer." +#: ../../Zotlabs/Module/Group.php:201 +msgid "All Connected Channels" +msgstr "Alle kanaalconnecties" -#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:136 -msgid "Ignore/Hide" -msgstr "Negeren/Verbergen" +#: ../../Zotlabs/Module/Group.php:233 +msgid "Click on a channel to add or remove." +msgstr "Klik op een kanaal om deze toe te voegen of te verwijderen." #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184 #: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659 -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62 msgid "Profile not found." msgstr "Profiel niet gevonden." @@ -5524,15 +6144,15 @@ msgstr "Huwelijke status" msgid "Romantic Partner" msgstr "Romantische partner" -#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775 +#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772 msgid "Likes" msgstr "Houdt van" -#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776 +#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773 msgid "Dislikes" msgstr "Houdt niet van" -#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783 +#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780 msgid "Work/Employment" msgstr "Werk/arbeid" @@ -5545,7 +6165,7 @@ msgid "Political Views" msgstr "Politieke overtuigingen" #: ../../Zotlabs/Module/Profiles.php:486 -#: ../../extend/addon/addon/openid/MysqlProvider.php:74 +#: ../../addon/openid/MysqlProvider.php:74 msgid "Gender" msgstr "Geslacht" @@ -5569,5735 +6189,5608 @@ msgstr "Profiel bijgewerkt" msgid "Hide your connections list from viewers of this profile" msgstr "Laat de lijst met connecties niet aan bezoekers van dit profiel zien." -#: ../../Zotlabs/Module/Profiles.php:725 +#: ../../Zotlabs/Module/Profiles.php:722 msgid "Edit Profile Details" msgstr "Profiel bewerken" -#: ../../Zotlabs/Module/Profiles.php:727 +#: ../../Zotlabs/Module/Profiles.php:724 msgid "View this profile" -msgstr "Profiel weergeven" +msgstr "Profiel tonen" -#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827 -#: ../../include/channel.php:1066 +#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824 +#: ../../include/channel.php:1319 msgid "Edit visibility" msgstr "Zichtbaarheid bewerken" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:726 msgid "Profile Tools" msgstr "Hulpmiddelen" -#: ../../Zotlabs/Module/Profiles.php:730 +#: ../../Zotlabs/Module/Profiles.php:727 msgid "Change cover photo" msgstr "Omslagfoto wijzigen" -#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037 +#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1289 msgid "Change profile photo" msgstr "Profielfoto veranderen" -#: ../../Zotlabs/Module/Profiles.php:732 +#: ../../Zotlabs/Module/Profiles.php:729 msgid "Create a new profile using these settings" msgstr "Een nieuw profiel aanmaken met dit profiel als basis" -#: ../../Zotlabs/Module/Profiles.php:733 +#: ../../Zotlabs/Module/Profiles.php:730 msgid "Clone this profile" msgstr "Dit profiel klonen" -#: ../../Zotlabs/Module/Profiles.php:734 +#: ../../Zotlabs/Module/Profiles.php:731 msgid "Delete this profile" msgstr "Dit profiel verwijderen" -#: ../../Zotlabs/Module/Profiles.php:735 +#: ../../Zotlabs/Module/Profiles.php:732 msgid "Add profile things" msgstr "Dingen aan je profiel toevoegen" -#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1715 +#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1708 msgid "Personal" msgstr "Persoonlijk" -#: ../../Zotlabs/Module/Profiles.php:738 -msgid "Relation" +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Relationship" msgstr "Relatie" -#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55 +#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:44 +#: ../../include/datetime.php:58 msgid "Miscellaneous" msgstr "Diversen" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Import profile from file" msgstr "Profiel vanuit bestand importeren" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "Export profile to file" msgstr "Profiel naar bestand exporteren" -#: ../../Zotlabs/Module/Profiles.php:743 +#: ../../Zotlabs/Module/Profiles.php:740 msgid "Your gender" msgstr "Jouw geslacht" -#: ../../Zotlabs/Module/Profiles.php:744 +#: ../../Zotlabs/Module/Profiles.php:741 msgid "Marital status" msgstr "Burgerlijke staat" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Sexual preference" msgstr "Seksuele voorkeur" -#: ../../Zotlabs/Module/Profiles.php:748 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "Profile name" msgstr "Profielnaam" -#: ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "This is your default profile." msgstr "Dit is jouw standaardprofiel" -#: ../../Zotlabs/Module/Profiles.php:752 +#: ../../Zotlabs/Module/Profiles.php:749 msgid "Your full name" msgstr "Jouw volledige naam" -#: ../../Zotlabs/Module/Profiles.php:753 +#: ../../Zotlabs/Module/Profiles.php:750 msgid "Title/Description" msgstr "Titel/omschrijving" -#: ../../Zotlabs/Module/Profiles.php:756 +#: ../../Zotlabs/Module/Profiles.php:753 msgid "Street address" msgstr "Straat en huisnummer" -#: ../../Zotlabs/Module/Profiles.php:757 +#: ../../Zotlabs/Module/Profiles.php:754 msgid "Locality/City" msgstr "Woonplaats" -#: ../../Zotlabs/Module/Profiles.php:758 +#: ../../Zotlabs/Module/Profiles.php:755 msgid "Region/State" msgstr "Provincie/gewest/deelstaat" -#: ../../Zotlabs/Module/Profiles.php:759 +#: ../../Zotlabs/Module/Profiles.php:756 msgid "Postal/Zip code" msgstr "Postcode" -#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Profiles.php:762 msgid "Who (if applicable)" msgstr "Wie (wanneer van toepassing)" -#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Profiles.php:762 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Voorbeelden: petra123, Petra Jansen, petra@voorbeeld.nl" -#: ../../Zotlabs/Module/Profiles.php:766 +#: ../../Zotlabs/Module/Profiles.php:763 msgid "Since (date)" msgstr "Sinds (datum)" -#: ../../Zotlabs/Module/Profiles.php:769 +#: ../../Zotlabs/Module/Profiles.php:766 msgid "Tell us about yourself" msgstr "Vertel ons iets over jezelf" -#: ../../Zotlabs/Module/Profiles.php:770 -#: ../../extend/addon/addon/openid/MysqlProvider.php:68 +#: ../../Zotlabs/Module/Profiles.php:767 +#: ../../addon/openid/MysqlProvider.php:68 msgid "Homepage URL" msgstr "URL homepagina" -#: ../../Zotlabs/Module/Profiles.php:771 +#: ../../Zotlabs/Module/Profiles.php:768 msgid "Hometown" msgstr "Oorspronkelijk uit" -#: ../../Zotlabs/Module/Profiles.php:772 +#: ../../Zotlabs/Module/Profiles.php:769 msgid "Political views" msgstr "Politieke overtuigingen" -#: ../../Zotlabs/Module/Profiles.php:773 +#: ../../Zotlabs/Module/Profiles.php:770 msgid "Religious views" msgstr "Religieuze overtuigingen" -#: ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Keywords used in directory listings" msgstr "Trefwoorden voor in de kanalengids" -#: ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Example: fishing photography software" msgstr "Voorbeeld: muziek, fotografie, software" -#: ../../Zotlabs/Module/Profiles.php:777 +#: ../../Zotlabs/Module/Profiles.php:774 msgid "Musical interests" msgstr "Muzikale interesses" -#: ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Profiles.php:775 msgid "Books, literature" msgstr "Boeken/literatuur" -#: ../../Zotlabs/Module/Profiles.php:779 +#: ../../Zotlabs/Module/Profiles.php:776 msgid "Television" msgstr "Televisie" -#: ../../Zotlabs/Module/Profiles.php:780 +#: ../../Zotlabs/Module/Profiles.php:777 msgid "Film/Dance/Culture/Entertainment" msgstr "Film/dans/cultuur/entertainment" -#: ../../Zotlabs/Module/Profiles.php:781 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Hobbies/Interests" msgstr "Hobby's/interesses" -#: ../../Zotlabs/Module/Profiles.php:782 +#: ../../Zotlabs/Module/Profiles.php:779 msgid "Love/Romance" msgstr "Liefde/romantiek" -#: ../../Zotlabs/Module/Profiles.php:784 +#: ../../Zotlabs/Module/Profiles.php:781 msgid "School/Education" msgstr "School/opleiding" -#: ../../Zotlabs/Module/Profiles.php:785 +#: ../../Zotlabs/Module/Profiles.php:782 msgid "Contact information and social networks" msgstr "Contactinformatie en sociale netwerken" -#: ../../Zotlabs/Module/Profiles.php:786 +#: ../../Zotlabs/Module/Profiles.php:783 msgid "My other channels" msgstr "Mijn andere kanalen" -#: ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Profiles.php:785 msgid "Communications" msgstr "Communicatie" -#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062 +#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1315 msgid "Profile Image" msgstr "Profielfoto" -#: ../../Zotlabs/Module/Profiles.php:833 ../../include/nav.php:105 -#: ../../include/channel.php:1044 +#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296 +#: ../../include/nav.php:117 msgid "Edit Profiles" msgstr "Bewerk profielen" -#: ../../Zotlabs/Module/Settings/Features.php:45 -msgid "Additional Features" -msgstr "Extra functies" +#: ../../Zotlabs/Module/Go.php:21 +msgid "This page is available only to site members" +msgstr "Deze pagina is alleen toegankelijk voor hubleden" -#: ../../Zotlabs/Module/Settings/Oauth.php:34 -msgid "Name is required" -msgstr "Naam is vereist" +#: ../../Zotlabs/Module/Go.php:27 +msgid "Welcome" +msgstr "Welkom" -#: ../../Zotlabs/Module/Settings/Oauth.php:38 -msgid "Key and Secret are required" -msgstr "Key en secret zijn vereist" +#: ../../Zotlabs/Module/Go.php:29 +msgid "What would you like to do?" +msgstr "Wat wil je graag doen?" -#: ../../Zotlabs/Module/Settings/Oauth.php:86 -#: ../../Zotlabs/Module/Settings/Oauth.php:112 -#: ../../Zotlabs/Module/Settings/Oauth.php:148 -msgid "Add application" -msgstr "Applicatie toevoegen" +#: ../../Zotlabs/Module/Go.php:31 +msgid "" +"Please bookmark this page if you would like to return to it in the future" +msgstr "Maak een bladwijzer voor deze pagina aan, wanneer je in de toekomst hier weer naar wil terugkeren" -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -msgid "Name of application" -msgstr "Naam van applicatie" +#: ../../Zotlabs/Module/Go.php:35 +msgid "Upload a profile photo" +msgstr "Profielfoto uploaden" + +#: ../../Zotlabs/Module/Go.php:36 +msgid "Upload a cover photo" +msgstr "Omslagfoto uploaden" + +#: ../../Zotlabs/Module/Go.php:37 +msgid "Edit your default profile" +msgstr "Jouw standaardprofiel bewerken" + +#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:34 +msgid "View friend suggestions" +msgstr "Kanaalvoorstellen tonen" + +#: ../../Zotlabs/Module/Go.php:39 +msgid "View the channel directory" +msgstr "Kanalengids tonen" + +#: ../../Zotlabs/Module/Go.php:40 +msgid "View/edit your channel settings" +msgstr "Jouw profielinstellingen bekijken/bewerken" + +#: ../../Zotlabs/Module/Go.php:41 +msgid "View the site or project documentation" +msgstr "Documentatie van deze hub en het Hubzillaproject tonen" + +#: ../../Zotlabs/Module/Go.php:42 +msgid "Visit your channel homepage" +msgstr "Jouw kanaalpagina tonen" + +#: ../../Zotlabs/Module/Go.php:43 +msgid "" +"View your connections and/or add somebody whose address you already know" +msgstr "Jouw connecties tonen en/of iemand toevoegen waarvan je het adres al weet" + +#: ../../Zotlabs/Module/Go.php:44 +msgid "" +"View your personal stream (this may be empty until you add some connections)" +msgstr "Jouw persoonlijke tijdlijn tonen (deze is waarschijnlijk leeg totdat je enkele connecties toevoegt)" + +#: ../../Zotlabs/Module/Go.php:52 +msgid "View the public stream. Warning: this content is not moderated" +msgstr "De openbare tijdlijn tonen. Waarschuwing: de inhoud van deze berichten wordt niet gemodereerd." + +#: ../../Zotlabs/Module/Editwebpage.php:139 +msgid "Page link" +msgstr "Paginalink" + +#: ../../Zotlabs/Module/Editwebpage.php:166 +msgid "Edit Webpage" +msgstr "Webpagina bewerken" + +#: ../../Zotlabs/Module/Manage.php:145 +msgid "Create a new channel" +msgstr "Nieuw kanaal aanmaken" + +#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:240 +#: ../../include/nav.php:102 ../../include/nav.php:190 +msgid "Channel Manager" +msgstr "Kanaalbeheer" + +#: ../../Zotlabs/Module/Manage.php:171 +msgid "Current Channel" +msgstr "Huidig kanaal" + +#: ../../Zotlabs/Module/Manage.php:173 +msgid "Switch to one of your channels by selecting it." +msgstr "Activeer een van jouw andere kanalen door er op te klikken." + +#: ../../Zotlabs/Module/Manage.php:174 +msgid "Default Channel" +msgstr "Standaardkanaal" + +#: ../../Zotlabs/Module/Manage.php:175 +msgid "Make Default" +msgstr "Als standaard instellen" + +#: ../../Zotlabs/Module/Manage.php:178 +#, php-format +msgid "%d new messages" +msgstr "%d nieuwe berichten" + +#: ../../Zotlabs/Module/Manage.php:179 +#, php-format +msgid "%d new introductions" +msgstr "%d nieuwe connectieverzoeken" + +#: ../../Zotlabs/Module/Manage.php:181 +msgid "Delegated Channel" +msgstr "Uitbesteed kanaal" + +#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194 +#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1893 +#: ../../include/features.php:123 ../../include/nav.php:458 +msgid "Cards" +msgstr "Kaarten" + +#: ../../Zotlabs/Module/Cards.php:99 +msgid "Add Card" +msgstr "Kaart toevoegen" + +#: ../../Zotlabs/Module/Dirsearch.php:33 +msgid "This directory server requires an access token" +msgstr "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig" + +#: ../../Zotlabs/Module/Siteinfo.php:18 +msgid "About this site" +msgstr "Over deze hub" + +#: ../../Zotlabs/Module/Siteinfo.php:19 +msgid "Site Name" +msgstr "Hubnaam" + +#: ../../Zotlabs/Module/Siteinfo.php:23 +msgid "Administrator" +msgstr "Beheerder" + +#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:232 +msgid "Terms of Service" +msgstr "Gebruiksvoorwaarden" + +#: ../../Zotlabs/Module/Siteinfo.php:26 +msgid "Software and Project information" +msgstr "Software- en projectinformatie" + +#: ../../Zotlabs/Module/Siteinfo.php:27 +msgid "This site is powered by $Projectname" +msgstr "Dit is een $Projectname-hub" + +#: ../../Zotlabs/Module/Siteinfo.php:28 +msgid "" +"Federated and decentralised networking and identity services provided by Zot" +msgstr "Federatieve en gedecentraliseerde netwerk- en identiteitsdiensten, mogelijk gemaakt door Zot" + +#: ../../Zotlabs/Module/Siteinfo.php:30 +#, php-format +msgid "Version %s" +msgstr "Versie %s" + +#: ../../Zotlabs/Module/Siteinfo.php:31 +msgid "Project homepage" +msgstr "Projectwebsite" + +#: ../../Zotlabs/Module/Siteinfo.php:32 +msgid "Developer homepage" +msgstr "Ontwikkelaarswebsite" + +#: ../../Zotlabs/Module/Ratings.php:70 +msgid "No ratings" +msgstr "Geen beoordelingen" + +#: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35 +#: ../../include/conversation.php:1082 +msgid "Ratings" +msgstr "Beoordelingen" + +#: ../../Zotlabs/Module/Ratings.php:98 +msgid "Rating: " +msgstr "Beoordeling: " + +#: ../../Zotlabs/Module/Ratings.php:99 +msgid "Website: " +msgstr "Website: " + +#: ../../Zotlabs/Module/Ratings.php:101 +msgid "Description: " +msgstr "Omschrijving: " + +#: ../../Zotlabs/Module/Webpages.php:54 +msgid "Import Webpage Elements" +msgstr "Webpagina-elementen importeren" -#: ../../Zotlabs/Module/Settings/Oauth.php:90 -#: ../../Zotlabs/Module/Settings/Oauth.php:116 -#: ../../extend/addon/addon/statusnet/statusnet.php:893 -#: ../../extend/addon/addon/twitter/twitter.php:775 -msgid "Consumer Key" -msgstr "Consumer key" +#: ../../Zotlabs/Module/Webpages.php:55 +msgid "Import selected" +msgstr "Importbestand geselecteerd" -#: ../../Zotlabs/Module/Settings/Oauth.php:90 -#: ../../Zotlabs/Module/Settings/Oauth.php:91 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20" +#: ../../Zotlabs/Module/Webpages.php:78 +msgid "Export Webpage Elements" +msgstr "Webpagina-elementen exporteren" -#: ../../Zotlabs/Module/Settings/Oauth.php:91 -#: ../../Zotlabs/Module/Settings/Oauth.php:117 -#: ../../extend/addon/addon/statusnet/statusnet.php:892 -#: ../../extend/addon/addon/twitter/twitter.php:776 -msgid "Consumer Secret" -msgstr "Consumer secret" +#: ../../Zotlabs/Module/Webpages.php:79 +msgid "Export selected" +msgstr "Selectie exporteren" -#: ../../Zotlabs/Module/Settings/Oauth.php:92 -#: ../../Zotlabs/Module/Settings/Oauth.php:118 -msgid "Redirect" -msgstr "Redirect/doorverwijzing" +#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:244 +#: ../../include/conversation.php:1915 ../../include/nav.php:481 +msgid "Webpages" +msgstr "Webpagina's" -#: ../../Zotlabs/Module/Settings/Oauth.php:92 -msgid "" -"Redirect URI - leave blank unless your application specifically requires " -"this" -msgstr "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist" +#: ../../Zotlabs/Module/Webpages.php:248 +msgid "Actions" +msgstr "Acties" -#: ../../Zotlabs/Module/Settings/Oauth.php:93 -#: ../../Zotlabs/Module/Settings/Oauth.php:119 -msgid "Icon url" -msgstr "Pictogram-URL" +#: ../../Zotlabs/Module/Webpages.php:249 +msgid "Page Link" +msgstr "Paginalink" -#: ../../Zotlabs/Module/Settings/Oauth.php:104 -msgid "Application not found." -msgstr "Applicatie niet gevonden." +#: ../../Zotlabs/Module/Webpages.php:250 +msgid "Page Title" +msgstr "Paginatitel" -#: ../../Zotlabs/Module/Settings/Oauth.php:147 -msgid "Connected Apps" -msgstr "Verbonden applicaties" +#: ../../Zotlabs/Module/Webpages.php:280 +msgid "Invalid file type." +msgstr "Ongeldig bestandsformaat" -#: ../../Zotlabs/Module/Settings/Oauth.php:151 -msgid "Client key starts with" -msgstr "Client key begint met" +#: ../../Zotlabs/Module/Webpages.php:292 +msgid "Error opening zip file" +msgstr "Fout tijdens openen zipbestand" -#: ../../Zotlabs/Module/Settings/Oauth.php:152 -msgid "No name" -msgstr "Geen naam" +#: ../../Zotlabs/Module/Webpages.php:303 +msgid "Invalid folder path." +msgstr "Ongeldige maplocatie" -#: ../../Zotlabs/Module/Settings/Oauth.php:153 -msgid "Remove authorization" -msgstr "Autorisatie verwijderen" +#: ../../Zotlabs/Module/Webpages.php:330 +msgid "No webpage elements detected." +msgstr "Geen webpagina-elementen gedecteerd" -#: ../../Zotlabs/Module/Settings/Account.php:20 -msgid "Not valid email." -msgstr "Geen geldig e-mailadres." +#: ../../Zotlabs/Module/Webpages.php:405 +msgid "Import complete." +msgstr "Importeren voltooid." -#: ../../Zotlabs/Module/Settings/Account.php:23 -msgid "Protected email address. Cannot change to that email." -msgstr "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken." +#: ../../Zotlabs/Module/Changeaddr.php:35 +msgid "" +"Channel name changes are not allowed within 48 hours of changing the account" +" password." +msgstr "Veranderen van kanaaladres is niet toegestaan binnen 48 uur na het veranderen van het accountwachtwoord." -#: ../../Zotlabs/Module/Settings/Account.php:32 -msgid "System failure storing new email. Please try again." -msgstr "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer." +#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:214 +#: ../../include/channel.php:599 +msgid "Reserved nickname. Please choose another." +msgstr "Deze naam is gereserveerd. Kies een andere." -#: ../../Zotlabs/Module/Settings/Account.php:40 -msgid "Technical skill level updated" -msgstr "Technisch niveau bijgewerkt" +#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:219 +#: ../../include/channel.php:604 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik." -#: ../../Zotlabs/Module/Settings/Account.php:56 -msgid "Password verification failed." -msgstr "Wachtwoordverificatie mislukt" +#: ../../Zotlabs/Module/Changeaddr.php:77 +msgid "Change channel nickname/address" +msgstr "Kanaaladres veranderen" -#: ../../Zotlabs/Module/Settings/Account.php:63 -msgid "Passwords do not match. Password unchanged." -msgstr "Wachtwoorden komen niet overeen. Wachtwoord onveranderd." +#: ../../Zotlabs/Module/Changeaddr.php:78 +msgid "Any/all connections on other networks will be lost!" +msgstr "Alle connecties op andere netwerken gaan verloren!" -#: ../../Zotlabs/Module/Settings/Account.php:67 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd." +#: ../../Zotlabs/Module/Changeaddr.php:80 +msgid "New channel address" +msgstr "Nieuw kanaaladres" -#: ../../Zotlabs/Module/Settings/Account.php:81 -msgid "Password changed." -msgstr "Wachtwoord veranderd." +#: ../../Zotlabs/Module/Changeaddr.php:81 +msgid "Rename Channel" +msgstr "Kanaal hernoemen" -#: ../../Zotlabs/Module/Settings/Account.php:83 -msgid "Password update failed. Please try again." -msgstr "Bijwerken wachtwoord mislukt. Probeer opnieuw." +#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43 +msgid "Item is not editable" +msgstr "Item is niet te bewerken" -#: ../../Zotlabs/Module/Settings/Account.php:112 -msgid "Account Settings" -msgstr "Account-instellingen" +#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144 +msgid "Edit post" +msgstr "Bericht bewerken" -#: ../../Zotlabs/Module/Settings/Account.php:113 -msgid "Current Password" -msgstr "Huidig wachtwoord" +#: ../../Zotlabs/Module/Dreport.php:45 +msgid "Invalid message" +msgstr "Ongeldig bericht" -#: ../../Zotlabs/Module/Settings/Account.php:114 -msgid "Enter New Password" -msgstr "Nieuw wachtwoord invoeren" +#: ../../Zotlabs/Module/Dreport.php:78 +msgid "no results" +msgstr "geen resultaten" -#: ../../Zotlabs/Module/Settings/Account.php:115 -msgid "Confirm New Password" -msgstr "Nieuw wachtwoord bevestigen" +#: ../../Zotlabs/Module/Dreport.php:93 +msgid "channel sync processed" +msgstr "kanaalsync verwerkt" -#: ../../Zotlabs/Module/Settings/Account.php:115 -msgid "Leave password fields blank unless changing" -msgstr "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen" +#: ../../Zotlabs/Module/Dreport.php:97 +msgid "queued" +msgstr "in wachtrij" -#: ../../Zotlabs/Module/Settings/Account.php:116 -msgid "Your technical skill level" -msgstr "Jouw technisch niveau" +#: ../../Zotlabs/Module/Dreport.php:101 +msgid "posted" +msgstr "verstuurd" -#: ../../Zotlabs/Module/Settings/Account.php:116 -msgid "Used to provide a member experience matched to your comfort level" -msgstr "Wordt gebruikt om je een gebruikerservaring te bieden die met jouw technisch niveau overeenkomt" +#: ../../Zotlabs/Module/Dreport.php:105 +msgid "accepted for delivery" +msgstr "geaccepteerd om afgeleverd te worden" -#: ../../Zotlabs/Module/Settings/Account.php:119 -#: ../../Zotlabs/Module/Settings/Channel.php:483 -msgid "Email Address:" -msgstr "E-mailadres:" +#: ../../Zotlabs/Module/Dreport.php:109 +msgid "updated" +msgstr "geüpdatet" -#: ../../Zotlabs/Module/Settings/Account.php:121 -msgid "Remove this account including all its channels" -msgstr "Dit account en al zijn kanalen verwijderen" +#: ../../Zotlabs/Module/Dreport.php:112 +msgid "update ignored" +msgstr "update genegeerd" -#: ../../Zotlabs/Module/Settings/Channel.php:251 -#: ../../extend/addon/addon/logrot/logrot.php:54 -#: ../../extend/addon/addon/msgfooter/msgfooter.php:54 -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:184 -#: ../../extend/addon/addon/piwik/piwik.php:116 -#: ../../extend/addon/addon/twitter/twitter.php:766 -#: ../../extend/addon/addon/xmpp/xmpp.php:102 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:82 -msgid "Settings updated." -msgstr "Instellingen bijgewerkt." +#: ../../Zotlabs/Module/Dreport.php:115 +msgid "permission denied" +msgstr "toegang geweigerd" -#: ../../Zotlabs/Module/Settings/Channel.php:312 -msgid "Nobody except yourself" -msgstr "Niemand, behalve jezelf" +#: ../../Zotlabs/Module/Dreport.php:119 +msgid "recipient not found" +msgstr "ontvanger niet gevonden" -#: ../../Zotlabs/Module/Settings/Channel.php:313 -msgid "Only those you specifically allow" -msgstr "Alleen connecties met uitdrukkelijke toestemming" +#: ../../Zotlabs/Module/Dreport.php:122 +msgid "mail recalled" +msgstr "Privébericht ingetrokken" -#: ../../Zotlabs/Module/Settings/Channel.php:314 -msgid "Approved connections" -msgstr "Geaccepteerde connecties" +#: ../../Zotlabs/Module/Dreport.php:125 +msgid "duplicate mail received" +msgstr "dubbel privébericht ontvangen" -#: ../../Zotlabs/Module/Settings/Channel.php:315 -msgid "Any connections" -msgstr "Alle connecties" +#: ../../Zotlabs/Module/Dreport.php:128 +msgid "mail delivered" +msgstr "privébericht afgeleverd" -#: ../../Zotlabs/Module/Settings/Channel.php:316 -msgid "Anybody on this website" -msgstr "Iedereen op deze hub" +#: ../../Zotlabs/Module/Dreport.php:148 +#, php-format +msgid "Delivery report for %1$s" +msgstr "Afleveringsrapport voor %1$s" -#: ../../Zotlabs/Module/Settings/Channel.php:317 -msgid "Anybody in this network" -msgstr "Iedereen in dit netwerk" +#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39 +#: ../../Zotlabs/Widget/Wiki_pages.php:96 +msgid "Options" +msgstr "Opties" -#: ../../Zotlabs/Module/Settings/Channel.php:318 -msgid "Anybody authenticated" -msgstr "Geauthenticeerd" +#: ../../Zotlabs/Module/Dreport.php:152 +msgid "Redeliver" +msgstr "Opnieuw afleveren" -#: ../../Zotlabs/Module/Settings/Channel.php:319 -msgid "Anybody on the internet" -msgstr "Iedereen op het internet" +#: ../../Zotlabs/Module/Sources.php:37 +msgid "Failed to create source. No channel selected." +msgstr "Aanmaken bron mislukt. Geen kanaal geselecteerd." -#: ../../Zotlabs/Module/Settings/Channel.php:395 -msgid "Publish your default profile in the network directory" -msgstr "Publiceer je standaardprofiel in de kanalengids" +#: ../../Zotlabs/Module/Sources.php:51 +msgid "Source created." +msgstr "Bron aangemaakt." -#: ../../Zotlabs/Module/Settings/Channel.php:400 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen" +#: ../../Zotlabs/Module/Sources.php:64 +msgid "Source updated." +msgstr "Bron aangemaakt." -#: ../../Zotlabs/Module/Settings/Channel.php:409 -msgid "Your channel address is" -msgstr "Jouw kanaaladres is" +#: ../../Zotlabs/Module/Sources.php:90 +msgid "*" +msgstr "*" -#: ../../Zotlabs/Module/Settings/Channel.php:412 -msgid "Your files/photos are accessible via WebDAV at" -msgstr "Jouw bestanden/foto's zijn beschikbaar via WebDAV op" +#: ../../Zotlabs/Module/Sources.php:96 +#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292 +msgid "Channel Sources" +msgstr "Kanaalbronnen" -#: ../../Zotlabs/Module/Settings/Channel.php:474 -msgid "Channel Settings" -msgstr "Kanaal-instellingen" +#: ../../Zotlabs/Module/Sources.php:97 +msgid "Manage remote sources of content for your channel." +msgstr "Beheer externe bronnen met inhoud voor jouw kanaal" -#: ../../Zotlabs/Module/Settings/Channel.php:481 -msgid "Basic Settings" -msgstr "Basis-instellingen" +#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108 +msgid "New Source" +msgstr "Nieuwe bron" -#: ../../Zotlabs/Module/Settings/Channel.php:482 -#: ../../include/channel.php:1255 -msgid "Full Name:" -msgstr "Volledige naam:" +#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143 +msgid "" +"Import all or selected content from the following channel into this channel " +"and distribute it according to your channel settings." +msgstr "Importeer complete of gedeelde inhoud vanuit het volgende kanaal naar dit kanaal, en verdeel het vervolgens volgens jouw kanaalinstellingen." -#: ../../Zotlabs/Module/Settings/Channel.php:484 -msgid "Your Timezone:" -msgstr "Jouw tijdzone:" +#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 +msgid "Only import content with these words (one per line)" +msgstr "Importeer alleen inhoud met deze woorden (één per regel)" -#: ../../Zotlabs/Module/Settings/Channel.php:485 -msgid "Default Post Location:" -msgstr "Standaardlocatie bericht:" +#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 +msgid "Leave blank to import all public content" +msgstr "Laat leeg om alle openbare inhoud te importeren" -#: ../../Zotlabs/Module/Settings/Channel.php:485 -msgid "Geographical location to display on your posts" -msgstr "Geografische locatie die bij het bericht moet worden vermeld" +#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148 +msgid "Channel Name" +msgstr "Kanaalnaam" -#: ../../Zotlabs/Module/Settings/Channel.php:486 -msgid "Use Browser Location:" -msgstr "Locatie van webbrowser gebruiken:" +#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 +msgid "" +"Add the following categories to posts imported from this source (comma " +"separated)" +msgstr "De volgende categorieën aan berichten toevoegen die uit deze bron zijn geïmporteerd (door komma's gescheiden)" -#: ../../Zotlabs/Module/Settings/Channel.php:488 -msgid "Adult Content" -msgstr "Inhoud voor volwassenen" +#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161 +msgid "Source not found." +msgstr "Bron niet gevonden" -#: ../../Zotlabs/Module/Settings/Channel.php:488 -msgid "" -"This channel frequently or regularly publishes adult content. (Please tag " -"any adult material and/or nudity with #NSFW)" -msgstr "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassenen. (Gebruik de tag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)" +#: ../../Zotlabs/Module/Sources.php:140 +msgid "Edit Source" +msgstr "Bron bewerken" -#: ../../Zotlabs/Module/Settings/Channel.php:490 -msgid "Security and Privacy Settings" -msgstr "Veiligheids- en privacy-instellingen" +#: ../../Zotlabs/Module/Sources.php:141 +msgid "Delete Source" +msgstr "Bron verwijderen" -#: ../../Zotlabs/Module/Settings/Channel.php:493 -msgid "Your permissions are already configured. Click to view/adjust" -msgstr "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen." +#: ../../Zotlabs/Module/Sources.php:169 +msgid "Source removed" +msgstr "Bron verwijderd" -#: ../../Zotlabs/Module/Settings/Channel.php:495 -msgid "Hide my online presence" -msgstr "Verberg mijn aanwezigheid" +#: ../../Zotlabs/Module/Sources.php:171 +msgid "Unable to remove source." +msgstr "Verwijderen bron mislukt." -#: ../../Zotlabs/Module/Settings/Channel.php:495 -msgid "Prevents displaying in your profile that you are online" -msgstr "Voorkomt dat op je kanaalpagina te zien valt dat je momenteel op $Projectname aanwezig bent" +#: ../../Zotlabs/Module/Like.php:54 +msgid "Like/Dislike" +msgstr "Leuk/niet leuk" -#: ../../Zotlabs/Module/Settings/Channel.php:497 -msgid "Simple Privacy Settings:" -msgstr "Eenvoudige privacy-instellingen:" +#: ../../Zotlabs/Module/Like.php:59 +msgid "This action is restricted to members." +msgstr "Deze actie kan alleen door $Projectname-leden worden uitgevoerd." -#: ../../Zotlabs/Module/Settings/Channel.php:498 +#: ../../Zotlabs/Module/Like.php:60 msgid "" -"Very Public - extremely permissive (should be used with caution)" -msgstr "Zeer openbaar (kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)" +"Please login with your $Projectname ID or register as a new $Projectname member to continue." +msgstr "Je dient in te loggen met je $Projectname-account of een nieuw $Projectname-account aan te maken om verder te kunnen gaan." -#: ../../Zotlabs/Module/Settings/Channel.php:499 -msgid "" -"Typical - default public, privacy when desired (similar to social " -"network permissions but with improved privacy)" -msgstr "Normaal (standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)" +#: ../../Zotlabs/Module/Like.php:109 ../../Zotlabs/Module/Like.php:135 +#: ../../Zotlabs/Module/Like.php:173 +msgid "Invalid request." +msgstr "Ongeldig verzoek" -#: ../../Zotlabs/Module/Settings/Channel.php:500 -msgid "Private - default private, never open or public" -msgstr "Privé (standaard privé en nooit openbaar)" +#: ../../Zotlabs/Module/Like.php:121 ../../include/conversation.php:122 +msgid "channel" +msgstr "kanaal" -#: ../../Zotlabs/Module/Settings/Channel.php:501 -msgid "Blocked - default blocked to/from everybody" -msgstr "Geblokkeerd (standaard geblokkeerd naar/van iedereen)" +#: ../../Zotlabs/Module/Like.php:150 +msgid "thing" +msgstr "ding" -#: ../../Zotlabs/Module/Settings/Channel.php:503 -msgid "Allow others to tag your posts" -msgstr "Anderen toestaan om je berichten te taggen" +#: ../../Zotlabs/Module/Like.php:196 +msgid "Channel unavailable." +msgstr "Kanaal niet beschikbaar." -#: ../../Zotlabs/Module/Settings/Channel.php:503 -msgid "" -"Often used by the community to retro-actively flag inappropriate content" -msgstr "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren" +#: ../../Zotlabs/Module/Like.php:244 +msgid "Previous action reversed." +msgstr "Vorige actie omgedraaid" -#: ../../Zotlabs/Module/Settings/Channel.php:505 -msgid "Channel Permission Limits" -msgstr "Geavanceerde permissies" +#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529 +#: ../../addon/pubcrawl/as.php:1440 ../../include/conversation.php:160 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "%1$s vindt %3$s van %2$s leuk" -#: ../../Zotlabs/Module/Settings/Channel.php:507 -msgid "Expire other channel content after this many days" -msgstr "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:" +#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442 +#: ../../include/conversation.php:163 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "%1$s vindt %3$s van %2$s niet leuk" -#: ../../Zotlabs/Module/Settings/Channel.php:507 -msgid "0 or blank to use the website limit." -msgstr "0 of leeg om het standaard aantal dagen van deze hub te gebruiken." +#: ../../Zotlabs/Module/Like.php:442 +#, php-format +msgid "%1$s agrees with %2$s's %3$s" +msgstr "%1$s is het eens met %2$s's %3$s" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Like.php:444 #, php-format -msgid "This website expires after %d days." -msgstr "Deze hub laat de inhoud van andere kanalen na %d dagen verlopen." +msgid "%1$s doesn't agree with %2$s's %3$s" +msgstr "%1$s is het niet eens met %2$s's %3$s" -#: ../../Zotlabs/Module/Settings/Channel.php:507 -msgid "This website does not expire imported content." -msgstr "Deze hub laat de inhoud van andere kanalen niet verlopen." +#: ../../Zotlabs/Module/Like.php:446 +#, php-format +msgid "%1$s abstains from a decision on %2$s's %3$s" +msgstr "%1$s onthoudt zich van een besluit over %2$s's %3$s" -#: ../../Zotlabs/Module/Settings/Channel.php:507 -msgid "The website limit takes precedence if lower than your limit." -msgstr "Wanneer de standaard aantal dagen van deze hub lager ligt dan jouw aantal, dan heeft de limiet van deze hub voorrang." +#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "%1$s is aanwezig op %2$s's %3$s" -#: ../../Zotlabs/Module/Settings/Channel.php:508 -msgid "Maximum Friend Requests/Day:" -msgstr "Maximum aantal connectieverzoeken per dag:" +#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "%1$s is niet aanwezig op %2$s's %3$s" -#: ../../Zotlabs/Module/Settings/Channel.php:508 -msgid "May reduce spam activity" -msgstr "Kan eventuele spam verminderen" +#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "%1$s is mogelijk aanwezig op %2$s's %3$s" -#: ../../Zotlabs/Module/Settings/Channel.php:509 -msgid "Default Access Control List (ACL)" -msgstr "Standaard permissies voor nieuwe berichten" +#: ../../Zotlabs/Module/Like.php:564 +msgid "Action completed." +msgstr "Actie voltooid" -#: ../../Zotlabs/Module/Settings/Channel.php:511 -msgid "Use my default audience setting for the type of object published" -msgstr "Gebruik mijn standaard privacy-instelling voor dit type publicatie" +#: ../../Zotlabs/Module/Like.php:565 +msgid "Thank you." +msgstr "Bedankt" -#: ../../Zotlabs/Module/Settings/Channel.php:518 -msgid "Channel permissions category:" -msgstr "Kanaaltype en -permissies:" +#: ../../Zotlabs/Module/Directory.php:106 +msgid "No default suggestions were found." +msgstr "Er zijn geen standaard kanaalvoorstellen gevonden." -#: ../../Zotlabs/Module/Settings/Channel.php:519 -msgid "Default Permissions Group" -msgstr "Standaard permissiegroep" +#: ../../Zotlabs/Module/Directory.php:255 +#, php-format +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "%d beoordeling" +msgstr[1] "%d beoordelingen" -#: ../../Zotlabs/Module/Settings/Channel.php:525 -msgid "Maximum private messages per day from unknown people:" -msgstr "Maximum aantal privé-berichten per dag van onbekende personen:" +#: ../../Zotlabs/Module/Directory.php:266 +msgid "Gender: " +msgstr "Geslacht:" -#: ../../Zotlabs/Module/Settings/Channel.php:525 -msgid "Useful to reduce spamming" -msgstr "Kan eventuele spam verminderen" +#: ../../Zotlabs/Module/Directory.php:268 +msgid "Status: " +msgstr "Status: " -#: ../../Zotlabs/Module/Settings/Channel.php:528 -msgid "Notification Settings" -msgstr "Notificatie-instellingen" +#: ../../Zotlabs/Module/Directory.php:270 +msgid "Homepage: " +msgstr "Homepage: " -#: ../../Zotlabs/Module/Settings/Channel.php:529 -msgid "By default post a status message when:" -msgstr "Plaats automatisch een bericht wanneer:" +#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1564 +msgid "Age:" +msgstr "Leeftijd:" -#: ../../Zotlabs/Module/Settings/Channel.php:530 -msgid "accepting a friend request" -msgstr "Een connectieverzoek wordt geaccepteerd" +#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1391 +#: ../../include/event.php:54 ../../include/event.php:86 +msgid "Location:" +msgstr "Plaats:" -#: ../../Zotlabs/Module/Settings/Channel.php:531 -msgid "joining a forum/community" -msgstr "Je lid wordt van een forum/groep" +#: ../../Zotlabs/Module/Directory.php:330 +msgid "Description:" +msgstr "Omschrijving:" -#: ../../Zotlabs/Module/Settings/Channel.php:532 -msgid "making an interesting profile change" -msgstr "Er sprake is van een interessante profielwijziging" +#: ../../Zotlabs/Module/Directory.php:335 ../../include/channel.php:1593 +msgid "Hometown:" +msgstr "Oorspronkelijk uit:" -#: ../../Zotlabs/Module/Settings/Channel.php:533 -msgid "Send a notification email when:" -msgstr "Verzend een notificatie per e-mail wanneer:" +#: ../../Zotlabs/Module/Directory.php:337 ../../include/channel.php:1599 +msgid "About:" +msgstr "Over:" -#: ../../Zotlabs/Module/Settings/Channel.php:534 -msgid "You receive a connection request" -msgstr "Je een connectieverzoek ontvangt" +#: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56 +#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 +#: ../../include/conversation.php:1052 ../../include/channel.php:1376 +#: ../../include/connections.php:110 +msgid "Connect" +msgstr "Verbinden" -#: ../../Zotlabs/Module/Settings/Channel.php:535 -msgid "Your connections are confirmed" -msgstr "Jouw connecties zijn bevestigd" +#: ../../Zotlabs/Module/Directory.php:339 +msgid "Public Forum:" +msgstr "Openbaar forum:" -#: ../../Zotlabs/Module/Settings/Channel.php:536 -msgid "Someone writes on your profile wall" -msgstr "Iemand iets op jouw kanaal heeft geschreven" +#: ../../Zotlabs/Module/Directory.php:342 +msgid "Keywords: " +msgstr "Trefwoorden: " -#: ../../Zotlabs/Module/Settings/Channel.php:537 -msgid "Someone writes a followup comment" -msgstr "Iemand een reactie schrijft" +#: ../../Zotlabs/Module/Directory.php:345 +msgid "Don't suggest" +msgstr "Niet voorstellen" -#: ../../Zotlabs/Module/Settings/Channel.php:538 -msgid "You receive a private message" -msgstr "Je een privé-bericht ontvangt" +#: ../../Zotlabs/Module/Directory.php:347 +msgid "Common connections (estimated):" +msgstr "Gemeenschappelijke connecties (schatting):" -#: ../../Zotlabs/Module/Settings/Channel.php:539 -msgid "You receive a friend suggestion" -msgstr "Je een kanaalvoorstel ontvangt" +#: ../../Zotlabs/Module/Directory.php:396 +msgid "Global Directory" +msgstr "Volledige kanalengids" -#: ../../Zotlabs/Module/Settings/Channel.php:540 -msgid "You are tagged in a post" -msgstr "Je expliciet in een bericht bent genoemd" +#: ../../Zotlabs/Module/Directory.php:396 +msgid "Local Directory" +msgstr "Lokale kanalengids" -#: ../../Zotlabs/Module/Settings/Channel.php:541 -msgid "You are poked/prodded/etc. in a post" -msgstr "Je bent in een bericht aangestoten/gepord/etc." +#: ../../Zotlabs/Module/Directory.php:402 +msgid "Finding:" +msgstr "Gezocht naar:" -#: ../../Zotlabs/Module/Settings/Channel.php:543 -msgid "Someone likes your post/comment" -msgstr "Iemand jouw bericht/reactie leuk vindt" +#: ../../Zotlabs/Module/Directory.php:405 ../../Zotlabs/Module/Suggest.php:64 +#: ../../include/contact_widgets.php:24 +msgid "Channel Suggestions" +msgstr "Voorgestelde kanalen" -#: ../../Zotlabs/Module/Settings/Channel.php:546 -msgid "Show visual notifications including:" -msgstr "Toon de volgende zichtbare notificaties:" +#: ../../Zotlabs/Module/Directory.php:407 +msgid "next page" +msgstr "volgende pagina" -#: ../../Zotlabs/Module/Settings/Channel.php:548 -msgid "Unseen grid activity" -msgstr "Niet bekeken grid-activiteit" +#: ../../Zotlabs/Module/Directory.php:407 +msgid "previous page" +msgstr "vorige pagina" -#: ../../Zotlabs/Module/Settings/Channel.php:549 -msgid "Unseen channel activity" -msgstr "Niet bekeken kanaal-activiteit" +#: ../../Zotlabs/Module/Directory.php:408 +msgid "Sort options" +msgstr "Sorteeropties" -#: ../../Zotlabs/Module/Settings/Channel.php:550 -msgid "Unseen private messages" -msgstr "Niet bekeken privéberichten" +#: ../../Zotlabs/Module/Directory.php:409 +msgid "Alphabetic" +msgstr "Alfabetisch" -#: ../../Zotlabs/Module/Settings/Channel.php:550 -#: ../../Zotlabs/Module/Settings/Channel.php:555 -#: ../../Zotlabs/Module/Settings/Channel.php:556 -#: ../../Zotlabs/Module/Settings/Channel.php:557 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:343 -msgid "Recommended" -msgstr "Aanbevolen" +#: ../../Zotlabs/Module/Directory.php:410 +msgid "Reverse Alphabetic" +msgstr "Omgekeerd alfabetisch" -#: ../../Zotlabs/Module/Settings/Channel.php:551 -msgid "Upcoming events" -msgstr "Aankomende gebeurtenissen" +#: ../../Zotlabs/Module/Directory.php:411 +msgid "Newest to Oldest" +msgstr "Nieuw naar oud" -#: ../../Zotlabs/Module/Settings/Channel.php:552 -msgid "Events today" -msgstr "Gebeurtenissen van vandaag" +#: ../../Zotlabs/Module/Directory.php:412 +msgid "Oldest to Newest" +msgstr "Oud naar nieuw" -#: ../../Zotlabs/Module/Settings/Channel.php:553 -msgid "Upcoming birthdays" -msgstr "Aankomende verjaardagen" +#: ../../Zotlabs/Module/Directory.php:429 +msgid "No entries (some entries may be hidden)." +msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)." -#: ../../Zotlabs/Module/Settings/Channel.php:553 -msgid "Not available in all themes" -msgstr "Niet in alle thema's beschikbaar" +#: ../../Zotlabs/Module/Xchan.php:10 +msgid "Xchan Lookup" +msgstr "Xchan opzoeken" -#: ../../Zotlabs/Module/Settings/Channel.php:554 -msgid "System (personal) notifications" -msgstr "(Persoonlijke) systeemnotificaties" +#: ../../Zotlabs/Module/Xchan.php:13 +msgid "Lookup xchan beginning with (or webbie): " +msgstr "Zoek een xchan (of webbie) die begint met:" + +#: ../../Zotlabs/Module/Suggest.php:39 +msgid "" +"No suggestions available. If this is a new site, please try again in 24 " +"hours." +msgstr "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer." -#: ../../Zotlabs/Module/Settings/Channel.php:555 -msgid "System info messages" -msgstr "Systeemmededelingen" +#: ../../Zotlabs/Module/Suggest.php:58 ../../Zotlabs/Widget/Suggestions.php:46 +msgid "Ignore/Hide" +msgstr "Negeren/Verbergen" -#: ../../Zotlabs/Module/Settings/Channel.php:556 -msgid "System critical alerts" -msgstr "Kritische systeemwaarschuwingen" +#: ../../Zotlabs/Module/Oexchange.php:27 +msgid "Unable to find your hub." +msgstr "Niet in staat om je hub te vinden" -#: ../../Zotlabs/Module/Settings/Channel.php:557 -msgid "New connections" -msgstr "Nieuwe connecties" +#: ../../Zotlabs/Module/Oexchange.php:41 +msgid "Post successful." +msgstr "Verzenden bericht geslaagd." -#: ../../Zotlabs/Module/Settings/Channel.php:558 -msgid "System Registrations" -msgstr "Nieuwe accountregistraties op deze hub" +#: ../../Zotlabs/Module/Mail.php:73 +msgid "Unable to lookup recipient." +msgstr "Niet in staat om ontvanger op te zoeken." -#: ../../Zotlabs/Module/Settings/Channel.php:559 -msgid "" -"Also show new wall posts, private messages and connections under Notices" -msgstr "Toon tevens nieuwe kanaalberichten, privéberichten en connecties onder Notificaties" +#: ../../Zotlabs/Module/Mail.php:80 +msgid "Unable to communicate with requested channel." +msgstr "Niet in staat om met het aangevraagde kanaal te communiceren." -#: ../../Zotlabs/Module/Settings/Channel.php:561 -msgid "Notify me of events this many days in advance" -msgstr "Herinner mij zoveel dagen van te voren aan gebeurtenissen" +#: ../../Zotlabs/Module/Mail.php:87 +msgid "Cannot verify requested channel." +msgstr "Kan opgevraagd kanaal niet verifieren" -#: ../../Zotlabs/Module/Settings/Channel.php:561 -msgid "Must be greater than 0" -msgstr "Moet hoger dan 0 zijn" +#: ../../Zotlabs/Module/Mail.php:105 +msgid "Selected channel has private message restrictions. Send failed." +msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt." -#: ../../Zotlabs/Module/Settings/Channel.php:567 -msgid "Advanced Account/Page Type Settings" -msgstr "Instellingen geavanceerd account/paginatype" +#: ../../Zotlabs/Module/Mail.php:160 +msgid "Messages" +msgstr "Berichten" -#: ../../Zotlabs/Module/Settings/Channel.php:568 -msgid "Change the behaviour of this account for special situations" -msgstr "Verander het gedrag van dit account voor speciale situaties" +#: ../../Zotlabs/Module/Mail.php:173 +msgid "message" +msgstr "bericht" -#: ../../Zotlabs/Module/Settings/Channel.php:570 -msgid "Miscellaneous Settings" -msgstr "Diverse instellingen" +#: ../../Zotlabs/Module/Mail.php:214 +msgid "Message recalled." +msgstr "Bericht ingetrokken." -#: ../../Zotlabs/Module/Settings/Channel.php:571 -msgid "Default photo upload folder" -msgstr "Standaard fotoalbum voor uploads" +#: ../../Zotlabs/Module/Mail.php:227 +msgid "Conversation removed." +msgstr "Conversatie verwijderd" -#: ../../Zotlabs/Module/Settings/Channel.php:571 -#: ../../Zotlabs/Module/Settings/Channel.php:572 -msgid "%Y - current year, %m - current month" -msgstr "%Y - dit jaar, %m - deze maand" +#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "Verloopt op DD-MM-YYYY om HH:MM" -#: ../../Zotlabs/Module/Settings/Channel.php:572 -msgid "Default file upload folder" -msgstr "Standaard bestandsmap voor uploads" +#: ../../Zotlabs/Module/Mail.php:270 +msgid "Requested channel is not in this network" +msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar" -#: ../../Zotlabs/Module/Settings/Channel.php:574 -msgid "Personal menu to display in your channel pages" -msgstr "Persoonlijk menu om op je kanaalpagina's weer te geven" +#: ../../Zotlabs/Module/Mail.php:278 +msgid "Send Private Message" +msgstr "Privébericht versturen" -#: ../../Zotlabs/Module/Settings/Channel.php:576 -msgid "Remove this channel." -msgstr "Verwijder dit kanaal." +#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421 +msgid "To:" +msgstr "Aan:" -#: ../../Zotlabs/Module/Settings/Channel.php:577 -msgid "Firefox Share $Projectname provider" -msgstr "$Projectname-service voor Firefox Share" +#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423 +msgid "Subject:" +msgstr "Onderwerp:" -#: ../../Zotlabs/Module/Settings/Channel.php:578 -msgid "Start calendar week on monday" -msgstr "Begin in de agenda de week op maandag" +#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 +#: ../../include/conversation.php:1385 +msgid "Attach file" +msgstr "Bestand toevoegen" -#: ../../Zotlabs/Module/Settings/Featured.php:20 -msgid "Affinity Slider settings updated." -msgstr "Affiniteitsinstellingen bijgewerkt." +#: ../../Zotlabs/Module/Mail.php:289 +msgid "Send" +msgstr "Verzenden" -#: ../../Zotlabs/Module/Settings/Featured.php:34 -msgid "No feature settings configured" -msgstr "Geen plugin-instellingen aanwezig" +#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 +#: ../../include/conversation.php:1430 +msgid "Set expiration date" +msgstr "Verloopdatum instellen" -#: ../../Zotlabs/Module/Settings/Featured.php:41 -msgid "Default maximum affinity level" -msgstr "Standaard hoogste affiniteitsniveau" +#: ../../Zotlabs/Module/Mail.php:393 +msgid "Delete message" +msgstr "Bericht verwijderen" -#: ../../Zotlabs/Module/Settings/Featured.php:46 -msgid "Default minimum affinity level" -msgstr "Standaard laagste affiniteitsniveau" +#: ../../Zotlabs/Module/Mail.php:394 +msgid "Delivery report" +msgstr "Afleveringsrapport" -#: ../../Zotlabs/Module/Settings/Featured.php:50 -msgid "Affinity Slider Settings" -msgstr "Affiniteitsinstellingen" +#: ../../Zotlabs/Module/Mail.php:395 +msgid "Recall message" +msgstr "Bericht intrekken" -#: ../../Zotlabs/Module/Settings/Featured.php:60 -msgid "Feature/Addon Settings" -msgstr "Plugin-instellingen" +#: ../../Zotlabs/Module/Mail.php:397 +msgid "Message has been recalled." +msgstr "Bericht is ingetrokken." -#: ../../Zotlabs/Module/Settings/Permcats.php:37 -msgid "Permission category saved." -msgstr "Permissiegroep opgeslagen." +#: ../../Zotlabs/Module/Mail.php:414 +msgid "Delete Conversation" +msgstr "Verwijder conversatie" -#: ../../Zotlabs/Module/Settings/Permcats.php:63 +#: ../../Zotlabs/Module/Mail.php:416 msgid "" -"Use this form to create permission rules for various classes of people or " -"connections." -msgstr "Gebruik dit formulier om permissieregels voor diverse soorten mensen en connecties aan te maken." - -#: ../../Zotlabs/Module/Settings/Permcats.php:96 -msgid "Permission Categories" -msgstr "Permissiegroepen" +"No secure communications available. You may be able to " +"respond from the sender's profile page." +msgstr "Geen veilige communicatie beschikbaar. Mogelijk kan je reageren op de kanaalpagina van de afzender." -#: ../../Zotlabs/Module/Settings/Permcats.php:104 -msgid "Permission Name" -msgstr "Permissienaam" +#: ../../Zotlabs/Module/Mail.php:420 +msgid "Send Reply" +msgstr "Antwoord versturen" -#: ../../Zotlabs/Module/Settings/Tokens.php:31 +#: ../../Zotlabs/Module/Mail.php:425 #, php-format -msgid "This channel is limited to %d tokens" -msgstr "Dit kanaal heeft een limiet van %d tokens" - -#: ../../Zotlabs/Module/Settings/Tokens.php:37 -msgid "Name and Password are required." -msgstr "Naam en wachtwoord zijn vereist" +msgid "Your message for %s (%s):" +msgstr "Jouw privébericht aan %s (%s):" -#: ../../Zotlabs/Module/Settings/Tokens.php:77 -msgid "Token saved." -msgstr "Token opgeslagen." +#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12 +msgid "Public Hubs" +msgstr "Openbare hubs" -#: ../../Zotlabs/Module/Settings/Tokens.php:113 +#: ../../Zotlabs/Module/Pubsites.php:27 msgid "" -"Use this form to create temporary access identifiers to share things with " -"non-members. These identities may be used in Access Control Lists and " -"visitors may login using these credentials to access private content." -msgstr "Gebruik dit formulier om tijdelijke identiteiten aan te maken, waarmee je bepaalde informatie met niet-leden kan delen. Deze identiteiten kunnen onder Permissies (handmatige selectie) worden gebruikt. Gasten kunnen inloggen met onderstaande gegevens om zo toegang te krijgen tot privéinhoud." +"The listed hubs allow public registration for the $Projectname network. All " +"hubs in the network are interlinked so membership on any of them conveys " +"membership in the network as a whole. Some hubs may require subscription or " +"provide tiered service plans. The hub itself may provide " +"additional details." +msgstr "Op de hier getoonde hubs kan iedereen zich voor het $Projectname-netwerk aanmelden. Alle hubs in het netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen een financiële tegemoetkoming voor bepaalde uitbreidingen. Mogelijk wordt hierover op de hub zelf meer informatie gegeven." -#: ../../Zotlabs/Module/Settings/Tokens.php:115 -msgid "" -"You may also provide dropbox style access links to friends and " -"associates by adding the Login Password to any specific site URL as shown. " -"Examples:" -msgstr "Je kan ook dropbox-achtige links aan mensen geven door bovenstaand wachtwoord op onderstaande manier aan een hub-URL toe te voegen. Voorbeelden:" +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Hub URL" +msgstr "Hub-URL" -#: ../../Zotlabs/Module/Settings/Tokens.php:150 ../../include/widgets.php:644 -msgid "Guest Access Tokens" -msgstr "Gasttoegang" +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Access Type" +msgstr "Toegangs-
     type" -#: ../../Zotlabs/Module/Settings/Tokens.php:157 -msgid "Login Name" -msgstr "Inlognaam" +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Registration Policy" +msgstr "Registratie-
     beleid" -#: ../../Zotlabs/Module/Settings/Tokens.php:158 -msgid "Login Password" -msgstr "Wachtwoord:" +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Stats" +msgstr "Stats" -#: ../../Zotlabs/Module/Settings/Tokens.php:159 -msgid "Expires (yyyy-mm-dd)" -msgstr "Geldig t/m (yyyy-mm-dd)" +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Software" +msgstr "Software" -#: ../../Zotlabs/Module/Settings/Display.php:145 -msgid "No special theme for mobile devices" -msgstr "Geen speciaal thema voor mobiele apparaten" +#: ../../Zotlabs/Module/Pubsites.php:49 +msgid "Rate" +msgstr "Beoordeel" -#: ../../Zotlabs/Module/Settings/Display.php:148 -#, php-format -msgid "%s - (Experimental)" -msgstr "%s - (experimenteel)" +#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:267 +msgid "webpage" +msgstr "Webpagina" -#: ../../Zotlabs/Module/Settings/Display.php:198 -msgid "Display Settings" -msgstr "Weergave-instellingen" +#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:273 +msgid "block" +msgstr "blok" -#: ../../Zotlabs/Module/Settings/Display.php:199 -msgid "Theme Settings" -msgstr "Thema-instellingen" +#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:270 +msgid "layout" +msgstr "lay-out" -#: ../../Zotlabs/Module/Settings/Display.php:200 -msgid "Custom Theme Settings" -msgstr "Handmatige thema-instellingen" +#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:276 +msgid "menu" +msgstr "menu" -#: ../../Zotlabs/Module/Settings/Display.php:201 -msgid "Content Settings" -msgstr "Inhoudsinstellingen" +#: ../../Zotlabs/Module/Impel.php:183 +#, php-format +msgid "%s element installed" +msgstr "%s onderdeel geïnstalleerd" -#: ../../Zotlabs/Module/Settings/Display.php:207 -msgid "Display Theme:" -msgstr "Gebruik thema:" +#: ../../Zotlabs/Module/Impel.php:186 +#, php-format +msgid "%s element installation failed" +msgstr "Installatie %s-element mislukt" -#: ../../Zotlabs/Module/Settings/Display.php:208 -msgid "Select scheme" -msgstr "Kies schema van thema" +#: ../../Zotlabs/Module/Rbmark.php:94 +msgid "Select a bookmark folder" +msgstr "Kies een bladwijzermap" -#: ../../Zotlabs/Module/Settings/Display.php:210 -msgid "Mobile Theme:" -msgstr "Mobiel thema:" +#: ../../Zotlabs/Module/Rbmark.php:99 +msgid "Save Bookmark" +msgstr "Bladwijzer opslaan" -#: ../../Zotlabs/Module/Settings/Display.php:211 -msgid "Preload images before rendering the page" -msgstr "Afbeeldingen laden voordat de pagina wordt weergegeven" +#: ../../Zotlabs/Module/Rbmark.php:100 +msgid "URL of bookmark" +msgstr "URL van bladwijzer" -#: ../../Zotlabs/Module/Settings/Display.php:211 -msgid "" -"The subjective page load time will be longer but the page will be ready when" -" displayed" -msgstr "De laadtijd van een pagina lijkt langer, maar de pagina is wel meteen helemaal geladen wanneer deze wordt weergeven" +#: ../../Zotlabs/Module/Rbmark.php:105 +msgid "Or enter new bookmark folder name" +msgstr "Of geef de naam op van een nieuwe bladwijzermap" -#: ../../Zotlabs/Module/Settings/Display.php:212 -msgid "Enable user zoom on mobile devices" -msgstr "Inzoomen op smartphones en tablets toestaan" +#: ../../Zotlabs/Module/Filer.php:52 +msgid "Enter a folder name" +msgstr "Vul een mapnaam in" -#: ../../Zotlabs/Module/Settings/Display.php:213 -msgid "Update browser every xx seconds" -msgstr "Ververs de webbrowser om de zoveel seconde" +#: ../../Zotlabs/Module/Filer.php:52 +msgid "or select an existing folder (doubleclick)" +msgstr "of kies een bestaande map (dubbelklikken)" -#: ../../Zotlabs/Module/Settings/Display.php:213 -msgid "Minimum of 10 seconds, no maximum" -msgstr "Minimaal 10 seconde, geen maximum" +#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:151 +msgid "Save to Folder" +msgstr "In map opslaan" -#: ../../Zotlabs/Module/Settings/Display.php:214 -msgid "Maximum number of conversations to load at any time:" -msgstr "Maximaal aantal conversaties die per keer geladen worden:" +#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34 +#, php-format +msgid "Fetching URL returns error: %1$s" +msgstr "Ophalen URL gaf een foutmelding terug: %1$s" + +#: ../../Zotlabs/Module/Register.php:49 +msgid "Maximum daily site registrations exceeded. Please try again tomorrow." +msgstr "Maximum toegestane dagelijkse registraties op deze $Projectname-hub bereikt. Probeer het morgen (UTC) nogmaals." + +#: ../../Zotlabs/Module/Register.php:55 +msgid "" +"Please indicate acceptance of the Terms of Service. Registration failed." +msgstr "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden." -#: ../../Zotlabs/Module/Settings/Display.php:214 -msgid "Maximum of 100 items" -msgstr "Maximaal 100 conversaties" +#: ../../Zotlabs/Module/Register.php:89 +msgid "Passwords do not match." +msgstr "Wachtwoorden komen niet met elkaar overeen." -#: ../../Zotlabs/Module/Settings/Display.php:215 -msgid "Show emoticons (smilies) as images" -msgstr "Toon emoticons (smilies) als afbeeldingen" +#: ../../Zotlabs/Module/Register.php:132 +msgid "Registration successful. Continue to create your first channel..." +msgstr "Registratie geslaagd. Ga verder met het aanmaken van jouw eerste kanaal..." -#: ../../Zotlabs/Module/Settings/Display.php:216 -msgid "Manual conversation updates" -msgstr "Handmatige conversatie-updates" +#: ../../Zotlabs/Module/Register.php:135 +msgid "" +"Registration successful. Please check your email for validation " +"instructions." +msgstr "Registratie geslaagd. Controleer je e-mail voor instructies." -#: ../../Zotlabs/Module/Settings/Display.php:216 -msgid "Default is on, turning this off may increase screen jumping" -msgstr "Dit is standaard ingeschakeld en door dit uit te schakelen kunnen items soms verspringen." +#: ../../Zotlabs/Module/Register.php:142 +msgid "Your registration is pending approval by the site owner." +msgstr "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze $Projectname-hub." -#: ../../Zotlabs/Module/Settings/Display.php:217 -msgid "Link post titles to source" -msgstr "Berichtkoppen naar originele locatie linken" +#: ../../Zotlabs/Module/Register.php:145 +msgid "Your registration can not be processed." +msgstr "Jouw registratie kan niet verwerkt worden." -#: ../../Zotlabs/Module/Settings/Display.php:218 -msgid "System Page Layout Editor - (advanced)" -msgstr "Lay-out bewerken van systeempagina's (geavanceerd)" +#: ../../Zotlabs/Module/Register.php:192 +msgid "Registration on this hub is disabled." +msgstr "Registreren van nieuwe accounts is op deze hub uitgeschakeld." -#: ../../Zotlabs/Module/Settings/Display.php:221 -msgid "Use blog/list mode on channel page" -msgstr "Gebruik blog/lijst-modus op kanaalpagina" +#: ../../Zotlabs/Module/Register.php:201 +msgid "Registration on this hub is by approval only." +msgstr "Registraties op deze hub moeten eerst worden goedgekeurd." -#: ../../Zotlabs/Module/Settings/Display.php:221 -#: ../../Zotlabs/Module/Settings/Display.php:222 -msgid "(comments displayed separately)" -msgstr "(reacties worden afzonderlijk weergeven)" +#: ../../Zotlabs/Module/Register.php:202 +msgid "Register at another affiliated hub." +msgstr "Registreer op een andere hub." -#: ../../Zotlabs/Module/Settings/Display.php:222 -msgid "Use blog/list mode on grid page" -msgstr "Gebruik blog/lijst-modus op gridpagina" +#: ../../Zotlabs/Module/Register.php:212 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "Deze $Projectname-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals." -#: ../../Zotlabs/Module/Settings/Display.php:223 -msgid "Channel page max height of content (in pixels)" -msgstr "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)" +#: ../../Zotlabs/Module/Register.php:238 +#, php-format +msgid "I accept the %s for this website" +msgstr "Ik accepteer de %s van deze $Projectname-hub" -#: ../../Zotlabs/Module/Settings/Display.php:223 -#: ../../Zotlabs/Module/Settings/Display.php:224 -msgid "click to expand content exceeding this height" -msgstr "klik om inhoud uit te klappen die deze hoogte overschrijdt" +#: ../../Zotlabs/Module/Register.php:245 +#, php-format +msgid "I am over %s years of age and accept the %s for this website" +msgstr "Ik ben %s jaar of ouder en accepteer de %s van deze hub" -#: ../../Zotlabs/Module/Settings/Display.php:224 -msgid "Grid page max height of content (in pixels)" -msgstr "Maximale hoogte berichtinhoud op gridpagina (in pixels)" +#: ../../Zotlabs/Module/Register.php:250 +msgid "Your email address" +msgstr "Jouw e-mailadres" -#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98 -msgid "Tag removed" -msgstr "Tag verwijderd" +#: ../../Zotlabs/Module/Register.php:251 +msgid "Choose a password" +msgstr "Geef een wachtwoord op" -#: ../../Zotlabs/Module/Tagrm.php:123 -msgid "Remove Item Tag" -msgstr "Verwijder item-tag" +#: ../../Zotlabs/Module/Register.php:252 +msgid "Please re-enter your password" +msgstr "Geef het wachtwoord opnieuw op" -#: ../../Zotlabs/Module/Tagrm.php:125 -msgid "Select a tag to remove: " -msgstr "Kies een tag om te verwijderen" +#: ../../Zotlabs/Module/Register.php:253 +msgid "Please enter your invitation code" +msgstr "Vul jouw uitnodigingscode in" -#: ../../Zotlabs/Module/Thing.php:114 -msgid "Thing updated" -msgstr "Ding bijgewerkt" +#: ../../Zotlabs/Module/Register.php:258 +msgid "no" +msgstr "Nee" -#: ../../Zotlabs/Module/Thing.php:166 -msgid "Object store: failed" -msgstr "Opslaan van ding mislukt" +#: ../../Zotlabs/Module/Register.php:258 +msgid "yes" +msgstr "Ja" -#: ../../Zotlabs/Module/Thing.php:170 -msgid "Thing added" -msgstr "Ding toegevoegd" +#: ../../Zotlabs/Module/Register.php:274 +msgid "Membership on this site is by invitation only." +msgstr "Registreren op deze $Projectname-hub kan alleen op uitnodiging." -#: ../../Zotlabs/Module/Thing.php:196 -#, php-format -msgid "OBJ: %1$s %2$s %3$s" -msgstr "OBJ: %1$s %2$s %3$s" +#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1570 +#: ../../include/nav.php:164 +msgid "Register" +msgstr "Registreren" -#: ../../Zotlabs/Module/Thing.php:259 -msgid "Show Thing" -msgstr "Ding weergeven" +#: ../../Zotlabs/Module/Register.php:287 +msgid "" +"This site requires email verification. After completing this form, please " +"check your email for further instructions." +msgstr "Deze hub vereist e-mailverificatie. Controleer na het indienen van dit formulier jouw e-mail voor verdere instructies." -#: ../../Zotlabs/Module/Thing.php:266 -msgid "item not found." -msgstr "Item niet gevonden" +#: ../../Zotlabs/Module/Cover_photo.php:136 +#: ../../Zotlabs/Module/Cover_photo.php:186 +msgid "Cover Photos" +msgstr "Omslagfoto's" -#: ../../Zotlabs/Module/Thing.php:299 -msgid "Edit Thing" -msgstr "Ding bewerken" +#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4558 +msgid "female" +msgstr "vrouw" -#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:355 -msgid "Select a profile" -msgstr "Kies een profiel" +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4559 +#, php-format +msgid "%1$s updated her %2$s" +msgstr "%1$s heeft haar %2$s bijgewerkt" -#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358 -msgid "Post an activity" -msgstr "Plaats een bericht" +#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4560 +msgid "male" +msgstr "man" -#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358 -msgid "Only sends to viewers of the applicable profile" -msgstr "Toont dit alleen aan diegene die het gekozen profiel mogen zien." +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4561 +#, php-format +msgid "%1$s updated his %2$s" +msgstr "%1$s heeft zijn %2$s bijgewerkt" -#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:360 -msgid "Name of thing e.g. something" -msgstr "Naam van ding" +#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4563 +#, php-format +msgid "%1$s updated their %2$s" +msgstr "De %2$s van %1$s is bijgewerkt" -#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:361 -msgid "URL of thing (optional)" -msgstr "URL van ding (niet verplicht)" +#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2070 +msgid "cover photo" +msgstr "omslagfoto" -#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:362 -msgid "URL for photo of thing (optional)" -msgstr "URL voor foto van ding (niet verplicht)" +#: ../../Zotlabs/Module/Cover_photo.php:361 +msgid "Change Cover Photo" +msgstr "Omslagfoto wijzigen" -#: ../../Zotlabs/Module/Thing.php:353 -msgid "Add Thing to your Profile" -msgstr "Ding aan je profiel toevoegen" +#: ../../Zotlabs/Module/Help.php:23 +msgid "Documentation Search" +msgstr "Zoek documentatie" -#: ../../Zotlabs/Module/Setup.php:176 -msgid "$Projectname Server - Setup" -msgstr "$Projectname Hub - Setup" +#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1824 +#: ../../include/nav.php:391 +msgid "About" +msgstr "Over" -#: ../../Zotlabs/Module/Setup.php:180 -msgid "Could not connect to database." -msgstr "Could not connect to database." +#: ../../Zotlabs/Module/Help.php:82 +msgid "Administrators" +msgstr "Beheerders" -#: ../../Zotlabs/Module/Setup.php:184 -msgid "" -"Could not connect to specified site URL. Possible SSL certificate or DNS " -"issue." -msgstr "Could not connect to specified hub URL. Possible SSL certificate or DNS issue." +#: ../../Zotlabs/Module/Help.php:83 +msgid "Developers" +msgstr "Ontwikkelaars" -#: ../../Zotlabs/Module/Setup.php:191 -msgid "Could not create table." -msgstr "Could not create table." +#: ../../Zotlabs/Module/Help.php:84 +msgid "Tutorials" +msgstr "Zelfstudie" -#: ../../Zotlabs/Module/Setup.php:196 -msgid "Your site database has been installed." -msgstr "Your hub database has been installed." +#: ../../Zotlabs/Module/Help.php:95 +msgid "$Projectname Documentation" +msgstr "$Projectname-documentatie" -#: ../../Zotlabs/Module/Setup.php:200 -msgid "" -"You may need to import the file \"install/schema_xxx.sql\" manually using a " -"database client." -msgstr "You may need to import the file \"install/schema_xxx.sql\" manually using a database client." +#: ../../Zotlabs/Module/Help.php:96 +msgid "Contents" +msgstr "Inhoud" -#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263 -#: ../../Zotlabs/Module/Setup.php:750 -msgid "Please see the file \"install/INSTALL.txt\"." -msgstr "Please see the file \"install/INSTALL.txt\"." +#: ../../Zotlabs/Module/Display.php:394 +msgid "Article" +msgstr "Artikel" -#: ../../Zotlabs/Module/Setup.php:260 -msgid "System check" -msgstr "System check" +#: ../../Zotlabs/Module/Display.php:446 +msgid "Item has been removed." +msgstr "Item is verwijderd" -#: ../../Zotlabs/Module/Setup.php:265 -msgid "Check again" -msgstr "Check again" +#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98 +msgid "Tag removed" +msgstr "Tag verwijderd" -#: ../../Zotlabs/Module/Setup.php:287 -msgid "Database connection" -msgstr "Database connection" +#: ../../Zotlabs/Module/Tagrm.php:123 +msgid "Remove Item Tag" +msgstr "Verwijder item-tag" -#: ../../Zotlabs/Module/Setup.php:288 -msgid "" -"In order to install $Projectname we need to know how to connect to your " -"database." -msgstr "In order to install $Projectname we need to know how to connect to your database." +#: ../../Zotlabs/Module/Tagrm.php:125 +msgid "Select a tag to remove: " +msgstr "Kies een tag om te verwijderen" -#: ../../Zotlabs/Module/Setup.php:289 -msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." -msgstr "Please contact your hosting provider or server administrator if you have questions about these settings." +#: ../../Zotlabs/Module/Network.php:100 +msgid "No such group" +msgstr "Collectie niet gevonden" -#: ../../Zotlabs/Module/Setup.php:290 -msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." -msgstr "The database you specify below should already exist. If it does not, please create it before continuing." +#: ../../Zotlabs/Module/Network.php:142 +msgid "No such channel" +msgstr "Niet zo'n kanaal" -#: ../../Zotlabs/Module/Setup.php:294 -msgid "Database Server Name" -msgstr "Database Server Name" +#: ../../Zotlabs/Module/Network.php:147 +msgid "forum" +msgstr "forum" -#: ../../Zotlabs/Module/Setup.php:294 -msgid "Default is 127.0.0.1" -msgstr "Default is 127.0.0.1" +#: ../../Zotlabs/Module/Network.php:159 +msgid "Search Results For:" +msgstr "Zoekresultaten voor:" -#: ../../Zotlabs/Module/Setup.php:295 -msgid "Database Port" -msgstr "Database Port" +#: ../../Zotlabs/Module/Network.php:229 +msgid "Privacy group is empty" +msgstr "Privacygroep is leeg" -#: ../../Zotlabs/Module/Setup.php:295 -msgid "Communication port number - use 0 for default" -msgstr "Communication port number - use 0 for default" +#: ../../Zotlabs/Module/Network.php:238 +msgid "Privacy group: " +msgstr "Privacygroep: " -#: ../../Zotlabs/Module/Setup.php:296 -msgid "Database Login Name" -msgstr "Database Login Name" +#: ../../Zotlabs/Module/Network.php:265 +msgid "Invalid connection." +msgstr "Ongeldige connectie." -#: ../../Zotlabs/Module/Setup.php:297 -msgid "Database Login Password" -msgstr "Database Login Password" +#: ../../Zotlabs/Module/Network.php:285 ../../addon/redred/redred.php:65 +msgid "Invalid channel." +msgstr "Onbekend kanaal." -#: ../../Zotlabs/Module/Setup.php:298 -msgid "Database Name" -msgstr "Database Name" +#: ../../Zotlabs/Module/Acl.php:361 +msgid "network" +msgstr "netwerk" -#: ../../Zotlabs/Module/Setup.php:299 -msgid "Database Type" -msgstr "Database Type" +#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82 +#: ../../Zotlabs/Lib/Enotify.php:66 ../../addon/opensearch/opensearch.php:42 +msgid "$Projectname" +msgstr "$Projectname" -#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347 -msgid "Site administrator email address" -msgstr "Hub administrator email address" +#: ../../Zotlabs/Module/Home.php:92 +#, php-format +msgid "Welcome to %s" +msgstr "Welkom op %s" -#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347 -msgid "" -"Your account email address must match this in order to use the web admin " -"panel." -msgstr "Your account email address must match this in order to use the web admin panel." +#: ../../Zotlabs/Module/Filestorage.php:79 +msgid "Permission Denied." +msgstr "Toegang geweigerd" -#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349 -msgid "Website URL" -msgstr "Hub URL" +#: ../../Zotlabs/Module/Filestorage.php:95 +msgid "File not found." +msgstr "Bestand niet gevonden." -#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349 -msgid "Please use SSL (https) URL if available." -msgstr "Please use SSL (https) URL if available." +#: ../../Zotlabs/Module/Filestorage.php:142 +msgid "Edit file permissions" +msgstr "Bestandsrechten bewerken" -#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:353 -msgid "Please select a default timezone for your website" -msgstr "Please select a default timezone for your hub" +#: ../../Zotlabs/Module/Filestorage.php:154 +msgid "Set/edit permissions" +msgstr "Rechten instellen/bewerken" -#: ../../Zotlabs/Module/Setup.php:336 -msgid "Site settings" -msgstr "Hub settings" +#: ../../Zotlabs/Module/Filestorage.php:155 +msgid "Include all files and sub folders" +msgstr "Toepassen op alle bestanden en submappen" -#: ../../Zotlabs/Module/Setup.php:392 -msgid "PHP version 5.5 or greater is required." -msgstr "PHP version 5.5 or greater is required." +#: ../../Zotlabs/Module/Filestorage.php:156 +msgid "Return to file list" +msgstr "Terugkeren naar bestandlijst " -#: ../../Zotlabs/Module/Setup.php:393 -msgid "PHP version" -msgstr "PHP version" +#: ../../Zotlabs/Module/Filestorage.php:158 +msgid "Copy/paste this code to attach file to a post" +msgstr "Kopieer/plak deze code om het bestand aan een bericht te koppelen" -#: ../../Zotlabs/Module/Setup.php:409 -msgid "Could not find a command line version of PHP in the web server PATH." -msgstr "Could not find a command line version of PHP in the web server PATH." +#: ../../Zotlabs/Module/Filestorage.php:159 +msgid "Copy/paste this URL to link file from a web page" +msgstr "Kopieer/plak deze URL om het bestand aan een externe webpagina te koppelen" -#: ../../Zotlabs/Module/Setup.php:410 -msgid "" -"If you don't have a command line version of PHP installed on server, you " -"will not be able to run background polling via cron." -msgstr "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron." +#: ../../Zotlabs/Module/Filestorage.php:161 +msgid "Share this file" +msgstr "Dit bestand delen" -#: ../../Zotlabs/Module/Setup.php:414 -msgid "PHP executable path" -msgstr "PHP executable path" +#: ../../Zotlabs/Module/Filestorage.php:162 +msgid "Show URL to this file" +msgstr "Toon URL van dit bestand" -#: ../../Zotlabs/Module/Setup.php:414 -msgid "" -"Enter full path to php executable. You can leave this blank to continue the " -"installation." -msgstr "Enter full path to php executable. You can leave this blank to continue the installation." +#: ../../Zotlabs/Module/Filestorage.php:163 +#: ../../Zotlabs/Storage/Browser.php:397 +msgid "Show in your contacts shared folder" +msgstr "In de met jouw connecties gedeelde map tonen " -#: ../../Zotlabs/Module/Setup.php:419 -msgid "Command line PHP" -msgstr "Command line PHP" +#: ../../Zotlabs/Module/Common.php:14 +msgid "No channel." +msgstr "Geen kanaal." -#: ../../Zotlabs/Module/Setup.php:429 -msgid "" -"Unable to check command line PHP, as shell_exec() is disabled. This is " -"required." -msgstr "Unable to check command line PHP, as shell_exec() is disabled. This is required." +#: ../../Zotlabs/Module/Common.php:45 +msgid "No connections in common." +msgstr "Geen gemeenschappelijke connecties." -#: ../../Zotlabs/Module/Setup.php:432 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." -msgstr "The command line version of PHP on your system does not have \"register_argc_argv\" enabled." +#: ../../Zotlabs/Module/Common.php:65 +msgid "View Common Connections" +msgstr "Gemeenschappelijke connecties tonen" -#: ../../Zotlabs/Module/Setup.php:433 -msgid "This is required for message delivery to work." -msgstr "This is required for message delivery to work." +#: ../../Zotlabs/Module/Email_resend.php:30 +msgid "Email verification resent" +msgstr "E-mailverificatie opnieuw verzonden" -#: ../../Zotlabs/Module/Setup.php:436 -msgid "PHP register_argc_argv" -msgstr "PHP register_argc_argv" +#: ../../Zotlabs/Module/Email_resend.php:33 +msgid "Unable to resend email verification message." +msgstr "Opnieuw verzenden e-mailverificatie mislukt" -#: ../../Zotlabs/Module/Setup.php:454 +#: ../../Zotlabs/Module/Viewconnections.php:65 +msgid "No connections." +msgstr "Geen connecties." + +#: ../../Zotlabs/Module/Viewconnections.php:83 #, php-format -msgid "" -"Your max allowed total upload size is set to %s. Maximum size of one file to" -" upload is set to %s. You are allowed to upload up to %d files at once." -msgstr "Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once." +msgid "Visit %s's profile [%s]" +msgstr "Bezoek het profiel van %s [%s]" -#: ../../Zotlabs/Module/Setup.php:459 -msgid "You can adjust these settings in the server php.ini file." -msgstr "You can adjust these settings in the server php.ini file." +#: ../../Zotlabs/Module/Viewconnections.php:113 +msgid "View Connections" +msgstr "Connecties tonen" -#: ../../Zotlabs/Module/Setup.php:461 -msgid "PHP upload limits" -msgstr "PHP upload limits" +#: ../../Zotlabs/Module/Admin.php:97 +msgid "Blocked accounts" +msgstr "Geblokkeerde accounts" -#: ../../Zotlabs/Module/Setup.php:484 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" -msgstr "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys" +#: ../../Zotlabs/Module/Admin.php:98 +msgid "Expired accounts" +msgstr "Verlopen accounts" -#: ../../Zotlabs/Module/Setup.php:485 -msgid "" -"If running under Windows, please see " -"\"http://www.php.net/manual/en/openssl.installation.php\"." -msgstr "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"." +#: ../../Zotlabs/Module/Admin.php:99 +msgid "Expiring accounts" +msgstr "Accounts die nog moeten verlopen" -#: ../../Zotlabs/Module/Setup.php:488 -msgid "Generate encryption keys" -msgstr "Generate encryption keys" +#: ../../Zotlabs/Module/Admin.php:112 +msgid "Clones" +msgstr "Klonen" -#: ../../Zotlabs/Module/Setup.php:505 -msgid "libCurl PHP module" -msgstr "libCurl PHP module" +#: ../../Zotlabs/Module/Admin.php:118 +msgid "Message queues" +msgstr "Berichtenwachtrij" -#: ../../Zotlabs/Module/Setup.php:506 -msgid "GD graphics PHP module" -msgstr "GD graphics PHP module" +#: ../../Zotlabs/Module/Admin.php:132 +msgid "Your software should be updated" +msgstr "Jouw software moet worden bijgewerkt " -#: ../../Zotlabs/Module/Setup.php:507 -msgid "OpenSSL PHP module" -msgstr "OpenSSL PHP module" +#: ../../Zotlabs/Module/Admin.php:137 +msgid "Summary" +msgstr "Samenvatting" -#: ../../Zotlabs/Module/Setup.php:508 -msgid "PDO database PHP module" -msgstr "PDO database PHP module" +#: ../../Zotlabs/Module/Admin.php:140 +msgid "Registered accounts" +msgstr "Geregistreerde accounts" -#: ../../Zotlabs/Module/Setup.php:509 -msgid "mb_string PHP module" -msgstr "mb_string PHP module" +#: ../../Zotlabs/Module/Admin.php:141 +msgid "Pending registrations" +msgstr "Accounts die op goedkeuring wachten" -#: ../../Zotlabs/Module/Setup.php:510 -msgid "xml PHP module" -msgstr "xml PHP module" +#: ../../Zotlabs/Module/Admin.php:142 +msgid "Registered channels" +msgstr "Geregistreerde kanalen" -#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:516 -msgid "Apache mod_rewrite module" -msgstr "Apache mod_rewrite module" +#: ../../Zotlabs/Module/Admin.php:143 +msgid "Active plugins" +msgstr "Ingeschakelde plug-ins" -#: ../../Zotlabs/Module/Setup.php:514 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." -msgstr "Error: Apache webserver mod-rewrite module is required but not installed." +#: ../../Zotlabs/Module/Admin.php:144 +msgid "Version" +msgstr "Versie" -#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:523 -msgid "exec" -msgstr "exec" +#: ../../Zotlabs/Module/Admin.php:145 +msgid "Repository version (master)" +msgstr "Versie repository (master)" -#: ../../Zotlabs/Module/Setup.php:520 -msgid "" -"Error: exec is required but is either not installed or has been disabled in " -"php.ini" -msgstr "Error: exec is required but is either not installed or has been disabled in php.ini" +#: ../../Zotlabs/Module/Admin.php:146 +msgid "Repository version (dev)" +msgstr "Versie repository (dev)" -#: ../../Zotlabs/Module/Setup.php:526 ../../Zotlabs/Module/Setup.php:529 -msgid "shell_exec" -msgstr "shell_exec" +#: ../../Zotlabs/Module/Service_limits.php:23 +msgid "No service class restrictions found." +msgstr "Geen abonnementsbeperkingen gevonden." -#: ../../Zotlabs/Module/Setup.php:526 -msgid "" -"Error: shell_exec is required but is either not installed or has been " -"disabled in php.ini" -msgstr "Error: shell_exec is required but is either not installed or has been disabled in php.ini" +#: ../../Zotlabs/Module/Rate.php:156 +msgid "Website:" +msgstr "Website:" -#: ../../Zotlabs/Module/Setup.php:534 -msgid "Error: libCURL PHP module required but not installed." -msgstr "Error: libCURL PHP module required but not installed." +#: ../../Zotlabs/Module/Rate.php:159 +#, php-format +msgid "Remote Channel [%s] (not yet known on this site)" +msgstr "Kanaal op afstand [%s] (nog niet op deze hub bekend)" -#: ../../Zotlabs/Module/Setup.php:538 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." -msgstr "Error: GD graphics PHP module with JPEG support required but not installed." +#: ../../Zotlabs/Module/Rate.php:160 +msgid "Rating (this information is public)" +msgstr "Beoordeling (deze informatie is openbaar)" -#: ../../Zotlabs/Module/Setup.php:542 -msgid "Error: openssl PHP module required but not installed." -msgstr "Error: openssl PHP module required but not installed." +#: ../../Zotlabs/Module/Rate.php:161 +msgid "Optionally explain your rating (this information is public)" +msgstr "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)" -#: ../../Zotlabs/Module/Setup.php:546 -msgid "Error: PDO database PHP module required but not installed." -msgstr "Error: PDO database PHP module required but not installed." +#: ../../Zotlabs/Module/Card_edit.php:128 +msgid "Edit Card" +msgstr "Kaart bewerken" -#: ../../Zotlabs/Module/Setup.php:550 -msgid "Error: mb_string PHP module required but not installed." -msgstr "Error: mb_string PHP module required but not installed." +#: ../../Zotlabs/Module/Lostpass.php:19 +msgid "No valid account found." +msgstr "Geen geldige account gevonden." -#: ../../Zotlabs/Module/Setup.php:554 -msgid "Error: xml PHP module required for DAV but not installed." -msgstr "Error: xml PHP module required for DAV but not installed." +#: ../../Zotlabs/Module/Lostpass.php:33 +msgid "Password reset request issued. Check your email." +msgstr "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail." -#: ../../Zotlabs/Module/Setup.php:572 -msgid "" -"The web installer needs to be able to create a file called \".htconfig.php\"" -" in the top folder of your web server and it is unable to do so." -msgstr "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so." +#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108 +#, php-format +msgid "Site Member (%s)" +msgstr "Lid van hub (%s)" -#: ../../Zotlabs/Module/Setup.php:573 -msgid "" -"This is most often a permission setting, as the web server may not be able " -"to write files in your folder - even if you can." -msgstr "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can." +#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49 +#, php-format +msgid "Password reset requested at %s" +msgstr "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend" -#: ../../Zotlabs/Module/Setup.php:574 +#: ../../Zotlabs/Module/Lostpass.php:68 msgid "" -"At the end of this procedure, we will give you a text to save in a file " -"named .htconfig.php in your Red top folder." -msgstr "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder." +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." +msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt." -#: ../../Zotlabs/Module/Setup.php:575 -msgid "" -"You can alternatively skip this procedure and perform a manual installation." -" Please see the file \"install/INSTALL.txt\" for instructions." -msgstr "You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions." +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1598 +msgid "Password Reset" +msgstr "Wachtwoord vergeten?" -#: ../../Zotlabs/Module/Setup.php:578 -msgid ".htconfig.php is writable" -msgstr ".htconfig.php is writable" +#: ../../Zotlabs/Module/Lostpass.php:92 +msgid "Your password has been reset as requested." +msgstr "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht." -#: ../../Zotlabs/Module/Setup.php:592 -msgid "" -"This software uses the Smarty3 template engine to render its web views. " -"Smarty3 compiles templates to PHP to speed up rendering." -msgstr "This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering." +#: ../../Zotlabs/Module/Lostpass.php:93 +msgid "Your new password is" +msgstr "Jouw nieuwe wachtwoord is" -#: ../../Zotlabs/Module/Setup.php:593 -#, php-format -msgid "" -"In order to store these compiled templates, the web server needs to have " -"write access to the directory %s under the top level web folder." -msgstr "In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder." +#: ../../Zotlabs/Module/Lostpass.php:94 +msgid "Save or copy your new password - and then" +msgstr "Kopieer of sla je nieuwe wachtwoord op - en" -#: ../../Zotlabs/Module/Setup.php:594 ../../Zotlabs/Module/Setup.php:615 -msgid "" -"Please ensure that the user that your web server runs as (e.g. www-data) has" -" write access to this folder." -msgstr "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder." +#: ../../Zotlabs/Module/Lostpass.php:95 +msgid "click here to login" +msgstr "klik dan hier om in te loggen" -#: ../../Zotlabs/Module/Setup.php:595 -#, php-format +#: ../../Zotlabs/Module/Lostpass.php:96 msgid "" -"Note: as a security measure, you should give the web server write access to " -"%s only--not the template files (.tpl) that it contains." -msgstr "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains." +"Your password may be changed from the Settings page after " +"successful login." +msgstr "Jouw wachtwoord kan worden veranderd onder instellingen, nadat je succesvol bent ingelogd." -#: ../../Zotlabs/Module/Setup.php:598 +#: ../../Zotlabs/Module/Lostpass.php:117 #, php-format -msgid "%s is writable" -msgstr "%s is writable" +msgid "Your password has changed at %s" +msgstr "Jouw wachtwoord op %s is veranderd" + +#: ../../Zotlabs/Module/Lostpass.php:130 +msgid "Forgot your Password?" +msgstr "Wachtwoord vergeten?" -#: ../../Zotlabs/Module/Setup.php:614 +#: ../../Zotlabs/Module/Lostpass.php:131 msgid "" -"This software uses the store directory to save uploaded files. The web " -"server needs to have write access to the store directory under the top level" -" web folder" -msgstr "This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." +msgstr "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies." + +#: ../../Zotlabs/Module/Lostpass.php:132 +msgid "Email Address" +msgstr "E-mailadres" + +#: ../../Zotlabs/Module/Notifications.php:62 +#: ../../Zotlabs/Lib/ThreadItem.php:408 +msgid "Mark all seen" +msgstr "Markeer alles als bekeken" -#: ../../Zotlabs/Module/Setup.php:618 -msgid "store is writable" -msgstr "store is writable" +#: ../../Zotlabs/Lib/Techlevels.php:10 +msgid "0. Beginner/Basic" +msgstr "0. Beginner/basic" -#: ../../Zotlabs/Module/Setup.php:651 -msgid "" -"SSL certificate cannot be validated. Fix certificate or disable https access" -" to this site." -msgstr "SSL certificate cannot be validated. Fix certificate or disable https access to this hub." +#: ../../Zotlabs/Lib/Techlevels.php:11 +msgid "1. Novice - not skilled but willing to learn" +msgstr "1. Onervaren - niet bekwaam, maar wil graag leren" -#: ../../Zotlabs/Module/Setup.php:652 -msgid "" -"If you have https access to your website or allow connections to TCP port " -"443 (the https: port), you MUST use a browser-valid certificate. You MUST " -"NOT use self-signed certificates!" -msgstr "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!" +#: ../../Zotlabs/Lib/Techlevels.php:12 +msgid "2. Intermediate - somewhat comfortable" +msgstr "2. Ervaren - voelt zich enigszins comfortabel" -#: ../../Zotlabs/Module/Setup.php:653 -msgid "" -"This restriction is incorporated because public posts from you may for " -"example contain references to images on your own hub." -msgstr "This restriction is incorporated because public posts from you may for example contain references to images on your own hub." +#: ../../Zotlabs/Lib/Techlevels.php:13 +msgid "3. Advanced - very comfortable" +msgstr "3. Gevorderd - voelt zich comfortabel" -#: ../../Zotlabs/Module/Setup.php:654 -msgid "" -"If your certificate is not recognized, members of other sites (who may " -"themselves have valid certificates) will get a warning message on their own " -"site complaining about security issues." -msgstr "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues." +#: ../../Zotlabs/Lib/Techlevels.php:14 +msgid "4. Expert - I can write computer code" +msgstr "4. Expert - kan programmeren" -#: ../../Zotlabs/Module/Setup.php:655 -msgid "" -"This can cause usability issues elsewhere (not just on your own site) so we " -"must insist on this requirement." -msgstr "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement." +#: ../../Zotlabs/Lib/Techlevels.php:15 +msgid "5. Wizard - I probably know more than you do" +msgstr "5. Wizard - ik weet waarschijnlijk meer dan jij" -#: ../../Zotlabs/Module/Setup.php:656 -msgid "" -"Providers are available that issue free certificates which are browser-" -"valid." -msgstr "Providers are available that issue free certificates which are browser-valid." +#: ../../Zotlabs/Lib/Apps.php:231 +msgid "Site Admin" +msgstr "Hubbeheerder" -#: ../../Zotlabs/Module/Setup.php:658 -msgid "" -"If you are confident that the certificate is valid and signed by a trusted " -"authority, check to see if you have failed to install an intermediate cert. " -"These are not normally required by browsers, but are required for server-to-" -"server communications." -msgstr "If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications." +#: ../../Zotlabs/Lib/Apps.php:232 ../../addon/buglink/buglink.php:16 +msgid "Report Bug" +msgstr "Bugrapport indienen" -#: ../../Zotlabs/Module/Setup.php:660 -msgid "SSL certificate validation" -msgstr "SSL certificate validation" +#: ../../Zotlabs/Lib/Apps.php:233 +msgid "View Bookmarks" +msgstr "Bladwijzers bekijken" -#: ../../Zotlabs/Module/Setup.php:666 -msgid "" -"Url rewrite in .htaccess is not working. Check your server " -"configuration.Test: " -msgstr "Url rewrite in .htaccess is not working. Check your server configuration.Test: " +#: ../../Zotlabs/Lib/Apps.php:234 +msgid "My Chatrooms" +msgstr "Mijn chatkanalen" -#: ../../Zotlabs/Module/Setup.php:669 -msgid "Url rewrite is working" -msgstr "Url rewrite is working" +#: ../../Zotlabs/Lib/Apps.php:236 +msgid "Firefox Share" +msgstr "Firefox Share" -#: ../../Zotlabs/Module/Setup.php:683 -msgid "" -"The database configuration file \".htconfig.php\" could not be written. " -"Please use the enclosed text to create a configuration file in your web " -"server root." -msgstr "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root." +#: ../../Zotlabs/Lib/Apps.php:237 +msgid "Remote Diagnostics" +msgstr "Diagnose op afstand" -#: ../../Zotlabs/Module/Setup.php:707 -#: ../../extend/addon/addon/cdav/cdav.php:41 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:401 -msgid "Errors encountered creating database tables." -msgstr "Errors encountered creating database tables." +#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:417 +msgid "Suggest Channels" +msgstr "Kanalen voorstellen" -#: ../../Zotlabs/Module/Setup.php:748 -msgid "

    What next

    " -msgstr "

    What next

    " +#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1589 +#: ../../include/nav.php:126 ../../include/nav.php:130 +msgid "Login" +msgstr "Inloggen" -#: ../../Zotlabs/Module/Setup.php:749 -msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the " -"poller." -msgstr "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." +#: ../../Zotlabs/Lib/Apps.php:241 +msgid "Activity" +msgstr "Jouw tijdlijn" -#: ../../Zotlabs/Module/Viewconnections.php:65 -msgid "No connections." -msgstr "Geen connecties." +#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1931 +#: ../../include/features.php:96 ../../include/nav.php:497 +msgid "Wiki" +msgstr "Wiki" -#: ../../Zotlabs/Module/Viewconnections.php:78 -#, php-format -msgid "Visit %s's profile [%s]" -msgstr "Bezoek het profiel van %s [%s]" +#: ../../Zotlabs/Lib/Apps.php:246 +msgid "Channel Home" +msgstr "Jouw kanaal" -#: ../../Zotlabs/Module/Viewconnections.php:107 -msgid "View Connections" -msgstr "Connecties weergeven" +#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1853 +#: ../../include/conversation.php:1856 +msgid "Events" +msgstr "Agenda" -#: ../../Zotlabs/Module/Wiki.php:30 -msgid "Profile Unavailable." -msgstr "Profiel niet beschikbaar." +#: ../../Zotlabs/Lib/Apps.php:250 +msgid "Directory" +msgstr "Kanalengids" -#: ../../Zotlabs/Module/Wiki.php:44 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:40 -msgid "Not found" -msgstr "Niet gevonden" +#: ../../Zotlabs/Lib/Apps.php:252 +msgid "Mail" +msgstr "Privéberichten" -#: ../../Zotlabs/Module/Wiki.php:68 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:60 -msgid "Invalid channel" -msgstr "Onbekend kanaal" +#: ../../Zotlabs/Lib/Apps.php:255 +msgid "Chat" +msgstr "Chatten" -#: ../../Zotlabs/Module/Wiki.php:159 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:144 -#: ../../include/conversation.php:1900 -msgid "Wikis" -msgstr "Wiki's" +#: ../../Zotlabs/Lib/Apps.php:257 +msgid "Probe" +msgstr "Onderzoeken" -#: ../../Zotlabs/Module/Wiki.php:165 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:150 -msgid "Download" -msgstr "Download" +#: ../../Zotlabs/Lib/Apps.php:258 +msgid "Suggest" +msgstr "Voorstellen" -#: ../../Zotlabs/Module/Wiki.php:169 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154 -msgid "Wiki name" -msgstr "Naam wiki" +#: ../../Zotlabs/Lib/Apps.php:259 +msgid "Random Channel" +msgstr "Willekeurig kanaal" -#: ../../Zotlabs/Module/Wiki.php:170 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155 -msgid "Content type" -msgstr "Opmaaktype" +#: ../../Zotlabs/Lib/Apps.php:260 +msgid "Invite" +msgstr "Uitnodigen " -#: ../../Zotlabs/Module/Wiki.php:179 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164 -msgid "Create a status post for this wiki" -msgstr "Plaats een bericht over deze wiki" +#: ../../Zotlabs/Lib/Apps.php:261 ../../Zotlabs/Widget/Admin.php:26 +msgid "Features" +msgstr "Extra functies" -#: ../../Zotlabs/Module/Wiki.php:204 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:183 -msgid "Wiki not found" -msgstr "Wiki is niet gevonden" +#: ../../Zotlabs/Lib/Apps.php:262 ../../addon/openid/MysqlProvider.php:69 +msgid "Language" +msgstr "Taal" -#: ../../Zotlabs/Module/Wiki.php:228 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:208 -msgid "Rename page" -msgstr "Pagina hernoemen" +#: ../../Zotlabs/Lib/Apps.php:263 +msgid "Post" +msgstr "Bericht" -#: ../../Zotlabs/Module/Wiki.php:232 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:212 -msgid "Error retrieving page content" -msgstr "Fout tijdens ophalen inhoud pagina" +#: ../../Zotlabs/Lib/Apps.php:264 ../../addon/openid/MysqlProvider.php:58 +#: ../../addon/openid/MysqlProvider.php:59 +#: ../../addon/openid/MysqlProvider.php:60 +msgid "Profile Photo" +msgstr "Profielfoto" -#: ../../Zotlabs/Module/Wiki.php:259 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:241 -msgid "Revision Comparison" -msgstr "Revisies vergelijken" +#: ../../Zotlabs/Lib/Apps.php:407 +msgid "Purchase" +msgstr "Aanschaffen" -#: ../../Zotlabs/Module/Wiki.php:260 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242 -msgid "Revert" -msgstr "Ongedaan maken" +#: ../../Zotlabs/Lib/Apps.php:411 +msgid "Undelete" +msgstr "Verwijdering ongedaan maken" -#: ../../Zotlabs/Module/Wiki.php:264 -msgid "Short description of your changes (optional)" -msgstr "Korte omschrijving van jouw wijzigingen (niet verplicht)" +#: ../../Zotlabs/Lib/Apps.php:419 +msgid "Add to app-tray" +msgstr "Aan appmenu toevoegen" -#: ../../Zotlabs/Module/Wiki.php:271 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251 -msgid "Source" -msgstr "Bron" +#: ../../Zotlabs/Lib/Apps.php:420 +msgid "Remove from app-tray" +msgstr "Uit appmenu verwijderen" -#: ../../Zotlabs/Module/Wiki.php:279 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:259 -msgid "New page name" -msgstr "Nieuwe paginanaam" +#: ../../Zotlabs/Lib/Apps.php:421 +msgid "Pin to navbar" +msgstr "Op navigatiebalk vastzetten" -#: ../../Zotlabs/Module/Wiki.php:284 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:264 -#: ../../include/conversation.php:1299 -msgid "Embed image from photo albums" -msgstr "Afbeelding uit een fotoalbum invoegen" +#: ../../Zotlabs/Lib/Apps.php:422 +msgid "Unpin from navbar" +msgstr "Van navigatiebalk losmaken" -#: ../../Zotlabs/Module/Wiki.php:285 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265 -#: ../../include/conversation.php:1393 -msgid "Embed an image from your albums" -msgstr "Afbeelding uit jouw albums invoegen" +#: ../../Zotlabs/Lib/Permcat.php:82 +msgctxt "permcat" +msgid "default" +msgstr "standaard" -#: ../../Zotlabs/Module/Wiki.php:287 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267 -#: ../../include/conversation.php:1395 ../../include/conversation.php:1442 -msgid "OK" -msgstr "OK" +#: ../../Zotlabs/Lib/Permcat.php:133 +msgctxt "permcat" +msgid "follower" +msgstr "volger" -#: ../../Zotlabs/Module/Wiki.php:288 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268 -#: ../../include/conversation.php:1335 -msgid "Choose images to embed" -msgstr "Kies afbeeldingen om in te voegen" +#: ../../Zotlabs/Lib/Permcat.php:137 +msgctxt "permcat" +msgid "contributor" +msgstr "bijdrager" -#: ../../Zotlabs/Module/Wiki.php:289 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269 -#: ../../include/conversation.php:1336 -msgid "Choose an album" -msgstr "Kies een album" +#: ../../Zotlabs/Lib/Permcat.php:141 +msgctxt "permcat" +msgid "publisher" +msgstr "publichist " -#: ../../Zotlabs/Module/Wiki.php:290 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270 -msgid "Choose a different album" -msgstr "Kies een ander album" +#: ../../Zotlabs/Lib/NativeWikiPage.php:42 +#: ../../Zotlabs/Lib/NativeWikiPage.php:93 +msgid "(No Title)" +msgstr "(Geen titel)" -#: ../../Zotlabs/Module/Wiki.php:291 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271 -#: ../../include/conversation.php:1338 -msgid "Error getting album list" -msgstr "Fout tijdens ophalen albumlijst" +#: ../../Zotlabs/Lib/NativeWikiPage.php:107 +msgid "Wiki page create failed." +msgstr "Aanmaken wiki-pagina mislukt." -#: ../../Zotlabs/Module/Wiki.php:292 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272 -#: ../../include/conversation.php:1339 -msgid "Error getting photo link" -msgstr "Fout tijdens ophalen fotolink" +#: ../../Zotlabs/Lib/NativeWikiPage.php:120 +msgid "Wiki not found." +msgstr "Wiki niet gevonden" -#: ../../Zotlabs/Module/Wiki.php:293 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273 -#: ../../include/conversation.php:1340 -msgid "Error getting album" -msgstr "Fout tijdens ophalen album" +#: ../../Zotlabs/Lib/NativeWikiPage.php:131 +msgid "Destination name already exists" +msgstr "Naam van doel bestaat al" -#: ../../Zotlabs/Module/Wiki.php:357 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337 -msgid "Error creating wiki. Invalid name." -msgstr "Fout tijdens aanmaken wiki. Ongeldige naam." +#: ../../Zotlabs/Lib/NativeWikiPage.php:163 +#: ../../Zotlabs/Lib/NativeWikiPage.php:359 +msgid "Page not found" +msgstr "Pagina niet gevonden" -#: ../../Zotlabs/Module/Wiki.php:369 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348 -msgid "Wiki created, but error creating Home page." -msgstr "Wiki aangemaakt, maar fout tijdens aanmaken homepagina." +#: ../../Zotlabs/Lib/NativeWikiPage.php:194 +msgid "Error reading page content" +msgstr "Fout tijdens lezen pagina-inhoud" -#: ../../Zotlabs/Module/Wiki.php:376 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353 -msgid "Error creating wiki" -msgstr "Fout tijdens aanmaken wiki." +#: ../../Zotlabs/Lib/NativeWikiPage.php:350 +#: ../../Zotlabs/Lib/NativeWikiPage.php:400 +#: ../../Zotlabs/Lib/NativeWikiPage.php:467 +#: ../../Zotlabs/Lib/NativeWikiPage.php:508 +msgid "Error reading wiki" +msgstr "Fout tijdens lezen wiki" -#: ../../Zotlabs/Module/Wiki.php:388 -msgid "Wiki delete permission denied." -msgstr "Toegang geweigerd tijdens verwijderen wiki." +#: ../../Zotlabs/Lib/NativeWikiPage.php:388 +msgid "Page update failed." +msgstr "Bijwerken van pagina mislukt." -#: ../../Zotlabs/Module/Wiki.php:398 -msgid "Error deleting wiki" -msgstr "Fout tijdens verwijderen wiki" +#: ../../Zotlabs/Lib/NativeWikiPage.php:422 +msgid "Nothing deleted" +msgstr "Niets verwijderd" -#: ../../Zotlabs/Module/Wiki.php:424 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400 -msgid "New page created" -msgstr "Nieuwe pagina aangemaakt" +#: ../../Zotlabs/Lib/NativeWikiPage.php:488 +msgid "Compare: object not found." +msgstr "Vergelijken: object niet gevonden." -#: ../../Zotlabs/Module/Wiki.php:539 -msgid "Cannot delete Home" -msgstr "Kan Home niet verwijderen" +#: ../../Zotlabs/Lib/NativeWikiPage.php:494 +msgid "Page updated" +msgstr "Pagina bijgewerkt" -#: ../../Zotlabs/Module/Wiki.php:603 -msgid "Current Revision" -msgstr "Huidige revisie" +#: ../../Zotlabs/Lib/NativeWikiPage.php:497 +msgid "Untitled" +msgstr "Naamloos" -#: ../../Zotlabs/Module/Wiki.php:603 -msgid "Selected Revision" -msgstr "Geselecteerde revisie" +#: ../../Zotlabs/Lib/NativeWikiPage.php:503 +msgid "Wiki resource_id required for git commit" +msgstr "Resource_id wiki voor git commit vereist" -#: ../../Zotlabs/Module/Wiki.php:653 -msgid "You must be authenticated." -msgstr "Je moet geauthenticeerd zijn" +#: ../../Zotlabs/Lib/NativeWikiPage.php:559 +#: ../../Zotlabs/Widget/Wiki_page_history.php:23 +msgctxt "wiki_history" +msgid "Message" +msgstr "Bericht" -#: ../../Zotlabs/Module/Chat.php:179 -msgid "Room not found" -msgstr "Chatkanaal niet gevonden" +#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:744 +#: ../../include/bbcode.php:914 +msgid "Different viewers will see this text differently" +msgstr "Deze tekst wordt per persoon anders getoond." -#: ../../Zotlabs/Module/Chat.php:195 -msgid "Leave Room" -msgstr "Chatkanaal verlaten" +#: ../../Zotlabs/Lib/PermissionDescription.php:34 +#: ../../include/acl_selectors.php:33 +msgid "Visible to your default audience" +msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld" -#: ../../Zotlabs/Module/Chat.php:196 -msgid "Delete Room" -msgstr "Chatkanaal verwijderen" +#: ../../Zotlabs/Lib/PermissionDescription.php:107 +#: ../../include/acl_selectors.php:106 +msgid "Only me" +msgstr "Alleen ik" -#: ../../Zotlabs/Module/Chat.php:197 -msgid "I am away right now" -msgstr "Ik ben momenteel afwezig" +#: ../../Zotlabs/Lib/PermissionDescription.php:108 +msgid "Public" +msgstr "Openbaar" -#: ../../Zotlabs/Module/Chat.php:198 -msgid "I am online" -msgstr "Ik ben online" +#: ../../Zotlabs/Lib/PermissionDescription.php:109 +msgid "Anybody in the $Projectname network" +msgstr "Iedereen in het $Projectname-netwerk" -#: ../../Zotlabs/Module/Chat.php:200 -msgid "Bookmark this room" -msgstr "Chatkanaal aan bladwijzers toevoegen" +#: ../../Zotlabs/Lib/PermissionDescription.php:110 +#, php-format +msgid "Any account on %s" +msgstr "Iedereen op %s" -#: ../../Zotlabs/Module/Chat.php:229 -msgid "New Chatroom" -msgstr "Nieuw chatkanaal" +#: ../../Zotlabs/Lib/PermissionDescription.php:111 +msgid "Any of my connections" +msgstr "Al mijn geaccepteerde connecties" -#: ../../Zotlabs/Module/Chat.php:230 -msgid "Chatroom name" -msgstr "Naam chatkanaal" +#: ../../Zotlabs/Lib/PermissionDescription.php:112 +msgid "Only connections I specifically allow" +msgstr "Alleen connecties die uitdrukkelijk door jou zijn toegestaan" -#: ../../Zotlabs/Module/Chat.php:231 -msgid "Expiration of chats (minutes)" -msgstr "Aantal minuten voordat chatberichten worden verwijderd" +#: ../../Zotlabs/Lib/PermissionDescription.php:113 +msgid "Anybody authenticated (could include visitors from other networks)" +msgstr "Geauthenticeerde leden (kan bezoekers van andere netwerken bevatten)" -#: ../../Zotlabs/Module/Chat.php:247 -#, php-format -msgid "%1$s's Chatrooms" -msgstr "Chatkanalen van %1$s" +#: ../../Zotlabs/Lib/PermissionDescription.php:114 +msgid "Any connections including those who haven't yet been approved" +msgstr "Al mijn geaccepteerde en nog niet geaccepteerde connecties" -#: ../../Zotlabs/Module/Chat.php:252 -msgid "No chatrooms available" -msgstr "Geen chatkanalen beschikbaar" +#: ../../Zotlabs/Lib/PermissionDescription.php:150 +msgid "" +"This is your default setting for the audience of your normal stream, and " +"posts." +msgstr "Dit is de standaard privacyinstelling voor wie jouw berichten kan bekijken" -#: ../../Zotlabs/Module/Chat.php:256 -msgid "Expiration" -msgstr "Verloopt na" +#: ../../Zotlabs/Lib/PermissionDescription.php:151 +msgid "" +"This is your default setting for who can view your default channel profile" +msgstr "Dit is de standaard privacyinstelling voor wie jouw standaardprofiel kan bekijken" -#: ../../Zotlabs/Module/Chat.php:257 -msgid "min" -msgstr "min" +#: ../../Zotlabs/Lib/PermissionDescription.php:152 +msgid "This is your default setting for who can view your connections" +msgstr "Dit is de standaard privacyinstelling voor wie een lijst met jouw connecties kan bekijken" -#: ../../Zotlabs/Module/Xchan.php:10 -msgid "Xchan Lookup" -msgstr "Xchan opzoeken" +#: ../../Zotlabs/Lib/PermissionDescription.php:153 +msgid "" +"This is your default setting for who can view your file storage and photos" +msgstr "Dit is de standaard privacyinstelling voor wie jouw bestanden en foto's kan bekijken" -#: ../../Zotlabs/Module/Xchan.php:13 -msgid "Lookup xchan beginning with (or webbie): " -msgstr "Zoek een xchan (of webbie) die begint met:" +#: ../../Zotlabs/Lib/PermissionDescription.php:154 +msgid "This is your default setting for the audience of your webpages" +msgstr "Dit is de standaard privacyinstelling voor wie jouw webpagina's kan bekijken" -#: ../../Zotlabs/Lib/Chatroom.php:27 +#: ../../Zotlabs/Lib/Chatroom.php:23 msgid "Missing room name" msgstr "Naam chatkanaal ontbreekt" -#: ../../Zotlabs/Lib/Chatroom.php:36 +#: ../../Zotlabs/Lib/Chatroom.php:32 msgid "Duplicate room name" msgstr "Naam chatkanaal bestaat al" -#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94 +#: ../../Zotlabs/Lib/Chatroom.php:82 ../../Zotlabs/Lib/Chatroom.php:90 msgid "Invalid room specifier." msgstr "Ongeldige omschrijving chatkanaal" -#: ../../Zotlabs/Lib/Chatroom.php:126 +#: ../../Zotlabs/Lib/Chatroom.php:122 msgid "Room not found." msgstr "Chatkanaal niet gevonden" -#: ../../Zotlabs/Lib/Chatroom.php:147 +#: ../../Zotlabs/Lib/Chatroom.php:143 msgid "Room is full" msgstr "Chatkanaal is vol" -#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1947 +#: ../../Zotlabs/Lib/Enotify.php:60 msgid "$Projectname Notification" -msgstr "$Projectname-notificatie" +msgstr "$Projectname-melding" -#: ../../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:1948 +#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:308 +#: ../../addon/diaspora/util.php:321 ../../addon/diaspora/p.php:48 msgid "$projectname" msgstr "$projectname" -#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1950 +#: ../../Zotlabs/Lib/Enotify.php:63 msgid "Thank You," msgstr "Bedankt," -#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1952 +#: ../../Zotlabs/Lib/Enotify.php:65 ../../addon/hubwall/hubwall.php:33 #, php-format msgid "%s Administrator" msgstr "Beheerder %s" -#: ../../Zotlabs/Lib/Enotify.php:116 +#: ../../Zotlabs/Lib/Enotify.php:66 +#, php-format +msgid "This email was sent by %1$s at %2$s." +msgstr "Deze e-mail was verzonden door %1$s op %2$s." + +#: ../../Zotlabs/Lib/Enotify.php:67 +#, php-format +msgid "" +"To stop receiving these messages, please adjust your Notification Settings " +"at %s" +msgstr "Wanneer je deze berichten niet meer wilt ontvangen, wijzig dan de instellingen voor jouw Meldingen op %s" + +#: ../../Zotlabs/Lib/Enotify.php:68 +#, php-format +msgid "To stop receiving these messages, please adjust your %s." +msgstr "Wanneer je deze berichten niet meer wilt ontvangen, wijzig dan de instellingen voor jouw %s." + +#: ../../Zotlabs/Lib/Enotify.php:123 #, php-format msgid "%s " msgstr "%s " -#: ../../Zotlabs/Lib/Enotify.php:120 +#: ../../Zotlabs/Lib/Enotify.php:127 #, php-format msgid "[$Projectname:Notify] New mail received at %s" -msgstr "[$Projectname:Notificatie] Nieuw privébericht ontvangen op %s" +msgstr "[$Projectname-melding] Nieuw privébericht ontvangen op %s" -#: ../../Zotlabs/Lib/Enotify.php:122 +#: ../../Zotlabs/Lib/Enotify.php:129 #, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." -msgstr "%1$s, %2$s zond jou een nieuw privébericht om %3$s." +msgid "%1$s sent you a new private message at %2$s." +msgstr "%1$s heeft je een nieuw privébericht gestuurd op %2$s." -#: ../../Zotlabs/Lib/Enotify.php:123 +#: ../../Zotlabs/Lib/Enotify.php:130 #, php-format msgid "%1$s sent you %2$s." msgstr "%1$s zond jou %2$s." -#: ../../Zotlabs/Lib/Enotify.php:123 +#: ../../Zotlabs/Lib/Enotify.php:130 msgid "a private message" msgstr "een privébericht" -#: ../../Zotlabs/Lib/Enotify.php:124 +#: ../../Zotlabs/Lib/Enotify.php:131 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "Bezoek %s om je privéberichten te bekijken en/of er op te reageren." -#: ../../Zotlabs/Lib/Enotify.php:183 +#: ../../Zotlabs/Lib/Enotify.php:144 +msgid "commented on" +msgstr "gaf een reactie op" + +#: ../../Zotlabs/Lib/Enotify.php:155 +msgid "liked" +msgstr "vindt dit leuk:" + +#: ../../Zotlabs/Lib/Enotify.php:158 +msgid "disliked" +msgstr "vindt dit niet leuk:" + +#: ../../Zotlabs/Lib/Enotify.php:201 #, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" -msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %4$s[/zrl]" +msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" +msgstr "%1$s %2$s [zrl=%3$s]een %4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:191 +#: ../../Zotlabs/Lib/Enotify.php:209 #, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" -msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %5$s van %4$s[/zrl]" +msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" +msgstr "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:200 +#: ../../Zotlabs/Lib/Enotify.php:218 #, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" -msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]jouw %4$s[/zrl]" +msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" +msgstr "%1$s %2$s [zrl=%3$s]jouw %4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:211 +#: ../../Zotlabs/Lib/Enotify.php:230 +#, php-format +msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s" +msgstr "[$Projectname-melding] %2$s gaf een te modereren reactie in conversatie #%1$d" + +#: ../../Zotlabs/Lib/Enotify.php:232 #, php-format msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s" -msgstr "[$Projectname:Notificatie] %2$s gaf een reactie in conversatie #%1$d" +msgstr "[$Projectname-melding] %2$s gaf een reactie in conversatie #%1$d" -#: ../../Zotlabs/Lib/Enotify.php:212 +#: ../../Zotlabs/Lib/Enotify.php:233 #, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." -msgstr "%1$s, %2$s gaf een reactie in een conversatie die jij volgt." +msgid "%1$s commented on an item/conversation you have been following." +msgstr "%1$s gaf een reactie op/in een item/conversatie die je volgt." -#: ../../Zotlabs/Lib/Enotify.php:215 ../../Zotlabs/Lib/Enotify.php:292 -#: ../../Zotlabs/Lib/Enotify.php:309 ../../Zotlabs/Lib/Enotify.php:335 -#: ../../Zotlabs/Lib/Enotify.php:353 ../../Zotlabs/Lib/Enotify.php:367 +#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:317 +#: ../../Zotlabs/Lib/Enotify.php:333 ../../Zotlabs/Lib/Enotify.php:358 +#: ../../Zotlabs/Lib/Enotify.php:375 ../../Zotlabs/Lib/Enotify.php:388 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Bezoek %s om de conversatie te bekijken en/of er op te reageren." -#: ../../Zotlabs/Lib/Enotify.php:273 +#: ../../Zotlabs/Lib/Enotify.php:240 ../../Zotlabs/Lib/Enotify.php:241 +#, php-format +msgid "Please visit %s to approve or reject this comment." +msgstr "Bezoek %s om de reactie goed of af te keuren." + +#: ../../Zotlabs/Lib/Enotify.php:299 #, php-format -msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]" -msgstr "%1$s, %2$s vindt [zrl=%3$s]jouw %4$s[/zrl] leuk" +msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]" +msgstr "%1$s vindt [zrl=%2$s]jouw %3$s[/zrl] leuk" -#: ../../Zotlabs/Lib/Enotify.php:288 +#: ../../Zotlabs/Lib/Enotify.php:313 #, php-format msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s" -msgstr "[$Projectname:Notificatie] %2$s vindt iets leuk in conversatie #%1$d" +msgstr "[$Projectname-melding] %2$s vindt iets leuk in conversatie #%1$d" -#: ../../Zotlabs/Lib/Enotify.php:289 +#: ../../Zotlabs/Lib/Enotify.php:314 #, php-format -msgid "%1$s, %2$s liked an item/conversation you created." -msgstr "%1$s, %2$s vindt iets leuk in een conversatie die jij bent gestart." +msgid "%1$s liked an item/conversation you created." +msgstr "%1$s vindt iets leuk in een conversatie die jij bent gestart." -#: ../../Zotlabs/Lib/Enotify.php:300 +#: ../../Zotlabs/Lib/Enotify.php:325 #, php-format msgid "[$Projectname:Notify] %s posted to your profile wall" -msgstr "[$Projectname:Notificatie] %s heeft een bericht op jouw kanaal geplaatst" +msgstr "[$Projectname-melding] %s heeft een bericht op jouw kanaal geplaatst" -#: ../../Zotlabs/Lib/Enotify.php:302 +#: ../../Zotlabs/Lib/Enotify.php:327 #, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" -msgstr "%1$s, %2$s heeft om %3$s een bericht op jouw kanaal geplaatst" +msgid "%1$s posted to your profile wall at %2$s" +msgstr "%1$s heeft om %2$s een bericht op jouw kanaalpagina geplaatst" -#: ../../Zotlabs/Lib/Enotify.php:304 +#: ../../Zotlabs/Lib/Enotify.php:329 #, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" -msgstr "%1$s, %2$s heeft een bericht op [zrl=%3$s]jouw kanaal[/zrl] geplaatst" +msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" +msgstr "%1$s heeft een bericht op jouw [zrl=%2$s]kanaalpagina[/zrl] geplaatst" -#: ../../Zotlabs/Lib/Enotify.php:328 +#: ../../Zotlabs/Lib/Enotify.php:352 #, php-format msgid "[$Projectname:Notify] %s tagged you" -msgstr "[$Projectname:Notificatie] %s heeft jou genoemd" +msgstr "[$Projectname-melding] %s heeft jou genoemd" -#: ../../Zotlabs/Lib/Enotify.php:329 +#: ../../Zotlabs/Lib/Enotify.php:353 #, php-format -msgid "%1$s, %2$s tagged you at %3$s" -msgstr "%1$s, %2$s noemde jou op %3$s" +msgid "%1$s tagged you at %2$s" +msgstr "%1$s vermeldde jou om %2$s" -#: ../../Zotlabs/Lib/Enotify.php:330 +#: ../../Zotlabs/Lib/Enotify.php:354 #, php-format -msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." -msgstr "%1$s, %2$s [zrl=%3$s]noemde jou[/zrl]." +msgid "%1$s [zrl=%2$s]tagged you[/zrl]." +msgstr "%1$s [zrl=%2$s]vermeldde jou[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:342 +#: ../../Zotlabs/Lib/Enotify.php:365 #, php-format msgid "[$Projectname:Notify] %1$s poked you" -msgstr "[$Projectname:Notificatie] %1$s heeft jou aangestoten" +msgstr "[$Projectname-melding] %1$s heeft jou aangestoten" -#: ../../Zotlabs/Lib/Enotify.php:343 +#: ../../Zotlabs/Lib/Enotify.php:366 #, php-format -msgid "%1$s, %2$s poked you at %3$s" -msgstr "%1$s, %2$s heeft je aangestoten op %3$s" +msgid "%1$s poked you at %2$s" +msgstr "%1$s porde jou om %2$s" -#: ../../Zotlabs/Lib/Enotify.php:344 +#: ../../Zotlabs/Lib/Enotify.php:367 #, php-format -msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." -msgstr "%1$s, %2$s [zrl=%2$s]heeft je aangestoten[/zrl]." +msgid "%1$s [zrl=%2$s]poked you[/zrl]." +msgstr "%1$s [zrl=%2$s]porde jou[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:360 +#: ../../Zotlabs/Lib/Enotify.php:382 #, php-format msgid "[$Projectname:Notify] %s tagged your post" -msgstr "[$Projectname:Notificatie] %s heeft jouw bericht getagd" +msgstr "[$Projectname-melding] %s heeft jouw bericht getagd" -#: ../../Zotlabs/Lib/Enotify.php:361 +#: ../../Zotlabs/Lib/Enotify.php:383 #, php-format -msgid "%1$s, %2$s tagged your post at %3$s" -msgstr "%1$s, %2$s heeft jouw bericht om %3$s getagd" +msgid "%1$s tagged your post at %2$s" +msgstr "%1$s tagde jouw bericht om %2$s" -#: ../../Zotlabs/Lib/Enotify.php:362 +#: ../../Zotlabs/Lib/Enotify.php:384 #, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" -msgstr "%1$s, %2$s heeft [zrl=%3$s]jouw bericht[/zrl] getagd" +msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" +msgstr "%1$s tagde [zrl=%2$s]jouw bericht[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:374 +#: ../../Zotlabs/Lib/Enotify.php:395 msgid "[$Projectname:Notify] Introduction received" -msgstr "[$Projectname:Notificatie] Connectieverzoek ontvangen" +msgstr "[$Projectname-melding] Connectieverzoek ontvangen" -#: ../../Zotlabs/Lib/Enotify.php:375 +#: ../../Zotlabs/Lib/Enotify.php:396 #, php-format -msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" -msgstr "%1$s, je hebt een nieuw connectieverzoek ontvangen van '%2$s' op %3$s" +msgid "You've received an new connection request from '%1$s' at %2$s" +msgstr "Je hebt een nieuw connectieverzoek ontvangen van '%1$s' op %2$s" -#: ../../Zotlabs/Lib/Enotify.php:376 +#: ../../Zotlabs/Lib/Enotify.php:397 #, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." -msgstr "%1$s, je hebt een [zrl=%2$s]nieuw connectieverzoek[/zrl] ontvangen van %3$s." +msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s." +msgstr "Je hebt een [zrl=%1$s]nieuw connectieverzoek[/zrl] ontvangen van %2$s." -#: ../../Zotlabs/Lib/Enotify.php:380 ../../Zotlabs/Lib/Enotify.php:399 +#: ../../Zotlabs/Lib/Enotify.php:400 ../../Zotlabs/Lib/Enotify.php:418 #, php-format msgid "You may visit their profile at %s" msgstr "Je kan het profiel bekijken op %s" -#: ../../Zotlabs/Lib/Enotify.php:382 +#: ../../Zotlabs/Lib/Enotify.php:402 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "Bezoek %s om het connectieverzoek te accepteren of af te wijzen." -#: ../../Zotlabs/Lib/Enotify.php:389 +#: ../../Zotlabs/Lib/Enotify.php:409 msgid "[$Projectname:Notify] Friend suggestion received" -msgstr "[$Projectname:Notificatie] Kanaalvoorstel ontvangen" +msgstr "[$Projectname-melding] Kanaalvoorstel ontvangen" -#: ../../Zotlabs/Lib/Enotify.php:390 +#: ../../Zotlabs/Lib/Enotify.php:410 #, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" -msgstr "%1$s, je hebt een kanaalvoorstel ontvangen van '%2$s' om %3$s" +msgid "You've received a friend suggestion from '%1$s' at %2$s" +msgstr "Je hebt een kanaalvoorstel ontvangen van '%1$s' om %2$s" -#: ../../Zotlabs/Lib/Enotify.php:391 +#: ../../Zotlabs/Lib/Enotify.php:411 #, php-format msgid "" -"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from " -"%4$s." -msgstr "%1$s, je hebt [zrl=%2$s]een kanaalvoorstel[/zrl] ontvangen voor %3$s van %4$s." +"You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." +msgstr "Je hebt [zrl=%1$s]een kanaalvoorstel ontvangen[/zrl] voor %2$s van %3$s." -#: ../../Zotlabs/Lib/Enotify.php:397 +#: ../../Zotlabs/Lib/Enotify.php:416 msgid "Name:" msgstr "Naam:" -#: ../../Zotlabs/Lib/Enotify.php:398 +#: ../../Zotlabs/Lib/Enotify.php:417 msgid "Photo:" msgstr "Foto:" -#: ../../Zotlabs/Lib/Enotify.php:401 +#: ../../Zotlabs/Lib/Enotify.php:420 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen." -#: ../../Zotlabs/Lib/Enotify.php:619 +#: ../../Zotlabs/Lib/Enotify.php:640 msgid "[$Projectname:Notify]" -msgstr "[$Projectname:Notificatie]" +msgstr "[$Projectname-melding]" -#: ../../Zotlabs/Lib/Enotify.php:779 +#: ../../Zotlabs/Lib/Enotify.php:808 msgid "created a new post" msgstr "maakte een nieuw bericht aan" -#: ../../Zotlabs/Lib/Enotify.php:780 +#: ../../Zotlabs/Lib/Enotify.php:809 #, php-format msgid "commented on %s's post" msgstr "gaf een reactie op een bericht van %s" -#: ../../Zotlabs/Lib/PermissionDescription.php:34 -#: ../../include/acl_selectors.php:128 -msgid "Visible to your default audience" -msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld" - -#: ../../Zotlabs/Lib/PermissionDescription.php:107 -#: ../../include/acl_selectors.php:201 -msgid "Only me" -msgstr "Alleen ik" - -#: ../../Zotlabs/Lib/PermissionDescription.php:108 -msgid "Public" -msgstr "Openbaar" - -#: ../../Zotlabs/Lib/PermissionDescription.php:109 -msgid "Anybody in the $Projectname network" -msgstr "Iedereen in het $Projectname-netwerk" - -#: ../../Zotlabs/Lib/PermissionDescription.php:110 +#: ../../Zotlabs/Lib/Enotify.php:816 #, php-format -msgid "Any account on %s" -msgstr "Iedereen op %s" - -#: ../../Zotlabs/Lib/PermissionDescription.php:111 -msgid "Any of my connections" -msgstr "Al mijn geaccepteerde connecties" - -#: ../../Zotlabs/Lib/PermissionDescription.php:112 -msgid "Only connections I specifically allow" -msgstr "Alleen connecties die uitdrukkelijk door jou zijn toegestaan" - -#: ../../Zotlabs/Lib/PermissionDescription.php:113 -msgid "Anybody authenticated (could include visitors from other networks)" -msgstr "Geauthenticeerde leden (kan bezoekers van andere netwerken bevatten)" - -#: ../../Zotlabs/Lib/PermissionDescription.php:114 -msgid "Any connections including those who haven't yet been approved" -msgstr "Al mijn geaccepteerde en nog niet geaccepteerde connecties" - -#: ../../Zotlabs/Lib/PermissionDescription.php:150 -msgid "" -"This is your default setting for the audience of your normal stream, and " -"posts." -msgstr "Dit is de standaard privacy-instelling voor wie jouw berichten kan bekijken" - -#: ../../Zotlabs/Lib/PermissionDescription.php:151 -msgid "" -"This is your default setting for who can view your default channel profile" -msgstr "Dit is de standaard privacy-instelling voor wie jouw standaardprofiel kan bekijken" - -#: ../../Zotlabs/Lib/PermissionDescription.php:152 -msgid "This is your default setting for who can view your connections" -msgstr "Dit is de standaard privacy-instelling voor wie een lijst met jouw connecties kan bekijken" - -#: ../../Zotlabs/Lib/PermissionDescription.php:153 -msgid "" -"This is your default setting for who can view your file storage and photos" -msgstr "Dit is de standaard privacy-instelling voor wie jouw bestanden en foto's kan bekijken" - -#: ../../Zotlabs/Lib/PermissionDescription.php:154 -msgid "This is your default setting for the audience of your webpages" -msgstr "Dit is de standaard privacy-instelling voor wie jouw webpagina's kan bekijken" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:31 -#: ../../Zotlabs/Lib/NativeWikiPage.php:70 -msgid "(No Title)" -msgstr "(Geen titel)" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:84 -msgid "Wiki page create failed." -msgstr "Aanmaken wiki-pagina mislukt." - -#: ../../Zotlabs/Lib/NativeWikiPage.php:97 -msgid "Wiki not found." -msgstr "Wiki niet gevonden" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:108 -msgid "Destination name already exists" -msgstr "Naam van doel bestaat al" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:134 -#: ../../Zotlabs/Lib/NativeWikiPage.php:361 -msgid "Page not found" -msgstr "Pagina niet gevonden" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:164 -msgid "Error reading page content" -msgstr "Fout tijdens lezen pagina-inhoud" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:346 -#: ../../Zotlabs/Lib/NativeWikiPage.php:399 -#: ../../Zotlabs/Lib/NativeWikiPage.php:466 -#: ../../Zotlabs/Lib/NativeWikiPage.php:507 -msgid "Error reading wiki" -msgstr "Fout tijdens lezen wiki" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:387 -msgid "Page update failed." -msgstr "Bijwerken van pagina mislukt." - -#: ../../Zotlabs/Lib/NativeWikiPage.php:421 -msgid "Nothing deleted" -msgstr "Niets verwijderd" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:487 -msgid "Compare: object not found." -msgstr "Vergelijken: object niet gevonden." - -#: ../../Zotlabs/Lib/NativeWikiPage.php:493 -msgid "Page updated" -msgstr "Pagina bijgewerkt" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:496 -msgid "Untitled" -msgstr "Naamloos" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:502 -msgid "Wiki resource_id required for git commit" -msgstr "Resource_id wiki voor git commit vereist" +msgid "edited a post dated %s" +msgstr "bewerkte een bericht op %s" -#: ../../Zotlabs/Lib/NativeWikiPage.php:573 -#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579 -#: ../../include/bbcode.php:610 ../../include/bbcode.php:756 -msgid "Different viewers will see this text differently" -msgstr "Deze tekst wordt per persoon anders weergeven." +#: ../../Zotlabs/Lib/Enotify.php:820 +#, php-format +msgid "edited a comment dated %s" +msgstr "bewerkte een reactie op %s" -#: ../../Zotlabs/Lib/Permcat.php:58 -msgctxt "permcat" -msgid "default" -msgstr "standaard" +#: ../../Zotlabs/Lib/NativeWiki.php:151 +msgid "Wiki updated successfully" +msgstr "Bijwerken wiki geslaagd" -#: ../../Zotlabs/Lib/Permcat.php:96 -msgctxt "permcat" -msgid "follower" -msgstr "volger" +#: ../../Zotlabs/Lib/NativeWiki.php:205 +msgid "Wiki files deleted successfully" +msgstr "Verwijderen wiki-bestanden geslaagd" -#: ../../Zotlabs/Lib/Permcat.php:100 -msgctxt "permcat" -msgid "contributor" -msgstr "bijdrager" +#: ../../Zotlabs/Lib/DB_Upgrade.php:83 +#, php-format +msgid "Update Error at %s" +msgstr "Update-fout op %s" -#: ../../Zotlabs/Lib/Permcat.php:104 -msgctxt "permcat" -msgid "publisher" -msgstr "publichist " +#: ../../Zotlabs/Lib/DB_Upgrade.php:89 +#, php-format +msgid "Update %s failed. See error logs." +msgstr "Update %s mislukt. Zie foutenlogboek." -#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:663 +#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:697 msgid "Private Message" msgstr "Niet voor iedereen zichtbaar" -#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:655 +#: ../../Zotlabs/Lib/ThreadItem.php:147 ../../include/conversation.php:689 msgid "Select" msgstr "Kies" -#: ../../Zotlabs/Lib/ThreadItem.php:136 -msgid "Save to Folder" -msgstr "In map opslaan" - -#: ../../Zotlabs/Lib/ThreadItem.php:157 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "I will attend" msgstr "Aanwezig" -#: ../../Zotlabs/Lib/ThreadItem.php:157 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "I will not attend" msgstr "Niet aanwezig" -#: ../../Zotlabs/Lib/ThreadItem.php:157 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "I might attend" msgstr "Mogelijk aanwezig" -#: ../../Zotlabs/Lib/ThreadItem.php:167 +#: ../../Zotlabs/Lib/ThreadItem.php:182 msgid "I agree" msgstr "Eens" -#: ../../Zotlabs/Lib/ThreadItem.php:167 +#: ../../Zotlabs/Lib/ThreadItem.php:182 msgid "I disagree" msgstr "Oneens" -#: ../../Zotlabs/Lib/ThreadItem.php:167 +#: ../../Zotlabs/Lib/ThreadItem.php:182 msgid "I abstain" msgstr "Onthouding" -#: ../../Zotlabs/Lib/ThreadItem.php:223 +#: ../../Zotlabs/Lib/ThreadItem.php:238 msgid "Add Star" msgstr "Ster toevoegen" -#: ../../Zotlabs/Lib/ThreadItem.php:224 +#: ../../Zotlabs/Lib/ThreadItem.php:239 msgid "Remove Star" msgstr "Ster verwijderen" -#: ../../Zotlabs/Lib/ThreadItem.php:225 +#: ../../Zotlabs/Lib/ThreadItem.php:240 msgid "Toggle Star Status" msgstr "Ster toevoegen of verwijderen" -#: ../../Zotlabs/Lib/ThreadItem.php:229 +#: ../../Zotlabs/Lib/ThreadItem.php:244 msgid "starred" msgstr "met ster" -#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../include/conversation.php:670 +#: ../../Zotlabs/Lib/ThreadItem.php:254 ../../include/conversation.php:704 msgid "Message signature validated" msgstr "Berichtkenmerk gevalideerd" -#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:671 +#: ../../Zotlabs/Lib/ThreadItem.php:255 ../../include/conversation.php:705 msgid "Message signature incorrect" msgstr "Berichtkenmerk onjuist" -#: ../../Zotlabs/Lib/ThreadItem.php:248 +#: ../../Zotlabs/Lib/ThreadItem.php:263 msgid "Add Tag" msgstr "Tag toevoegen" -#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:316 +#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575 msgid "like" msgstr "vind dit leuk" -#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:317 +#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576 msgid "dislike" msgstr "vind dit niet leuk" -#: ../../Zotlabs/Lib/ThreadItem.php:273 +#: ../../Zotlabs/Lib/ThreadItem.php:286 msgid "Share This" msgstr "Delen" -#: ../../Zotlabs/Lib/ThreadItem.php:273 +#: ../../Zotlabs/Lib/ThreadItem.php:286 msgid "share" msgstr "delen" -#: ../../Zotlabs/Lib/ThreadItem.php:282 +#: ../../Zotlabs/Lib/ThreadItem.php:295 msgid "Delivery Report" msgstr "Afleveringsrapport" -#: ../../Zotlabs/Lib/ThreadItem.php:300 +#: ../../Zotlabs/Lib/ThreadItem.php:313 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d reactie" -msgstr[1] "%d reacties weergeven" +msgstr[1] "%d reacties getoond" -#: ../../Zotlabs/Lib/ThreadItem.php:329 ../../Zotlabs/Lib/ThreadItem.php:330 +#: ../../Zotlabs/Lib/ThreadItem.php:343 ../../Zotlabs/Lib/ThreadItem.php:344 #, php-format msgid "View %s's profile - %s" msgstr "Profiel van %s bekijken - %s" -#: ../../Zotlabs/Lib/ThreadItem.php:333 +#: ../../Zotlabs/Lib/ThreadItem.php:347 msgid "to" msgstr "aan" -#: ../../Zotlabs/Lib/ThreadItem.php:334 +#: ../../Zotlabs/Lib/ThreadItem.php:348 msgid "via" msgstr "via" -#: ../../Zotlabs/Lib/ThreadItem.php:335 +#: ../../Zotlabs/Lib/ThreadItem.php:349 msgid "Wall-to-Wall" msgstr "Kanaal-naar-kanaal" -#: ../../Zotlabs/Lib/ThreadItem.php:336 +#: ../../Zotlabs/Lib/ThreadItem.php:350 msgid "via Wall-To-Wall:" msgstr "via kanaal-naar-kanaal" -#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:717 +#: ../../Zotlabs/Lib/ThreadItem.php:363 ../../include/conversation.php:763 #, php-format msgid "from %s" msgstr "van %s" -#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:720 +#: ../../Zotlabs/Lib/ThreadItem.php:366 ../../include/conversation.php:766 #, php-format msgid "last edited: %s" msgstr "laatst bewerkt: %s" -#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:721 +#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:767 #, php-format msgid "Expires: %s" msgstr "Verloopt: %s" -#: ../../Zotlabs/Lib/ThreadItem.php:360 +#: ../../Zotlabs/Lib/ThreadItem.php:374 msgid "Attend" msgstr "Aanwezig" -#: ../../Zotlabs/Lib/ThreadItem.php:361 +#: ../../Zotlabs/Lib/ThreadItem.php:375 msgid "Attendance Options" msgstr "Aanwezigheidsopties" -#: ../../Zotlabs/Lib/ThreadItem.php:362 +#: ../../Zotlabs/Lib/ThreadItem.php:376 msgid "Vote" msgstr "Stem" -#: ../../Zotlabs/Lib/ThreadItem.php:363 +#: ../../Zotlabs/Lib/ThreadItem.php:377 msgid "Voting Options" msgstr "Stemopties" -#: ../../Zotlabs/Lib/ThreadItem.php:383 -#: ../../extend/addon/addon/bookmarker/bookmarker.php:38 +#: ../../Zotlabs/Lib/ThreadItem.php:398 +#: ../../addon/bookmarker/bookmarker.php:38 msgid "Save Bookmarks" msgstr "Bladwijzers opslaan" -#: ../../Zotlabs/Lib/ThreadItem.php:384 +#: ../../Zotlabs/Lib/ThreadItem.php:399 msgid "Add to Calendar" msgstr "Aan agenda toevoegen" -#: ../../Zotlabs/Lib/ThreadItem.php:393 -msgid "Mark all seen" -msgstr "Markeer alles als bekeken" - -#: ../../Zotlabs/Lib/ThreadItem.php:442 ../../include/js_strings.php:7 -#, php-format -msgid "%s show all" -msgstr "%s alle" - -#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1385 -msgid "Bold" -msgstr "Vet" - -#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1386 -msgid "Italic" -msgstr "Cursief" - -#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1387 -msgid "Underline" -msgstr "Onderstrepen" - -#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1388 -msgid "Quote" -msgstr "Citeren" - -#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1389 -msgid "Code" -msgstr "Broncode" - -#: ../../Zotlabs/Lib/ThreadItem.php:737 -msgid "Image" -msgstr "Afbeelding" - -#: ../../Zotlabs/Lib/ThreadItem.php:738 -msgid "Insert Link" -msgstr "Link invoegen" - -#: ../../Zotlabs/Lib/ThreadItem.php:739 -msgid "Video" -msgstr "Video" - -#: ../../Zotlabs/Lib/NativeWiki.php:126 -msgid "Wiki files deleted successfully" -msgstr "Verwijderen wiki-bestanden geslaagd" - -#: ../../Zotlabs/Lib/Apps.php:212 -msgid "Site Admin" -msgstr "Hubbeheerder" - -#: ../../Zotlabs/Lib/Apps.php:213 -#: ../../extend/addon/addon/buglink/buglink.php:16 -msgid "Report Bug" -msgstr "Bugrapport indienen" - -#: ../../Zotlabs/Lib/Apps.php:214 -msgid "View Bookmarks" -msgstr "Bladwijzers bekijken" - -#: ../../Zotlabs/Lib/Apps.php:215 -msgid "My Chatrooms" -msgstr "Mijn chatkanalen" - -#: ../../Zotlabs/Lib/Apps.php:217 -msgid "Firefox Share" -msgstr "Firefox Share" - -#: ../../Zotlabs/Lib/Apps.php:218 -msgid "Remote Diagnostics" -msgstr "Diagnose op afstand" +#: ../../Zotlabs/Lib/ThreadItem.php:426 ../../include/conversation.php:483 +msgid "This is an unsaved preview" +msgstr "Dit is een niet opgeslagen voorvertoning" -#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:337 -msgid "Suggest Channels" -msgstr "Kanalen voorstellen" +#: ../../Zotlabs/Lib/ThreadItem.php:458 ../../include/js_strings.php:7 +#, php-format +msgid "%s show all" +msgstr "%s alle" -#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:130 -#: ../../boot.php:1749 -msgid "Login" -msgstr "Inloggen" +#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1380 +msgid "Bold" +msgstr "Vet" -#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:194 -msgid "Grid" -msgstr "Grid" +#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1381 +msgid "Italic" +msgstr "Cursief" -#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1903 -#: ../../include/features.php:99 -msgid "Wiki" -msgstr "Wiki" +#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1382 +msgid "Underline" +msgstr "Onderstrepen" -#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:198 -msgid "Channel Home" -msgstr "Jouw kanaal" +#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1383 +msgid "Quote" +msgstr "Citeren" -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1853 -#: ../../include/conversation.php:1856 ../../include/nav.php:218 -msgid "Events" -msgstr "Agenda" +#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1384 +msgid "Code" +msgstr "Broncode" -#: ../../Zotlabs/Lib/Apps.php:231 ../../include/nav.php:182 -msgid "Directory" -msgstr "Kanalengids" +#: ../../Zotlabs/Lib/ThreadItem.php:758 +msgid "Image" +msgstr "Afbeelding" -#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:210 -msgid "Mail" -msgstr "Privéberichten" +#: ../../Zotlabs/Lib/ThreadItem.php:759 +msgid "Attach File" +msgstr "Bestand toevoegen" -#: ../../Zotlabs/Lib/Apps.php:236 -msgid "Chat" -msgstr "Chatten" +#: ../../Zotlabs/Lib/ThreadItem.php:760 +msgid "Insert Link" +msgstr "Link invoegen" -#: ../../Zotlabs/Lib/Apps.php:238 -msgid "Probe" -msgstr "Onderzoeken" +#: ../../Zotlabs/Lib/ThreadItem.php:761 +msgid "Video" +msgstr "Video" -#: ../../Zotlabs/Lib/Apps.php:239 -msgid "Suggest" -msgstr "Voorstellen" +#: ../../Zotlabs/Lib/ThreadItem.php:771 +msgid "Your full name (required)" +msgstr "Jouw volledige naam (verplicht)" -#: ../../Zotlabs/Lib/Apps.php:240 -msgid "Random Channel" -msgstr "Willekeurig kanaal" +#: ../../Zotlabs/Lib/ThreadItem.php:772 +msgid "Your email address (required)" +msgstr "Jouw e-mailadres (verplicht)" -#: ../../Zotlabs/Lib/Apps.php:241 -msgid "Invite" -msgstr "Uitnodigen " +#: ../../Zotlabs/Lib/ThreadItem.php:773 +msgid "Your website URL (optional)" +msgstr "URL van jouw website (niet verplicht)" -#: ../../Zotlabs/Lib/Apps.php:242 ../../include/widgets.php:1638 -msgid "Features" -msgstr "Extra functies" +#: ../../Zotlabs/Zot/Auth.php:152 +msgid "" +"Remote authentication blocked. You are logged into this site locally. Please" +" logout and retry." +msgstr "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen." -#: ../../Zotlabs/Lib/Apps.php:243 -#: ../../extend/addon/addon/openid/MysqlProvider.php:69 -msgid "Language" -msgstr "Taal" +#: ../../Zotlabs/Zot/Auth.php:264 ../../addon/openid/Mod_Openid.php:76 +#: ../../addon/openid/Mod_Openid.php:178 +#, php-format +msgid "Welcome %s. Remote authentication successful." +msgstr "Welkom %s. Authenticatie op afstand geslaagd." -#: ../../Zotlabs/Lib/Apps.php:244 -msgid "Post" -msgstr "Bericht" +#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:287 +msgid "parent" +msgstr "omhoog" -#: ../../Zotlabs/Lib/Apps.php:245 -#: ../../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 "Profielfoto" +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2845 +msgid "Collection" +msgstr "map" -#: ../../Zotlabs/Lib/Apps.php:355 -msgid "Purchase" -msgstr "Aanschaffen" +#: ../../Zotlabs/Storage/Browser.php:134 +msgid "Principal" +msgstr "principal" -#: ../../Zotlabs/Lib/Apps.php:359 -msgid "Undelete" -msgstr "Verwijdering ongedaan maken" +#: ../../Zotlabs/Storage/Browser.php:137 +msgid "Addressbook" +msgstr "Adresboek" -#: ../../Zotlabs/Lib/Apps.php:364 -msgid "Add to app-tray" -msgstr "Aan appmenu toevoegen" +#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:420 +#: ../../include/nav.php:423 +msgid "Calendar" +msgstr "Agenda" -#: ../../Zotlabs/Lib/Apps.php:365 -msgid "Remove from app-tray" -msgstr "Uit appmenu verwijderen" +#: ../../Zotlabs/Storage/Browser.php:143 +msgid "Schedule Inbox" +msgstr "Planning-postvak IN" -#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24 -msgid "Flag Adult Photos" -msgstr "Markeer foto's als voor volwassenen" +#: ../../Zotlabs/Storage/Browser.php:146 +msgid "Schedule Outbox" +msgstr "Planning-postvak UIT" -#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:25 -msgid "" -"Provide photo edit option to hide inappropriate photos from default album " -"view" -msgstr "Zorgt voor een optie om foto's met inhoud voor volwassenen in de standaard albumweergave te verbergen" +#: ../../Zotlabs/Storage/Browser.php:273 +msgid "Total" +msgstr "Totaal" -#: ../../extend/addon/addon/chords/Mod_Chords.php:44 -msgid "" -"This is a fairly comprehensive and complete guitar chord dictionary which " -"will list most of the available ways to play a certain chord, starting from " -"the base of the fingerboard up to a few frets beyond the twelfth fret " -"(beyond which everything repeats). A couple of non-standard tunings are " -"provided for the benefit of slide players, etc." -msgstr "This is a fairly comprehensive and complete guitar chord dictionary which will list most of the available ways to play a certain chord, starting from the base of the fingerboard up to a few frets beyond the twelfth fret (beyond which everything repeats). A couple of non-standard tunings are provided for the benefit of slide players, etc." +#: ../../Zotlabs/Storage/Browser.php:275 +msgid "Shared" +msgstr "Gedeeld" -#: ../../extend/addon/addon/chords/Mod_Chords.php:46 -msgid "" -"Chord names start with a root note (A-G) and may include sharps (#) and " -"flats (b). This software will parse most of the standard naming conventions " -"such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements." -msgstr "Chord names start with a root note (A-G) and may include sharps (#) and flats (b). This software will parse most of the standard naming conventions such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements." +#: ../../Zotlabs/Storage/Browser.php:277 +msgid "Add Files" +msgstr "Bestanden toevoegen" -#: ../../extend/addon/addon/chords/Mod_Chords.php:48 -msgid "" -"Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, " -"E7b13b11 ..." -msgstr "Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..." +#: ../../Zotlabs/Storage/Browser.php:353 +#, php-format +msgid "You are using %1$s of your available file storage." +msgstr "Je gebruikt %1$s van de beschikbare bestandsopslag." -#: ../../extend/addon/addon/chords/Mod_Chords.php:51 -msgid "Guitar Chords" -msgstr "Gitaarakkoorden" +#: ../../Zotlabs/Storage/Browser.php:358 +#, php-format +msgid "You are using %1$s of %2$s available file storage. (%3$s%)" +msgstr "Je gebruikt %1$s van totaal %2$s beschikbare bestandsopslag. (%3$s%)" -#: ../../extend/addon/addon/chords/Mod_Chords.php:52 -msgid "The complete online chord dictionary" -msgstr "Het complete online akkoordenboek" +#: ../../Zotlabs/Storage/Browser.php:369 +msgid "WARNING:" +msgstr "WAARSCHUWING:" -#: ../../extend/addon/addon/chords/Mod_Chords.php:57 -msgid "Tuning" -msgstr "Stemmen" +#: ../../Zotlabs/Storage/Browser.php:381 +msgid "Create new folder" +msgstr "Nieuwe map aanmaken" -#: ../../extend/addon/addon/chords/Mod_Chords.php:58 -msgid "Chord name: example: Em7" -msgstr "Akkoordnaam: bijvoorbeeld: Em7" +#: ../../Zotlabs/Storage/Browser.php:383 +msgid "Upload file" +msgstr "Bestand uploaden" -#: ../../extend/addon/addon/chords/Mod_Chords.php:59 -msgid "Show for left handed stringing" -msgstr "Toon voor linkshandige gitaar" +#: ../../Zotlabs/Storage/Browser.php:396 +msgid "Drop files here to immediately upload" +msgstr "Sleep bestanden hierheen om ze onmiddellijk te uploaden" -#: ../../extend/addon/addon/chords/chords.php:33 -msgid "Quick Reference" -msgstr "Beknopt overzicht" +#: ../../Zotlabs/Widget/Forums.php:100 +msgid "Forums" +msgstr "Forums" -#: ../../extend/addon/addon/diaspora/import_diaspora.php:16 -msgid "No username found in import file." -msgstr "Geen gebruikersnaam in het importbestand gevonden." +#: ../../Zotlabs/Widget/Cdav.php:37 +msgid "Select Channel" +msgstr "Kies een kanaal" -#: ../../extend/addon/addon/diaspora/import_diaspora.php:41 -#: ../../include/import.php:51 -msgid "Unable to create a unique channel address. Import failed." -msgstr "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt." +#: ../../Zotlabs/Widget/Cdav.php:42 +msgid "Read-write" +msgstr "Lees- en schrijfrechten" -#: ../../extend/addon/addon/diaspora/diaspora.php:677 -msgid "Diaspora Protocol Settings updated." -msgstr "Diaspora-protocol-instellingen bijgewerkt." +#: ../../Zotlabs/Widget/Cdav.php:43 +msgid "Read-only" +msgstr "Alleen leesrechten" -#: ../../extend/addon/addon/diaspora/diaspora.php:696 -msgid "Enable the Diaspora protocol for this channel" -msgstr "Het Diaspora-protocol voor dit kanaal inschakelen" +#: ../../Zotlabs/Widget/Cdav.php:117 +msgid "My Calendars" +msgstr "Mijn agenda's" -#: ../../extend/addon/addon/diaspora/diaspora.php:700 -msgid "Allow any Diaspora member to comment on your public posts" -msgstr "Geef elk Diaspora-lid toestemming om op jouw openbare berichten te reageren" +#: ../../Zotlabs/Widget/Cdav.php:119 +msgid "Shared Calendars" +msgstr "Gedeelde agenda's" -#: ../../extend/addon/addon/diaspora/diaspora.php:704 -msgid "Prevent your hashtags from being redirected to other sites" -msgstr "Voorkom dat jouw hashtags naar andere websites worden doorverwezen" +#: ../../Zotlabs/Widget/Cdav.php:123 +msgid "Share this calendar" +msgstr "Agenda delen" -#: ../../extend/addon/addon/diaspora/diaspora.php:709 -msgid "Followed hashtags (comma separated, do not include the #)" -msgstr "Gevolgde hashtags (door komma's gescheiden lijst, zonder de #)" +#: ../../Zotlabs/Widget/Cdav.php:125 +msgid "Calendar name and color" +msgstr "Naam en kleur agenda" -#: ../../extend/addon/addon/diaspora/diaspora.php:714 -msgid "Diaspora Protocol Settings" -msgstr "Diaspora-protocol (incl. Friendica)" +#: ../../Zotlabs/Widget/Cdav.php:127 +msgid "Create new calendar" +msgstr "Nieuwe agenda aanmaken" -#: ../../extend/addon/addon/dirstats/dirstats.php:94 -msgid "Hubzilla Directory Stats" -msgstr "Kanalengidsstatistieken Hubzilla" +#: ../../Zotlabs/Widget/Cdav.php:129 +msgid "Calendar Name" +msgstr "Naam agenda" -#: ../../extend/addon/addon/dirstats/dirstats.php:95 -msgid "Total Hubs" -msgstr "Totaal aantal hubs" +#: ../../Zotlabs/Widget/Cdav.php:130 +msgid "Calendar Tools" +msgstr "Agenda-hulpmiddelen" -#: ../../extend/addon/addon/dirstats/dirstats.php:97 -msgid "Hubzilla Hubs" -msgstr "Hubzilla-hubs" +#: ../../Zotlabs/Widget/Cdav.php:131 +msgid "Import calendar" +msgstr "Importeren" -#: ../../extend/addon/addon/dirstats/dirstats.php:99 -msgid "Friendica Hubs" -msgstr "Friendica-hubs" +#: ../../Zotlabs/Widget/Cdav.php:132 +msgid "Select a calendar to import to" +msgstr "Kies een agenda om te importeren" -#: ../../extend/addon/addon/dirstats/dirstats.php:101 -msgid "Diaspora Pods" -msgstr "Diaspora-pods" +#: ../../Zotlabs/Widget/Cdav.php:159 +msgid "Addressbooks" +msgstr "Adresboeken" -#: ../../extend/addon/addon/dirstats/dirstats.php:103 -msgid "Hubzilla Channels" -msgstr "Hubzilla-kanalen" +#: ../../Zotlabs/Widget/Cdav.php:161 +msgid "Addressbook name" +msgstr "Naam adresboek" -#: ../../extend/addon/addon/dirstats/dirstats.php:105 -msgid "Friendica Channels" -msgstr "Friendica-kanalen" +#: ../../Zotlabs/Widget/Cdav.php:163 +msgid "Create new addressbook" +msgstr "Nieuw adresboek aanmaken" -#: ../../extend/addon/addon/dirstats/dirstats.php:107 -msgid "Diaspora Channels" -msgstr "Diaspora-kanalen" +#: ../../Zotlabs/Widget/Cdav.php:164 +msgid "Addressbook Name" +msgstr "Naam adresboek" -#: ../../extend/addon/addon/dirstats/dirstats.php:109 -msgid "Aged 35 and above" -msgstr "Leeftijd is ouder dan 35 jaar" +#: ../../Zotlabs/Widget/Cdav.php:166 +msgid "Addressbook Tools" +msgstr "Adresboek-hulpmiddelen" -#: ../../extend/addon/addon/dirstats/dirstats.php:111 -msgid "Aged 34 and under" -msgstr "Leeftijd is jonger dan 34" +#: ../../Zotlabs/Widget/Cdav.php:167 +msgid "Import addressbook" +msgstr "Importeren" -#: ../../extend/addon/addon/dirstats/dirstats.php:113 -msgid "Average Age" -msgstr "Gemiddelde leeftijd" +#: ../../Zotlabs/Widget/Cdav.php:168 +msgid "Select an addressbook to import to" +msgstr "Kies een adresboek om te importeren" -#: ../../extend/addon/addon/dirstats/dirstats.php:115 -msgid "Known Chatrooms" -msgstr "Bekend aantal chatkanalen" +#: ../../Zotlabs/Widget/Appcategories.php:40 +#: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141 +#: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:409 +#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 +#: ../../include/taxonomy.php:532 +msgid "Categories" +msgstr "Categorieën" -#: ../../extend/addon/addon/dirstats/dirstats.php:117 -msgid "Known Tags" -msgstr "Bekend aantal tags" +#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Widget/Filer.php:31 +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100 +#: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189 +msgid "Everything" +msgstr "Alles" -#: ../../extend/addon/addon/dirstats/dirstats.php:119 -msgid "" -"Please note Diaspora and Friendica statistics are merely those **this " -"directory** is aware of, and not all those known in the network. This also " -"applies to chatrooms," -msgstr "Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network. This also applies to chatrooms," +#: ../../Zotlabs/Widget/Eventstools.php:13 +msgid "Events Tools" +msgstr "Agenda-hulpmiddelen" -#: ../../extend/addon/addon/donate/donate.php:21 -msgid "Project Servers and Resources" -msgstr "Projectservers en -middelen" +#: ../../Zotlabs/Widget/Eventstools.php:14 +msgid "Export Calendar" +msgstr "Exporteren" -#: ../../extend/addon/addon/donate/donate.php:22 -msgid "Project Creator and Tech Lead" -msgstr "Projectgrondlegger en hoofdontwikkelaar" +#: ../../Zotlabs/Widget/Eventstools.php:15 +msgid "Import Calendar" +msgstr "Importeren" -#: ../../extend/addon/addon/donate/donate.php:23 -msgid "Admin, developer, directorymin, support bloke" -msgstr "Beheerder, ontwikkelaar, kanalengidsbeheerder en supportgozer" +#: ../../Zotlabs/Widget/Suggestedchats.php:32 +msgid "Suggested Chatrooms" +msgstr "Voorgestelde chatkanalen" -#: ../../extend/addon/addon/donate/donate.php:50 -msgid "" -"And the hundreds of other people and organisations who helped make the " -"Hubzilla possible." -msgstr "En de honderden andere mensen en organisaties die Hubzilla mogelijk hebben gemaakt. " +#: ../../Zotlabs/Widget/Hq_controls.php:14 +msgid "HQ Control Panel" +msgstr "HQ-controlepaneel" -#: ../../extend/addon/addon/donate/donate.php:53 -msgid "" -"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving " -"their time and expertise - and often paying out of pocket for services they " -"share with others." -msgstr "De Hubzillaprojecten worden hoofdzakelijk aangeboden door vrijwilligers die er hun tijd en expertise insteken - en meestal zelf de diensten betalen die ze met anderen delen." +#: ../../Zotlabs/Widget/Hq_controls.php:17 +msgid "Create a new post" +msgstr "Nieuw bericht aanmaken" -#: ../../extend/addon/addon/donate/donate.php:54 -msgid "" -"There is no corporate funding and no ads, and we do not collect and sell " -"your personal information. (We don't control your personal information - " -"you do.)" -msgstr "Wij worden niet gefinancierd door bedrijven en reclame, en wij verzamelen en verkopen niet jouw persoonlijke gegevens. We hebben geen controle over jouw persoonlijke gegevens - dat heb jezelf." +#: ../../Zotlabs/Widget/Mailmenu.php:13 +msgid "Private Mail Menu" +msgstr "Privéberichten" + +#: ../../Zotlabs/Widget/Mailmenu.php:15 +msgid "Combined View" +msgstr "Gecombineerd postvak" -#: ../../extend/addon/addon/donate/donate.php:55 -msgid "" -"Help support our ground-breaking work in decentralisation, web identity, and" -" privacy." -msgstr "Steun ons baanbrekende werk in decentralisatie, webidentiteit en privacy. " +#: ../../Zotlabs/Widget/Mailmenu.php:20 +msgid "Inbox" +msgstr "Postvak IN" -#: ../../extend/addon/addon/donate/donate.php:57 -msgid "" -"Your donations keep servers and services running and also helps us to " -"provide innovative new features and continued development." -msgstr "Jouw donaties laten onze servers en diensten draaien, en helpt ons om nieuwe innovatieve mogelijkheden te blijven ontwikkelen." +#: ../../Zotlabs/Widget/Mailmenu.php:25 +msgid "Outbox" +msgstr "Postvak UIT" -#: ../../extend/addon/addon/donate/donate.php:60 -msgid "Donate" -msgstr "Doneer" +#: ../../Zotlabs/Widget/Mailmenu.php:30 +msgid "New Message" +msgstr "Nieuw bericht" -#: ../../extend/addon/addon/donate/donate.php:62 -msgid "" -"Choose a project, developer, or public hub to support with a one-time " -"donation" -msgstr "Kies een project, ontwikkelaar of openbaar toegankelijke hub, die je met een eenmalige donatie wil steunen" +#: ../../Zotlabs/Widget/Chatroom_list.php:16 +#: ../../include/conversation.php:1867 ../../include/conversation.php:1870 +#: ../../include/nav.php:434 ../../include/nav.php:437 +msgid "Chatrooms" +msgstr "Chatkanalen" -#: ../../extend/addon/addon/donate/donate.php:63 -msgid "Donate Now" -msgstr "Doneer nu" +#: ../../Zotlabs/Widget/Chatroom_list.php:20 +msgid "Overview" +msgstr "Overzicht" -#: ../../extend/addon/addon/donate/donate.php:64 -msgid "" -"Or become a project sponsor (Hubzilla Project " -"only)" -msgstr "Of wordt een projectsponsor (alleen het Hubzilla-project)" +#: ../../Zotlabs/Widget/Rating.php:51 +msgid "Rating Tools" +msgstr "Beoordelingen" -#: ../../extend/addon/addon/donate/donate.php:65 -msgid "" -"Please indicate if you would like your first name or full name (or nothing) " -"to appear in our sponsor listing" -msgstr "Geef aan of jouw voornaam of volledige naam (of niets) op onze sponsorlijst moet verschijnen" +#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57 +msgid "Rate Me" +msgstr "Beoordeel mij" -#: ../../extend/addon/addon/donate/donate.php:66 -msgid "Sponsor" -msgstr "Sponsor" +#: ../../Zotlabs/Widget/Rating.php:60 +msgid "View Ratings" +msgstr "Bekijk beoordelingen" -#: ../../extend/addon/addon/donate/donate.php:69 -msgid "Special thanks to: " -msgstr "Speciale dank gaat naar: " +#: ../../Zotlabs/Widget/Activity.php:50 +msgctxt "widget" +msgid "Activity" +msgstr "Activiteit" -#: ../../extend/addon/addon/dwpost/dwpost.php:42 -msgid "Post to Dreamwidth" -msgstr "Dreamwidth" +#: ../../Zotlabs/Widget/Follow.php:22 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "Je hebt %1$.0f van de %2$.0f toegestane connecties." -#: ../../extend/addon/addon/dwpost/dwpost.php:73 -msgid "Enable Dreamwidth Post Plugin" -msgstr "Doorplaatsen naar Dreamwidth inschakelen" +#: ../../Zotlabs/Widget/Follow.php:29 +msgid "Add New Connection" +msgstr "Nieuwe connectie toevoegen" -#: ../../extend/addon/addon/dwpost/dwpost.php:77 -msgid "Dreamwidth username" -msgstr "Gebruikersnaam Dreamwidth" +#: ../../Zotlabs/Widget/Follow.php:30 +msgid "Enter channel address" +msgstr "Vul kanaaladres in" -#: ../../extend/addon/addon/dwpost/dwpost.php:81 -msgid "Dreamwidth password" -msgstr "Wachtwoord Dreamwidth" +#: ../../Zotlabs/Widget/Follow.php:31 +msgid "Examples: bob@example.com, https://example.com/barbara" +msgstr "Voorbeelden: bob@example.com, http://example.com/barbara" -#: ../../extend/addon/addon/dwpost/dwpost.php:85 -msgid "Post to Dreamwidth by default" -msgstr "Standaard doorplaatsen naar Dreamwidth" +#: ../../Zotlabs/Widget/Wiki_list.php:15 +msgid "Wiki List" +msgstr "Wiki's" -#: ../../extend/addon/addon/dwpost/dwpost.php:89 -msgid "Dreamwidth Post Settings" -msgstr "Dreamwidth (berichten doorplaatsen)" +#: ../../Zotlabs/Widget/Archive.php:43 +msgid "Archives" +msgstr "Archieven" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:45 -msgid "Flattr this!" -msgstr "Flattr this!" +#: ../../Zotlabs/Widget/Conversations.php:17 +msgid "Received Messages" +msgstr "Ontvangen berichten" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:83 -msgid "Flattr widget settings updated." -msgstr "Instellingen Flattrwidget bijgewerkt." +#: ../../Zotlabs/Widget/Conversations.php:21 +msgid "Sent Messages" +msgstr "Verzonden berichten" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:100 -msgid "Flattr user" -msgstr "Gebruikersnaam Flattr" +#: ../../Zotlabs/Widget/Conversations.php:25 +msgid "Conversations" +msgstr "Conversaties" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:104 -msgid "URL of the Thing to flattr" -msgstr "URL van het Flattr-item" +#: ../../Zotlabs/Widget/Conversations.php:37 +msgid "No messages." +msgstr "Geen berichten" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:104 -msgid "If empty channel URL is used" -msgstr "Wanneer een lege kanaal-URL wordt gebruikt" +#: ../../Zotlabs/Widget/Conversations.php:57 +msgid "Delete conversation" +msgstr "Verwijder conversatie" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:108 -msgid "Title of the Thing to flattr" -msgstr "Naam van het Flattr-item" +#: ../../Zotlabs/Widget/Chatroom_members.php:11 +msgid "Chat Members" +msgstr "Chatleden" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:108 -msgid "If empty \"channel name on The Hubzilla\" will be used" -msgstr "Wanneer een lege \"kanaalnaam op Hubzilla\" wordt gebruikt" +#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58 +msgid "photo/image" +msgstr "foto/afbeelding" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112 -msgid "Static or dynamic flattr button" -msgstr "Statische of dynamische Flattr-knop" +#: ../../Zotlabs/Widget/Savedsearch.php:75 +msgid "Remove term" +msgstr "Verwijder zoekterm" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112 -msgid "static" -msgstr "statisch" +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:381 +msgid "Saved Searches" +msgstr "Opgeslagen zoekopdrachten" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112 -msgid "dynamic" -msgstr "dynamisch" +#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:333 +msgid "add" +msgstr "toevoegen" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116 -msgid "Alignment of the widget" -msgstr "Uitlijning van de widget" +#: ../../Zotlabs/Widget/Notes.php:16 +msgid "Notes" +msgstr "Aantekeningen" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116 -msgid "left" -msgstr "links" +#: ../../Zotlabs/Widget/Wiki_pages.php:32 +#: ../../Zotlabs/Widget/Wiki_pages.php:89 +msgid "Add new page" +msgstr "Nieuwe pagina toevoegen" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116 -msgid "right" -msgstr "rechts" +#: ../../Zotlabs/Widget/Wiki_pages.php:83 +msgid "Wiki Pages" +msgstr "Wikipagina's" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120 -msgid "Enable Flattr widget" -msgstr "Flattrwidget inschakelen" +#: ../../Zotlabs/Widget/Wiki_pages.php:94 +msgid "Page name" +msgstr "Paginanaam" -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124 -msgid "Flattr Widget Settings" -msgstr "Flattrwidget" +#: ../../Zotlabs/Widget/Affinity.php:45 +msgid "Refresh" +msgstr "Vernieuwen" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:118 -msgid "Contact not found." -msgstr "Contact niet gevonden" +#: ../../Zotlabs/Widget/Tasklist.php:23 +msgid "Tasks" +msgstr "Taken" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:119 -msgid "" -"This may occasionally happen if contact was requested by both persons and it" -" has already been approved." -msgstr "This may occasionally happen if contact was requested by both persons and it has already been approved." +#: ../../Zotlabs/Widget/Suggestions.php:51 +msgid "Suggestions" +msgstr "Voorgestelde kanalen" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:238 -msgid "Response from remote site was not understood." -msgstr "Response from remote site was not understood." +#: ../../Zotlabs/Widget/Suggestions.php:52 +msgid "See more..." +msgstr "Meer..." -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:247 -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:252 -msgid "Unexpected response from remote site: " -msgstr "Unexpected response from remote site: " +#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 +#: ../../include/features.php:470 +msgid "Saved Folders" +msgstr "Bewaarde mappen" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:261 -msgid "Confirmation completed successfully." -msgstr "Confirmation completed successfully." +#: ../../Zotlabs/Widget/Cover_photo.php:54 +msgid "Click to show more" +msgstr "Klik voor meer" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:263 -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:277 -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:284 -msgid "Remote site reported: " -msgstr "Remote site reported: " +#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320 +#: ../../include/taxonomy.php:449 ../../include/taxonomy.php:470 +msgid "Tags" +msgstr "Tags" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:275 -msgid "Temporary failure. Please wait and try again." -msgstr "Temporary failure. Please wait and try again." +#: ../../Zotlabs/Widget/Newmember.php:24 +msgid "Profile Creation" +msgstr "Profiel aanmaken" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:282 -msgid "Introduction failed or was revoked." -msgstr "Introduction failed or was revoked." +#: ../../Zotlabs/Widget/Newmember.php:26 +msgid "Upload profile photo" +msgstr "Profielfoto uploaden" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:428 -msgid "Unable to set contact photo." -msgstr "Unable to set contact photo." +#: ../../Zotlabs/Widget/Newmember.php:27 +msgid "Upload cover photo" +msgstr "Omslagfoto uploaden" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:485 -#, php-format -msgid "%1$s is now friends with %2$s" -msgstr "%1$s is now friends with %2$s" +#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:119 +msgid "Edit your profile" +msgstr "Jouw profiel bewerken" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:570 -#, php-format -msgid "No user record found for '%s' " -msgstr "No user record found for '%s' " +#: ../../Zotlabs/Widget/Newmember.php:31 +msgid "Find and Connect with others" +msgstr "Vind en verbind met anderen" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:580 -msgid "Our site encryption key is apparently messed up." -msgstr "Our site encryption key is apparently messed up." +#: ../../Zotlabs/Widget/Newmember.php:33 +msgid "View the directory" +msgstr "Kanalengids tonen" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:591 -msgid "Empty site URL was provided or URL could not be decrypted by us." -msgstr "Empty site URL was provided or URL could not be decrypted by us." +#: ../../Zotlabs/Widget/Newmember.php:35 +msgid "Manage your connections" +msgstr "Jouw connecties beheren" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:612 -msgid "Contact record was not found for you on our site." -msgstr "Contact record was not found for you on our site." +#: ../../Zotlabs/Widget/Newmember.php:38 +msgid "Communicate" +msgstr "Communiceren" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:626 -#, php-format -msgid "Site public key not available in contact record for URL %s." -msgstr "Site public key not available in contact record for URL %s." +#: ../../Zotlabs/Widget/Newmember.php:40 +msgid "View your channel homepage" +msgstr "Jouw kanaalpagina tonen" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:646 -msgid "" -"The ID provided by your system is a duplicate on our system. It should work " -"if you try again." -msgstr "The ID provided by your system is a duplicate on our system. It should work if you try again." +#: ../../Zotlabs/Widget/Newmember.php:41 +msgid "View your network stream" +msgstr "Jouw tijdlijn tonen" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:657 -msgid "Unable to set your contact credentials on our system." -msgstr "Unable to set your contact credentials on our system." +#: ../../Zotlabs/Widget/Newmember.php:47 +msgid "Documentation" +msgstr "Documentatie" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:724 -msgid "Unable to update your contact profile details on our system" -msgstr "Unable to update your contact profile details on our system" +#: ../../Zotlabs/Widget/Newmember.php:58 +msgid "View public stream" +msgstr "Openbare tijdlijn tonen" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:751 -#: ../../extend/addon/addon/friendica/dfrn_request.php:749 -msgid "[Name Withheld]" -msgstr "[Name Withheld]" +#: ../../Zotlabs/Widget/Newmember.php:62 ../../include/features.php:60 +msgid "New Member Links" +msgstr "Links voor nieuwe leden" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:796 -#, php-format -msgid "%1$s has joined %2$s" -msgstr "%1$s has joined %2$s" +#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60 +msgid "Member registrations waiting for confirmation" +msgstr "Accounts die op goedkeuring wachten" -#: ../../extend/addon/addon/friendica/dfrn_poll.php:103 -#: ../../extend/addon/addon/friendica/dfrn_poll.php:536 -#, php-format -msgid "%1$s welcomes %2$s" -msgstr "%1$s welcomes %2$s" +#: ../../Zotlabs/Widget/Admin.php:29 +msgid "Inspect queue" +msgstr "Inspecteer berichtenwachtrij" -#: ../../extend/addon/addon/friendica/dfrn_request.php:102 -msgid "This introduction has already been accepted." -msgstr "This introduction has already been accepted." +#: ../../Zotlabs/Widget/Admin.php:31 +msgid "DB updates" +msgstr "Database-updates" -#: ../../extend/addon/addon/friendica/dfrn_request.php:123 -#: ../../extend/addon/addon/friendica/dfrn_request.php:528 -msgid "Profile location is not valid or does not contain profile information." -msgstr "Profile location is not valid or does not contain profile information." +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:199 +msgid "Admin" +msgstr "Beheer" -#: ../../extend/addon/addon/friendica/dfrn_request.php:128 -#: ../../extend/addon/addon/friendica/dfrn_request.php:533 -msgid "Warning: profile location has no identifiable owner name." -msgstr "Warning: profile location has no identifiable owner name." +#: ../../Zotlabs/Widget/Admin.php:56 +msgid "Plugin Features" +msgstr "Plug-in-opties" -#: ../../extend/addon/addon/friendica/dfrn_request.php:130 -#: ../../extend/addon/addon/friendica/dfrn_request.php:535 -msgid "Warning: profile location has no profile photo." -msgstr "Warning: profile location has no profile photo." +#: ../../Zotlabs/Widget/Settings_menu.php:35 +msgid "Account settings" +msgstr "Account" -#: ../../extend/addon/addon/friendica/dfrn_request.php:133 -#: ../../extend/addon/addon/friendica/dfrn_request.php:538 -#, php-format -msgid "%d required parameter was not found at the given location" -msgid_plural "%d required parameters were not found at the given location" -msgstr[0] "%d required parameter was not found at the given location" -msgstr[1] "%d required parameters were not found at the given location" +#: ../../Zotlabs/Widget/Settings_menu.php:41 +msgid "Channel settings" +msgstr "Kanaal" -#: ../../extend/addon/addon/friendica/dfrn_request.php:180 -msgid "Introduction complete." -msgstr "Introduction complete." +#: ../../Zotlabs/Widget/Settings_menu.php:50 +msgid "Additional features" +msgstr "Extra functies" -#: ../../extend/addon/addon/friendica/dfrn_request.php:224 -msgid "Unrecoverable protocol error." -msgstr "Unrecoverable protocol error." +#: ../../Zotlabs/Widget/Settings_menu.php:57 +msgid "Addon settings" +msgstr "Plug-ins" -#: ../../extend/addon/addon/friendica/dfrn_request.php:252 -msgid "Profile unavailable." -msgstr "Profile unavailable." +#: ../../Zotlabs/Widget/Settings_menu.php:63 +msgid "Display settings" +msgstr "Weergave" -#: ../../extend/addon/addon/friendica/dfrn_request.php:277 -#, php-format -msgid "%s has received too many connection requests today." -msgstr "%s has received too many connection requests today." +#: ../../Zotlabs/Widget/Settings_menu.php:70 +msgid "Manage locations" +msgstr "Locaties beheren" -#: ../../extend/addon/addon/friendica/dfrn_request.php:278 -msgid "Spam protection measures have been invoked." -msgstr "Spam protection measures have been invoked." +#: ../../Zotlabs/Widget/Settings_menu.php:77 +msgid "Export channel" +msgstr "Kanaal exporteren" -#: ../../extend/addon/addon/friendica/dfrn_request.php:279 -msgid "Friends are advised to please try again in 24 hours." -msgstr "Friends are advised to please try again in 24 hours." +#: ../../Zotlabs/Widget/Settings_menu.php:84 +msgid "OAuth1 apps" +msgstr "OAuth1-applicaties" -#: ../../extend/addon/addon/friendica/dfrn_request.php:341 -msgid "Invalid locator" -msgstr "Invalid locator" +#: ../../Zotlabs/Widget/Settings_menu.php:92 +msgid "OAuth2 apps" +msgstr "OAuth2-applicaties" -#: ../../extend/addon/addon/friendica/dfrn_request.php:350 -msgid "Invalid email address." -msgstr "Invalid email address." +#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240 +msgid "Permission Groups" +msgstr "Permissiegroepen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:377 -msgid "This account has not been configured for email. Request failed." -msgstr "This account has not been configured for email. Request failed." +#: ../../Zotlabs/Widget/Settings_menu.php:125 +msgid "Premium Channel Settings" +msgstr "Instellingen premiumkanaal" -#: ../../extend/addon/addon/friendica/dfrn_request.php:473 -msgid "Unable to resolve your name at the provided location." -msgstr "Unable to resolve your name at the provided location." +#: ../../Zotlabs/Widget/Bookmarkedchats.php:24 +msgid "Bookmarked Chatrooms" +msgstr "Bladwijzers van chatkanalen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:486 -msgid "You have already introduced yourself here." -msgstr "You have already introduced yourself here." +#: ../../Zotlabs/Widget/Notifications.php:16 +msgid "New Network Activity" +msgstr "Nieuwe tijdlijnactiviteit" -#: ../../extend/addon/addon/friendica/dfrn_request.php:490 -#, php-format -msgid "Apparently you are already friends with %s." -msgstr "Apparently you are already friends with %s." +#: ../../Zotlabs/Widget/Notifications.php:17 +msgid "New Network Activity Notifications" +msgstr "Nieuwe tijdlijnactiviteitmeldingen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:511 -msgid "Invalid profile URL." -msgstr "Invalid profile URL." +#: ../../Zotlabs/Widget/Notifications.php:20 +msgid "View your network activity" +msgstr "Jouw tijdlijnactiviteit tonen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:517 -msgid "Disallowed profile URL." -msgstr "Disallowed profile URL." +#: ../../Zotlabs/Widget/Notifications.php:23 +msgid "Mark all notifications read" +msgstr "Markeer alle meldingen als gelezen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:587 -msgid "Failed to update contact record." -msgstr "Failed to update contact record." +#: ../../Zotlabs/Widget/Notifications.php:26 +#: ../../Zotlabs/Widget/Notifications.php:45 +#: ../../Zotlabs/Widget/Notifications.php:141 +msgid "Show new posts only" +msgstr "Alleen nieuwe berichten tonen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:608 -msgid "Your introduction has been sent." -msgstr "Your introduction has been sent." +#: ../../Zotlabs/Widget/Notifications.php:27 +#: ../../Zotlabs/Widget/Notifications.php:46 +#: ../../Zotlabs/Widget/Notifications.php:142 +msgid "Filter by name" +msgstr "Op naam filteren" -#: ../../extend/addon/addon/friendica/dfrn_request.php:662 -msgid "Please login to confirm introduction." -msgstr "Please login to confirm introduction." +#: ../../Zotlabs/Widget/Notifications.php:35 +msgid "New Home Activity" +msgstr "Nieuwe kanaalactiviteit" -#: ../../extend/addon/addon/friendica/dfrn_request.php:676 -msgid "" -"Incorrect identity currently logged in. Please login to " -"this profile." -msgstr "Incorrect identity currently logged in. Please login to this profile." +#: ../../Zotlabs/Widget/Notifications.php:36 +msgid "New Home Activity Notifications" +msgstr "Nieuwe kanaalactiviteitmeldingen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:690 -#: ../../extend/addon/addon/friendica/dfrn_request.php:707 -msgid "Confirm" -msgstr "Confirm" +#: ../../Zotlabs/Widget/Notifications.php:39 +msgid "View your home activity" +msgstr "Jouw kanaalactiviteit tonen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:702 -msgid "Hide this contact" -msgstr "Hide this contact" +#: ../../Zotlabs/Widget/Notifications.php:42 +#: ../../Zotlabs/Widget/Notifications.php:138 +msgid "Mark all notifications seen" +msgstr "Markeer alle meldingen als bekeken" -#: ../../extend/addon/addon/friendica/dfrn_request.php:705 -#, php-format -msgid "Welcome home %s." -msgstr "Welcome home %s." +#: ../../Zotlabs/Widget/Notifications.php:54 +msgid "New Mails" +msgstr "Nieuwe privéberichten" -#: ../../extend/addon/addon/friendica/dfrn_request.php:706 -#, php-format -msgid "Please confirm your introduction/connection request to %s." -msgstr "Please confirm your introduction/connection request to %s." +#: ../../Zotlabs/Widget/Notifications.php:55 +msgid "New Mails Notifications" +msgstr "Nieuw privéberichtmeldingen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:836 -msgid "" -"Please enter your 'Identity Address' from one of the following supported " -"communications networks:" -msgstr "Please enter your 'Identity Address' from one of the following supported communications networks:" +#: ../../Zotlabs/Widget/Notifications.php:58 +msgid "View your private mails" +msgstr "Jouw privéberichten tonen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:857 -#, php-format -msgid "" -"If you are not yet a member of the free social web, follow this link to find a public Friendica site and " -"join us today." -msgstr "If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today." +#: ../../Zotlabs/Widget/Notifications.php:61 +msgid "Mark all messages seen" +msgstr "Markeer alle berichten als bekeken" -#: ../../extend/addon/addon/friendica/dfrn_request.php:862 -msgid "Friend/Connection Request" -msgstr "Friend/Connection Request" +#: ../../Zotlabs/Widget/Notifications.php:69 +msgid "New Events" +msgstr "Nieuwe gebeurtenissen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:863 -msgid "" -"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " -"testuser@identi.ca" -msgstr "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" +#: ../../Zotlabs/Widget/Notifications.php:70 +msgid "New Events Notifications" +msgstr "Nieuwe gebeurtenismeldingen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:864 -msgid "Please answer the following:" -msgstr "Please answer the following:" +#: ../../Zotlabs/Widget/Notifications.php:73 +msgid "View events" +msgstr "Agenda tonen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:865 -#, php-format -msgid "Does %s know you?" -msgstr "Does %s know you?" +#: ../../Zotlabs/Widget/Notifications.php:76 +msgid "Mark all events seen" +msgstr "Markeer alle gebeurtenissen als bekeken" -#: ../../extend/addon/addon/friendica/dfrn_request.php:869 -msgid "Add a personal note:" -msgstr "Add a personal note:" +#: ../../Zotlabs/Widget/Notifications.php:85 +msgid "New Connections Notifications" +msgstr "Nieuwe connectiemeldingen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:871 -#: ../../include/network.php:2265 ../../include/network.php:2266 -msgid "Friendica" -msgstr "Friendica" +#: ../../Zotlabs/Widget/Notifications.php:88 +msgid "View all connections" +msgstr "Toon alle connecties" -#: ../../extend/addon/addon/friendica/dfrn_request.php:872 -msgid "StatusNet/Federated Social Web" -msgstr "StatusNet/Federated Social Web" +#: ../../Zotlabs/Widget/Notifications.php:96 +msgid "New Files" +msgstr "Nieuwe bestanden" -#: ../../extend/addon/addon/friendica/dfrn_request.php:873 -#: ../../include/network.php:2271 -msgid "Diaspora" -msgstr "Diaspora" +#: ../../Zotlabs/Widget/Notifications.php:97 +msgid "New Files Notifications" +msgstr "Nieuw bestandmeldingen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:874 -#, php-format -msgid "" -" - please do not use this form. Instead, enter %s into your Diaspora search" -" bar." -msgstr " - please do not use this form. Instead, enter %s into your Diaspora search bar." +#: ../../Zotlabs/Widget/Notifications.php:104 +#: ../../Zotlabs/Widget/Notifications.php:105 +msgid "Notices" +msgstr "Meldingen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:875 -msgid "Your Identity Address:" -msgstr "Your Identity Address:" +#: ../../Zotlabs/Widget/Notifications.php:108 +msgid "View all notices" +msgstr "Alle meldingen tonen" -#: ../../extend/addon/addon/friendica/dfrn_request.php:878 -msgid "Submit Request" -msgstr "Submit Request" +#: ../../Zotlabs/Widget/Notifications.php:111 +msgid "Mark all notices seen" +msgstr "Markeer alle meldingen als bekeken" -#: ../../extend/addon/addon/friendica/friendica.php:113 -#: ../../extend/addon/addon/gnusoc/gnusoc.php:118 -msgid "GNU-Social Protocol Settings updated." -msgstr "GNU social-protocol-instellingen bijgewerkt." +#: ../../Zotlabs/Widget/Notifications.php:121 +msgid "New Registrations" +msgstr "Nieuwe registraties" -#: ../../extend/addon/addon/friendica/friendica.php:124 -msgid "Enable the (experimental) GNU-Social protocol for this channel" -msgstr "GNU social-protocol voor dit kanaal inschakelen (experimenteel)" +#: ../../Zotlabs/Widget/Notifications.php:122 +msgid "New Registrations Notifications" +msgstr "Nieuwe registratiemeldingen" -#: ../../extend/addon/addon/friendica/friendica.php:128 -#: ../../extend/addon/addon/gnusoc/gnusoc.php:133 -msgid "GNU-Social Protocol Settings" -msgstr "GNU social-protocol" +#: ../../Zotlabs/Widget/Notifications.php:132 +msgid "Public Stream Notifications" +msgstr "Openbare tijdlijnmeldingen" -#: ../../extend/addon/addon/friendica/friendica.php:185 -#: ../../extend/addon/addon/gnusoc/gnusoc.php:323 -msgid "Follow" -msgstr "Volgen" +#: ../../Zotlabs/Widget/Notifications.php:135 +msgid "View the public stream" +msgstr "De openbare tijdlijn tonen" -#: ../../extend/addon/addon/friendica/friendica.php:188 -#: ../../extend/addon/addon/gnusoc/gnusoc.php:326 -#, php-format -msgid "%1$s is now following %2$s" -msgstr "%1$s volgt nu %2$s" +#: ../../Zotlabs/Widget/Notifications.php:150 +msgid "Sorry, you have got no notifications at the moment" +msgstr "Sorry, maar je hebt op dit moment geen meldingen" -#: ../../extend/addon/addon/frphotos/frphotos.php:91 -msgid "Friendica Photo Album Import" -msgstr "Fotoalbums importeren vanuit Friendica" +#: ../../util/nconfig.php:34 +msgid "Source channel not found." +msgstr "Bron van kanaal niet gevonden" -#: ../../extend/addon/addon/frphotos/frphotos.php:92 -msgid "This will import all your Friendica photo albums to this Red channel." -msgstr "Hiermee importeer je al jouw Friendica-fotoalbums in dit Hubzilla-kanaal." +#: ../../boot.php:1569 +msgid "Create an account to access services and applications" +msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen" -#: ../../extend/addon/addon/frphotos/frphotos.php:93 -msgid "Friendica Server base URL" -msgstr "Basis-URL van Friendica-server" +#: ../../boot.php:1588 ../../include/nav.php:111 ../../include/nav.php:140 +#: ../../include/nav.php:159 +msgid "Logout" +msgstr "Uitloggen" -#: ../../extend/addon/addon/frphotos/frphotos.php:94 -msgid "Friendica Login Username" -msgstr "Gebruikersnaam Friendica" +#: ../../boot.php:1592 +msgid "Login/Email" +msgstr "E-mailadres of inlognaam" -#: ../../extend/addon/addon/frphotos/frphotos.php:95 -msgid "Friendica Login Password" -msgstr "Wachtwoord Friendica" +#: ../../boot.php:1593 +msgid "Password" +msgstr "Wachtwoord" -#: ../../extend/addon/addon/hubwall/hubwall.php:19 -msgid "Send email to all members" -msgstr "Naar alle leden e-mail versturen" +#: ../../boot.php:1594 +msgid "Remember me" +msgstr "Aangemeld blijven" + +#: ../../boot.php:1597 +msgid "Forgot your password?" +msgstr "Wachtwoord vergeten?" -#: ../../extend/addon/addon/hubwall/hubwall.php:33 +#: ../../boot.php:2354 #, php-format -msgid "$1%s Administrator" -msgstr "Beheerder $1%s" +msgid "[$Projectname] Website SSL error for %s" +msgstr "[$Projectname] Probleem met SSL-certificaat van %s" -#: ../../extend/addon/addon/hubwall/hubwall.php:50 -#: ../../extend/addon/addon/mailtest/mailtest.php:50 -msgid "No recipients found." -msgstr "Geen ontvangers gevonden" +#: ../../boot.php:2359 +msgid "Website SSL certificate is not valid. Please correct." +msgstr "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b." -#: ../../extend/addon/addon/hubwall/hubwall.php:73 +#: ../../boot.php:2475 #, php-format -msgid "%1$d of %2$d messages sent." -msgstr "%1$d van %2$d berichten verzonden." +msgid "[$Projectname] Cron tasks not running on %s" +msgstr "[$Projectname] Crontaken zijn niet actief op %s" -#: ../../extend/addon/addon/hubwall/hubwall.php:81 -msgid "Send email to all hub members." -msgstr "Naar alle leden van deze hub e-mail versturen." +#: ../../boot.php:2480 +msgid "Cron/Scheduled tasks not running." +msgstr "Cron is niet actief" + +#: ../../boot.php:2481 ../../include/datetime.php:238 +msgid "never" +msgstr "nooit" -#: ../../extend/addon/addon/hubwall/hubwall.php:92 -#: ../../extend/addon/addon/mailtest/mailtest.php:96 -msgid "Message subject" -msgstr "Onderwerp e-mailbericht" +#: ../../store/[data]/smarty3/compiled/a0a1289f91f53b2c12e4e0b45ffe8291540ba895_0.file.cover_photo.tpl.php:123 +msgid "Cover Photo" +msgstr "Omslagfoto" -#: ../../extend/addon/addon/hubwall/hubwall.php:93 -msgid "Sender Email address" -msgstr "E-mailadres afzender" +#: ../../view/theme/redbasic_c/php/config.php:16 +#: ../../view/theme/redbasic_c/php/config.php:19 +#: ../../view/theme/redbasic/php/config.php:16 +#: ../../view/theme/redbasic/php/config.php:19 +msgid "Focus (Hubzilla default)" +msgstr "Focus (Hubzilla-standaard)" -#: ../../extend/addon/addon/hubwall/hubwall.php:94 -msgid "Test mode (only send to hub administrator)" -msgstr "Testmodus (alleen naar hubbeheerder sturen)" +#: ../../view/theme/redbasic_c/php/config.php:99 +#: ../../view/theme/redbasic/php/config.php:97 +msgid "Theme settings" +msgstr "Thema-instellingen" -#: ../../extend/addon/addon/ijpost/ijpost.php:42 -msgid "Post to Insanejournal" -msgstr "InsaneJournal" +#: ../../view/theme/redbasic_c/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:98 +msgid "Narrow navbar" +msgstr "Smalle navigatiebalk" -#: ../../extend/addon/addon/ijpost/ijpost.php:73 -msgid "Enable InsaneJournal Post Plugin" -msgstr "Doorplaatsen naar InsaneJournal inschakelen" +#: ../../view/theme/redbasic_c/php/config.php:101 +#: ../../view/theme/redbasic/php/config.php:99 +msgid "Navigation bar background color" +msgstr "Achtergrondkleur navigatiebalk" -#: ../../extend/addon/addon/ijpost/ijpost.php:77 -msgid "InsaneJournal username" -msgstr "Gebruikersnaam InsaneJournal" +#: ../../view/theme/redbasic_c/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:100 +msgid "Navigation bar icon color " +msgstr "Pictogramkleur navigatiebalk" -#: ../../extend/addon/addon/ijpost/ijpost.php:81 -msgid "InsaneJournal password" -msgstr "Wachtwoord InsaneJournal" +#: ../../view/theme/redbasic_c/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:101 +msgid "Navigation bar active icon color " +msgstr "Actieve pictogramkleur navigatiebalk" -#: ../../extend/addon/addon/ijpost/ijpost.php:85 -msgid "Post to InsaneJournal by default" -msgstr "Standaard doorplaatsen naar InsaneJournal" +#: ../../view/theme/redbasic_c/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:102 +msgid "Link color" +msgstr "Linkkleur" -#: ../../extend/addon/addon/ijpost/ijpost.php:89 -msgid "InsaneJournal Post Settings" -msgstr "InsaneJournal (berichten doorplaatsen)" +#: ../../view/theme/redbasic_c/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:103 +msgid "Set font-color for banner" +msgstr "Tekstkleur van banner instellen" -#: ../../extend/addon/addon/ijpost/ijpost.php:104 -msgid "Insane Journal Settings saved." -msgstr "InsaneJournal-instellingen opgeslagen." +#: ../../view/theme/redbasic_c/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:104 +msgid "Set the background color" +msgstr "Achtergrondkleur instellen" -#: ../../extend/addon/addon/irc/irc.php:45 -msgid "Channels to auto connect" -msgstr "Kanalen om automatisch mee te verbinden" +#: ../../view/theme/redbasic_c/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Set the background image" +msgstr "Achtergrondafbeelding instellen" -#: ../../extend/addon/addon/irc/irc.php:45 -#: ../../extend/addon/addon/irc/irc.php:49 -msgid "Comma separated list" -msgstr "Door komma's gescheiden lijst" +#: ../../view/theme/redbasic_c/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:106 +msgid "Set the background color of items" +msgstr "Achtergrondkleur items instellen" -#: ../../extend/addon/addon/irc/irc.php:49 -#: ../../extend/addon/addon/irc/irc.php:96 -msgid "Popular Channels" -msgstr "Populaire chatkanalen" +#: ../../view/theme/redbasic_c/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Set the background color of comments" +msgstr "Achtergrondkleur reacties instellen" -#: ../../extend/addon/addon/irc/irc.php:53 -msgid "IRC Settings" -msgstr "IRC" +#: ../../view/theme/redbasic_c/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:108 +msgid "Set font-size for the entire application" +msgstr "Tekstgrootte van de volledige applicatie instellen" -#: ../../extend/addon/addon/irc/irc.php:69 -msgid "IRC settings saved." -msgstr "IRC-instellingen opgeslagen." +#: ../../view/theme/redbasic_c/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:108 +msgid "Examples: 1rem, 100%, 16px" +msgstr "Voorbeelden: 1rem, 100%, 16px" -#: ../../extend/addon/addon/irc/irc.php:74 -msgid "IRC Chatroom" -msgstr "IRC-chatkanaal" +#: ../../view/theme/redbasic_c/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:109 +msgid "Set font-color for posts and comments" +msgstr "Tekstkleur van berichten en reacties" -#: ../../extend/addon/addon/jappixmini/jappixmini.php:305 -#: ../../include/channel.php:1139 ../../include/channel.php:1301 -msgid "Status:" -msgstr "Status:" +#: ../../view/theme/redbasic_c/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:110 +msgid "Set radius of corners" +msgstr "Radius van hoeken instellen" -#: ../../extend/addon/addon/jappixmini/jappixmini.php:309 -msgid "Activate addon" -msgstr "Plugin inschakelen" +#: ../../view/theme/redbasic_c/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:110 +msgid "Example: 4px" +msgstr "Voorbeeld: 4px" -#: ../../extend/addon/addon/jappixmini/jappixmini.php:313 -msgid "Hide Jappixmini Chat-Widget from the webinterface" -msgstr "Hide Jappixmini Chat-Widget from the webinterface" +#: ../../view/theme/redbasic_c/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:111 +msgid "Set shadow depth of photos" +msgstr "Schaduwdiepte van foto's instellen" -#: ../../extend/addon/addon/jappixmini/jappixmini.php:318 -msgid "Jabber username" -msgstr "Gebruikersnaam Jabber" +#: ../../view/theme/redbasic_c/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:112 +msgid "Set maximum width of content region in pixel" +msgstr "Maximumbreedte conversatieruimte instellen (in pixels)" -#: ../../extend/addon/addon/jappixmini/jappixmini.php:324 -msgid "Jabber server" -msgstr "Jabberserver" +#: ../../view/theme/redbasic_c/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:112 +msgid "Leave empty for default width" +msgstr "Laat leeg voor standaardbreedte" -#: ../../extend/addon/addon/jappixmini/jappixmini.php:330 -msgid "Jabber BOSH host URL" -msgstr "Jabber BOSH host URL" +#: ../../view/theme/redbasic_c/php/config.php:115 +msgid "Left align page content" +msgstr "Inhoud links uitlijnen" -#: ../../extend/addon/addon/jappixmini/jappixmini.php:337 -msgid "Jabber password" -msgstr "Wachtwoord Jabber" +#: ../../view/theme/redbasic_c/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:113 +msgid "Set size of conversation author photo" +msgstr "Grootte profielfoto's van berichten instellen" -#: ../../extend/addon/addon/jappixmini/jappixmini.php:343 -msgid "Encrypt Jabber password with Hubzilla password" -msgstr "Versleutel Jabber-wachtwoord met Hubzilla-wachtwoord" +#: ../../view/theme/redbasic_c/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:114 +msgid "Set size of followup author photos" +msgstr "Grootte profielfoto's van reacties instellen" -#: ../../extend/addon/addon/jappixmini/jappixmini.php:347 -#: ../../extend/addon/addon/redred/redred.php:115 -msgid "Hubzilla password" -msgstr "Wachtwoord Hubzilla" +#: ../../addon/rendezvous/rendezvous.php:57 +msgid "Errors encountered deleting database table " +msgstr "Fouten opgetreden tijdens verwijderen databasetabel " -#: ../../extend/addon/addon/jappixmini/jappixmini.php:351 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:355 -msgid "Approve subscription requests from Hubzilla contacts automatically" -msgstr "Approve subscription requests from Hubzilla contacts automatically" +#: ../../addon/rendezvous/rendezvous.php:95 +#: ../../addon/twitter/twitter.php:779 +msgid "Submit Settings" +msgstr "Instellingen toepassen" -#: ../../extend/addon/addon/jappixmini/jappixmini.php:359 -msgid "Purge internal list of jabber addresses of contacts" -msgstr "Purge internal list of jabber addresses of contacts" +#: ../../addon/rendezvous/rendezvous.php:96 +msgid "Drop tables when uninstalling?" +msgstr "Verwijder tabellen tijdens uitschakelen plug-in?" -#: ../../extend/addon/addon/jappixmini/jappixmini.php:364 -msgid "Configuration Help" -msgstr "Configuratiehulp" +#: ../../addon/rendezvous/rendezvous.php:96 +msgid "" +"If checked, the Rendezvous database tables will be deleted when the plugin " +"is uninstalled." +msgstr "Wanneer dit is aangevinkt worden de tabellen in de Rendezvous-database verwijderd wanneer de plug-in wordt uitgeschakeld." -#: ../../extend/addon/addon/jappixmini/jappixmini.php:371 -msgid "Jappix Mini Settings" -msgstr "Jappix Mini" +#: ../../addon/rendezvous/rendezvous.php:97 +msgid "Mapbox Access Token" +msgstr "Toegangstoken " -#: ../../extend/addon/addon/js_upload/js_upload.php:44 -msgid "Upload a file" -msgstr "Bestand uploaden" +#: ../../addon/rendezvous/rendezvous.php:97 +msgid "" +"If you enter a Mapbox access token, it will be used to retrieve map tiles " +"from Mapbox instead of the default OpenStreetMap tile server." +msgstr "De Mapbox-toegangstoken wordt gebruikt om kaarttegels (tiles) van Mapbox op te halen in plaats van de standaard tile-server van OpenStreetMap." -#: ../../extend/addon/addon/js_upload/js_upload.php:45 -msgid "Drop files here to upload" -msgstr "Sleep bestanden hierheen om ze te uploaden" +#: ../../addon/rendezvous/rendezvous.php:162 +msgid "Rendezvous" +msgstr "Rendezvous" -#: ../../extend/addon/addon/js_upload/js_upload.php:47 -msgid "Failed" -msgstr "Mislukt" +#: ../../addon/rendezvous/rendezvous.php:167 +msgid "" +"This identity has been deleted by another member due to inactivity. Please " +"press the \"New identity\" button or refresh the page to register a new " +"identity. You may use the same name." +msgstr "Deze identiteit is door een ander lid verwijderd als gevolg van inactiviteit. Klik op de knop \"Nieuwe identiteit\" of herlaad de pagina om een nieuwe identiteit aan te maken. Je kan eventueel dezelfde naam gebruiken." -#: ../../extend/addon/addon/js_upload/js_upload.php:315 -msgid "No files were uploaded." -msgstr "Er zijn geen bestanden geüpload." +#: ../../addon/rendezvous/rendezvous.php:168 +msgid "Welcome to Rendezvous!" +msgstr "Welkom bij Rendezvous!" -#: ../../extend/addon/addon/js_upload/js_upload.php:322 -msgid "Uploaded file is empty" -msgstr "Geüpload bestand is leeg" +#: ../../addon/rendezvous/rendezvous.php:169 +msgid "" +"Enter your name to join this rendezvous. To begin sharing your location with" +" the other members, tap the GPS control. When your location is discovered, a" +" red dot will appear and others will be able to see you on the map." +msgstr "Vul je naam in om deel te nemen aan deze rendezvous. Om met het delen van je locatie met de andere leden te beginnen, klik je op de locatieknop van je webbrowser. Nadat jouw locatie is gevonden verschijnt er een rode stip en kunnen andere leden jou zien op de kaart." -#: ../../extend/addon/addon/js_upload/js_upload.php:335 -msgid "Image exceeds size limit of " -msgstr "Afbeeldingsgrootte overschrijdt het limiet van " +#: ../../addon/rendezvous/rendezvous.php:171 +msgid "Let's meet here" +msgstr "Laten we elkaar hier ontmoeten" -#: ../../extend/addon/addon/js_upload/js_upload.php:347 -msgid "File has an invalid extension, it should be one of " -msgstr "Bestand heeft een ongeldige extensie. Geldige extensies zijn " +#: ../../addon/rendezvous/rendezvous.php:174 +msgid "New marker" +msgstr "Nieuwe markering" -#: ../../extend/addon/addon/js_upload/js_upload.php:359 -msgid "Upload was cancelled, or server error encountered" -msgstr "Upload werd geannuleerd of er was een serverfout" +#: ../../addon/rendezvous/rendezvous.php:175 +msgid "Edit marker" +msgstr "Markering bewerken" -#: ../../extend/addon/addon/ldapauth/ldapauth.php:61 -msgid "An account has been created for you." -msgstr "Er is voor jou een account aangemaakt." +#: ../../addon/rendezvous/rendezvous.php:176 +msgid "New identity" +msgstr "Nieuwe identiteit" -#: ../../extend/addon/addon/ldapauth/ldapauth.php:68 -msgid "Authentication successful but rejected: account creation is disabled." -msgstr "Authenticatie geslaagd, maar afgekeurd: aanmaken accounts uitgeschakeld." +#: ../../addon/rendezvous/rendezvous.php:177 +msgid "Delete marker" +msgstr "Markering verwijderen" -#: ../../extend/addon/addon/libertree/libertree.php:38 -msgid "Post to Libertree" -msgstr "Libertree" +#: ../../addon/rendezvous/rendezvous.php:178 +msgid "Delete member" +msgstr "Lid verwijderen" -#: ../../extend/addon/addon/libertree/libertree.php:69 -msgid "Enable Libertree Post Plugin" -msgstr "Doorplaatsen naar Libertree inschakelen" +#: ../../addon/rendezvous/rendezvous.php:179 +msgid "Edit proximity alert" +msgstr "Nabijheidswaarschuwing bewerken" -#: ../../extend/addon/addon/libertree/libertree.php:73 -msgid "Libertree API token" -msgstr "API-token Libertree" +#: ../../addon/rendezvous/rendezvous.php:180 +msgid "" +"A proximity alert will be issued when this member is within a certain radius" +" of you.

    Enter a radius in meters (0 to disable):" +msgstr "Een nabijheidswaarschuwing wordt actief wanneer dit lid zich binnen een bepaalde straal rond jouw locatie bevindt.

    Voer het aantal meters van de straal in (0 om uit te schakelen):" -#: ../../extend/addon/addon/libertree/libertree.php:77 -msgid "Libertree site URL" -msgstr "Website-URL Libertree" +#: ../../addon/rendezvous/rendezvous.php:180 +#: ../../addon/rendezvous/rendezvous.php:185 +msgid "distance" +msgstr "afstand" -#: ../../extend/addon/addon/libertree/libertree.php:81 -msgid "Post to Libertree by default" -msgstr "Standaard doorplaatsen naar Libertree" +#: ../../addon/rendezvous/rendezvous.php:181 +msgid "Proximity alert distance (meters)" +msgstr "Afstand nabijheidswaarschuwing (meter)" -#: ../../extend/addon/addon/libertree/libertree.php:85 -msgid "Libertree Post Settings" -msgstr "Libertree (berichten doorplaatsen)" +#: ../../addon/rendezvous/rendezvous.php:182 +#: ../../addon/rendezvous/rendezvous.php:184 +msgid "" +"A proximity alert will be issued when you are within a certain radius of the" +" marker location.

    Enter a radius in meters (0 to disable):" +msgstr "Een nabijheidswaarschuwing wordt actief wanneer je je binnen een bepaalde straal rond een specifieke locatie bevindt.

    Voer het aantal meters van de straal in (0 om uit te schakelen):" -#: ../../extend/addon/addon/libertree/libertree.php:99 -msgid "Libertree Settings saved." -msgstr "Libertree-instellingen opgeslagen." +#: ../../addon/rendezvous/rendezvous.php:183 +msgid "Marker proximity alert" +msgstr "Locatiemarkering nabijheidswaarschuwing" -#: ../../extend/addon/addon/ljpost/ljpost.php:42 -msgid "Post to LiveJournal" -msgstr "LiveJournal" +#: ../../addon/rendezvous/rendezvous.php:186 +msgid "Reminder note" +msgstr "Herinnering" -#: ../../extend/addon/addon/ljpost/ljpost.php:70 -msgid "Enable LiveJournal Post Plugin" -msgstr "Doorplaatsen naar LiveJournal inschakelen" +#: ../../addon/rendezvous/rendezvous.php:187 +msgid "" +"Enter a note to be displayed when you are within the specified proximity..." +msgstr "Vul de tekst in die getoond moet worden wanneer je je op de aangegeven afstand bevindt..." -#: ../../extend/addon/addon/ljpost/ljpost.php:74 -msgid "LiveJournal username" -msgstr "Gebruikersnaam LiveJournal" +#: ../../addon/rendezvous/rendezvous.php:199 +msgid "Add new rendezvous" +msgstr "Nieuwe rendezvous toevoegen" -#: ../../extend/addon/addon/ljpost/ljpost.php:78 -msgid "LiveJournal password" -msgstr "Wachtwoord LiveJournal" +#: ../../addon/rendezvous/rendezvous.php:200 +msgid "" +"Create a new rendezvous and share the access link with those you wish to " +"invite to the group. Those who open the link become members of the " +"rendezvous. They can view other member locations, add markers to the map, or" +" share their own locations with the group." +msgstr "Maak een nieuwe rendezvous aan en deel de toegangslink met wie je wil uitnodigen voor de groep. Wie op de link klikt wordt lid van rendezvous. Zij kunnen dan de locaties zien van andere leden, markeringen aan de kaart toevoegen of hun eigen locaties met de groep delen." -#: ../../extend/addon/addon/ljpost/ljpost.php:82 -msgid "Post to LiveJournal by default" -msgstr "Standaard doorplaatsen naar LiveJournal" +#: ../../addon/rendezvous/rendezvous.php:232 +msgid "You have no rendezvous. Press the button above to create a rendezvous!" +msgstr "Je hebt geen rendezvous. Klik de knop hierboven om een rendezvous aan te maken!" -#: ../../extend/addon/addon/ljpost/ljpost.php:86 -msgid "LiveJournal Post Settings" -msgstr "LiveJournal (berichten doorplaatsen)" +#: ../../addon/skeleton/skeleton.php:59 +msgid "Some setting" +msgstr "Een of andere instelling" -#: ../../extend/addon/addon/ljpost/ljpost.php:101 -msgid "LiveJournal Settings saved." -msgstr "LiveJournal-instellingen opgeslagen." +#: ../../addon/skeleton/skeleton.php:61 +msgid "A setting" +msgstr "Een instelling" -#: ../../extend/addon/addon/logrot/logrot.php:36 -msgid "Logfile archive directory" -msgstr "Logbestand archiefmap" +#: ../../addon/skeleton/skeleton.php:64 +msgid "Skeleton Settings" +msgstr "Plug-in-skeleton" -#: ../../extend/addon/addon/logrot/logrot.php:36 -msgid "Directory to store rotated logs" -msgstr "Map om geroteerde logbestanden in op te slaan" +#: ../../addon/gnusoc/gnusoc.php:249 +msgid "GNU-Social Protocol Settings updated." +msgstr "GNU social-protocol-instellingen bijgewerkt." -#: ../../extend/addon/addon/logrot/logrot.php:37 -msgid "Logfile size in bytes before rotating" -msgstr "Grootte van logbestand in bytes, voordat het wordt geroteerd" +#: ../../addon/gnusoc/gnusoc.php:268 +msgid "" +"The GNU-Social protocol does not support location independence. Connections " +"you make within that network may be unreachable from alternate channel " +"locations." +msgstr "Het GNU social-protocol ondersteunt geen locatieonafhankelijkheid. Connecties die je met dit netwerk maakt zijn mogelijk onbereikbaar vanaf andere kanaallocaties." -#: ../../extend/addon/addon/logrot/logrot.php:38 -msgid "Number of logfiles to retain" -msgstr "Aantal te behouden logbestanden" +#: ../../addon/gnusoc/gnusoc.php:271 +msgid "Enable the GNU-Social protocol for this channel" +msgstr "GNU social-protocol voor dit kanaal inschakelen" -#: ../../extend/addon/addon/mailhost/mailhost.php:36 -msgid "Email notification hub" -msgstr "Hub voor e-mailnotificaties" +#: ../../addon/gnusoc/gnusoc.php:275 +msgid "GNU-Social Protocol Settings" +msgstr "GNU social-protocol" -#: ../../extend/addon/addon/mailhost/mailhost.php:36 -msgid "Hostname" -msgstr "Hostnaam" +#: ../../addon/gnusoc/gnusoc.php:471 +msgid "Follow" +msgstr "Volgen" -#: ../../extend/addon/addon/mailhost/mailhost.php:40 -msgid "Mailhost Settings" -msgstr "Mailhost" +#: ../../addon/gnusoc/gnusoc.php:474 +#, php-format +msgid "%1$s is now following %2$s" +msgstr "%1$s volgt nu %2$s" -#: ../../extend/addon/addon/mailhost/mailhost.php:54 -msgid "MAILHOST Settings saved." -msgstr "Mailhost-instellingen opgeslagen." +#: ../../addon/planets/planets.php:121 +msgid "Planets Settings updated." +msgstr "Planets-instellingen opgeslagen." -#: ../../extend/addon/addon/moremoods/moremoods.php:19 -msgid "lonely" -msgstr "Eenzaam" +#: ../../addon/planets/planets.php:149 +msgid "Enable Planets Plugin" +msgstr "Planets inschakelen" -#: ../../extend/addon/addon/moremoods/moremoods.php:20 -msgid "drunk" -msgstr "dronken" +#: ../../addon/planets/planets.php:153 +msgid "Planets Settings" +msgstr "Planets" -#: ../../extend/addon/addon/moremoods/moremoods.php:21 -msgid "horny" -msgstr "geil" +#: ../../addon/openclipatar/openclipatar.php:50 +#: ../../addon/openclipatar/openclipatar.php:128 +msgid "System defaults:" +msgstr "Systeemstandaarden:" -#: ../../extend/addon/addon/moremoods/moremoods.php:22 -msgid "stoned" -msgstr "stoned" +#: ../../addon/openclipatar/openclipatar.php:54 +msgid "Preferred Clipart IDs" +msgstr "Voorkeursclipart" -#: ../../extend/addon/addon/moremoods/moremoods.php:23 -msgid "fucked up" -msgstr "opgefokt" +#: ../../addon/openclipatar/openclipatar.php:54 +msgid "List of preferred clipart ids. These will be shown first." +msgstr "Lijst met clipartnummers die als eerste moeten worden getoond." -#: ../../extend/addon/addon/moremoods/moremoods.php:24 -msgid "clusterfucked" -msgstr "clusterfucked" +#: ../../addon/openclipatar/openclipatar.php:55 +msgid "Default Search Term" +msgstr "Standaard zoekterm" -#: ../../extend/addon/addon/moremoods/moremoods.php:25 -msgid "crazy" -msgstr "gek" +#: ../../addon/openclipatar/openclipatar.php:55 +msgid "The default search term. These will be shown second." +msgstr "Standaard zoekterm. Deze worden als tweede getoond." -#: ../../extend/addon/addon/moremoods/moremoods.php:26 -msgid "hurt" -msgstr "gekwetst" +#: ../../addon/openclipatar/openclipatar.php:56 +msgid "Return After" +msgstr "Ga na afloop naar" -#: ../../extend/addon/addon/moremoods/moremoods.php:27 -msgid "sleepy" -msgstr "slaperig" +#: ../../addon/openclipatar/openclipatar.php:56 +msgid "Page to load after image selection." +msgstr "Pagina die na het kiezen van een afbeelding moet laden." -#: ../../extend/addon/addon/moremoods/moremoods.php:28 -msgid "grumpy" -msgstr "chagrijnig" +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1300 +#: ../../include/nav.php:119 +msgid "Edit Profile" +msgstr "Profiel bewerken" -#: ../../extend/addon/addon/moremoods/moremoods.php:29 -msgid "high" -msgstr "high" +#: ../../addon/openclipatar/openclipatar.php:59 +msgid "Profile List" +msgstr "Profiellijst" -#: ../../extend/addon/addon/moremoods/moremoods.php:30 -msgid "semi-conscious" -msgstr "half bij kennis" +#: ../../addon/openclipatar/openclipatar.php:61 +msgid "Order of Preferred" +msgstr "Voorkeursclipart sorteren op" -#: ../../extend/addon/addon/moremoods/moremoods.php:31 -msgid "in love" -msgstr "verliefd" +#: ../../addon/openclipatar/openclipatar.php:61 +msgid "Sort order of preferred clipart ids." +msgstr "Als eerste getoonde clipart hierop sorteren." -#: ../../extend/addon/addon/moremoods/moremoods.php:32 -msgid "in lust" -msgstr "wellustig" +#: ../../addon/openclipatar/openclipatar.php:62 +#: ../../addon/openclipatar/openclipatar.php:68 +msgid "Newest first" +msgstr "Nieuwste eerst" -#: ../../extend/addon/addon/moremoods/moremoods.php:33 -msgid "naked" -msgstr "naakt" +#: ../../addon/openclipatar/openclipatar.php:65 +msgid "As entered" +msgstr "Zoals ingevoerd" -#: ../../extend/addon/addon/moremoods/moremoods.php:34 -msgid "stinky" -msgstr "stinkend" +#: ../../addon/openclipatar/openclipatar.php:67 +msgid "Order of other" +msgstr "Overige clipart sorteren op" -#: ../../extend/addon/addon/moremoods/moremoods.php:35 -msgid "sweaty" -msgstr "zweterig" +#: ../../addon/openclipatar/openclipatar.php:67 +msgid "Sort order of other clipart ids." +msgstr "Overige clipart hierop sorteren." -#: ../../extend/addon/addon/moremoods/moremoods.php:36 -msgid "bleeding out" -msgstr "aan het doodbloeden" +#: ../../addon/openclipatar/openclipatar.php:69 +msgid "Most downloaded first" +msgstr "Meest gedownload eerst" -#: ../../extend/addon/addon/moremoods/moremoods.php:37 -msgid "victorious" -msgstr "zegevierend" +#: ../../addon/openclipatar/openclipatar.php:70 +msgid "Most liked first" +msgstr "Meest geliked eerst" -#: ../../extend/addon/addon/moremoods/moremoods.php:38 -msgid "defeated" -msgstr "verslagen" +#: ../../addon/openclipatar/openclipatar.php:72 +msgid "Preferred IDs Message" +msgstr "Tekst voorkeursclipart" -#: ../../extend/addon/addon/moremoods/moremoods.php:39 -msgid "envious" -msgstr "jaloers" +#: ../../addon/openclipatar/openclipatar.php:72 +msgid "Message to display above preferred results." +msgstr "Tekst die bovenaan de resultaten met voorkeursclipart moet worden getoond." -#: ../../extend/addon/addon/moremoods/moremoods.php:40 -msgid "jealous" -msgstr "jaloers" +#: ../../addon/openclipatar/openclipatar.php:78 +msgid "Uploaded by: " +msgstr "Geüpload door: " -#: ../../extend/addon/addon/morepokes/morepokes.php:19 -msgid "bitchslap" -msgstr "bitchslappen" +#: ../../addon/openclipatar/openclipatar.php:78 +msgid "Drawn by: " +msgstr "Getekend door: " -#: ../../extend/addon/addon/morepokes/morepokes.php:19 -msgid "bitchslapped" -msgstr "bitchslapped" +#: ../../addon/openclipatar/openclipatar.php:182 +#: ../../addon/openclipatar/openclipatar.php:194 +msgid "Use this image" +msgstr "Deze afbeelding gebruiken" -#: ../../extend/addon/addon/morepokes/morepokes.php:20 -msgid "shag" -msgstr "wippen" +#: ../../addon/openclipatar/openclipatar.php:192 +msgid "Or select from a free OpenClipart.org image:" +msgstr "Of kies uit een vrije OpenClipart.org-afbeelding:" -#: ../../extend/addon/addon/morepokes/morepokes.php:20 -msgid "shagged" -msgstr "wipte met" +#: ../../addon/openclipatar/openclipatar.php:195 +msgid "Search Term" +msgstr "Zoekterm" -#: ../../extend/addon/addon/morepokes/morepokes.php:21 -msgid "patent" -msgstr "patent" +#: ../../addon/openclipatar/openclipatar.php:232 +msgid "Unknown error. Please try again later." +msgstr "Onbekende fout. Probeer later nog eens." -#: ../../extend/addon/addon/morepokes/morepokes.php:21 -msgid "patented" -msgstr "patented" +#: ../../addon/openclipatar/openclipatar.php:308 +msgid "Profile photo updated successfully." +msgstr "Bijwerken profielfoto geslaagd." -#: ../../extend/addon/addon/morepokes/morepokes.php:22 -msgid "hug" -msgstr "knuffelen" +#: ../../addon/adultphotoflag/adultphotoflag.php:24 +msgid "Flag Adult Photos" +msgstr "Markeer foto's als voor volwassenen" -#: ../../extend/addon/addon/morepokes/morepokes.php:22 -msgid "hugged" -msgstr "knuffelde" +#: ../../addon/adultphotoflag/adultphotoflag.php:25 +msgid "" +"Provide photo edit option to hide inappropriate photos from default album " +"view" +msgstr "Zorgt voor een optie om foto's met inhoud voor volwassenen in de standaard albumweergave te verbergen" -#: ../../extend/addon/addon/morepokes/morepokes.php:23 -msgid "murder" -msgstr "vermoorden" +#: ../../addon/wppost/wppost.php:45 +msgid "Post to WordPress" +msgstr "WordPress" -#: ../../extend/addon/addon/morepokes/morepokes.php:23 -msgid "murdered" -msgstr "vermoorde" +#: ../../addon/wppost/wppost.php:82 +msgid "Enable WordPress Post Plugin" +msgstr "Doorplaatsen naar WordPress inschakelen" -#: ../../extend/addon/addon/morepokes/morepokes.php:24 -msgid "worship" -msgstr "aanbidden" +#: ../../addon/wppost/wppost.php:86 +msgid "WordPress username" +msgstr "Gebruikersnaam WordPress" -#: ../../extend/addon/addon/morepokes/morepokes.php:24 -msgid "worshipped" -msgstr "aanbad" +#: ../../addon/wppost/wppost.php:90 +msgid "WordPress password" +msgstr "Wachtwoord WordPress" -#: ../../extend/addon/addon/morepokes/morepokes.php:25 -msgid "kiss" -msgstr "kussen" +#: ../../addon/wppost/wppost.php:94 +msgid "WordPress API URL" +msgstr "API-URL WordPress" -#: ../../extend/addon/addon/morepokes/morepokes.php:25 -msgid "kissed" -msgstr "kuste" +#: ../../addon/wppost/wppost.php:95 +msgid "Typically https://your-blog.tld/xmlrpc.php" +msgstr "Meestal https://jouw-blog.tld/xmlrpc.php" -#: ../../extend/addon/addon/morepokes/morepokes.php:26 -msgid "tempt" -msgstr "verleiden" +#: ../../addon/wppost/wppost.php:98 +msgid "WordPress blogid" +msgstr "Blog ID WordPress" -#: ../../extend/addon/addon/morepokes/morepokes.php:26 -msgid "tempted" -msgstr "verleidde" +#: ../../addon/wppost/wppost.php:99 +msgid "For multi-user sites such as wordpress.com, otherwise leave blank" +msgstr "Voor websites met meerdere gebruikers, zoals wordpress.com. Anders leeg laten." -#: ../../extend/addon/addon/morepokes/morepokes.php:27 -msgid "raise eyebrows at" -msgstr "wenkbrauwen optrekken" +#: ../../addon/wppost/wppost.php:105 +msgid "Post to WordPress by default" +msgstr "Standaard naar WordPress doorplaatsen" -#: ../../extend/addon/addon/morepokes/morepokes.php:27 -msgid "raised their eyebrows at" -msgstr "trok zijn/haar wenkbrauwen op naar" +#: ../../addon/wppost/wppost.php:109 +msgid "Forward comments (requires hubzilla_wp plugin)" +msgstr "Reacties doorplaatsen (Hubzilla_WP-plug-in vereist)" -#: ../../extend/addon/addon/morepokes/morepokes.php:28 -msgid "insult" -msgstr "beledigen" +#: ../../addon/wppost/wppost.php:113 +msgid "WordPress Post Settings" +msgstr "WordPress (berichten doorplaatsen)" -#: ../../extend/addon/addon/morepokes/morepokes.php:28 -msgid "insulted" -msgstr "beledigde" +#: ../../addon/wppost/wppost.php:129 +msgid "Wordpress Settings saved." +msgstr "WordPress-instellingen opgeslagen." -#: ../../extend/addon/addon/morepokes/morepokes.php:29 -msgid "praise" -msgstr "prijzen" +#: ../../addon/nsfw/nsfw.php:80 +msgid "" +"This plugin looks in posts for the words/text you specify below, and " +"collapses any content containing those keywords so it is not displayed at " +"inappropriate times, such as sexual innuendo that may be improper in a work " +"setting. It is polite and recommended to tag any content containing nudity " +"with #NSFW. This filter can also match any other word/text you specify, and" +" can thereby be used as a general purpose content filter." +msgstr "Deze plug-in controleert berichten op woorden die je hieronder kunt opgeven en klapt berichten in die deze woorden bevatten, zodat die berichten niet op ongeschikte momenten worden getoond. Denk hierbij bijvoorbeeld aan berichten met erotische afbeeldingen, die waarschijnlijk niet geschikt zijn binnen een werkomgeving. Het is beleefd en het wordt aangeraden om zulke berichten met #NSFW te taggen. Dit filter kan ook gebruikt worden met andere woorden en is dus voor alles inzetbaar." -#: ../../extend/addon/addon/morepokes/morepokes.php:29 -msgid "praised" -msgstr "prees" +#: ../../addon/nsfw/nsfw.php:84 +msgid "Enable Content filter" +msgstr "Inhoudsfilter inschakelen" -#: ../../extend/addon/addon/morepokes/morepokes.php:30 -msgid "be dubious of" -msgstr "twijfels hebben" +#: ../../addon/nsfw/nsfw.php:88 +msgid "Comma separated list of keywords to hide" +msgstr "Door komma's gescheiden lijst met woorden die gefilterd moeten worden." -#: ../../extend/addon/addon/morepokes/morepokes.php:30 -msgid "was dubious of" -msgstr "had twijfels over" +#: ../../addon/nsfw/nsfw.php:88 +msgid "Word, /regular-expression/, lang=xx, lang!=xx" +msgstr "Woord, /reguliere expressie/, lang=xx, lang!=xx" -#: ../../extend/addon/addon/morepokes/morepokes.php:31 -msgid "eat" -msgstr "opeten" +#: ../../addon/nsfw/nsfw.php:92 +msgid "Not Safe For Work Settings" +msgstr "Not Safe For Work (inhoudsfilter)" -#: ../../extend/addon/addon/morepokes/morepokes.php:31 -msgid "ate" -msgstr "at" +#: ../../addon/nsfw/nsfw.php:92 +msgid "General Purpose Content Filter" +msgstr "Voor alles te gebruiken inhoudsfilter" -#: ../../extend/addon/addon/morepokes/morepokes.php:32 -msgid "giggle and fawn at" -msgstr "giechelen en vleien" +#: ../../addon/nsfw/nsfw.php:110 +msgid "NSFW Settings saved." +msgstr "NSFW-instellingen opgeslagen." -#: ../../extend/addon/addon/morepokes/morepokes.php:32 -msgid "giggled and fawned at" -msgstr "giechelde naar en vleide met" +#: ../../addon/nsfw/nsfw.php:207 +msgid "Possible adult content" +msgstr "Mogelijk inhoud voor volwassenen" -#: ../../extend/addon/addon/morepokes/morepokes.php:33 -msgid "doubt" -msgstr "betwijfelen" +#: ../../addon/nsfw/nsfw.php:222 +#, php-format +msgid "%s - view" +msgstr "%s - tonen" -#: ../../extend/addon/addon/morepokes/morepokes.php:33 -msgid "doubted" -msgstr "betwijfelde" +#: ../../addon/ijpost/ijpost.php:42 +msgid "Post to Insanejournal" +msgstr "InsaneJournal" -#: ../../extend/addon/addon/morepokes/morepokes.php:34 -msgid "glare" -msgstr "boos kijken" +#: ../../addon/ijpost/ijpost.php:73 +msgid "Enable InsaneJournal Post Plugin" +msgstr "Doorplaatsen naar InsaneJournal inschakelen" -#: ../../extend/addon/addon/morepokes/morepokes.php:34 -msgid "glared at" -msgstr "keek boos naar" +#: ../../addon/ijpost/ijpost.php:77 +msgid "InsaneJournal username" +msgstr "Gebruikersnaam InsaneJournal" -#: ../../extend/addon/addon/morepokes/morepokes.php:35 -msgid "fuck" -msgstr "neuken" +#: ../../addon/ijpost/ijpost.php:81 +msgid "InsaneJournal password" +msgstr "Wachtwoord InsaneJournal" -#: ../../extend/addon/addon/morepokes/morepokes.php:35 -msgid "fucked" -msgstr "neukte" +#: ../../addon/ijpost/ijpost.php:85 +msgid "Post to InsaneJournal by default" +msgstr "Standaard doorplaatsen naar InsaneJournal" -#: ../../extend/addon/addon/morepokes/morepokes.php:36 -msgid "bonk" -msgstr "naaien" +#: ../../addon/ijpost/ijpost.php:89 +msgid "InsaneJournal Post Settings" +msgstr "InsaneJournal (berichten doorplaatsen)" -#: ../../extend/addon/addon/morepokes/morepokes.php:36 -msgid "bonked" -msgstr "naaide" +#: ../../addon/ijpost/ijpost.php:104 +msgid "Insane Journal Settings saved." +msgstr "InsaneJournal-instellingen opgeslagen." -#: ../../extend/addon/addon/morepokes/morepokes.php:37 -msgid "declare undying love for" -msgstr "eeuwige liefde verklaren" +#: ../../addon/dwpost/dwpost.php:42 +msgid "Post to Dreamwidth" +msgstr "Dreamwidth" -#: ../../extend/addon/addon/morepokes/morepokes.php:37 -msgid "declared undying love for" -msgstr "verklaarde de eeuwige liefde aan" +#: ../../addon/dwpost/dwpost.php:73 +msgid "Enable Dreamwidth Post Plugin" +msgstr "Doorplaatsen naar Dreamwidth inschakelen" -#: ../../extend/addon/addon/msgfooter/msgfooter.php:46 -#: ../../extend/addon/addon/xmpp/xmpp.php:91 -msgid "Save Settings" -msgstr "Instellingen opslaan" +#: ../../addon/dwpost/dwpost.php:77 +msgid "Dreamwidth username" +msgstr "Gebruikersnaam Dreamwidth" -#: ../../extend/addon/addon/msgfooter/msgfooter.php:47 -msgid "text to include in all outgoing posts from this site" -msgstr "tekst om onderaan elk uitgaand bericht van deze hub te plaatsen" +#: ../../addon/dwpost/dwpost.php:81 +msgid "Dreamwidth password" +msgstr "Wachtwoord Dreamwidth" -#: ../../extend/addon/addon/nofed/nofed.php:42 -msgid "Federate" -msgstr "Federeren" +#: ../../addon/dwpost/dwpost.php:85 +msgid "Post to Dreamwidth by default" +msgstr "Standaard doorplaatsen naar Dreamwidth" -#: ../../extend/addon/addon/nofed/nofed.php:56 -msgid "nofed Settings saved." -msgstr "Geen federatie-instellingen opgeslagen." +#: ../../addon/dwpost/dwpost.php:89 +msgid "Dreamwidth Post Settings" +msgstr "Dreamwidth (berichten doorplaatsen)" -#: ../../extend/addon/addon/nofed/nofed.php:72 -msgid "Allow Federation Toggle" -msgstr "Federatie toestaan?" +#: ../../addon/notifyadmin/notifyadmin.php:34 +msgid "New registration" +msgstr "Nieuwe registratie" -#: ../../extend/addon/addon/nofed/nofed.php:76 -msgid "Federate posts by default" -msgstr "Standaard berichten federeren" +#: ../../addon/notifyadmin/notifyadmin.php:42 +#, php-format +msgid "Message sent to %s. New account registration: %s" +msgstr "Bericht naar %s verzonden. Nieuwe accountregistratie: %s " -#: ../../extend/addon/addon/nofed/nofed.php:80 -msgid "NoFed Settings" -msgstr "Geen federatie" +#: ../../addon/dirstats/dirstats.php:94 +msgid "Hubzilla Directory Stats" +msgstr "Kanalengidsstatistieken Hubzilla" -#: ../../extend/addon/addon/nsabait/nsabait.php:125 -msgid "Nsabait Settings updated." -msgstr "NSAbait-instellingen bijgewerkt." +#: ../../addon/dirstats/dirstats.php:95 +msgid "Total Hubs" +msgstr "Totaal aantal hubs" -#: ../../extend/addon/addon/nsabait/nsabait.php:157 -msgid "Enable NSAbait Plugin" -msgstr "NSAbait inschakelen" +#: ../../addon/dirstats/dirstats.php:97 +msgid "Hubzilla Hubs" +msgstr "Hubzilla-hubs" -#: ../../extend/addon/addon/nsabait/nsabait.php:161 -msgid "NSAbait Settings" -msgstr "NSAbait" +#: ../../addon/dirstats/dirstats.php:99 +msgid "Friendica Hubs" +msgstr "Friendica-hubs" -#: ../../extend/addon/addon/nsfw/nsfw.php:80 -msgid "" -"This plugin looks in posts for the words/text you specify below, and " -"collapses any content containing those keywords so it is not displayed at " -"inappropriate times, such as sexual innuendo that may be improper in a work " -"setting. It is polite and recommended to tag any content containing nudity " -"with #NSFW. This filter can also match any other word/text you specify, and" -" can thereby be used as a general purpose content filter." -msgstr "Deze plug-in controleert berichten op woorden die je hieronder kunt opgeven en klapt berichten in die deze woorden bevatten, zodat die berichten niet worden weergegeven op ongeschikte momenten. Denk hierbij aan berichten met erotische afbeeldingen, die waarschijnlijk niet geschikt zijn binnen (bijvoorbeeld) een werkomgeving. Het is beleefd en het wordt aangeraden om zulke berichten met #NSFW te taggen. Dit filter kan ook gebruikt worden met andere woorden en is dus voor alles inzetbaar." +#: ../../addon/dirstats/dirstats.php:101 +msgid "Diaspora Pods" +msgstr "Diaspora-pods" -#: ../../extend/addon/addon/nsfw/nsfw.php:84 -msgid "Enable Content filter" -msgstr "Inhoudsfilter inschakelen" +#: ../../addon/dirstats/dirstats.php:103 +msgid "Hubzilla Channels" +msgstr "Hubzilla-kanalen" -#: ../../extend/addon/addon/nsfw/nsfw.php:88 -msgid "Comma separated list of keywords to hide" -msgstr "Door komma's gescheiden lijst met woorden die gefilterd moeten worden." +#: ../../addon/dirstats/dirstats.php:105 +msgid "Friendica Channels" +msgstr "Friendica-kanalen" -#: ../../extend/addon/addon/nsfw/nsfw.php:88 -msgid "Word, /regular-expression/, lang=xx, lang!=xx" -msgstr "Woord, /reguliere expressie/, lang=xx, lang!=xx" +#: ../../addon/dirstats/dirstats.php:107 +msgid "Diaspora Channels" +msgstr "Diaspora-kanalen" -#: ../../extend/addon/addon/nsfw/nsfw.php:92 -msgid "Not Safe For Work Settings" -msgstr "Not Safe For Work (inhoudsfilter)" +#: ../../addon/dirstats/dirstats.php:109 +msgid "Aged 35 and above" +msgstr "Leeftijd is ouder dan 35 jaar" -#: ../../extend/addon/addon/nsfw/nsfw.php:92 -msgid "General Purpose Content Filter" -msgstr "Voor alles te gebruiken inhoudsfilter" +#: ../../addon/dirstats/dirstats.php:111 +msgid "Aged 34 and under" +msgstr "Leeftijd is jonger dan 34" -#: ../../extend/addon/addon/nsfw/nsfw.php:110 -msgid "NSFW Settings saved." -msgstr "NSFW-instellingen opgeslagen." +#: ../../addon/dirstats/dirstats.php:113 +msgid "Average Age" +msgstr "Gemiddelde leeftijd" -#: ../../extend/addon/addon/nsfw/nsfw.php:207 -msgid "Possible adult content" -msgstr "Mogelijk inhoud voor volwassenen" +#: ../../addon/dirstats/dirstats.php:115 +msgid "Known Chatrooms" +msgstr "Bekend aantal chatkanalen" -#: ../../extend/addon/addon/nsfw/nsfw.php:211 -#, php-format -msgid "%s - view" -msgstr "%s - tonen" +#: ../../addon/dirstats/dirstats.php:117 +msgid "Known Tags" +msgstr "Bekend aantal tags" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:50 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:128 -msgid "System defaults:" -msgstr "Systeemstandaarden:" +#: ../../addon/dirstats/dirstats.php:119 +msgid "" +"Please note Diaspora and Friendica statistics are merely those **this " +"directory** is aware of, and not all those known in the network. This also " +"applies to chatrooms," +msgstr "Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network. This also applies to chatrooms," -#: ../../extend/addon/addon/openclipatar/openclipatar.php:54 -msgid "Preferred Clipart IDs" -msgstr "Voorkeursclipart" +#: ../../addon/likebanner/likebanner.php:51 +msgid "Your Webbie:" +msgstr "Jouw kanaaladres:" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:54 -msgid "List of preferred clipart ids. These will be shown first." -msgstr "Lijst met clipartnummers die als eerste moeten worden getoond." +#: ../../addon/likebanner/likebanner.php:54 +msgid "Fontsize (px):" +msgstr "Tekengrootte (px):" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:55 -msgid "Default Search Term" -msgstr "Standaard zoekterm" +#: ../../addon/likebanner/likebanner.php:68 +msgid "Link:" +msgstr "Link:" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:55 -msgid "The default search term. These will be shown second." -msgstr "Standaard zoekterm. Deze worden als tweede getoond." +#: ../../addon/likebanner/likebanner.php:70 +msgid "Like us on Hubzilla" +msgstr "Like ons op Hubzilla" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:56 -msgid "Return After" -msgstr "Ga na afloop naar" +#: ../../addon/likebanner/likebanner.php:72 +msgid "Embed:" +msgstr "Insluiten (embed):" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:56 -msgid "Page to load after image selection." -msgstr "Pagina die na het kiezen van een afbeelding moet laden." +#: ../../addon/redphotos/redphotos.php:106 +msgid "Photos imported" +msgstr "Foto's geïmporteerd" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:58 -#: ../../include/nav.php:107 ../../include/channel.php:1048 -msgid "Edit Profile" -msgstr "Profiel bewerken" +#: ../../addon/redphotos/redphotos.php:129 +msgid "Redmatrix Photo Album Import" +msgstr "Fotoalbums importeren vanuit Redmatrix" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:59 -msgid "Profile List" -msgstr "Profiellijst" +#: ../../addon/redphotos/redphotos.php:130 +msgid "This will import all your Redmatrix photo albums to this channel." +msgstr "Hiermee importeer je al jouw Redmatrix-fotoalbums in dit Hubzilla-kanaal." -#: ../../extend/addon/addon/openclipatar/openclipatar.php:61 -msgid "Order of Preferred" -msgstr "Voorkeursclipart sorteren op" +#: ../../addon/redphotos/redphotos.php:131 +#: ../../addon/redfiles/redfiles.php:121 +msgid "Redmatrix Server base URL" +msgstr "Basis-URL van Redmatrix-hub" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:61 -msgid "Sort order of preferred clipart ids." -msgstr "Als eerste getoonde clipart hierop sorteren." +#: ../../addon/redphotos/redphotos.php:132 +#: ../../addon/redfiles/redfiles.php:122 +msgid "Redmatrix Login Username" +msgstr "Gebruikersnaam Redmatrix" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:62 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:68 -msgid "Newest first" -msgstr "Nieuwste eerst" +#: ../../addon/redphotos/redphotos.php:133 +#: ../../addon/redfiles/redfiles.php:123 +msgid "Redmatrix Login Password" +msgstr "Wachtwoord Redmatrix" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:65 -msgid "As entered" -msgstr "Zoals ingevoerd" +#: ../../addon/redphotos/redphotos.php:134 +msgid "Import just this album" +msgstr "Alleen dit album importeren" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:67 -msgid "Order of other" -msgstr "Overige clipart sorteren op" +#: ../../addon/redphotos/redphotos.php:134 +msgid "Leave blank to import all albums" +msgstr "Laat leeg om alle albums te importeren" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:67 -msgid "Sort order of other clipart ids." -msgstr "Overige clipart hierop sorteren." +#: ../../addon/redphotos/redphotos.php:135 +msgid "Maximum count to import" +msgstr "Maximaal aantal om te importeren" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:69 -msgid "Most downloaded first" -msgstr "Meest gedownload eerst" +#: ../../addon/redphotos/redphotos.php:135 +msgid "0 or blank to import all available" +msgstr "0 of leeg om alles te importeren" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:70 -msgid "Most liked first" -msgstr "Meest geliked eerst" +#: ../../addon/irc/irc.php:45 +msgid "Channels to auto connect" +msgstr "Kanalen om automatisch mee te verbinden" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:72 -msgid "Preferred IDs Message" -msgstr "Tekst voorkeursclipart" +#: ../../addon/irc/irc.php:45 ../../addon/irc/irc.php:49 +msgid "Comma separated list" +msgstr "Door komma's gescheiden lijst" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:72 -msgid "Message to display above preferred results." -msgstr "Tekst die bovenaan de resultaten met voorkeursclipart moet worden getoond." +#: ../../addon/irc/irc.php:49 ../../addon/irc/irc.php:96 +msgid "Popular Channels" +msgstr "Populaire chatkanalen" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:78 -msgid "Uploaded by: " -msgstr "Geüpload door: " +#: ../../addon/irc/irc.php:53 +msgid "IRC Settings" +msgstr "IRC" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:78 -msgid "Drawn by: " -msgstr "Getekend door: " +#: ../../addon/irc/irc.php:69 +msgid "IRC settings saved." +msgstr "IRC-instellingen opgeslagen." -#: ../../extend/addon/addon/openclipatar/openclipatar.php:192 -msgid "Or select from a free OpenClipart.org image:" -msgstr "Of kies uit een vrije OpenClipart.org-afbeelding:" +#: ../../addon/irc/irc.php:74 +msgid "IRC Chatroom" +msgstr "IRC-chatkanaal" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:195 -msgid "Search Term" -msgstr "Zoekterm" +#: ../../addon/ljpost/ljpost.php:42 +msgid "Post to LiveJournal" +msgstr "LiveJournal" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:232 -msgid "Unknown error. Please try again later." -msgstr "Onbekende fout. Probeer later nog eens." +#: ../../addon/ljpost/ljpost.php:70 +msgid "Enable LiveJournal Post Plugin" +msgstr "Doorplaatsen naar LiveJournal inschakelen" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:308 -msgid "Profile photo updated successfully." -msgstr "Bijwerken profielfoto geslaagd." +#: ../../addon/ljpost/ljpost.php:74 +msgid "LiveJournal username" +msgstr "Gebruikersnaam LiveJournal" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:146 -msgid "View Larger" -msgstr "Groter tonen" +#: ../../addon/ljpost/ljpost.php:78 +msgid "LiveJournal password" +msgstr "Wachtwoord LiveJournal" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:169 -msgid "Tile Server URL" -msgstr "URL tile-server" +#: ../../addon/ljpost/ljpost.php:82 +msgid "Post to LiveJournal by default" +msgstr "Standaard doorplaatsen naar LiveJournal" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:169 -msgid "" -"A list of public tile servers" -msgstr "Een lijst met openbare tile-servers" +#: ../../addon/ljpost/ljpost.php:86 +msgid "LiveJournal Post Settings" +msgstr "LiveJournal (berichten doorplaatsen)" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:170 -msgid "Nominatim (reverse geocoding) Server URL" -msgstr "Server-URL Nominatim (reverse geocoding)" +#: ../../addon/ljpost/ljpost.php:101 +msgid "LiveJournal Settings saved." +msgstr "LiveJournal-instellingen opgeslagen." -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:170 +#: ../../addon/openid/openid.php:49 msgid "" -"A list of Nominatim servers" -msgstr "Een lijst met Nominatim-servers" +"We encountered a problem while logging in with the OpenID you provided. " +"Please check the correct spelling of the ID." +msgstr "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten." -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:171 -msgid "Default zoom" -msgstr "Standaard zoomniveau" +#: ../../addon/openid/openid.php:49 +msgid "The error message was:" +msgstr "Foutmelding was:" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:171 -msgid "" -"The default zoom level. (1:world, 18:highest, also depends on tile server)" -msgstr "Standaard zoomniveau. Van 1 (wereld) t/m 18 (maximaal). Is ook afhankelijk van tile-server." +#: ../../addon/openid/MysqlProvider.php:52 +msgid "First Name" +msgstr "Voornaam" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:172 -msgid "Include marker on map" -msgstr "Markering op kaart plaatsen" +#: ../../addon/openid/MysqlProvider.php:53 +msgid "Last Name" +msgstr "Achternaam" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:172 -msgid "Include a marker on the map." -msgstr "Plaatst een markering op de kaart." +#: ../../addon/openid/MysqlProvider.php:54 ../../addon/redred/redred.php:111 +msgid "Nickname" +msgstr "Bijnaam" -#: ../../extend/addon/addon/pageheader/pageheader.php:43 -msgid "Message to display on every page on this server" -msgstr "Bericht om op elke pagina van deze hub weer te geven" +#: ../../addon/openid/MysqlProvider.php:55 +msgid "Full Name" +msgstr "Volledige naam" -#: ../../extend/addon/addon/pageheader/pageheader.php:48 -msgid "Pageheader Settings" -msgstr "Pageheader" +#: ../../addon/openid/MysqlProvider.php:61 +msgid "Profile Photo 16px" +msgstr "Profielfoto 16px" -#: ../../extend/addon/addon/pageheader/pageheader.php:64 -msgid "pageheader Settings saved." -msgstr "Pageheader-instellingen opgeslagen." +#: ../../addon/openid/MysqlProvider.php:62 +msgid "Profile Photo 32px" +msgstr "Profielfoto 32px" -#: ../../extend/addon/addon/piwik/piwik.php:85 -msgid "" -"This website is tracked using the Piwik " -"analytics tool." -msgstr "Het bezoek aan deze website wordt gemeten door Piwik." +#: ../../addon/openid/MysqlProvider.php:63 +msgid "Profile Photo 48px" +msgstr "Profielfoto 48px" -#: ../../extend/addon/addon/piwik/piwik.php:88 -#, php-format -msgid "" -"If you do not want that your visits are logged this way you can" -" set a cookie to prevent Piwik from tracking further visits of the site " -"(opt-out)." -msgstr "Wanneer je niet wil dat jouw bezoek aan deze website wordt bijgehouden, kan je een cookie achterlaten om te verhinderen dat Piwik jou op deze website blijft volgen (opt-out)." +#: ../../addon/openid/MysqlProvider.php:64 +msgid "Profile Photo 64px" +msgstr "Profielfoto 64px" -#: ../../extend/addon/addon/piwik/piwik.php:96 -msgid "Piwik Base URL" -msgstr "Basis-URL Piwik" +#: ../../addon/openid/MysqlProvider.php:65 +msgid "Profile Photo 80px" +msgstr "Profielfoto 80px" -#: ../../extend/addon/addon/piwik/piwik.php:96 -msgid "" -"Absolute path to your Piwik installation. (without protocol (http/s), with " -"trailing slash)" -msgstr "Absoluut pad naar jouw Piwik-installatie (zonder protocol (http/s), met een slash op het einde)" +#: ../../addon/openid/MysqlProvider.php:66 +msgid "Profile Photo 128px" +msgstr "Profielfoto 128px" -#: ../../extend/addon/addon/piwik/piwik.php:97 -msgid "Site ID" -msgstr "Site ID" +#: ../../addon/openid/MysqlProvider.php:67 +msgid "Timezone" +msgstr "Tijdzone" -#: ../../extend/addon/addon/piwik/piwik.php:98 -msgid "Show opt-out cookie link?" -msgstr "Toon opt-out cookie-link?" +#: ../../addon/openid/MysqlProvider.php:70 +msgid "Birth Year" +msgstr "Geboortejaar" -#: ../../extend/addon/addon/piwik/piwik.php:99 -msgid "Asynchronous tracking" -msgstr "Asynchroon volgen" +#: ../../addon/openid/MysqlProvider.php:71 +msgid "Birth Month" +msgstr "Geboortemaand" -#: ../../extend/addon/addon/piwik/piwik.php:100 -msgid "Enable frontend JavaScript error tracking" -msgstr "Volgen van front-end JavaScript-fouten inschakelen" +#: ../../addon/openid/MysqlProvider.php:72 +msgid "Birth Day" +msgstr "Geboortedag" -#: ../../extend/addon/addon/piwik/piwik.php:100 -msgid "This feature requires Piwik >= 2.2.0" -msgstr "Deze functie vereist Piwik >= 2.2.0" +#: ../../addon/openid/MysqlProvider.php:73 +msgid "Birthdate" +msgstr "Geboortedatum" -#: ../../extend/addon/addon/planets/planets.php:121 -msgid "Planets Settings updated." -msgstr "Planets-instellingen opgeslagen." +#: ../../addon/openid/Mod_Openid.php:30 +msgid "OpenID protocol error. No ID returned." +msgstr "OpenID-protocolfout. Geen ID terugontvangen." -#: ../../extend/addon/addon/planets/planets.php:153 -msgid "Enable Planets Plugin" -msgstr "Planets inschakelen" +#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:300 +msgid "Login failed." +msgstr "Inloggen mislukt." + +#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 +#: ../../include/selectors.php:66 ../../include/channel.php:1480 +msgid "Male" +msgstr "Man" -#: ../../extend/addon/addon/planets/planets.php:157 -msgid "Planets Settings" -msgstr "Planets" +#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 +#: ../../include/selectors.php:66 ../../include/channel.php:1478 +msgid "Female" +msgstr "Vrouw" -#: ../../extend/addon/addon/pumpio/pumpio.php:148 -msgid "You are now authenticated to pumpio." -msgstr "De verbinding met pump.io is geverifieerd" +#: ../../addon/randpost/randpost.php:97 +msgid "You're welcome." +msgstr "Je bent van harte welkom." -#: ../../extend/addon/addon/pumpio/pumpio.php:149 -msgid "return to the featured settings page" -msgstr "Ga terug naar pagina met plugin-instellingen" +#: ../../addon/randpost/randpost.php:98 +msgid "Ah shucks..." +msgstr "Hé verdorie..." -#: ../../extend/addon/addon/pumpio/pumpio.php:163 -msgid "Post to Pump.io" -msgstr "Pump.io" +#: ../../addon/randpost/randpost.php:99 +msgid "Don't mention it." +msgstr "Graag gedaan." -#: ../../extend/addon/addon/pumpio/pumpio.php:198 -msgid "Pump.io servername" -msgstr "Pump.io-servernaam" +#: ../../addon/randpost/randpost.php:100 +msgid "<blush>" +msgstr "" -#: ../../extend/addon/addon/pumpio/pumpio.php:198 -msgid "Without \"http://\" or \"https://\"" -msgstr "Zonder \"http://\" of \"https://\"" +#: ../../addon/startpage/startpage.php:109 +msgid "Page to load after login" +msgstr "Pagina die na het inloggen getoond moet worden" -#: ../../extend/addon/addon/pumpio/pumpio.php:202 -msgid "Pump.io username" -msgstr "Gebruikersnaam Pump.io" +#: ../../addon/startpage/startpage.php:109 +msgid "" +"Examples: "apps", "network?f=&gid=37" (privacy " +"collection), "channel" or "notifications/system" (leave " +"blank for default network page (grid)." +msgstr "Voorbeelden: "apps", "network?f=&gid=37" (privacygroep), "channel" of "notifications/system" (laat leeg voor de standaard netwerkpagina (activiteiten)." -#: ../../extend/addon/addon/pumpio/pumpio.php:202 -msgid "Without the servername" -msgstr "Zonder servernaam" +#: ../../addon/startpage/startpage.php:113 +msgid "Startpage Settings" +msgstr "Startpagina" -#: ../../extend/addon/addon/pumpio/pumpio.php:213 -msgid "You are not authenticated to pumpio" -msgstr "De verbinding met pump.io is niet geverifieerd" +#: ../../addon/morepokes/morepokes.php:19 +msgid "bitchslap" +msgstr "bitchslappen" -#: ../../extend/addon/addon/pumpio/pumpio.php:215 -msgid "(Re-)Authenticate your pump.io connection" -msgstr "Verifieer (opnieuw) jouw pump.io-verbinding" +#: ../../addon/morepokes/morepokes.php:19 +msgid "bitchslapped" +msgstr "bitchslapped" -#: ../../extend/addon/addon/pumpio/pumpio.php:219 -msgid "Enable pump.io Post Plugin" -msgstr "Doorplaatsen naar Pump.io inschakelen" +#: ../../addon/morepokes/morepokes.php:20 +msgid "shag" +msgstr "wippen" -#: ../../extend/addon/addon/pumpio/pumpio.php:223 -msgid "Post to pump.io by default" -msgstr "Standaard doorplaatsen naar Pump.io" +#: ../../addon/morepokes/morepokes.php:20 +msgid "shagged" +msgstr "wipte met" -#: ../../extend/addon/addon/pumpio/pumpio.php:227 -msgid "Should posts be public" -msgstr "Moeten berichten openbaar zijn" +#: ../../addon/morepokes/morepokes.php:21 +msgid "patent" +msgstr "patent" -#: ../../extend/addon/addon/pumpio/pumpio.php:231 -msgid "Mirror all public posts" -msgstr "Alle openbare berichten doorplaatsen" +#: ../../addon/morepokes/morepokes.php:21 +msgid "patented" +msgstr "patented" -#: ../../extend/addon/addon/pumpio/pumpio.php:237 -msgid "Pump.io Post Settings" -msgstr "Pump.io (berichten doorplaatsen)" +#: ../../addon/morepokes/morepokes.php:22 +msgid "hug" +msgstr "knuffelen" -#: ../../extend/addon/addon/pumpio/pumpio.php:266 -msgid "PumpIO Settings saved." -msgstr "Pump.io-instellingen opgeslagen." +#: ../../addon/morepokes/morepokes.php:22 +msgid "hugged" +msgstr "knuffelde" -#: ../../extend/addon/addon/qrator/qrator.php:48 -msgid "QR code" -msgstr "QR-code" +#: ../../addon/morepokes/morepokes.php:23 +msgid "murder" +msgstr "vermoorden" -#: ../../extend/addon/addon/qrator/qrator.php:63 -msgid "QR Generator" -msgstr "QR-code-generator" +#: ../../addon/morepokes/morepokes.php:23 +msgid "murdered" +msgstr "vermoorde" -#: ../../extend/addon/addon/qrator/qrator.php:64 -msgid "Enter some text" -msgstr "Vul wat tekst in" +#: ../../addon/morepokes/morepokes.php:24 +msgid "worship" +msgstr "aanbidden" -#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81 -msgid "Enable Rainbowtag" -msgstr "Rainbowtag inschakelen" +#: ../../addon/morepokes/morepokes.php:24 +msgid "worshipped" +msgstr "aanbad" -#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85 -msgid "Rainbowtag Settings" -msgstr "Rainbowtag" +#: ../../addon/morepokes/morepokes.php:25 +msgid "kiss" +msgstr "kussen" -#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:101 -msgid "Rainbowtag Settings saved." -msgstr "Rainbowtag-instellingen opgeslagen." +#: ../../addon/morepokes/morepokes.php:25 +msgid "kissed" +msgstr "kuste" -#: ../../extend/addon/addon/randpost/randpost.php:97 -msgid "You're welcome." -msgstr "Je bent van harte welkom." +#: ../../addon/morepokes/morepokes.php:26 +msgid "tempt" +msgstr "verleiden" -#: ../../extend/addon/addon/randpost/randpost.php:98 -msgid "Ah shucks..." -msgstr "Hé verdorie..." +#: ../../addon/morepokes/morepokes.php:26 +msgid "tempted" +msgstr "verleidde" -#: ../../extend/addon/addon/randpost/randpost.php:99 -msgid "Don't mention it." -msgstr "Graag gedaan." +#: ../../addon/morepokes/morepokes.php:27 +msgid "raise eyebrows at" +msgstr "wenkbrauwen optrekken" -#: ../../extend/addon/addon/randpost/randpost.php:100 -msgid "<blush>" -msgstr "" +#: ../../addon/morepokes/morepokes.php:27 +msgid "raised their eyebrows at" +msgstr "trok zijn/haar wenkbrauwen op naar" -#: ../../extend/addon/addon/redfiles/redfiles.php:119 -msgid "Redmatrix File Storage Import" -msgstr "Importeer bestanden vanuit Redmatrix" +#: ../../addon/morepokes/morepokes.php:28 +msgid "insult" +msgstr "beledigen" -#: ../../extend/addon/addon/redfiles/redfiles.php:120 -msgid "This will import all your Redmatrix cloud files to this channel." -msgstr "Hiermee importeer je al jouw Redmatrix-bestanden in dit kanaal." +#: ../../addon/morepokes/morepokes.php:28 +msgid "insulted" +msgstr "beledigde" -#: ../../extend/addon/addon/redfiles/redfiles.php:121 -#: ../../extend/addon/addon/redphotos/redphotos.php:131 -msgid "Redmatrix Server base URL" -msgstr "Basis-URL van Redmatrix-hub" +#: ../../addon/morepokes/morepokes.php:29 +msgid "praise" +msgstr "prijzen" -#: ../../extend/addon/addon/redfiles/redfiles.php:122 -#: ../../extend/addon/addon/redphotos/redphotos.php:132 -msgid "Redmatrix Login Username" -msgstr "Gebruikersnaam Redmatrix" +#: ../../addon/morepokes/morepokes.php:29 +msgid "praised" +msgstr "prees" -#: ../../extend/addon/addon/redfiles/redfiles.php:123 -#: ../../extend/addon/addon/redphotos/redphotos.php:133 -msgid "Redmatrix Login Password" -msgstr "Wachtwoord Redmatrix" +#: ../../addon/morepokes/morepokes.php:30 +msgid "be dubious of" +msgstr "twijfels hebben" -#: ../../extend/addon/addon/redfiles/redfilehelper.php:67 -msgid "file" -msgstr "bestand" +#: ../../addon/morepokes/morepokes.php:30 +msgid "was dubious of" +msgstr "had twijfels over" -#: ../../extend/addon/addon/redphotos/redphotos.php:106 -msgid "Photos imported" -msgstr "Foto's geïmporteerd" +#: ../../addon/morepokes/morepokes.php:31 +msgid "eat" +msgstr "opeten" -#: ../../extend/addon/addon/redphotos/redphotos.php:129 -msgid "Redmatrix Photo Album Import" -msgstr "Fotoalbums importeren vanuit Redmatrix" +#: ../../addon/morepokes/morepokes.php:31 +msgid "ate" +msgstr "at" -#: ../../extend/addon/addon/redphotos/redphotos.php:130 -msgid "This will import all your Redmatrix photo albums to this channel." -msgstr "Hiermee importeer je al jouw Redmatrix-fotoalbums in dit Hubzilla-kanaal." +#: ../../addon/morepokes/morepokes.php:32 +msgid "giggle and fawn at" +msgstr "giechelen en vleien" -#: ../../extend/addon/addon/redphotos/redphotos.php:134 -msgid "Import just this album" -msgstr "Alleen dit album importeren" +#: ../../addon/morepokes/morepokes.php:32 +msgid "giggled and fawned at" +msgstr "giechelde naar en vleide met" -#: ../../extend/addon/addon/redphotos/redphotos.php:134 -msgid "Leave blank to import all albums" -msgstr "Laat leeg om alle albums te importeren" +#: ../../addon/morepokes/morepokes.php:33 +msgid "doubt" +msgstr "betwijfelen" -#: ../../extend/addon/addon/redphotos/redphotos.php:135 -msgid "Maximum count to import" -msgstr "Maximaal aantal om te importeren" +#: ../../addon/morepokes/morepokes.php:33 +msgid "doubted" +msgstr "betwijfelde" -#: ../../extend/addon/addon/redphotos/redphotos.php:135 -msgid "0 or blank to import all available" -msgstr "0 of leeg om alles te importeren" +#: ../../addon/morepokes/morepokes.php:34 +msgid "glare" +msgstr "boos kijken" -#: ../../extend/addon/addon/redred/redred.php:45 -msgid "Post to Red" -msgstr "Hubzilla" +#: ../../addon/morepokes/morepokes.php:34 +msgid "glared at" +msgstr "keek boos naar" -#: ../../extend/addon/addon/redred/redred.php:60 -msgid "Channel is required." -msgstr "Een kanaal is vereist." +#: ../../addon/morepokes/morepokes.php:35 +msgid "fuck" +msgstr "neuken" -#: ../../extend/addon/addon/redred/redred.php:76 -msgid "redred Settings saved." -msgstr "RedRed-instellingen opgeslagen." +#: ../../addon/morepokes/morepokes.php:35 +msgid "fucked" +msgstr "neukte" -#: ../../extend/addon/addon/redred/redred.php:95 -msgid "Allow posting to another Hubzilla Channel" -msgstr "Doorplaatsen naar een ander Hubzilla-kanaal toestaan" +#: ../../addon/morepokes/morepokes.php:36 +msgid "bonk" +msgstr "naaien" -#: ../../extend/addon/addon/redred/redred.php:99 -msgid "Send public postings to Hubzilla channel by default" -msgstr "Standaard doorplaatsen naar een ander Hubzilla-kanaal toestaan" +#: ../../addon/morepokes/morepokes.php:36 +msgid "bonked" +msgstr "naaide" -#: ../../extend/addon/addon/redred/redred.php:103 -msgid "Hubzilla API Path" -msgstr "API-pad Hubzilla" +#: ../../addon/morepokes/morepokes.php:37 +msgid "declare undying love for" +msgstr "eeuwige liefde verklaren" -#: ../../extend/addon/addon/redred/redred.php:103 -#: ../../extend/addon/addon/rtof/rtof.php:89 -msgid "https://{sitename}/api" -msgstr "https://{hubnaam}/api" +#: ../../addon/morepokes/morepokes.php:37 +msgid "declared undying love for" +msgstr "verklaarde de eeuwige liefde aan" -#: ../../extend/addon/addon/redred/redred.php:107 -msgid "Hubzilla login name" -msgstr "Gebruikersnaam Hubzilla" +#: ../../addon/diaspora/diaspora.php:781 +msgid "Diaspora Protocol Settings updated." +msgstr "Diaspora-protocol-instellingen bijgewerkt." -#: ../../extend/addon/addon/redred/redred.php:111 -msgid "Hubzilla channel name" -msgstr "Kanaalnaam Hubzilla" +#: ../../addon/diaspora/diaspora.php:800 +msgid "" +"The Diaspora protocol does not support location independence. Connections " +"you make within that network may be unreachable from alternate channel " +"locations." +msgstr "Het Diaspora-protocol ondersteunt geen locatieonafhankelijkheid. Connecties die je met dit netwerk maakt zijn mogelijk onbereikbaar vanaf andere kanaallocaties." -#: ../../extend/addon/addon/redred/redred.php:111 -#: ../../extend/addon/addon/openid/MysqlProvider.php:54 -msgid "Nickname" -msgstr "Bijnaam" +#: ../../addon/diaspora/diaspora.php:803 +msgid "Enable the Diaspora protocol for this channel" +msgstr "Diaspora-protocol voor dit kanaal inschakelen" -#: ../../extend/addon/addon/redred/redred.php:119 -msgid "Hubzilla Crosspost Settings" -msgstr "Hubzilla (berichten doorplaatsen)" +#: ../../addon/diaspora/diaspora.php:807 +msgid "Allow any Diaspora member to comment on your public posts" +msgstr "Sta toe dat elk Diaspora-lid op jouw openbare berichten kan reageren." -#: ../../extend/addon/addon/rtof/rtof.php:45 -msgid "Post to Friendica" -msgstr "Friendica" +#: ../../addon/diaspora/diaspora.php:811 +msgid "Prevent your hashtags from being redirected to other sites" +msgstr "Voorkom dat jouw hashtags naar andere websites worden doorverwezen" -#: ../../extend/addon/addon/rtof/rtof.php:62 -msgid "rtof Settings saved." -msgstr "RTOF-instellingen opgeslagen." +#: ../../addon/diaspora/diaspora.php:815 +msgid "" +"Sign and forward posts and comments with no existing Diaspora signature" +msgstr "Berichten en reacties met geen bestaande Diaspora-handtekening ondertekenen en doorsturen" -#: ../../extend/addon/addon/rtof/rtof.php:81 -msgid "Allow posting to Friendica" -msgstr "Doorplaatsen naar Friendica toestaan" +#: ../../addon/diaspora/diaspora.php:820 +msgid "Followed hashtags (comma separated, do not include the #)" +msgstr "Gevolgde hashtags (door komma's gescheiden lijst, zonder de #)" -#: ../../extend/addon/addon/rtof/rtof.php:85 -msgid "Send public postings to Friendica by default" -msgstr "Standaard doorplaatsen naar Friendica" +#: ../../addon/diaspora/diaspora.php:825 +msgid "Diaspora Protocol Settings" +msgstr "Diaspora-protocol (incl. Friendica)" -#: ../../extend/addon/addon/rtof/rtof.php:89 -msgid "Friendica API Path" -msgstr "API-pad Friendica" +#: ../../addon/diaspora/import_diaspora.php:16 +msgid "No username found in import file." +msgstr "Geen gebruikersnaam in het importbestand gevonden." -#: ../../extend/addon/addon/rtof/rtof.php:93 -msgid "Friendica login name" -msgstr "Gebruikersnaam Friendica" +#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:67 +msgid "Unable to create a unique channel address. Import failed." +msgstr "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt." -#: ../../extend/addon/addon/rtof/rtof.php:97 -msgid "Friendica password" -msgstr "Wachtwoord Friendica" +#: ../../addon/testdrive/testdrive.php:104 +#, php-format +msgid "Your account on %s will expire in a few days." +msgstr "Jouw account op %s verloopt over een paar dagen. " -#: ../../extend/addon/addon/rtof/rtof.php:101 -msgid "Hubzilla to Friendica Post Settings" -msgstr "Friendica (berichten doorplaatsen)" +#: ../../addon/testdrive/testdrive.php:105 +msgid "Your $Productname test account is about to expire." +msgstr "Jouw $Productname-testaccount staat op het punt om te verlopen." -#: ../../extend/addon/addon/sendzid/sendzid.php:25 -msgid "Extended Identity Sharing" -msgstr "Uitgebreid identiteit delen" +#: ../../addon/rainbowtag/rainbowtag.php:81 +msgid "Enable Rainbowtag" +msgstr "Rainbowtag inschakelen" -#: ../../extend/addon/addon/sendzid/sendzid.php:26 -msgid "" -"Share your identity with all websites on the internet. When disabled, " -"identity is only shared with sites in the matrix." -msgstr "Deel jouw Hubzilla-identiteit met alle websites op het internet. Wanneer dit is uitgeschakeld wordt je identiteit alleen binnen het Hubzilla-netwerk gedeeld. Schakel dit alleen in als je weet wat je doet." +#: ../../addon/rainbowtag/rainbowtag.php:85 +msgid "Rainbowtag Settings" +msgstr "Rainbowtag" -#: ../../extend/addon/addon/skeleton/skeleton.php:59 -msgid "Some setting" -msgstr "Een of andere instelling" +#: ../../addon/rainbowtag/rainbowtag.php:101 +msgid "Rainbowtag Settings saved." +msgstr "Rainbowtag-instellingen opgeslagen." -#: ../../extend/addon/addon/skeleton/skeleton.php:61 -msgid "A setting" -msgstr "Een instelling" +#: ../../addon/upload_limits/upload_limits.php:25 +msgid "Show Upload Limits" +msgstr "Uploadlimieten tonen" -#: ../../extend/addon/addon/skeleton/skeleton.php:64 -msgid "Skeleton Settings" -msgstr "Plugin-skeleton" +#: ../../addon/upload_limits/upload_limits.php:27 +msgid "Hubzilla configured maximum size: " +msgstr "Op Hubzilla configureerde maximale grootte: " -#: ../../extend/addon/addon/smileybutton/smileybutton.php:273 -msgid "Deactivate the feature" -msgstr "Deze functie uitschakelen" +#: ../../addon/upload_limits/upload_limits.php:28 +msgid "PHP upload_max_filesize: " +msgstr "PHP upload_max_filesize: " + +#: ../../addon/upload_limits/upload_limits.php:29 +msgid "PHP post_max_size (must be larger than upload_max_filesize): " +msgstr "PHP post_max_size (moet hoger zijn dan upload_max_filesize): " -#: ../../extend/addon/addon/smileybutton/smileybutton.php:277 -msgid "Hide the button and show the smilies directly." -msgstr "Verberg de knop en toon de smilies direct." +#: ../../addon/gravatar/gravatar.php:123 +msgid "generic profile image" +msgstr "Algemene profielfoto" -#: ../../extend/addon/addon/smileybutton/smileybutton.php:281 -msgid "Smileybutton Settings" -msgstr "Smileyknop" +#: ../../addon/gravatar/gravatar.php:124 +msgid "random geometric pattern" +msgstr "Willekeurig geometrisch patroon" -#: ../../extend/addon/addon/startpage/startpage.php:109 -msgid "Page to load after login" -msgstr "Pagina die na het inloggen getoond moet worden" +#: ../../addon/gravatar/gravatar.php:125 +msgid "monster face" +msgstr "monstergezicht" -#: ../../extend/addon/addon/startpage/startpage.php:109 -msgid "" -"Examples: "apps", "network?f=&gid=37" (privacy " -"collection), "channel" or "notifications/system" (leave " -"blank for default network page (grid)." -msgstr "Voorbeelden: "apps", "network?f=&gid=37" (privacygroep), "channel" of "notifications/system" (laat leeg voor de standaard netwerkpagina (grid)." +#: ../../addon/gravatar/gravatar.php:126 +msgid "computer generated face" +msgstr "computergegenereerd gezicht" -#: ../../extend/addon/addon/startpage/startpage.php:113 -msgid "Startpage Settings" -msgstr "Startpagina" +#: ../../addon/gravatar/gravatar.php:127 +msgid "retro arcade style face" +msgstr "retro-arcadestijlgezicht" -#: ../../extend/addon/addon/statusnet/statusnet.php:143 -msgid "Post to GNU social" -msgstr "GNU social" +#: ../../addon/gravatar/gravatar.php:128 +msgid "Hub default profile photo" +msgstr "Standaard profielfoto hub" -#: ../../extend/addon/addon/statusnet/statusnet.php:195 +#: ../../addon/gravatar/gravatar.php:143 +msgid "Information" +msgstr "Informatie" + +#: ../../addon/gravatar/gravatar.php:143 msgid "" -"Please contact your site administrator.
    The provided API URL is not " -"valid." -msgstr "De verstrekte API-URL is ongeldig.
    Neem contact op met jouw hubbeheerder." +"Libravatar addon is installed, too. Please disable Libravatar addon or this " +"Gravatar addon.
    The Libravatar addon will fall back to Gravatar if " +"nothing was found at Libravatar." +msgstr "De Libravatar-plug-in is ook geïnstalleerd. Schakel de Libravatar of deze Gravatar-plug-in uit.
    De Libravatar-plug-in valt terug op Gravatar wanneer er niks op Libravatar wordt gevonden." -#: ../../extend/addon/addon/statusnet/statusnet.php:232 -msgid "We could not contact the GNU social API with the Path you entered." -msgstr "Wij konden de GNU social-API niet bereiken door middel van het ingevulde pad." +#: ../../addon/gravatar/gravatar.php:150 +#: ../../addon/msgfooter/msgfooter.php:46 ../../addon/xmpp/xmpp.php:91 +msgid "Save Settings" +msgstr "Instellingen opslaan" -#: ../../extend/addon/addon/statusnet/statusnet.php:266 -msgid "GNU social settings updated." -msgstr "GNU social-instellingen bijgewerkt." +#: ../../addon/gravatar/gravatar.php:151 +msgid "Default avatar image" +msgstr "Standaard avatar" -#: ../../extend/addon/addon/statusnet/statusnet.php:310 -msgid "Globally Available GNU social OAuthKeys" -msgstr "Op de gehele hub te gebruiken GNU social OAuthkeys." +#: ../../addon/gravatar/gravatar.php:151 +msgid "Select default avatar image if none was found at Gravatar. See README" +msgstr "Kies een standaard avatar wanneer niets op Gravatar wordt gevonden. Zie README" -#: ../../extend/addon/addon/statusnet/statusnet.php:312 -msgid "" -"There are preconfigured OAuth key pairs for some GNU social servers " -"available. If you are using one of them, please use these credentials.
    If not feel free to connect to any other GNU social instance (see below)." -msgstr "Er zijn op deze hub enkele voorgeconfigureerde OAuthkey-paren voor GNU social servers beschikbaar. Wanneer je een van deze servers gebruikt, gebruik dan deze voorgeconfigureerde gegevens.
    Wanneer dit niet het geval is, maak dan gerust met een andere GNU social-server verbinding (zie hieronder)." +#: ../../addon/gravatar/gravatar.php:152 +msgid "Rating of images" +msgstr "Beoordeling van afbeeldingen" -#: ../../extend/addon/addon/statusnet/statusnet.php:327 -msgid "Provide your own OAuth Credentials" -msgstr "Verstrek jouw eigen OAuth-gegevens" +#: ../../addon/gravatar/gravatar.php:152 +msgid "Select the appropriate avatar rating for your site. See README" +msgstr "Kies een toepasselijke avatarrating voor jouw hub. Zie README" -#: ../../extend/addon/addon/statusnet/statusnet.php:329 -msgid "" -"No consumer key pair for GNU social found. Register your Hubzilla Account as" -" an desktop client on your GNU social account, copy the consumer key pair " -"here and enter the API base root.
    Before you register your own OAuth " -"key pair ask the administrator if there is already a key pair for this " -"Hubzilla installation at your favourite GNU social installation." -msgstr "Geen consumerkey voor GNU social gevonden. Registreer jouw Hubzilla-account als een desktopclient in jouw GNU-social-account, kopieer en plak hier de consumerkey en de consumersecret, en vul de API-base-root in.
    Voordat je jouw eigen OAuthkey-paar registreert, vraag dan eerst aan jouw hubbeheerder of er al een key-paar voor deze hub op jouw favoriete GNU social-server bestaat." +#: ../../addon/gravatar/gravatar.php:165 +msgid "Gravatar settings updated." +msgstr "Gravatar-instellingen bijgewerkt." -#: ../../extend/addon/addon/statusnet/statusnet.php:333 -msgid "OAuth Consumer Key" -msgstr "OAuth-consumerkey" +#: ../../addon/hzfiles/hzfiles.php:79 +msgid "Hubzilla File Storage Import" +msgstr "Importeer bestanden vanuit Hubzilla" -#: ../../extend/addon/addon/statusnet/statusnet.php:337 -msgid "OAuth Consumer Secret" -msgstr "Oauth-consumersecret" +#: ../../addon/hzfiles/hzfiles.php:80 +msgid "This will import all your cloud files from another server." +msgstr "Hiermee importeer je al jouw bestanden vanaf een andere hub." -#: ../../extend/addon/addon/statusnet/statusnet.php:341 -msgid "Base API Path" -msgstr "Basispad API" +#: ../../addon/hzfiles/hzfiles.php:81 +msgid "Hubzilla Server base URL" +msgstr "Basis-URL van Hubzilla-server" -#: ../../extend/addon/addon/statusnet/statusnet.php:341 -msgid "Remember the trailing /" -msgstr "Vergeet niet de afsluitende /" +#: ../../addon/hzfiles/hzfiles.php:82 +msgid "Since modified date yyyy-mm-dd" +msgstr "Sinds de aangepaste datum jjjj-mm-dd" -#: ../../extend/addon/addon/statusnet/statusnet.php:345 -msgid "GNU social application name" -msgstr "Naam GNU social-applicatie" +#: ../../addon/hzfiles/hzfiles.php:83 +msgid "Until modified date yyyy-mm-dd" +msgstr "Tot de aangepaste datum jjjj-mm-dd" -#: ../../extend/addon/addon/statusnet/statusnet.php:368 -msgid "" -"To connect to your GNU social account click the button below to get a " -"security code from GNU social which you have to copy into the input box " -"below and submit the form. Only your public posts will be " -"posted to GNU social." -msgstr "Om jouw GNU social-account te koppelen klik je op de knop hieronder. Je krijgt dan een veiligheidscode van GNU social die je kan kopiëren en dan hieronder in het invulveld kan plakken. Vervolgens klik je op Opslaan. Alleen jouw openbare berichten kunnen worden doorgeplaatst naar GNU social." +#: ../../addon/visage/visage.php:93 +msgid "Recent Channel/Profile Viewers" +msgstr "Recente bezoekers van jouw kanaal/profiel" -#: ../../extend/addon/addon/statusnet/statusnet.php:370 -msgid "Log in with GNU social" -msgstr "Inloggen op " +#: ../../addon/visage/visage.php:98 +msgid "This plugin/addon has not been configured." +msgstr "Deze plug-in is niet geconfigureerd. " -#: ../../extend/addon/addon/statusnet/statusnet.php:373 -msgid "Copy the security code from GNU social here" -msgstr "Plak de veiligheidscode van GNU social hier" +#: ../../addon/visage/visage.php:99 +#, php-format +msgid "Please visit the Visage settings on %s" +msgstr "Bezoek de Visage-instellingen op %s" -#: ../../extend/addon/addon/statusnet/statusnet.php:383 -msgid "Cancel Connection Process" -msgstr "Annuleer het verbindingsproces" +#: ../../addon/visage/visage.php:99 +msgid "your feature settings page" +msgstr "Jouw plug-in-instellingen" -#: ../../extend/addon/addon/statusnet/statusnet.php:385 -msgid "Current GNU social API is" -msgstr "Huidige GNU social-API is" +#: ../../addon/visage/visage.php:112 +msgid "No entries." +msgstr "Niets aanwezig." -#: ../../extend/addon/addon/statusnet/statusnet.php:389 -msgid "Cancel GNU social Connection" -msgstr "Annuleer de GNU social-verbinding" +#: ../../addon/visage/visage.php:166 +msgid "Enable Visage Visitor Logging" +msgstr "Visage inschakelen " -#: ../../extend/addon/addon/statusnet/statusnet.php:401 -#: ../../extend/addon/addon/twitter/twitter.php:232 -msgid "Currently connected to: " -msgstr "Momenteel gekoppeld aan: " +#: ../../addon/visage/visage.php:170 +msgid "Visage Settings" +msgstr "Visage" -#: ../../extend/addon/addon/statusnet/statusnet.php:406 -msgid "" -"Note: Due your privacy settings (Hide your profile " -"details from unknown viewers?) the link potentially included in public " -"postings relayed to GNU social will lead the visitor to a blank page " -"informing the visitor that the access to your profile has been restricted." -msgstr "Opmerking: In verband met jouw privacyinstellingen (wanneer jouw kanaalprofiel voor onbekenden is verborgen) leidt de profiellink die mogelijk in jouw naar GNU social doorgestuurde openbare berichten staat, naar een lege pagina met de melding dat toegang tot jouw kanaalprofiel is beperkt." +#: ../../addon/nsabait/nsabait.php:125 +msgid "Nsabait Settings updated." +msgstr "NSAbait-instellingen bijgewerkt." -#: ../../extend/addon/addon/statusnet/statusnet.php:411 -msgid "Allow posting to GNU social" -msgstr "Doorplaatsen naar GNU social toestaan" +#: ../../addon/nsabait/nsabait.php:157 +msgid "Enable NSAbait Plugin" +msgstr "NSAbait inschakelen" -#: ../../extend/addon/addon/statusnet/statusnet.php:411 -msgid "" -"If enabled your public postings can be posted to the associated GNU-social " -"account" -msgstr "Wanneer dit is ingeschakeld kunnen jouw openbare berichten naar het gekoppelde Twitter-account worden doorgeplaatst" +#: ../../addon/nsabait/nsabait.php:161 +msgid "NSAbait Settings" +msgstr "NSAbait" -#: ../../extend/addon/addon/statusnet/statusnet.php:415 -msgid "Post to GNU social by default" -msgstr "Standaard doorplaatsen naar GNU social" +#: ../../addon/mailtest/mailtest.php:19 +msgid "Send test email" +msgstr "Test-e-mail versturen" -#: ../../extend/addon/addon/statusnet/statusnet.php:415 -msgid "" -"If enabled your public postings will be posted to the associated GNU-social " -"account by default" -msgstr "Wanneer dit is ingeschakeld worden al jouw openbare berichten standaard naar het gekoppelde GNU social-account doorgeplaatst" +#: ../../addon/mailtest/mailtest.php:50 ../../addon/hubwall/hubwall.php:50 +msgid "No recipients found." +msgstr "Geen ontvangers gevonden" -#: ../../extend/addon/addon/statusnet/statusnet.php:424 -#: ../../extend/addon/addon/twitter/twitter.php:255 -msgid "Clear OAuth configuration" -msgstr "OAuth-configuratie wissen" +#: ../../addon/mailtest/mailtest.php:66 +msgid "Mail sent." +msgstr "E-mail verzonden." -#: ../../extend/addon/addon/statusnet/statusnet.php:432 -msgid "GNU social Post Settings" -msgstr "GNU social (berichten doorplaatsen)" +#: ../../addon/mailtest/mailtest.php:68 +msgid "Sending of mail failed." +msgstr "Verzenden van e-mail mislukt." -#: ../../extend/addon/addon/statusnet/statusnet.php:891 -msgid "API URL" -msgstr "API-URL" +#: ../../addon/mailtest/mailtest.php:77 +msgid "Mail Test" +msgstr "E-mailtest" -#: ../../extend/addon/addon/statusnet/statusnet.php:894 -msgid "Application name" -msgstr "Naam applicatie" +#: ../../addon/mailtest/mailtest.php:96 ../../addon/hubwall/hubwall.php:92 +msgid "Message subject" +msgstr "Onderwerp e-mailbericht" -#: ../../extend/addon/addon/superblock/superblock.php:112 -msgid "Currently blocked" -msgstr "Momenteel geblokkeerd" +#: ../../addon/mdpost/mdpost.php:41 +msgid "Use markdown for editing posts" +msgstr "Sta het gebruik van markdown toe om berichten te bewerken" -#: ../../extend/addon/addon/superblock/superblock.php:114 -msgid "No channels currently blocked" -msgstr "Momenteel geen kanalen geblokkeerd" +#: ../../addon/openstreetmap/openstreetmap.php:146 +msgid "View Larger" +msgstr "Groter tonen" -#: ../../extend/addon/addon/superblock/superblock.php:120 -msgid "\"Superblock\" Settings" -msgstr "Superblock" +#: ../../addon/openstreetmap/openstreetmap.php:169 +msgid "Tile Server URL" +msgstr "URL tile-server" -#: ../../extend/addon/addon/superblock/superblock.php:345 -msgid "Block Completely" -msgstr "Volledig blokkeren" +#: ../../addon/openstreetmap/openstreetmap.php:169 +msgid "" +"A list of public tile servers" +msgstr "Een lijst met openbare tile-servers" -#: ../../extend/addon/addon/superblock/superblock.php:394 -msgid "superblock settings updated" -msgstr "Superblock-instellingen bijgewerkt" +#: ../../addon/openstreetmap/openstreetmap.php:170 +msgid "Nominatim (reverse geocoding) Server URL" +msgstr "Server-URL Nominatim (reverse geocoding)" -#: ../../extend/addon/addon/testdrive/testdrive.php:104 -#, php-format -msgid "Your account on %s will expire in a few days." -msgstr "Jouw account op %s verloopt over een paar dagen. " +#: ../../addon/openstreetmap/openstreetmap.php:170 +msgid "" +"A list of Nominatim servers" +msgstr "Een lijst met Nominatim-servers" -#: ../../extend/addon/addon/testdrive/testdrive.php:105 -msgid "Your $Productname test account is about to expire." -msgstr "Jouw $Productname-testaccount staat op het punt om te verlopen." +#: ../../addon/openstreetmap/openstreetmap.php:171 +msgid "Default zoom" +msgstr "Standaard zoomniveau" -#: ../../extend/addon/addon/tictac/tictac.php:21 -msgid "Three Dimensional Tic-Tac-Toe" -msgstr "Driedimensionaal Boter-kaas-en-eieren" +#: ../../addon/openstreetmap/openstreetmap.php:171 +msgid "" +"The default zoom level. (1:world, 18:highest, also depends on tile server)" +msgstr "Standaard zoomniveau. Van 1 (wereld) t/m 18 (maximaal). Is ook afhankelijk van tile-server." -#: ../../extend/addon/addon/tictac/tictac.php:54 -msgid "3D Tic-Tac-Toe" -msgstr "Boter-kaas-en-eieren in 3D" +#: ../../addon/openstreetmap/openstreetmap.php:172 +msgid "Include marker on map" +msgstr "Markering op kaart plaatsen" -#: ../../extend/addon/addon/tictac/tictac.php:59 -msgid "New game" -msgstr "Nieuw spel" +#: ../../addon/openstreetmap/openstreetmap.php:172 +msgid "Include a marker on the map." +msgstr "Plaatst een markering op de kaart." -#: ../../extend/addon/addon/tictac/tictac.php:60 -msgid "New game with handicap" -msgstr "Nieuw spel met handicap" +#: ../../addon/msgfooter/msgfooter.php:47 +msgid "text to include in all outgoing posts from this site" +msgstr "tekst om onderaan elk uitgaand bericht van deze hub te plaatsen" -#: ../../extend/addon/addon/tictac/tictac.php:61 -msgid "" -"Three dimensional tic-tac-toe is just like the traditional game except that " -"it is played on multiple levels simultaneously. " -msgstr "Driedimensionaal Boter-kaas-en-eieren is hetzelfde als het klassieke spel, behalve dat het gelijktijdig op meerdere hoogtes wordt gespeeld." +#: ../../addon/fuzzloc/fuzzloc.php:148 +msgid "Fuzzloc Settings updated." +msgstr "Fuzzloc-instellingen bijgewerkt." -#: ../../extend/addon/addon/tictac/tictac.php:62 +#: ../../addon/fuzzloc/fuzzloc.php:175 msgid "" -"In this case there are three levels. You win by getting three in a row on " -"any level, as well as up, down, and diagonally across the different levels." -msgstr "In dit geval zijn er drie hoogtes. Je wint wanneer je drie op een rij hebt op een van de drie hoogtes, van boven naar beneden of diagonaal." +"Fuzzloc allows you to blur your precise location if your channel uses " +"browser location mapping." +msgstr "Fuzzloc stelt je in staat om jouw exacte locatie te verhullen, wanneer jouw kanaal browserlocatie-mapping gebruikt." -#: ../../extend/addon/addon/tictac/tictac.php:64 -msgid "" -"The handicap game disables the center position on the middle level because " -"the player claiming this square often has an unfair advantage." -msgstr "Het spel met een handicap schakelt de middelste positie op de middelste hoogte uit, omdat de speler die deze positie krijgt vaak een oneerlijk voordeel geniet." +#: ../../addon/fuzzloc/fuzzloc.php:178 +msgid "Enable Fuzzloc Plugin" +msgstr "Fuzzloc inschakelen" -#: ../../extend/addon/addon/tictac/tictac.php:183 -msgid "You go first..." -msgstr "Jij bent eerst..." +#: ../../addon/fuzzloc/fuzzloc.php:182 +msgid "Minimum offset in meters" +msgstr "Minimum offset in meters" -#: ../../extend/addon/addon/tictac/tictac.php:188 -msgid "I'm going first this time..." -msgstr "Ik ga deze keer eerst..." +#: ../../addon/fuzzloc/fuzzloc.php:186 +msgid "Maximum offset in meters" +msgstr "Maximum offset in meters" -#: ../../extend/addon/addon/tictac/tictac.php:194 -msgid "You won!" -msgstr "Jij wint!" +#: ../../addon/fuzzloc/fuzzloc.php:191 +msgid "Fuzzloc Settings" +msgstr "Fuzzloc" -#: ../../extend/addon/addon/tictac/tictac.php:200 -#: ../../extend/addon/addon/tictac/tictac.php:225 -msgid "\"Cat\" game!" -msgstr "Gelijkspel!" +#: ../../addon/rtof/rtof.php:45 +msgid "Post to Friendica" +msgstr "Friendica" -#: ../../extend/addon/addon/tictac/tictac.php:223 -msgid "I won!" -msgstr "Ik win!" +#: ../../addon/rtof/rtof.php:62 +msgid "rtof Settings saved." +msgstr "RTOF-instellingen opgeslagen." -#: ../../extend/addon/addon/tour/tour.php:75 -msgid "Edit your profile and change settings." -msgstr "Jouw profiel bewerken en instellingen veranderen." +#: ../../addon/rtof/rtof.php:81 +msgid "Allow posting to Friendica" +msgstr "Doorplaatsen naar Friendica toestaan" -#: ../../extend/addon/addon/tour/tour.php:76 -msgid "Click here to see activity from your connections." -msgstr "Klik hier voor een tijdlijn met berichten en overige activiteiten van jouw connecties." +#: ../../addon/rtof/rtof.php:85 +msgid "Send public postings to Friendica by default" +msgstr "Standaard doorplaatsen naar Friendica" -#: ../../extend/addon/addon/tour/tour.php:77 -msgid "Click here to see your channel home." -msgstr "Klik hier voor de tijdlijn van jouw eigen kanaal." +#: ../../addon/rtof/rtof.php:89 +msgid "Friendica API Path" +msgstr "API-pad Friendica" -#: ../../extend/addon/addon/tour/tour.php:78 -msgid "You can access your private messages from here." -msgstr "Hiermee krijg je toegang tot jouw privéberichten." +#: ../../addon/rtof/rtof.php:89 ../../addon/redred/redred.php:103 +msgid "https://{sitename}/api" +msgstr "https://{hubnaam}/api" -#: ../../extend/addon/addon/tour/tour.php:79 -msgid "Create new events here." -msgstr "Nieuwe gebeurtenissen kan je hier aanmaken." +#: ../../addon/rtof/rtof.php:93 +msgid "Friendica login name" +msgstr "Gebruikersnaam Friendica" -#: ../../extend/addon/addon/tour/tour.php:80 -msgid "" -"You can accept new connections and change permissions for existing ones " -"here. You can also e.g. create groups of contacts." -msgstr "Hier kan je nieuwe connecties accepteren en instellingen van bestaande connecties wijzigen. Je kan hier bijv. ook privacygroepen aanmaken." +#: ../../addon/rtof/rtof.php:97 +msgid "Friendica password" +msgstr "Wachtwoord Friendica" -#: ../../extend/addon/addon/tour/tour.php:81 -msgid "System notifications will arrive here" -msgstr "Systeemnotificaties komen hier tevoorschijn" +#: ../../addon/rtof/rtof.php:101 +msgid "Hubzilla to Friendica Post Settings" +msgstr "Friendica (berichten doorplaatsen)" -#: ../../extend/addon/addon/tour/tour.php:82 -msgid "Search for content and users" -msgstr "Zoek hier naar tekst in berichten of naar andere kanalen." +#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1396 +#: ../../include/channel.php:1567 +msgid "Status:" +msgstr "Status:" -#: ../../extend/addon/addon/tour/tour.php:83 -msgid "Browse for new contacts" -msgstr "Blader hier in een gids met kanalen, die je toe kan voegen als connectie." +#: ../../addon/jappixmini/jappixmini.php:309 +msgid "Activate addon" +msgstr "Plug-in inschakelen" -#: ../../extend/addon/addon/tour/tour.php:84 -msgid "Launch installed apps" -msgstr "Open (op deze hub) geïnstalleerde apps." +#: ../../addon/jappixmini/jappixmini.php:313 +msgid "Hide Jappixmini Chat-Widget from the webinterface" +msgstr "Hide Jappixmini Chat-Widget from the webinterface" -#: ../../extend/addon/addon/tour/tour.php:85 -msgid "Looking for help? Click here." -msgstr "Zoek je hulp? Klik dan hier." +#: ../../addon/jappixmini/jappixmini.php:318 +msgid "Jabber username" +msgstr "Gebruikersnaam Jabber" -#: ../../extend/addon/addon/tour/tour.php:86 -msgid "" -"New events have occurred in your network. Click here to see what has " -"happened!" -msgstr "Er is iets nieuws gebeurd in jouw netwerk. Klik hier om te zien wat precies." +#: ../../addon/jappixmini/jappixmini.php:324 +msgid "Jabber server" +msgstr "Jabberserver" -#: ../../extend/addon/addon/tour/tour.php:87 -msgid "You have received a new private message. Click here to see from who!" -msgstr "Je hebt een nieuw privébericht ontvangen. Klik hier om te zien van wie." +#: ../../addon/jappixmini/jappixmini.php:330 +msgid "Jabber BOSH host URL" +msgstr "Jabber BOSH host URL" + +#: ../../addon/jappixmini/jappixmini.php:337 +msgid "Jabber password" +msgstr "Wachtwoord Jabber" + +#: ../../addon/jappixmini/jappixmini.php:343 +msgid "Encrypt Jabber password with Hubzilla password" +msgstr "Versleutel Jabber-wachtwoord met Hubzilla-wachtwoord" -#: ../../extend/addon/addon/tour/tour.php:88 -msgid "There are events this week. Click here too see which!" -msgstr "Er vinden deze week gebeurtenissen plaats. Klik hier om te zien welke dit zijn." +#: ../../addon/jappixmini/jappixmini.php:347 ../../addon/redred/redred.php:115 +msgid "Hubzilla password" +msgstr "Wachtwoord Hubzilla" -#: ../../extend/addon/addon/tour/tour.php:89 -msgid "You have received a new introduction. Click here to see who!" -msgstr "Je hebt een nieuw connectieverzoek ontvangen. Klik hier om te kijken van wie." +#: ../../addon/jappixmini/jappixmini.php:351 +#: ../../addon/jappixmini/jappixmini.php:355 +msgid "Approve subscription requests from Hubzilla contacts automatically" +msgstr "Approve subscription requests from Hubzilla contacts automatically" -#: ../../extend/addon/addon/tour/tour.php:90 -msgid "" -"There is a new system notification. Click here to see what has happened!" -msgstr "Er is een nieuwe systeemnotificatie. Klik hier om te zien wat er aan de hand is." +#: ../../addon/jappixmini/jappixmini.php:359 +msgid "Purge internal list of jabber addresses of contacts" +msgstr "Purge internal list of jabber addresses of contacts" -#: ../../extend/addon/addon/tour/tour.php:93 -msgid "Click here to share text, images, videos and sound." -msgstr "Klik hier om tekst, afbeeldingen, video en audio te delen." +#: ../../addon/jappixmini/jappixmini.php:364 +msgid "Configuration Help" +msgstr "Configuratiehulp" -#: ../../extend/addon/addon/tour/tour.php:94 -msgid "You can write an optional title for your update (good for long posts)." -msgstr "Je kan een titel voor je nieuwe bericht verzinnen, maar dit is niet verplicht. Vooral goed voor langere berichten." +#: ../../addon/jappixmini/jappixmini.php:371 +msgid "Jappix Mini Settings" +msgstr "Jappix Mini" -#: ../../extend/addon/addon/tour/tour.php:95 -msgid "Entering some categories here makes it easier to find your post later." -msgstr "Het invullen van enkele categorieën, maakt het later terugvinden van je berichten gemakkelijker. Dit is niet verplicht." +#: ../../addon/superblock/superblock.php:112 +msgid "Currently blocked" +msgstr "Momenteel geblokkeerd" -#: ../../extend/addon/addon/tour/tour.php:96 -msgid "Share photos, links, location, etc." -msgstr "Deel foto's, links, locaties, enz." +#: ../../addon/superblock/superblock.php:114 +msgid "No channels currently blocked" +msgstr "Momenteel geen kanalen geblokkeerd" -#: ../../extend/addon/addon/tour/tour.php:97 -msgid "" -"Only want to share content for a while? Make it expire at a certain date." -msgstr "Wil je alleen iets tot een bepaald moment delen? Dan kan je het hiermee op een bepaalde datum en tijd laten verlopen." +#: ../../addon/superblock/superblock.php:120 +msgid "Superblock Settings" +msgstr "Superblock" -#: ../../extend/addon/addon/tour/tour.php:98 -msgid "You can password protect content." -msgstr "Je kan met een wachtwoord gegevens beveiligen." +#: ../../addon/superblock/superblock.php:345 +msgid "Block Completely" +msgstr "Volledig blokkeren" -#: ../../extend/addon/addon/tour/tour.php:99 -msgid "Choose who you share with." -msgstr "Kies met wie je dit wil delen. " +#: ../../addon/superblock/superblock.php:394 +msgid "superblock settings updated" +msgstr "Superblock-instellingen bijgewerkt" -#: ../../extend/addon/addon/tour/tour.php:101 -msgid "Click here when you are done." -msgstr "Klik hier wanneer je klaar bent." +#: ../../addon/nofed/nofed.php:42 +msgid "Federate" +msgstr "Federeren" -#: ../../extend/addon/addon/tour/tour.php:104 -msgid "Adjust from which channels posts should be displayed." -msgstr "Aanpassen van welke kanalen berichten moeten worden getoond. " +#: ../../addon/nofed/nofed.php:56 +msgid "nofed Settings saved." +msgstr "Geen federatie-instellingen opgeslagen." -#: ../../extend/addon/addon/tour/tour.php:105 -msgid "Only show posts from channels in the specified privacy group." -msgstr "Toon alleen berichten van kanalen in de hier gekozen privacygroep." +#: ../../addon/nofed/nofed.php:72 +msgid "Allow Federation Toggle" +msgstr "Federatie toestaan?" -#: ../../extend/addon/addon/tour/tour.php:109 -msgid "Easily find posts containing tags (keywords preceded by the \"#\" symbol)." -msgstr "Vind gemakkelijk berichten met tags (trefwoorden die beginnen met een \"#\")." +#: ../../addon/nofed/nofed.php:76 +msgid "Federate posts by default" +msgstr "Standaard berichten federeren" -#: ../../extend/addon/addon/tour/tour.php:110 -msgid "Easily find posts in given category." -msgstr "Vind gemakkelijk berichten in een bepaalde categorie." +#: ../../addon/nofed/nofed.php:80 +msgid "NoFed Settings" +msgstr "Geen federatie" -#: ../../extend/addon/addon/tour/tour.php:111 -msgid "Easily find posts by date." -msgstr "Vind gemakkelijk berichten op datum." +#: ../../addon/redred/redred.php:45 +msgid "Post to Red" +msgstr "Hubzilla" -#: ../../extend/addon/addon/tour/tour.php:112 -msgid "" -"Suggested users who have volounteered to be shown as suggestions, and who we" -" think you might find interesting." -msgstr "Voorstellen voor kanalen die wellicht interessant voor jou zijn en hier ook vrijwillig voor hebben gekozen." +#: ../../addon/redred/redred.php:60 +msgid "Channel is required." +msgstr "Een kanaal is vereist." -#: ../../extend/addon/addon/tour/tour.php:113 -msgid "Here you see channels you have connected to." -msgstr "Hier kan je zien met welke kanalen je bent verbonden (connecties)." +#: ../../addon/redred/redred.php:76 +msgid "redred Settings saved." +msgstr "RedRed-instellingen opgeslagen." -#: ../../extend/addon/addon/tour/tour.php:114 -msgid "Save your search so you can repeat it at a later date." -msgstr "Sla jouw zoekopdracht op, zodat je het later opnieuw kan gebruiken." +#: ../../addon/redred/redred.php:95 +msgid "Allow posting to another Hubzilla Channel" +msgstr "Doorplaatsen naar een ander Hubzilla-kanaal toestaan" -#: ../../extend/addon/addon/tour/tour.php:117 -msgid "" -"If you see this icon you can be sure that the sender is who it say it is. It" -" is normal that it is not always possible to verify the sender, so the icon " -"will be missing sometimes. There is usually no need to worry about that." -msgstr "Wanneer je dit pictogram ziet, kan je er van uitgaan dat de afzender is wie hij/zij beweert te zijn. Het is niet altijd mogelijk om de afzender te verifiëren, waardoor het pictogram soms ontbreekt. Dit is meestal geen reden voor ongerustheid." +#: ../../addon/redred/redred.php:99 +msgid "Send public postings to Hubzilla channel by default" +msgstr "Standaard doorplaatsen naar een ander Hubzilla-kanaal toestaan" -#: ../../extend/addon/addon/tour/tour.php:118 -msgid "" -"Danger! It seems someone tried to forge a message! This message is not " -"necessarily from who it says it is from!" -msgstr "Gevaar! Het lijkt er op dat iemand een bericht heeft proberen te vervalsen! Dit bericht is mogelijk niet afkomstig van de vermelde afzender!" +#: ../../addon/redred/redred.php:103 +msgid "Hubzilla API Path" +msgstr "API-pad Hubzilla" -#: ../../extend/addon/addon/tour/tour.php:125 -msgid "" -"Welcome to Hubzilla! Would you like to see a tour of the UI?

    You can " -"pause it at any time and continue where you left off by reloading the page, " -"or navigting to another page.

    You can also advance by pressing the " -"return key" -msgstr "Welkom op Hubzilla! Wil jij een rondleiding hebben langs de gebruikersinterface?

    Je kan dit op elk moment pauzeren en weer hervatten door de pagina te herladen of naar een andere pagina te gaan.

    Je kan ook vooruitgaan met behulp van de entertoets." +#: ../../addon/redred/redred.php:107 +msgid "Hubzilla login name" +msgstr "Gebruikersnaam Hubzilla" -#: ../../extend/addon/addon/twitter/twitter.php:99 -msgid "Post to Twitter" -msgstr "Twitter" +#: ../../addon/redred/redred.php:111 +msgid "Hubzilla channel name" +msgstr "Kanaalnaam Hubzilla" -#: ../../extend/addon/addon/twitter/twitter.php:154 -msgid "Twitter settings updated." -msgstr "Twitter-instellingen bijgewerkt." +#: ../../addon/redred/redred.php:119 +msgid "Hubzilla Crosspost Settings" +msgstr "Hubzilla (berichten doorplaatsen)" -#: ../../extend/addon/addon/twitter/twitter.php:183 -msgid "" -"No consumer key pair for Twitter found. Please contact your site " -"administrator." -msgstr "Geen consumerkeys voor Twitter gevonden. Neem contact op met jouw hubbeheerder." +#: ../../addon/logrot/logrot.php:36 +msgid "Logfile archive directory" +msgstr "Logbestand archiefmap" -#: ../../extend/addon/addon/twitter/twitter.php:205 -msgid "" -"At this Hubzilla instance the Twitter plugin was enabled but you have not " -"yet connected your account to your Twitter account. To do so click the " -"button below to get a PIN from Twitter which you have to copy into the input" -" box below and submit the form. Only your public posts will" -" be posted to Twitter." -msgstr "De Twitter-plugin is op deze Hubzilla-hub ingeschakeld, maar je hebt nog niet jouw Hubzilla-kanaal met jouw Twitter-account gekoppeld. Om dit te doen klik je op de knop hieronder om een PIN-code van Twitter te krijgen. Deze dien je te kopiëren en in het invoegveld beneden te plakken. Vervolgens klik je op Opslaan. Alleen jouw openbare berichten kunnen op Twitter worden geplaatst." +#: ../../addon/logrot/logrot.php:36 +msgid "Directory to store rotated logs" +msgstr "Map om geroteerde logbestanden in op te slaan" -#: ../../extend/addon/addon/twitter/twitter.php:207 -msgid "Log in with Twitter" -msgstr "Op Twitter inloggen" +#: ../../addon/logrot/logrot.php:37 +msgid "Logfile size in bytes before rotating" +msgstr "Grootte van logbestand in bytes, voordat het wordt geroteerd" -#: ../../extend/addon/addon/twitter/twitter.php:210 -msgid "Copy the PIN from Twitter here" -msgstr "Plak of type de PIN-code hier" +#: ../../addon/logrot/logrot.php:38 +msgid "Number of logfiles to retain" +msgstr "Aantal te behouden logbestanden" -#: ../../extend/addon/addon/twitter/twitter.php:237 -msgid "" -"Note: Due your privacy settings (Hide your profile " -"details from unknown viewers?) the link potentially included in public " -"postings relayed to Twitter will lead the visitor to a blank page informing " -"the visitor that the access to your profile has been restricted." -msgstr "Opmerking: In verband met jouw privacyinstellingen (wanneer jouw kanaalprofiel voor onbekenden is verborgen) leidt de profiellink die mogelijk in jouw naar Twitter doorgestuurde openbare berichten staat, naar een lege pagina met de melding dat toegang tot jouw kanaalprofiel is beperkt." +#: ../../addon/frphotos/frphotos.php:92 +msgid "Friendica Photo Album Import" +msgstr "Fotoalbums importeren vanuit Friendica" -#: ../../extend/addon/addon/twitter/twitter.php:242 -msgid "Allow posting to Twitter" -msgstr "Doorplaatsen naar Twitter toestaan" +#: ../../addon/frphotos/frphotos.php:93 +msgid "This will import all your Friendica photo albums to this Red channel." +msgstr "Hiermee importeer je al jouw Friendica-fotoalbums in dit Hubzilla-kanaal." -#: ../../extend/addon/addon/twitter/twitter.php:242 -msgid "" -"If enabled your public postings can be posted to the associated Twitter " -"account" -msgstr "Wanneer dit is ingeschakeld kunnen jouw openbare berichten naar het gekoppelde Twitter-account worden doorgeplaatst" +#: ../../addon/frphotos/frphotos.php:94 +msgid "Friendica Server base URL" +msgstr "Basis-URL van Friendica-server" -#: ../../extend/addon/addon/twitter/twitter.php:246 -msgid "Send public postings to Twitter by default" -msgstr "Standaard doorplaatsen naar Twitter" +#: ../../addon/frphotos/frphotos.php:95 +msgid "Friendica Login Username" +msgstr "Gebruikersnaam Friendica" -#: ../../extend/addon/addon/twitter/twitter.php:246 -msgid "" -"If enabled your public postings will be posted to the associated Twitter " -"account by default" -msgstr "Wanneer dit is ingeschakeld worden al jouw openbare berichten standaard naar het gekoppelde Twitter-account doorgeplaatst" +#: ../../addon/frphotos/frphotos.php:96 +msgid "Friendica Login Password" +msgstr "Wachtwoord Friendica" -#: ../../extend/addon/addon/twitter/twitter.php:264 -msgid "Twitter Post Settings" -msgstr "Twitter (berichten doorplaatsen)" +#: ../../addon/pubcrawl/as.php:1146 ../../addon/pubcrawl/as.php:1273 +#: ../../addon/pubcrawl/as.php:1449 ../../include/network.php:1769 +msgid "ActivityPub" +msgstr "ActivityPub" -#: ../../extend/addon/addon/twitter/twitter.php:773 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:95 -msgid "Submit Settings" -msgstr "Instellingen toepassen" +#: ../../addon/pubcrawl/pubcrawl.php:1053 +msgid "ActivityPub Protocol Settings updated." +msgstr "ActivityPub-protocol-instellingen bijgewerkt. " -#: ../../extend/addon/addon/upload_limits/upload_limits.php:25 -msgid "Show Upload Limits" -msgstr "Uploadlimieten tonen" +#: ../../addon/pubcrawl/pubcrawl.php:1062 +msgid "" +"The ActivityPub protocol does not support location independence. Connections" +" you make within that network may be unreachable from alternate channel " +"locations." +msgstr "Het ActivityPub-protocol ondersteunt geen locatieonafhankelijkheid. Connecties die je met dit netwerk maakt zijn mogelijk onbereikbaar vanaf andere kanaallocaties." -#: ../../extend/addon/addon/upload_limits/upload_limits.php:27 -msgid "Hubzilla configured maximum size: " -msgstr "Op Hubzilla configureerde maximale grootte: " +#: ../../addon/pubcrawl/pubcrawl.php:1065 +msgid "Enable the ActivityPub protocol for this channel" +msgstr "ActivityPub-protocol voor dit kanaal inschakelen" -#: ../../extend/addon/addon/upload_limits/upload_limits.php:28 -msgid "PHP upload_max_filesize: " -msgstr "PHP upload_max_filesize: " +#: ../../addon/pubcrawl/pubcrawl.php:1068 +msgid "Send multi-media HTML articles" +msgstr "Verzend multimedia-HTML-artikelen" -#: ../../extend/addon/addon/upload_limits/upload_limits.php:29 -msgid "PHP post_max_size (must be larger than upload_max_filesize): " -msgstr "PHP post_max_size (moet hoger zijn dan upload_max_filesize): " +#: ../../addon/pubcrawl/pubcrawl.php:1068 +msgid "Not supported by some microblog services such as Mastodon" +msgstr "Wordt door sommige microblogdiensten, zoals Mastodon, niet ondersteund" -#: ../../extend/addon/addon/visage/visage.php:93 -msgid "Recent Channel/Profile Viewers" -msgstr "Recente bezoekers van jouw kanaal/profiel" +#: ../../addon/pubcrawl/pubcrawl.php:1072 +msgid "ActivityPub Protocol Settings" +msgstr "ActivityPub-protocol" -#: ../../extend/addon/addon/visage/visage.php:98 -msgid "This plugin/addon has not been configured." -msgstr "Deze plugin is niet geconfigureerd. " +#: ../../addon/donate/donate.php:21 +msgid "Project Servers and Resources" +msgstr "Projectservers en -middelen" -#: ../../extend/addon/addon/visage/visage.php:99 -#, php-format -msgid "Please visit the Visage settings on %s" -msgstr "Bezoek de Visage-instellingen op %s" +#: ../../addon/donate/donate.php:22 +msgid "Project Creator and Tech Lead" +msgstr "Projectgrondlegger en hoofdontwikkelaar" -#: ../../extend/addon/addon/visage/visage.php:99 -msgid "your feature settings page" -msgstr "Jouw plugin-instellingen" +#: ../../addon/donate/donate.php:23 +msgid "Admin, developer, directorymin, support bloke" +msgstr "Beheerder, ontwikkelaar, kanalengidsbeheerder en supportgozer" -#: ../../extend/addon/addon/visage/visage.php:112 -msgid "No entries." -msgstr "Niets aanwezig." +#: ../../addon/donate/donate.php:50 +msgid "" +"And the hundreds of other people and organisations who helped make the " +"Hubzilla possible." +msgstr "En de honderden andere mensen en organisaties die Hubzilla mogelijk hebben gemaakt. " -#: ../../extend/addon/addon/visage/visage.php:166 -msgid "Enable Visage Visitor Logging" -msgstr "Visage inschakelen " +#: ../../addon/donate/donate.php:53 +msgid "" +"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving " +"their time and expertise - and often paying out of pocket for services they " +"share with others." +msgstr "De Hubzillaprojecten worden hoofdzakelijk aangeboden door vrijwilligers die er hun tijd en expertise insteken - en meestal zelf de diensten betalen die ze met anderen delen." -#: ../../extend/addon/addon/visage/visage.php:170 -msgid "Visage Settings" -msgstr "Visage" +#: ../../addon/donate/donate.php:54 +msgid "" +"There is no corporate funding and no ads, and we do not collect and sell " +"your personal information. (We don't control your personal information - " +"you do.)" +msgstr "Wij worden niet gefinancierd door bedrijven en reclame, en wij verzamelen en verkopen niet jouw persoonlijke gegevens. We hebben geen controle over jouw persoonlijke gegevens - dat heb jezelf." -#: ../../extend/addon/addon/wholikesme/wholikesme.php:29 -msgid "Who likes me?" -msgstr "Wie vindt mij leuk?" +#: ../../addon/donate/donate.php:55 +msgid "" +"Help support our ground-breaking work in decentralisation, web identity, and" +" privacy." +msgstr "Steun ons baanbrekende werk in decentralisatie, webidentiteit en privacy. " -#: ../../extend/addon/addon/wppost/wppost.php:45 -msgid "Post to WordPress" -msgstr "WordPress" +#: ../../addon/donate/donate.php:57 +msgid "" +"Your donations keep servers and services running and also helps us to " +"provide innovative new features and continued development." +msgstr "Jouw donaties laten onze servers en diensten draaien, en helpt ons om nieuwe innovatieve mogelijkheden te blijven ontwikkelen." -#: ../../extend/addon/addon/wppost/wppost.php:82 -msgid "Enable WordPress Post Plugin" -msgstr "Doorplaatsen naar WordPress inschakelen" +#: ../../addon/donate/donate.php:60 +msgid "Donate" +msgstr "Doneer" -#: ../../extend/addon/addon/wppost/wppost.php:86 -msgid "WordPress username" -msgstr "Gebruikersnaam WordPress" +#: ../../addon/donate/donate.php:62 +msgid "" +"Choose a project, developer, or public hub to support with a one-time " +"donation" +msgstr "Kies een project, ontwikkelaar of openbaar toegankelijke hub, die je met een eenmalige donatie wil steunen" -#: ../../extend/addon/addon/wppost/wppost.php:90 -msgid "WordPress password" -msgstr "Wachtwoord WordPress" +#: ../../addon/donate/donate.php:63 +msgid "Donate Now" +msgstr "Doneer nu" -#: ../../extend/addon/addon/wppost/wppost.php:94 -msgid "WordPress API URL" -msgstr "API-URL WordPress" +#: ../../addon/donate/donate.php:64 +msgid "" +"Or become a project sponsor (Hubzilla Project " +"only)" +msgstr "Of wordt een projectsponsor (alleen het Hubzilla-project)" -#: ../../extend/addon/addon/wppost/wppost.php:95 -msgid "Typically https://your-blog.tld/xmlrpc.php" -msgstr "Meestal https://jouw-blog.tld/xmlrpc.php" +#: ../../addon/donate/donate.php:65 +msgid "" +"Please indicate if you would like your first name or full name (or nothing) " +"to appear in our sponsor listing" +msgstr "Geef aan of jouw voornaam of volledige naam (of niets) op onze sponsorlijst moet verschijnen" -#: ../../extend/addon/addon/wppost/wppost.php:98 -msgid "WordPress blogid" -msgstr "Blog ID WordPress" +#: ../../addon/donate/donate.php:66 +msgid "Sponsor" +msgstr "Sponsor" -#: ../../extend/addon/addon/wppost/wppost.php:99 -msgid "For multi-user sites such as wordpress.com, otherwise leave blank" -msgstr "Voor websites met meerdere gebruikers, zoals wordpress.com. Anders leeg laten." +#: ../../addon/donate/donate.php:69 +msgid "Special thanks to: " +msgstr "Speciale dank gaat naar: " + +#: ../../addon/chords/Mod_Chords.php:44 +msgid "" +"This is a fairly comprehensive and complete guitar chord dictionary which " +"will list most of the available ways to play a certain chord, starting from " +"the base of the fingerboard up to a few frets beyond the twelfth fret " +"(beyond which everything repeats). A couple of non-standard tunings are " +"provided for the benefit of slide players, etc." +msgstr "This is a fairly comprehensive and complete guitar chord dictionary which will list most of the available ways to play a certain chord, starting from the base of the fingerboard up to a few frets beyond the twelfth fret (beyond which everything repeats). A couple of non-standard tunings are provided for the benefit of slide players, etc." -#: ../../extend/addon/addon/wppost/wppost.php:105 -msgid "Post to WordPress by default" -msgstr "Standaard naar WordPress doorplaatsen" +#: ../../addon/chords/Mod_Chords.php:46 +msgid "" +"Chord names start with a root note (A-G) and may include sharps (#) and " +"flats (b). This software will parse most of the standard naming conventions " +"such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements." +msgstr "Chord names start with a root note (A-G) and may include sharps (#) and flats (b). This software will parse most of the standard naming conventions such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements." -#: ../../extend/addon/addon/wppost/wppost.php:109 -msgid "Forward comments (requires hubzilla_wp plugin)" -msgstr "Reacties doorplaatsen (Hubzilla_WP-plugin vereist)" +#: ../../addon/chords/Mod_Chords.php:48 +msgid "" +"Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, " +"E7b13b11 ..." +msgstr "Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..." -#: ../../extend/addon/addon/wppost/wppost.php:113 -msgid "WordPress Post Settings" -msgstr "WordPress (berichten doorplaatsen)" +#: ../../addon/chords/Mod_Chords.php:51 +msgid "Guitar Chords" +msgstr "Gitaarakkoorden" -#: ../../extend/addon/addon/wppost/wppost.php:129 -msgid "Wordpress Settings saved." -msgstr "WordPress-instellingen opgeslagen." +#: ../../addon/chords/Mod_Chords.php:52 +msgid "The complete online chord dictionary" +msgstr "Het complete online akkoordenboek" -#: ../../extend/addon/addon/xmpp/xmpp.php:31 -msgid "XMPP settings updated." -msgstr "XMPP-instellingen bijgewerkt." +#: ../../addon/chords/Mod_Chords.php:57 +msgid "Tuning" +msgstr "Stemmen" -#: ../../extend/addon/addon/xmpp/xmpp.php:53 -msgid "Enable Chat" -msgstr "Chatten inschakelen" +#: ../../addon/chords/Mod_Chords.php:58 +msgid "Chord name: example: Em7" +msgstr "Akkoordnaam: bijvoorbeeld: Em7" -#: ../../extend/addon/addon/xmpp/xmpp.php:58 -msgid "Individual credentials" -msgstr "Individuele credentials" +#: ../../addon/chords/Mod_Chords.php:59 +msgid "Show for left handed stringing" +msgstr "Toon voor linkshandige gitaar" -#: ../../extend/addon/addon/xmpp/xmpp.php:64 -msgid "Jabber BOSH server" -msgstr "BOSH-server van Jabber" +#: ../../addon/chords/chords.php:33 +msgid "Quick Reference" +msgstr "Beknopt overzicht" -#: ../../extend/addon/addon/xmpp/xmpp.php:69 -msgid "XMPP Settings" -msgstr "XMPP" +#: ../../addon/libertree/libertree.php:38 +msgid "Post to Libertree" +msgstr "Libertree" -#: ../../extend/addon/addon/xmpp/xmpp.php:92 -msgid "Jabber BOSH host" -msgstr "BOSH-host van Jabber" +#: ../../addon/libertree/libertree.php:69 +msgid "Enable Libertree Post Plugin" +msgstr "Doorplaatsen naar Libertree inschakelen" -#: ../../extend/addon/addon/xmpp/xmpp.php:93 -msgid "Use central userbase" -msgstr "Gebruik een centrale gebruikersgroep" +#: ../../addon/libertree/libertree.php:73 +msgid "Libertree API token" +msgstr "API-token Libertree" -#: ../../extend/addon/addon/xmpp/xmpp.php:93 -msgid "" -"If enabled, members will automatically login to an ejabberd server that has " -"to be installed on this machine with synchronized credentials via the " -"\"auth_ejabberd.php\" script." -msgstr "Wanneer ingeschakeld worden leden automatisch op een Ejabberd-server ingelogd. Deze dient wel op deze machine te zijn geïnstalleerd met zgn. 'synchronized credentials' via het 'auth_ejabberd.php'-script." +#: ../../addon/libertree/libertree.php:77 +msgid "Libertree site URL" +msgstr "Website-URL Libertree" -#: ../../extend/addon/addon/cdav/include/widgets.php:37 -msgid "Select Channel" -msgstr "Kies een kanaal" +#: ../../addon/libertree/libertree.php:81 +msgid "Post to Libertree by default" +msgstr "Standaard doorplaatsen naar Libertree" -#: ../../extend/addon/addon/cdav/include/widgets.php:42 -msgid "Read-write" -msgstr "Lees- en schrijfrechten" +#: ../../addon/libertree/libertree.php:85 +msgid "Libertree Post Settings" +msgstr "Libertree (berichten doorplaatsen)" -#: ../../extend/addon/addon/cdav/include/widgets.php:43 -msgid "Read-only" -msgstr "Alleen leesrechten" +#: ../../addon/libertree/libertree.php:99 +msgid "Libertree Settings saved." +msgstr "Libertree-instellingen opgeslagen." -#: ../../extend/addon/addon/cdav/include/widgets.php:116 -msgid "My Calendars" -msgstr "Mijn agenda's" +#: ../../addon/flattrwidget/flattrwidget.php:45 +msgid "Flattr this!" +msgstr "Flattr this!" -#: ../../extend/addon/addon/cdav/include/widgets.php:118 -msgid "Shared Calendars" -msgstr "Gedeelde agenda's" +#: ../../addon/flattrwidget/flattrwidget.php:83 +msgid "Flattr widget settings updated." +msgstr "Instellingen Flattrwidget bijgewerkt." -#: ../../extend/addon/addon/cdav/include/widgets.php:122 -msgid "Share this calendar" -msgstr "Agenda delen" +#: ../../addon/flattrwidget/flattrwidget.php:100 +msgid "Flattr user" +msgstr "Gebruikersnaam Flattr" -#: ../../extend/addon/addon/cdav/include/widgets.php:124 -msgid "Calendar name and color" -msgstr "Naam en kleur agenda" +#: ../../addon/flattrwidget/flattrwidget.php:104 +msgid "URL of the Thing to flattr" +msgstr "URL van het Flattr-item" -#: ../../extend/addon/addon/cdav/include/widgets.php:126 -msgid "Create new calendar" -msgstr "Nieuwe agenda aanmaken" +#: ../../addon/flattrwidget/flattrwidget.php:104 +msgid "If empty channel URL is used" +msgstr "Wanneer een lege kanaal-URL wordt gebruikt" -#: ../../extend/addon/addon/cdav/include/widgets.php:128 -msgid "Calendar Name" -msgstr "Naam agenda" +#: ../../addon/flattrwidget/flattrwidget.php:108 +msgid "Title of the Thing to flattr" +msgstr "Naam van het Flattr-item" -#: ../../extend/addon/addon/cdav/include/widgets.php:129 -msgid "Calendar Tools" -msgstr "Agenda-hulpmiddelen" +#: ../../addon/flattrwidget/flattrwidget.php:108 +msgid "If empty \"channel name on The Hubzilla\" will be used" +msgstr "Wanneer een lege \"kanaalnaam op Hubzilla\" wordt gebruikt" -#: ../../extend/addon/addon/cdav/include/widgets.php:130 -msgid "Import calendar" -msgstr "Importeren" +#: ../../addon/flattrwidget/flattrwidget.php:112 +msgid "Static or dynamic flattr button" +msgstr "Statische of dynamische Flattr-knop" -#: ../../extend/addon/addon/cdav/include/widgets.php:131 -msgid "Select a calendar to import to" -msgstr "Kies een agenda om te importeren" +#: ../../addon/flattrwidget/flattrwidget.php:112 +msgid "static" +msgstr "statisch" -#: ../../extend/addon/addon/cdav/include/widgets.php:158 -msgid "Addressbooks" -msgstr "Adresboeken" +#: ../../addon/flattrwidget/flattrwidget.php:112 +msgid "dynamic" +msgstr "dynamisch" -#: ../../extend/addon/addon/cdav/include/widgets.php:160 -msgid "Addressbook name" -msgstr "Naam adresboek" +#: ../../addon/flattrwidget/flattrwidget.php:116 +msgid "Alignment of the widget" +msgstr "Uitlijning van de widget" -#: ../../extend/addon/addon/cdav/include/widgets.php:162 -msgid "Create new addressbook" -msgstr "Nieuw adresboek aanmaken" +#: ../../addon/flattrwidget/flattrwidget.php:116 +msgid "left" +msgstr "links" -#: ../../extend/addon/addon/cdav/include/widgets.php:163 -msgid "Addressbook Name" -msgstr "Naam adresboek" +#: ../../addon/flattrwidget/flattrwidget.php:116 +msgid "right" +msgstr "rechts" -#: ../../extend/addon/addon/cdav/include/widgets.php:165 -msgid "Addressbook Tools" -msgstr "Adresboek-hulpmiddelen" +#: ../../addon/flattrwidget/flattrwidget.php:120 +msgid "Enable Flattr widget" +msgstr "Flattrwidget inschakelen" -#: ../../extend/addon/addon/cdav/include/widgets.php:166 -msgid "Import addressbook" -msgstr "Importeren" +#: ../../addon/flattrwidget/flattrwidget.php:124 +msgid "Flattr Widget Settings" +msgstr "Flattrwidget" -#: ../../extend/addon/addon/cdav/include/widgets.php:167 -msgid "Select an addressbook to import to" -msgstr "Kies een adresboek om te importeren" +#: ../../addon/statusnet/statusnet.php:143 +msgid "Post to GNU social" +msgstr "GNU social" -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:744 -msgid "INVALID EVENT DISMISSED!" -msgstr "ONGELDIGE GEBEURTENIS VERWIJDERD!" +#: ../../addon/statusnet/statusnet.php:195 +msgid "" +"Please contact your site administrator.
    The provided API URL is not " +"valid." +msgstr "De verstrekte API-URL is ongeldig.
    Neem contact op met jouw hubbeheerder." -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:745 -msgid "Summary: " -msgstr "Samenvatting: " +#: ../../addon/statusnet/statusnet.php:232 +msgid "We could not contact the GNU social API with the Path you entered." +msgstr "Wij konden de GNU social-API niet bereiken door middel van het ingevulde pad." -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:746 -msgid "Date: " -msgstr "Datum: " +#: ../../addon/statusnet/statusnet.php:266 +msgid "GNU social settings updated." +msgstr "GNU social-instellingen bijgewerkt." -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:747 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:754 -msgid "Reason: " -msgstr "Reden: " +#: ../../addon/statusnet/statusnet.php:310 +msgid "Globally Available GNU social OAuthKeys" +msgstr "Op de gehele hub te gebruiken GNU social OAuthkeys." -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:752 -msgid "INVALID CARD DISMISSED!" -msgstr "ONGELDIGE CONTACTKAART VERWIJDERD!" +#: ../../addon/statusnet/statusnet.php:312 +msgid "" +"There are preconfigured OAuth key pairs for some GNU social servers " +"available. If you are using one of them, please use these credentials.
    If not feel free to connect to any other GNU social instance (see below)." +msgstr "Er zijn op deze hub enkele voorgeconfigureerde OAuthkey-paren voor GNU social servers beschikbaar. Wanneer je een van deze servers gebruikt, gebruik dan deze voorgeconfigureerde gegevens.
    Wanneer dit niet het geval is, maak dan gerust met een andere GNU social-server verbinding (zie hieronder)." -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:753 -msgid "Name: " -msgstr "Naam: " +#: ../../addon/statusnet/statusnet.php:327 +msgid "Provide your own OAuth Credentials" +msgstr "Verstrek jouw eigen OAuth-gegevens" -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:770 +#: ../../addon/statusnet/statusnet.php:329 msgid "" -"You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV " -"Settings before you can use it." -msgstr "Voordat je dit kunt gebruiken dien je eerst deze plugin onder 'Plugin-instellingen > CalDAV/CardDAV' in te schakelen." +"No consumer key pair for GNU social found. Register your Hubzilla Account as" +" an desktop client on your GNU social account, copy the consumer key pair " +"here and enter the API base root.
    Before you register your own OAuth " +"key pair ask the administrator if there is already a key pair for this " +"Hubzilla installation at your favourite GNU social installation." +msgstr "Geen consumerkey voor GNU social gevonden. Registreer jouw Hubzilla-account als een desktopclient in jouw GNU-social-account, kopieer en plak hier de consumerkey en de consumersecret, en vul de API-base-root in.
    Voordat je jouw eigen OAuthkey-paar registreert, vraag dan eerst aan jouw hubbeheerder of er al een key-paar voor deze hub op jouw favoriete GNU social-server bestaat." -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:837 -msgid "Example: YYYY-MM-DD HH:mm" -msgstr "Bijvoorbeeld: JJJJ-MM-DD UU:mm" +#: ../../addon/statusnet/statusnet.php:333 +msgid "OAuth Consumer Key" +msgstr "OAuth-consumerkey" -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:837 -msgid "End date and time" -msgstr "Einddatum en -tijd" +#: ../../addon/statusnet/statusnet.php:337 +msgid "OAuth Consumer Secret" +msgstr "Oauth-consumersecret" -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:852 -msgid "List month" -msgstr "Maand tonen" +#: ../../addon/statusnet/statusnet.php:341 +msgid "Base API Path" +msgstr "Basispad API" -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:853 -msgid "List week" -msgstr "Week tonen" +#: ../../addon/statusnet/statusnet.php:341 +msgid "Remember the trailing /" +msgstr "Vergeet niet de afsluitende /" -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:854 -msgid "List day" -msgstr "Dag tonen" +#: ../../addon/statusnet/statusnet.php:345 +msgid "GNU social application name" +msgstr "Naam GNU social-applicatie" -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:861 -msgid "More" -msgstr "Meer" +#: ../../addon/statusnet/statusnet.php:368 +msgid "" +"To connect to your GNU social account click the button below to get a " +"security code from GNU social which you have to copy into the input box " +"below and submit the form. Only your public posts will be " +"posted to GNU social." +msgstr "Om jouw GNU social-account te koppelen klik je op de knop hieronder. Je krijgt dan een veiligheidscode van GNU social die je kan kopiëren en dan hieronder in het invulveld kan plakken. Vervolgens klik je op Opslaan. Alleen jouw openbare berichten kunnen worden doorgeplaatst naar GNU social." -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:862 -msgid "Less" -msgstr "Minder" +#: ../../addon/statusnet/statusnet.php:370 +msgid "Log in with GNU social" +msgstr "Inloggen op " -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:863 -msgid "Select calendar" -msgstr "Kies agenda" +#: ../../addon/statusnet/statusnet.php:373 +msgid "Copy the security code from GNU social here" +msgstr "Plak de veiligheidscode van GNU social hier" -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:865 -msgid "Delete all" -msgstr "Alles verwijderen" +#: ../../addon/statusnet/statusnet.php:383 +msgid "Cancel Connection Process" +msgstr "Annuleer het verbindingsproces" -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:867 -msgid "Sorry! Editing of recurrent events is not yet implemented." -msgstr "Excuses! Bewerken van herhalende gebeurtenissen is nog niet geïmplementeerd." +#: ../../addon/statusnet/statusnet.php:385 +msgid "Current GNU social API is" +msgstr "Huidige GNU social-API is" -#: ../../extend/addon/addon/cdav/cdav.php:36 -msgid "Errors encountered creating database table: " -msgstr "Fouten opgetreden tijdens aanmaken databasetabel: " +#: ../../addon/statusnet/statusnet.php:389 +msgid "Cancel GNU social Connection" +msgstr "Annuleer de GNU social-verbinding" -#: ../../extend/addon/addon/cdav/cdav.php:197 -msgid "Default Calendar" -msgstr "Standaard agenda" +#: ../../addon/statusnet/statusnet.php:401 ../../addon/twitter/twitter.php:233 +msgid "Currently connected to: " +msgstr "Momenteel gekoppeld aan: " -#: ../../extend/addon/addon/cdav/cdav.php:206 -msgid "Default Addressbook" -msgstr "Standaard adresboek" +#: ../../addon/statusnet/statusnet.php:406 +msgid "" +"Note: Due your privacy settings (Hide your profile " +"details from unknown viewers?) the link potentially included in public " +"postings relayed to GNU social will lead the visitor to a blank page " +"informing the visitor that the access to your profile has been restricted." +msgstr "Opmerking: In verband met jouw privacyinstellingen (wanneer jouw kanaalprofiel voor onbekenden is verborgen) leidt de profiellink die mogelijk in jouw naar GNU social doorgestuurde openbare berichten staat, naar een lege pagina met de melding dat toegang tot jouw kanaalprofiel is beperkt." -#: ../../extend/addon/addon/cdav/cdav.php:215 -msgid "CalDAV/CardDAV Settings saved." -msgstr "CalDAV/CardDAV-instellingen opgeslagen." +#: ../../addon/statusnet/statusnet.php:411 +msgid "Allow posting to GNU social" +msgstr "Doorplaatsen naar GNU social toestaan" -#: ../../extend/addon/addon/cdav/cdav.php:234 -msgid "Enable CalDAV/CardDAV Server for this channel" -msgstr "CalDAV/CardDAV-server voor dit kanaal inschakelen" +#: ../../addon/statusnet/statusnet.php:411 +msgid "" +"If enabled your public postings can be posted to the associated GNU-social " +"account" +msgstr "Wanneer dit is ingeschakeld kunnen jouw openbare berichten naar het gekoppelde Twitter-account worden doorgeplaatst" -#: ../../extend/addon/addon/cdav/cdav.php:237 -#, php-format -msgid "Your CalDAV resources are located at %s " -msgstr "Jouw CalDAV-URL is %s " +#: ../../addon/statusnet/statusnet.php:415 +msgid "Post to GNU social by default" +msgstr "Standaard doorplaatsen naar GNU social" -#: ../../extend/addon/addon/cdav/cdav.php:240 -#, php-format -msgid "Your CardDAV resources are located at %s " -msgstr "Jouw CardDAV-URL is %s " +#: ../../addon/statusnet/statusnet.php:415 +msgid "" +"If enabled your public postings will be posted to the associated GNU-social " +"account by default" +msgstr "Wanneer dit is ingeschakeld worden al jouw openbare berichten standaard naar het gekoppelde GNU social-account doorgeplaatst" + +#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:261 +msgid "Clear OAuth configuration" +msgstr "OAuth-configuratie wissen" -#: ../../extend/addon/addon/cdav/cdav.php:246 -msgid "CalDAV/CardDAV Settings" -msgstr "CalDAV/CardDAV" +#: ../../addon/statusnet/statusnet.php:432 +msgid "GNU social Post Settings" +msgstr "GNU social (berichten doorplaatsen)" -#: ../../extend/addon/addon/cdav/cdav.php:272 -#: ../../include/connections.php:670 -msgid "Home, Voice" -msgstr "Thuis, spraak" +#: ../../addon/statusnet/statusnet.php:892 +msgid "API URL" +msgstr "API-URL" -#: ../../extend/addon/addon/cdav/cdav.php:273 -#: ../../include/connections.php:671 -msgid "Home, Fax" -msgstr "Thuis, fax" +#: ../../addon/statusnet/statusnet.php:895 +msgid "Application name" +msgstr "Naam applicatie" -#: ../../extend/addon/addon/cdav/cdav.php:275 -#: ../../include/connections.php:673 -msgid "Work, Voice" -msgstr "Werk, spraak" +#: ../../addon/qrator/qrator.php:48 +msgid "QR code" +msgstr "QR-code" -#: ../../extend/addon/addon/cdav/cdav.php:276 -#: ../../include/connections.php:674 -msgid "Work, Fax" -msgstr "Werk, fax" +#: ../../addon/qrator/qrator.php:63 +msgid "QR Generator" +msgstr "QR-code-generator" -#: ../../extend/addon/addon/chess/chess.php:276 -#: ../../extend/addon/addon/chess/chess.php:433 +#: ../../addon/qrator/qrator.php:64 +msgid "Enter some text" +msgstr "Vul wat tekst in" + +#: ../../addon/chess/chess.php:353 ../../addon/chess/chess.php:542 msgid "Invalid game." msgstr "Ongeldig spel." -#: ../../extend/addon/addon/chess/chess.php:282 -#: ../../extend/addon/addon/chess/chess.php:439 +#: ../../addon/chess/chess.php:359 ../../addon/chess/chess.php:582 msgid "You are not a player in this game." msgstr "Jij doet niet aan dit speel mee." -#: ../../extend/addon/addon/chess/chess.php:315 +#: ../../addon/chess/chess.php:415 msgid "You must be a local channel to create a game." msgstr "Je moet een lokaal kanaal zijn om een spel aan te maken." -#: ../../extend/addon/addon/chess/chess.php:333 +#: ../../addon/chess/chess.php:433 msgid "You must select one opponent that is not yourself." msgstr "Je moet één tegenstander uitkiezen, maar niet jezelf." -#: ../../extend/addon/addon/chess/chess.php:336 -msgid "Creating new game..." -msgstr "Nieuw spel wordt aangemaakt..." - -#: ../../extend/addon/addon/chess/chess.php:342 -msgid "You must select white or black." -msgstr "Je moet wit of zwart kiezen." +#: ../../addon/chess/chess.php:444 +msgid "Random color chosen." +msgstr "Willekeurige kleur gekozen." -#: ../../extend/addon/addon/chess/chess.php:349 +#: ../../addon/chess/chess.php:452 msgid "Error creating new game." msgstr "Fout tijdens aanmaken nieuw spel." -#: ../../extend/addon/addon/chess/chess.php:381 ../../include/channel.php:899 +#: ../../addon/chess/chess.php:486 ../../include/channel.php:1151 msgid "Requested channel is not available." msgstr "Opgevraagd kanaal is niet beschikbaar." -#: ../../extend/addon/addon/chess/chess.php:395 +#: ../../addon/chess/chess.php:500 msgid "You must select a local channel /chess/channelname" msgstr "Je moet een lokaal kanaal kiezen: .../chess/kanaalnaam" -#: ../../extend/addon/addon/chess/chess.php:923 +#: ../../addon/chess/chess.php:1066 msgid "Enable notifications" -msgstr "Notificaties inschakelen" - -#: ../../extend/addon/addon/likebanner/likebanner.php:51 -msgid "Your Webbie:" -msgstr "Jouw kanaaladres:" - -#: ../../extend/addon/addon/likebanner/likebanner.php:54 -msgid "Fontsize (px):" -msgstr "Tekengrootte (px):" - -#: ../../extend/addon/addon/likebanner/likebanner.php:68 -msgid "Link:" -msgstr "Link:" - -#: ../../extend/addon/addon/likebanner/likebanner.php:70 -msgid "Like us on Hubzilla" -msgstr "Like ons op Hubzilla" - -#: ../../extend/addon/addon/likebanner/likebanner.php:72 -msgid "Embed:" -msgstr "Insluiten (embed):" - -#: ../../extend/addon/addon/openid/Mod_Id.php:85 -#: ../../include/selectors.php:49 ../../include/selectors.php:66 -msgid "Male" -msgstr "Man" - -#: ../../extend/addon/addon/openid/Mod_Id.php:87 -#: ../../include/selectors.php:49 ../../include/selectors.php:66 -msgid "Female" -msgstr "Vrouw" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:52 -msgid "First Name" -msgstr "Voornaam" +msgstr "Meldingen inschakelen" -#: ../../extend/addon/addon/openid/MysqlProvider.php:53 -msgid "Last Name" -msgstr "Achternaam" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:55 -msgid "Full Name" -msgstr "Volledige naam" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:61 -msgid "Profile Photo 16px" -msgstr "Profielfoto 16px" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:62 -msgid "Profile Photo 32px" -msgstr "Profielfoto 32px" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:63 -msgid "Profile Photo 48px" -msgstr "Profielfoto 48px" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:64 -msgid "Profile Photo 64px" -msgstr "Profielfoto 64px" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:65 -msgid "Profile Photo 80px" -msgstr "Profielfoto 80px" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:66 -msgid "Profile Photo 128px" -msgstr "Profielfoto 128px" +#: ../../addon/twitter/twitter.php:99 +msgid "Post to Twitter" +msgstr "Twitter" -#: ../../extend/addon/addon/openid/MysqlProvider.php:67 -msgid "Timezone" -msgstr "Tijdzone" +#: ../../addon/twitter/twitter.php:155 +msgid "Twitter settings updated." +msgstr "Twitter-instellingen bijgewerkt." -#: ../../extend/addon/addon/openid/MysqlProvider.php:70 -msgid "Birth Year" -msgstr "Geboortejaar" +#: ../../addon/twitter/twitter.php:184 +msgid "" +"No consumer key pair for Twitter found. Please contact your site " +"administrator." +msgstr "Geen consumerkeys voor Twitter gevonden. Neem contact op met jouw hubbeheerder." -#: ../../extend/addon/addon/openid/MysqlProvider.php:71 -msgid "Birth Month" -msgstr "Geboortemaand" +#: ../../addon/twitter/twitter.php:206 +msgid "" +"At this Hubzilla instance the Twitter plugin was enabled but you have not " +"yet connected your account to your Twitter account. To do so click the " +"button below to get a PIN from Twitter which you have to copy into the input" +" box below and submit the form. Only your public posts will" +" be posted to Twitter." +msgstr "De Twitter-plug-in is op deze Hubzilla-hub ingeschakeld, maar je hebt nog niet jouw Hubzilla-kanaal met jouw Twitter-account gekoppeld. Om dit te doen klik je op de knop hieronder om een PIN-code van Twitter te krijgen. Deze dien je te kopiëren en in het invoegveld beneden te plakken. Vervolgens klik je op Opslaan. Alleen jouw openbare berichten kunnen op Twitter worden geplaatst." -#: ../../extend/addon/addon/openid/MysqlProvider.php:72 -msgid "Birth Day" -msgstr "Geboortedag" +#: ../../addon/twitter/twitter.php:208 +msgid "Log in with Twitter" +msgstr "Op Twitter inloggen" -#: ../../extend/addon/addon/openid/MysqlProvider.php:73 -msgid "Birthdate" -msgstr "Geboortedatum" +#: ../../addon/twitter/twitter.php:211 +msgid "Copy the PIN from Twitter here" +msgstr "Plak of type de PIN-code hier" -#: ../../extend/addon/addon/openid/openid.php:49 +#: ../../addon/twitter/twitter.php:238 msgid "" -"We encountered a problem while logging in with the OpenID you provided. " -"Please check the correct spelling of the ID." -msgstr "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten." +"Note: Due your privacy settings (Hide your profile " +"details from unknown viewers?) the link potentially included in public " +"postings relayed to Twitter will lead the visitor to a blank page informing " +"the visitor that the access to your profile has been restricted." +msgstr "Opmerking: In verband met jouw privacyinstellingen (wanneer jouw kanaalprofiel voor onbekenden is verborgen) leidt de profiellink die mogelijk in jouw naar Twitter doorgestuurde openbare berichten staat, naar een lege pagina met de melding dat toegang tot jouw kanaalprofiel is beperkt." -#: ../../extend/addon/addon/openid/openid.php:49 -msgid "The error message was:" -msgstr "Foutmelding was:" +#: ../../addon/twitter/twitter.php:243 +msgid "Allow posting to Twitter" +msgstr "Doorplaatsen naar Twitter toestaan" -#: ../../extend/addon/addon/openid/Mod_Openid.php:30 -msgid "OpenID protocol error. No ID returned." -msgstr "OpenID-protocolfout. Geen ID terugontvangen." +#: ../../addon/twitter/twitter.php:243 +msgid "" +"If enabled your public postings can be posted to the associated Twitter " +"account" +msgstr "Wanneer dit is ingeschakeld kunnen jouw openbare berichten naar het gekoppelde Twitter-account worden doorgeplaatst" -#: ../../extend/addon/addon/openid/Mod_Openid.php:188 -#: ../../include/auth.php:286 -msgid "Login failed." -msgstr "Inloggen mislukt." +#: ../../addon/twitter/twitter.php:247 +msgid "Twitter post length" +msgstr "Lengte Twitterbericht" -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:44 -#, php-format -msgid "Reconnecting %d connections" -msgstr "%d connecties opnieuw aan het verbinden" +#: ../../addon/twitter/twitter.php:247 +msgid "Maximum tweet length" +msgstr "Maximale tweetlengte" -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:63 -msgid "Diaspora Reconnect" -msgstr "Diaspora opnieuw verbinden" +#: ../../addon/twitter/twitter.php:252 +msgid "Send public postings to Twitter by default" +msgstr "Standaard doorplaatsen naar Twitter" -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:65 +#: ../../addon/twitter/twitter.php:252 msgid "" -"Use this form to re-establish Diaspora connections which were initially made" -" from a different hub." -msgstr "Gebruik dit formulier om opnieuw met Diaspora-connecties te verbinden, die oorspronkelijk op een andere hub waren verbonden." - -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:70 -msgid "Reconnect" -msgstr "Opnieuw verbinden" - -#: ../../extend/addon/addon/mailtest/mailtest.php:19 -msgid "Send test email" -msgstr "Test-e-mail versturen" +"If enabled your public postings will be posted to the associated Twitter " +"account by default" +msgstr "Wanneer dit is ingeschakeld worden al jouw openbare berichten standaard naar het gekoppelde Twitter-account doorgeplaatst" -#: ../../extend/addon/addon/mailtest/mailtest.php:66 -msgid "Mail sent." -msgstr "E-mail verzonden." +#: ../../addon/twitter/twitter.php:270 +msgid "Twitter Post Settings" +msgstr "Twitter (berichten doorplaatsen)" -#: ../../extend/addon/addon/mailtest/mailtest.php:68 -msgid "Sending of mail failed." -msgstr "Verzenden van e-mail mislukt." +#: ../../addon/smileybutton/smileybutton.php:211 +msgid "Deactivate the feature" +msgstr "Deze functie uitschakelen" -#: ../../extend/addon/addon/mailtest/mailtest.php:77 -msgid "Mail Test" -msgstr "E-mailtest" +#: ../../addon/smileybutton/smileybutton.php:215 +msgid "Hide the button and show the smilies directly." +msgstr "Verberg de knop en toon de smilies direct." -#: ../../extend/addon/addon/rendezvous/rendezvous.php:57 -msgid "Errors encountered deleting database table " -msgstr "Fouten opgetreden tijdens verwijderen databasetabel " +#: ../../addon/smileybutton/smileybutton.php:219 +msgid "Smileybutton Settings" +msgstr "Smileyknop" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:96 -msgid "Drop tables when uninstalling?" -msgstr "Verwijder tabellen tijdens uitschakelen plugin?" +#: ../../addon/cart/myshop.php:138 +msgid "Order Not Found" +msgstr "Bestelling niet gevonden" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:96 -msgid "" -"If checked, the Rendezvous database tables will be deleted when the plugin " -"is uninstalled." -msgstr "Wanneer dit is aangevinkt worden de tabellen in de Rendezvous-database verwijderd wanneer de plugin wordt uitgeschakeld." +#: ../../addon/cart/cart.php:810 +msgid "Order cannot be checked out." +msgstr "De bestelling kan niet worden uitgecheckt." -#: ../../extend/addon/addon/rendezvous/rendezvous.php:97 -msgid "Mapbox Access Token" -msgstr "Toegangstoken " +#: ../../addon/cart/cart.php:1073 +msgid "Enable Shopping Cart" +msgstr "Winkelwagen inschakelen" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:97 -msgid "" -"If you enter a Mapbox access token, it will be used to retrieve map tiles " -"from Mapbox instead of the default OpenStreetMap tile server." -msgstr "De Mapbox-toegangstoken wordt gebruikt om kaarttegels (tiles) van Mapbox op te halen in plaats van de standaard tile-server van OpenStreetMap." +#: ../../addon/cart/cart.php:1080 +msgid "Enable Test Catalog" +msgstr "Testcatalogus inschakelen" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:162 -msgid "Rendezvous" -msgstr "Rendezvous" +#: ../../addon/cart/cart.php:1088 +msgid "Enable Manual Payments" +msgstr "Handmatige betalingen inschakelen" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:167 -msgid "" -"This identity has been deleted by another member due to inactivity. Please " -"press the \"New identity\" button or refresh the page to register a new " -"identity. You may use the same name." -msgstr "Deze identiteit is door een ander lid verwijderd als gevolg van inactiviteit. Klik op de knop \"Nieuwe identiteit\" of herlaad de pagina om een nieuwe identiteit aan te maken. Je kan eventueel dezelfde naam gebruiken." +#: ../../addon/cart/cart.php:1103 +msgid "Base Cart Settings" +msgstr "Algemene kaartinstellingen" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:168 -msgid "Welcome to Rendezvous!" -msgstr "Welkom bij Rendezvous!" +#: ../../addon/cart/cart.php:1151 +msgid "Add Item" +msgstr "Item toevoegen" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:169 -msgid "" -"Enter your name to join this rendezvous. To begin sharing your location with" -" the other members, tap the GPS control. When your location is discovered, a" -" red dot will appear and others will be able to see you on the map." -msgstr "Vul je naam in om deel te nemen aan deze rendezvous. Om met het delen van je locatie met de andere leden te beginnen, klik je op de locatieknop van je webbrowser. Nadat jouw locatie is gevonden verschijnt er een rode stip en kunnen andere leden jou zien op de kaart." +#: ../../addon/cart/cart.php:1165 +msgid "Call cart_post_" +msgstr "Call cart_post_" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:171 -msgid "Let's meet here" -msgstr "Laten we elkaar hier ontmoeten" +#: ../../addon/cart/cart.php:1195 +msgid "Cart Not Enabled (profile: " +msgstr "Winkelwagen niet ingeschakeld (profiel:" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:174 -msgid "New marker" -msgstr "Nieuwe markering" +#: ../../addon/cart/cart.php:1226 ../../addon/cart/manual_payments.php:36 +msgid "Order not found." +msgstr "Bestelling niet gevonden." -#: ../../extend/addon/addon/rendezvous/rendezvous.php:175 -msgid "Edit marker" -msgstr "Markering bewerken" +#: ../../addon/cart/cart.php:1262 ../../addon/cart/cart.php:1389 +msgid "No Order Found" +msgstr "Geen bestelling gevonden" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:176 -msgid "New identity" -msgstr "Nieuwe identiteit" +#: ../../addon/cart/cart.php:1270 +msgid "call: " +msgstr "call: " -#: ../../extend/addon/addon/rendezvous/rendezvous.php:177 -msgid "Delete marker" -msgstr "Markering verwijderen" +#: ../../addon/cart/cart.php:1273 +msgid "An unknown error has occurred Please start again." +msgstr "Er heeft zich een onbekende fout voorgedaan. Start opnieuw." -#: ../../extend/addon/addon/rendezvous/rendezvous.php:178 -msgid "Delete member" -msgstr "Lid verwijderen" +#: ../../addon/cart/cart.php:1414 +msgid "Invalid Payment Type. Please start again." +msgstr "Ongeldige betalingssoort. Start opnieuw." -#: ../../extend/addon/addon/rendezvous/rendezvous.php:179 -msgid "Edit proximity alert" -msgstr "Nabijheidswaarschuwing bewerken" +#: ../../addon/cart/cart.php:1421 +msgid "Order not found" +msgstr "Bestelling niet gevonden" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:180 -msgid "" -"A proximity alert will be issued when this member is within a certain radius" -" of you.

    Enter a radius in meters (0 to disable):" -msgstr "Een nabijheidswaarschuwing wordt actief wanneer dit lid zich binnen een bepaalde straal rond jouw locatie bevindt.

    Voer het aantal meters van de straal in (0 om uit te schakelen):" +#: ../../addon/cart/manual_payments.php:9 +msgid "Error: order mismatch. Please try again." +msgstr "Fout: mismatch bestelling. Probeer opnieuw." -#: ../../extend/addon/addon/rendezvous/rendezvous.php:180 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:185 -msgid "distance" -msgstr "afstand" +#: ../../addon/cart/manual_payments.php:29 +msgid "Manual payments are not enabled." +msgstr "Handmatige betalingen zijn niet ingeschakeld." -#: ../../extend/addon/addon/rendezvous/rendezvous.php:181 -msgid "Proximity alert distance (meters)" -msgstr "Afstand nabijheidswaarschuwing (meter)" +#: ../../addon/cart/manual_payments.php:44 +msgid "Finished" +msgstr "Afgerond" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:182 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:184 +#: ../../addon/piwik/piwik.php:85 msgid "" -"A proximity alert will be issued when you are within a certain radius of the" -" marker location.

    Enter a radius in meters (0 to disable):" -msgstr "Een nabijheidswaarschuwing wordt actief wanneer je je binnen een bepaalde straal rond een specifieke locatie bevindt.

    Voer het aantal meters van de straal in (0 om uit te schakelen):" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:183 -msgid "Marker proximity alert" -msgstr "Locatiemarkering nabijheidswaarschuwing" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:186 -msgid "Reminder note" -msgstr "Herinnering" +"This website is tracked using the Piwik " +"analytics tool." +msgstr "Het bezoek aan deze website wordt gemeten door Piwik." -#: ../../extend/addon/addon/rendezvous/rendezvous.php:187 +#: ../../addon/piwik/piwik.php:88 +#, php-format msgid "" -"Enter a note to be displayed when you are within the specified proximity..." -msgstr "Vul de tekst in die getoond moet worden wanneer je je op de aangegeven afstand bevindt..." +"If you do not want that your visits are logged this way you can" +" set a cookie to prevent Piwik from tracking further visits of the site " +"(opt-out)." +msgstr "Wanneer je niet wil dat jouw bezoek aan deze website wordt bijgehouden, kan je een cookie achterlaten om te verhinderen dat Piwik jou op deze website blijft volgen (opt-out)." -#: ../../extend/addon/addon/rendezvous/rendezvous.php:199 -msgid "Add new rendezvous" -msgstr "Nieuwe rendezvous toevoegen" +#: ../../addon/piwik/piwik.php:96 +msgid "Piwik Base URL" +msgstr "Basis-URL Piwik" -#: ../../extend/addon/addon/rendezvous/rendezvous.php:200 +#: ../../addon/piwik/piwik.php:96 msgid "" -"Create a new rendezvous and share the access link with those you wish to " -"invite to the group. Those who open the link become members of the " -"rendezvous. They can view other member locations, add markers to the map, or" -" share their own locations with the group." -msgstr "Maak een nieuwe rendezvous aan en deel de toegangslink met wie je wil uitnodigen voor de groep. Wie op de link klikt wordt lid van rendezvous. Zij kunnen dan de locaties zien van andere leden, markeringen aan de kaart toevoegen of hun eigen locaties met de groep delen." - -#: ../../extend/addon/addon/firefox/firefox.php:23 -msgid "Install Firefox Sharing Tools" -msgstr "Firefox Share" - -#: ../../extend/addon/addon/firefox/firefox.php:34 -msgid "Share content from Firefox to $Projectname" -msgstr "Deel webpagina's vanuit Firefox met " - -#: ../../extend/addon/addon/firefox/firefox.php:37 -msgid "Install Firefox Sharing Tools to this web browser" -msgstr "Activeer de $Projectname-service in Firefox" +"Absolute path to your Piwik installation. (without protocol (http/s), with " +"trailing slash)" +msgstr "Absoluut pad naar jouw Piwik-installatie (zonder protocol (http/s), met een slash op het einde)" -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:105 -msgid "Error retrieving wiki" -msgstr "Fout tijdens ophalen wiki" +#: ../../addon/piwik/piwik.php:97 +msgid "Site ID" +msgstr "Site ID" -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:112 -msgid "Error creating zip file export folder" -msgstr "Fout tijdens aanmaken exportmap zipbestand" +#: ../../addon/piwik/piwik.php:98 +msgid "Show opt-out cookie link?" +msgstr "Toon opt-out cookie-link?" -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:130 -msgid "Error downloading wiki: " -msgstr "Fout tijdens downloaden wiki: " +#: ../../addon/piwik/piwik.php:99 +msgid "Asynchronous tracking" +msgstr "Asynchroon volgen" -#: ../../extend/addon/addon/gitwiki/gitwiki.php:76 -#: ../../include/widgets.php:956 -msgid "Wiki Pages" -msgstr "Wikipagina's" +#: ../../addon/piwik/piwik.php:100 +msgid "Enable frontend JavaScript error tracking" +msgstr "Volgen van front-end JavaScript-fouten inschakelen" -#: ../../extend/addon/addon/gitwiki/gitwiki.php:81 -#: ../../include/widgets.php:962 -msgid "Add new page" -msgstr "Nieuwe pagina toevoegen" +#: ../../addon/piwik/piwik.php:100 +msgid "This feature requires Piwik >= 2.2.0" +msgstr "Deze functie vereist Piwik >= 2.2.0" -#: ../../extend/addon/addon/gitwiki/gitwiki.php:82 -#: ../../include/widgets.php:963 -msgid "Page name" -msgstr "Paginanaam" +#: ../../addon/tour/tour.php:76 +msgid "Edit your profile and change settings." +msgstr "Jouw profiel bewerken en instellingen veranderen." -#: ../../extend/addon/addon/gitwiki/gitwiki.php:95 -#: ../../include/widgets.php:913 -msgid "Wiki List" -msgstr "Wiki's" +#: ../../addon/tour/tour.php:77 +msgid "Click here to see activity from your connections." +msgstr "Klik hier voor een tijdlijn met berichten en overige activiteiten van jouw connecties." -#: ../../extend/addon/addon/gnusoc/gnusoc.php:129 -msgid "Enable the GNU-Social protocol for this channel" -msgstr "GNU social-protocol voor dit kanaal inschakelen" +#: ../../addon/tour/tour.php:78 +msgid "Click here to see your channel home." +msgstr "Klik hier voor de tijdlijn van jouw eigen kanaal." -#: ../../extend/addon/addon/opensearch/opensearch.php:26 ../../boot.php:1186 -#, php-format -msgctxt "opensearch" -msgid "Search %1$s (%2$s)" -msgstr "Zoek %1$s (%2$s)" +#: ../../addon/tour/tour.php:79 +msgid "You can access your private messages from here." +msgstr "Hiermee krijg je toegang tot jouw privéberichten." -#: ../../extend/addon/addon/opensearch/opensearch.php:28 ../../boot.php:1186 -msgctxt "opensearch" -msgid "$Projectname" -msgstr "$Projectname" +#: ../../addon/tour/tour.php:80 +msgid "Create new events here." +msgstr "Nieuwe gebeurtenissen kan je hier aanmaken." -#: ../../extend/addon/addon/opensearch/opensearch.php:43 -msgid "Search $Projectname" -msgstr "Zoek in " +#: ../../addon/tour/tour.php:81 +msgid "" +"You can accept new connections and change permissions for existing ones " +"here. You can also e.g. create groups of contacts." +msgstr "Hier kan je nieuwe connecties accepteren en instellingen van bestaande connecties wijzigen. Je kan hier bijv. ook privacygroepen aanmaken." -#: ../../include/dba/dba_driver.php:187 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden" +#: ../../addon/tour/tour.php:82 +msgid "System notifications will arrive here" +msgstr "Systeemmeldingen komen hier tevoorschijn" -#: ../../include/language.php:367 ../../include/text.php:1788 -msgid "default" -msgstr "standaard" +#: ../../addon/tour/tour.php:83 +msgid "Search for content and users" +msgstr "Zoek hier naar tekst in berichten of naar andere kanalen." -#: ../../include/language.php:380 -msgid "Select an alternate language" -msgstr "Kies een andere taal" +#: ../../addon/tour/tour.php:84 +msgid "Browse for new contacts" +msgstr "Blader hier in een gids met kanalen, die je toe kan voegen als connectie." -#: ../../include/account.php:35 -msgid "Not a valid email address" -msgstr "Geen geldig e-mailadres" +#: ../../addon/tour/tour.php:85 +msgid "Launch installed apps" +msgstr "Open (op deze hub) geïnstalleerde apps." -#: ../../include/account.php:37 -msgid "Your email domain is not among those allowed on this site" -msgstr "Jouw e-maildomein is op deze hub niet toegestaan" +#: ../../addon/tour/tour.php:86 +msgid "Looking for help? Click here." +msgstr "Zoek je hulp? Klik dan hier." -#: ../../include/account.php:43 -msgid "Your email address is already registered at this site." -msgstr "Jouw e-mailadres is al op deze hub geregistreerd." +#: ../../addon/tour/tour.php:87 +msgid "" +"New events have occurred in your network. Click here to see what has " +"happened!" +msgstr "Er is een nieuwe gebeurtenis in jouw netwerk. Klik hier om te zien wat precies." -#: ../../include/account.php:75 -msgid "An invitation is required." -msgstr "Een uitnodiging is vereist" +#: ../../addon/tour/tour.php:88 +msgid "You have received a new private message. Click here to see from who!" +msgstr "Je hebt een nieuw privébericht ontvangen. Klik hier om te zien van wie." -#: ../../include/account.php:79 -msgid "Invitation could not be verified." -msgstr "Uitnodiging kon niet geverifieerd worden" +#: ../../addon/tour/tour.php:89 +msgid "There are events this week. Click here too see which!" +msgstr "Er vinden deze week gebeurtenissen plaats. Klik hier om te zien welke dit zijn." -#: ../../include/account.php:130 -msgid "Please enter the required information." -msgstr "Vul de vereiste informatie in." +#: ../../addon/tour/tour.php:90 +msgid "You have received a new introduction. Click here to see who!" +msgstr "Je hebt een nieuw connectieverzoek ontvangen. Klik hier om te kijken van wie." -#: ../../include/account.php:198 -msgid "Failed to store account information." -msgstr "Account-informatie kon niet opgeslagen worden." +#: ../../addon/tour/tour.php:91 +msgid "" +"There is a new system notification. Click here to see what has happened!" +msgstr "Er is een nieuwe systeemmelding. Klik hier om te zien wat er aan de hand is." -#: ../../include/account.php:263 -#, php-format -msgid "Registration confirmation for %s" -msgstr "Registratiebevestiging voor %s" +#: ../../addon/tour/tour.php:94 +msgid "Click here to share text, images, videos and sound." +msgstr "Klik hier om tekst, afbeeldingen, video en audio te delen." -#: ../../include/account.php:330 -#, php-format -msgid "Registration request at %s" -msgstr "Registratiebevestiging voor %s" +#: ../../addon/tour/tour.php:95 +msgid "You can write an optional title for your update (good for long posts)." +msgstr "Je kan een titel voor je nieuwe bericht verzinnen, maar dit is niet verplicht. Vooral goed voor langere berichten." -#: ../../include/account.php:352 -msgid "your registration password" -msgstr "jouw registratiewachtwoord" +#: ../../addon/tour/tour.php:96 +msgid "Entering some categories here makes it easier to find your post later." +msgstr "Het invullen van enkele categorieën, maakt het later terugvinden van je berichten gemakkelijker. Dit is niet verplicht." -#: ../../include/account.php:358 ../../include/account.php:420 -#, php-format -msgid "Registration details for %s" -msgstr "Registratiegegevens voor %s" +#: ../../addon/tour/tour.php:97 +msgid "Share photos, links, location, etc." +msgstr "Deel foto's, links, locaties, enz." -#: ../../include/account.php:431 -msgid "Account approved." -msgstr "Account goedgekeurd" +#: ../../addon/tour/tour.php:98 +msgid "" +"Only want to share content for a while? Make it expire at a certain date." +msgstr "Wil je alleen iets tot een bepaald moment delen? Dan kan je het hiermee op een bepaalde datum en tijd laten verlopen." -#: ../../include/account.php:471 -#, php-format -msgid "Registration revoked for %s" -msgstr "Registratie ingetrokken voor %s" +#: ../../addon/tour/tour.php:99 +msgid "You can password protect content." +msgstr "Je kan met een wachtwoord gegevens beveiligen." -#: ../../include/account.php:756 ../../include/account.php:758 -msgid "Click here to upgrade." -msgstr "Klik hier om te upgraden." +#: ../../addon/tour/tour.php:100 +msgid "Choose who you share with." +msgstr "Kies met wie je dit wil delen. " -#: ../../include/account.php:764 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden." +#: ../../addon/tour/tour.php:102 +msgid "Click here when you are done." +msgstr "Klik hier wanneer je klaar bent." -#: ../../include/account.php:769 -msgid "This action is not available under your subscription plan." -msgstr "Deze handeling is niet mogelijk met jouw abonnement." +#: ../../addon/tour/tour.php:105 +msgid "Adjust from which channels posts should be displayed." +msgstr "Aanpassen van welke kanalen berichten moeten worden getoond. " -#: ../../include/widgets.php:46 ../../include/widgets.php:455 -#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 -#: ../../include/contact_widgets.php:91 -msgid "Categories" -msgstr "Categorieën" +#: ../../addon/tour/tour.php:106 +msgid "Only show posts from channels in the specified privacy group." +msgstr "Toon alleen berichten van kanalen in de hier gekozen privacygroep." -#: ../../include/widgets.php:141 -msgid "Suggestions" -msgstr "Voorgestelde kanalen" +#: ../../addon/tour/tour.php:110 +msgid "Easily find posts containing tags (keywords preceded by the \"#\" symbol)." +msgstr "Vind gemakkelijk berichten met tags (trefwoorden die beginnen met een \"#\")." -#: ../../include/widgets.php:142 -msgid "See more..." -msgstr "Meer..." +#: ../../addon/tour/tour.php:111 +msgid "Easily find posts in given category." +msgstr "Vind gemakkelijk berichten in een bepaalde categorie." -#: ../../include/widgets.php:162 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "Je hebt %1$.0f van de %2$.0f toegestane connecties." +#: ../../addon/tour/tour.php:112 +msgid "Easily find posts by date." +msgstr "Vind gemakkelijk berichten op datum." -#: ../../include/widgets.php:168 -msgid "Add New Connection" -msgstr "Nieuwe connectie toevoegen" +#: ../../addon/tour/tour.php:113 +msgid "" +"Suggested users who have volounteered to be shown as suggestions, and who we" +" think you might find interesting." +msgstr "Voorstellen voor kanalen die wellicht interessant voor jou zijn en hier ook vrijwillig voor hebben gekozen." -#: ../../include/widgets.php:169 -msgid "Enter channel address" -msgstr "Vul kanaaladres in" +#: ../../addon/tour/tour.php:114 +msgid "Here you see channels you have connected to." +msgstr "Hier kan je zien met welke kanalen je bent verbonden (connecties)." -#: ../../include/widgets.php:170 -msgid "Examples: bob@example.com, https://example.com/barbara" -msgstr "Voorbeelden: bob@example.com, http://example.com/barbara" +#: ../../addon/tour/tour.php:115 +msgid "Save your search so you can repeat it at a later date." +msgstr "Sla jouw zoekopdracht op, zodat je het later opnieuw kan gebruiken." -#: ../../include/widgets.php:186 -msgid "Notes" -msgstr "Aantekeningen" +#: ../../addon/tour/tour.php:118 +msgid "" +"If you see this icon you can be sure that the sender is who it say it is. It" +" is normal that it is not always possible to verify the sender, so the icon " +"will be missing sometimes. There is usually no need to worry about that." +msgstr "Wanneer je dit pictogram ziet, kan je er van uitgaan dat de afzender is wie hij/zij beweert te zijn. Het is niet altijd mogelijk om de afzender te verifiëren, waardoor het pictogram soms ontbreekt. Dit is meestal geen reden voor ongerustheid." -#: ../../include/widgets.php:262 -msgid "Remove term" -msgstr "Verwijder zoekterm" +#: ../../addon/tour/tour.php:119 +msgid "" +"Danger! It seems someone tried to forge a message! This message is not " +"necessarily from who it says it is from!" +msgstr "Gevaar! Het lijkt er op dat iemand een bericht heeft proberen te vervalsen! Dit bericht is mogelijk niet afkomstig van de vermelde afzender!" -#: ../../include/widgets.php:270 ../../include/features.php:301 -msgid "Saved Searches" -msgstr "Opgeslagen zoekopdrachten" +#: ../../addon/tour/tour.php:126 +msgid "" +"Welcome to Hubzilla! Would you like to see a tour of the UI?

    You can " +"pause it at any time and continue where you left off by reloading the page, " +"or navigting to another page.

    You can also advance by pressing the " +"return key" +msgstr "Welkom op Hubzilla! Wil jij een rondleiding hebben langs de gebruikersinterface?

    Je kan dit op elk moment pauzeren en weer hervatten door de pagina te herladen of naar een andere pagina te gaan.

    Je kan ook vooruitgaan met behulp van de entertoets." -#: ../../include/widgets.php:271 ../../include/group.php:336 -msgid "add" -msgstr "toevoegen" +#: ../../addon/sendzid/sendzid.php:25 +msgid "Extended Identity Sharing" +msgstr "Uitgebreid identiteit delen" -#: ../../include/widgets.php:333 ../../include/contact_widgets.php:53 -#: ../../include/features.php:390 -msgid "Saved Folders" -msgstr "Bewaarde mappen" +#: ../../addon/sendzid/sendzid.php:26 +msgid "" +"Share your identity with all websites on the internet. When disabled, " +"identity is only shared with $Projectname sites." +msgstr "Deel jouw Hubzilla-identiteit met alle websites op het internet. Wanneer dit is uitgeschakeld wordt je identiteit alleen binnen het Hubzilla-netwerk gedeeld." -#: ../../include/widgets.php:336 ../../include/widgets.php:458 -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 -msgid "Everything" -msgstr "Alles" +#: ../../addon/tictac/tictac.php:21 +msgid "Three Dimensional Tic-Tac-Toe" +msgstr "Driedimensionaal Boter-kaas-en-eieren" -#: ../../include/widgets.php:377 -msgid "Archives" -msgstr "Archieven" +#: ../../addon/tictac/tictac.php:54 +msgid "3D Tic-Tac-Toe" +msgstr "Boter-kaas-en-eieren in 3D" -#: ../../include/widgets.php:549 -msgid "Refresh" -msgstr "Vernieuwen" +#: ../../addon/tictac/tictac.php:59 +msgid "New game" +msgstr "Nieuw spel" -#: ../../include/widgets.php:589 -msgid "Account settings" -msgstr "Account" +#: ../../addon/tictac/tictac.php:60 +msgid "New game with handicap" +msgstr "Nieuw spel met handicap" -#: ../../include/widgets.php:595 -msgid "Channel settings" -msgstr "Kanaal" +#: ../../addon/tictac/tictac.php:61 +msgid "" +"Three dimensional tic-tac-toe is just like the traditional game except that " +"it is played on multiple levels simultaneously. " +msgstr "Driedimensionaal Boter-kaas-en-eieren is hetzelfde als het klassieke spel, behalve dat het gelijktijdig op meerdere hoogtes wordt gespeeld." -#: ../../include/widgets.php:604 -msgid "Additional features" -msgstr "Extra functies" +#: ../../addon/tictac/tictac.php:62 +msgid "" +"In this case there are three levels. You win by getting three in a row on " +"any level, as well as up, down, and diagonally across the different levels." +msgstr "In dit geval zijn er drie hoogtes. Je wint wanneer je drie op een rij hebt op een van de drie hoogtes, van boven naar beneden of diagonaal." -#: ../../include/widgets.php:611 -msgid "Feature/Addon settings" -msgstr "Plugin-instellingen" +#: ../../addon/tictac/tictac.php:64 +msgid "" +"The handicap game disables the center position on the middle level because " +"the player claiming this square often has an unfair advantage." +msgstr "Het spel met een handicap schakelt de middelste positie op de middelste hoogte uit, omdat de speler die deze positie krijgt vaak een oneerlijk voordeel geniet." -#: ../../include/widgets.php:617 -msgid "Display settings" -msgstr "Weergave" +#: ../../addon/tictac/tictac.php:183 +msgid "You go first..." +msgstr "Jij bent eerst..." -#: ../../include/widgets.php:624 -msgid "Manage locations" -msgstr "Locaties beheren" +#: ../../addon/tictac/tictac.php:188 +msgid "I'm going first this time..." +msgstr "Ik ga deze keer eerst..." -#: ../../include/widgets.php:631 -msgid "Export channel" -msgstr "Kanaal exporteren" +#: ../../addon/tictac/tictac.php:194 +msgid "You won!" +msgstr "Jij wint!" -#: ../../include/widgets.php:637 -msgid "Connected apps" -msgstr "Verbonden applicaties" +#: ../../addon/tictac/tictac.php:200 ../../addon/tictac/tictac.php:225 +msgid "\"Cat\" game!" +msgstr "Gelijkspel!" -#: ../../include/widgets.php:652 ../../include/features.php:153 -msgid "Permission Groups" -msgstr "Permissiegroepen" +#: ../../addon/tictac/tictac.php:223 +msgid "I won!" +msgstr "Ik win!" -#: ../../include/widgets.php:669 -msgid "Premium Channel Settings" -msgstr "Instellingen premiumkanaal" +#: ../../addon/pageheader/pageheader.php:43 +msgid "Message to display on every page on this server" +msgstr "Bericht om op elke pagina van deze hub te tonen" -#: ../../include/widgets.php:698 -msgid "Private Mail Menu" -msgstr "Privéberichten" +#: ../../addon/pageheader/pageheader.php:48 +msgid "Pageheader Settings" +msgstr "Pageheader" -#: ../../include/widgets.php:700 -msgid "Combined View" -msgstr "Gecombineerd postvak" +#: ../../addon/pageheader/pageheader.php:64 +msgid "pageheader Settings saved." +msgstr "Pageheader-instellingen opgeslagen." -#: ../../include/widgets.php:705 ../../include/nav.php:213 -msgid "Inbox" -msgstr "Postvak IN" +#: ../../addon/authchoose/authchoose.php:67 +msgid "Only authenticate automatically to sites of your friends" +msgstr "Alleen automatisch authentiseren op hubs van jouw connecties" -#: ../../include/widgets.php:710 ../../include/nav.php:214 -msgid "Outbox" -msgstr "Postvak UIT" +#: ../../addon/authchoose/authchoose.php:67 +msgid "By default you are automatically authenticated anywhere in the network" +msgstr "Standaard wordt je overal in het netwerk automatisch geauthentiseerd" -#: ../../include/widgets.php:715 ../../include/nav.php:215 -msgid "New Message" -msgstr "Nieuw bericht" +#: ../../addon/authchoose/authchoose.php:71 +msgid "Authchoose Settings" +msgstr "Authchoose (authenticatiekeuze)" -#: ../../include/widgets.php:732 ../../include/widgets.php:744 -msgid "Conversations" -msgstr "Conversaties" +#: ../../addon/authchoose/authchoose.php:85 +msgid "Atuhchoose Settings updated." +msgstr "Authchoose-instellingen bijgewerkt." -#: ../../include/widgets.php:736 -msgid "Received Messages" -msgstr "Ontvangen berichten" +#: ../../addon/moremoods/moremoods.php:19 +msgid "lonely" +msgstr "Eenzaam" -#: ../../include/widgets.php:740 -msgid "Sent Messages" -msgstr "Verzonden berichten" +#: ../../addon/moremoods/moremoods.php:20 +msgid "drunk" +msgstr "dronken" -#: ../../include/widgets.php:754 -msgid "No messages." -msgstr "Geen berichten" +#: ../../addon/moremoods/moremoods.php:21 +msgid "horny" +msgstr "geil" -#: ../../include/widgets.php:772 -msgid "Delete conversation" -msgstr "Verwijder conversatie" +#: ../../addon/moremoods/moremoods.php:22 +msgid "stoned" +msgstr "stoned" -#: ../../include/widgets.php:798 -msgid "Events Tools" -msgstr "Agenda-hulpmiddelen" +#: ../../addon/moremoods/moremoods.php:23 +msgid "fucked up" +msgstr "opgefokt" -#: ../../include/widgets.php:799 -msgid "Export Calendar" -msgstr "Exporteren" +#: ../../addon/moremoods/moremoods.php:24 +msgid "clusterfucked" +msgstr "clusterfucked" -#: ../../include/widgets.php:800 -msgid "Import Calendar" -msgstr "Importeren" +#: ../../addon/moremoods/moremoods.php:25 +msgid "crazy" +msgstr "gek" -#: ../../include/widgets.php:888 ../../include/conversation.php:1866 -#: ../../include/conversation.php:1869 -msgid "Chatrooms" -msgstr "Chatkanalen" +#: ../../addon/moremoods/moremoods.php:26 +msgid "hurt" +msgstr "gekwetst" -#: ../../include/widgets.php:892 -msgid "Overview" -msgstr "Overzicht" +#: ../../addon/moremoods/moremoods.php:27 +msgid "sleepy" +msgstr "slaperig" -#: ../../include/widgets.php:899 -msgid "Chat Members" -msgstr "Chatleden" +#: ../../addon/moremoods/moremoods.php:28 +msgid "grumpy" +msgstr "chagrijnig" -#: ../../include/widgets.php:977 -msgctxt "wiki_history" -msgid "Message" -msgstr "Bericht" +#: ../../addon/moremoods/moremoods.php:29 +msgid "high" +msgstr "high" -#: ../../include/widgets.php:999 -msgid "Bookmarked Chatrooms" -msgstr "Bladwijzers van chatkanalen" +#: ../../addon/moremoods/moremoods.php:30 +msgid "semi-conscious" +msgstr "half bij kennis" -#: ../../include/widgets.php:1030 -msgid "Suggested Chatrooms" -msgstr "Voorgestelde chatkanalen" +#: ../../addon/moremoods/moremoods.php:31 +msgid "in love" +msgstr "verliefd" -#: ../../include/widgets.php:1175 ../../include/widgets.php:1287 -msgid "photo/image" -msgstr "foto/afbeelding" +#: ../../addon/moremoods/moremoods.php:32 +msgid "in lust" +msgstr "wellustig" -#: ../../include/widgets.php:1230 -msgid "Click to show more" -msgstr "Klik voor meer" +#: ../../addon/moremoods/moremoods.php:33 +msgid "naked" +msgstr "naakt" -#: ../../include/widgets.php:1381 -msgid "Rating Tools" -msgstr "Beoordelingen" +#: ../../addon/moremoods/moremoods.php:34 +msgid "stinky" +msgstr "stinkend" -#: ../../include/widgets.php:1385 ../../include/widgets.php:1387 -msgid "Rate Me" -msgstr "Beoordeel mij" +#: ../../addon/moremoods/moremoods.php:35 +msgid "sweaty" +msgstr "zweterig" -#: ../../include/widgets.php:1390 -msgid "View Ratings" -msgstr "Bekijk beoordelingen" +#: ../../addon/moremoods/moremoods.php:36 +msgid "bleeding out" +msgstr "aan het doodbloeden" -#: ../../include/widgets.php:1483 -msgid "Forums" -msgstr "Forums" +#: ../../addon/moremoods/moremoods.php:37 +msgid "victorious" +msgstr "zegevierend" -#: ../../include/widgets.php:1540 -msgctxt "widget" -msgid "Activity" -msgstr "Activiteit" +#: ../../addon/moremoods/moremoods.php:38 +msgid "defeated" +msgstr "verslagen" -#: ../../include/widgets.php:1569 -msgid "Tasks" -msgstr "Taken" +#: ../../addon/moremoods/moremoods.php:39 +msgid "envious" +msgstr "jaloers" -#: ../../include/widgets.php:1635 ../../include/widgets.php:1673 -msgid "Member registrations waiting for confirmation" -msgstr "Accounts die op goedkeuring wachten" +#: ../../addon/moremoods/moremoods.php:40 +msgid "jealous" +msgstr "jaloers" -#: ../../include/widgets.php:1641 -msgid "Inspect queue" -msgstr "Inspecteer berichtenwachtrij" +#: ../../addon/xmpp/xmpp.php:31 +msgid "XMPP settings updated." +msgstr "XMPP-instellingen bijgewerkt." -#: ../../include/widgets.php:1643 -msgid "DB updates" -msgstr "Database-updates" +#: ../../addon/xmpp/xmpp.php:53 +msgid "Enable Chat" +msgstr "Chatten inschakelen" -#: ../../include/widgets.php:1668 ../../include/nav.php:233 -msgid "Admin" -msgstr "Beheer" +#: ../../addon/xmpp/xmpp.php:58 +msgid "Individual credentials" +msgstr "Individuele credentials" -#: ../../include/widgets.php:1669 -msgid "Plugin Features" -msgstr "Plugin-opties" +#: ../../addon/xmpp/xmpp.php:64 +msgid "Jabber BOSH server" +msgstr "BOSH-server van Jabber" -#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 -msgid "Tags" -msgstr "Tags" +#: ../../addon/xmpp/xmpp.php:69 +msgid "XMPP Settings" +msgstr "XMPP" -#: ../../include/taxonomy.php:293 -msgid "Keywords" -msgstr "Trefwoorden" +#: ../../addon/xmpp/xmpp.php:92 +msgid "Jabber BOSH host" +msgstr "BOSH-host van Jabber" -#: ../../include/taxonomy.php:314 -msgid "have" -msgstr "heb" +#: ../../addon/xmpp/xmpp.php:93 +msgid "Use central userbase" +msgstr "Gebruik een centrale gebruikersgroep" -#: ../../include/taxonomy.php:314 -msgid "has" -msgstr "heeft" +#: ../../addon/xmpp/xmpp.php:93 +msgid "" +"If enabled, members will automatically login to an ejabberd server that has " +"to be installed on this machine with synchronized credentials via the " +"\"auth_ejabberd.php\" script." +msgstr "Wanneer ingeschakeld worden leden automatisch op een Ejabberd-server ingelogd. Deze dient wel op deze machine te zijn geïnstalleerd met zgn. 'synchronized credentials' via het 'auth_ejabberd.php'-script." -#: ../../include/taxonomy.php:315 -msgid "want" -msgstr "wil" +#: ../../addon/wholikesme/wholikesme.php:29 +msgid "Who likes me?" +msgstr "Wie vindt mij leuk?" -#: ../../include/taxonomy.php:315 -msgid "wants" -msgstr "wil" +#: ../../addon/pumpio/pumpio.php:148 +msgid "You are now authenticated to pumpio." +msgstr "De verbinding met pump.io is geverifieerd" -#: ../../include/taxonomy.php:316 -msgid "likes" -msgstr "vindt dit leuk" +#: ../../addon/pumpio/pumpio.php:149 +msgid "return to the featured settings page" +msgstr "Ga terug naar pagina met plug-in-instellingen" -#: ../../include/taxonomy.php:317 -msgid "dislikes" -msgstr "vindt dit niet leuk" +#: ../../addon/pumpio/pumpio.php:163 +msgid "Post to Pump.io" +msgstr "Pump.io" -#: ../../include/event.php:22 ../../include/event.php:69 -#: ../../include/markdown.php:540 -msgid "l F d, Y \\@ g:i A" -msgstr "l d F Y \\@ G:i" +#: ../../addon/pumpio/pumpio.php:198 +msgid "Pump.io servername" +msgstr "Pump.io-servernaam" -#: ../../include/event.php:30 ../../include/event.php:73 -#: ../../include/markdown.php:546 -msgid "Starts:" -msgstr "Start:" +#: ../../addon/pumpio/pumpio.php:198 +msgid "Without \"http://\" or \"https://\"" +msgstr "Zonder \"http://\" of \"https://\"" -#: ../../include/event.php:40 ../../include/event.php:77 -#: ../../include/markdown.php:554 -msgid "Finishes:" -msgstr "Einde:" +#: ../../addon/pumpio/pumpio.php:202 +msgid "Pump.io username" +msgstr "Gebruikersnaam Pump.io" -#: ../../include/event.php:1004 -msgid "This event has been added to your calendar." -msgstr "Dit evenement is aan jouw agenda toegevoegd." +#: ../../addon/pumpio/pumpio.php:202 +msgid "Without the servername" +msgstr "Zonder servernaam" -#: ../../include/event.php:1204 -msgid "Not specified" -msgstr "Niet aangegeven" +#: ../../addon/pumpio/pumpio.php:213 +msgid "You are not authenticated to pumpio" +msgstr "De verbinding met pump.io is niet geverifieerd" -#: ../../include/event.php:1205 -msgid "Needs Action" -msgstr "Actie vereist" +#: ../../addon/pumpio/pumpio.php:215 +msgid "(Re-)Authenticate your pump.io connection" +msgstr "Verifieer (opnieuw) jouw pump.io-verbinding" -#: ../../include/event.php:1206 -msgid "Completed" -msgstr "Voltooid" +#: ../../addon/pumpio/pumpio.php:219 +msgid "Enable pump.io Post Plugin" +msgstr "Doorplaatsen naar Pump.io inschakelen" -#: ../../include/event.php:1207 -msgid "In Process" -msgstr "In behandeling" +#: ../../addon/pumpio/pumpio.php:223 +msgid "Post to pump.io by default" +msgstr "Standaard doorplaatsen naar Pump.io" -#: ../../include/event.php:1208 -msgid "Cancelled" -msgstr "Geannuleerd" +#: ../../addon/pumpio/pumpio.php:227 +msgid "Should posts be public" +msgstr "Moeten berichten openbaar zijn" -#: ../../include/datetime.php:147 -msgid "Birthday" -msgstr "Verjaardag of geboortedatum" +#: ../../addon/pumpio/pumpio.php:231 +msgid "Mirror all public posts" +msgstr "Alle openbare berichten doorplaatsen" -#: ../../include/datetime.php:149 -msgid "Age: " -msgstr "Leeftijd:" +#: ../../addon/pumpio/pumpio.php:237 +msgid "Pump.io Post Settings" +msgstr "Pump.io (berichten doorplaatsen)" -#: ../../include/datetime.php:151 -msgid "YYYY-MM-DD or MM-DD" -msgstr "JJJJ-MM-DD of MM-DD" +#: ../../addon/pumpio/pumpio.php:266 +msgid "PumpIO Settings saved." +msgstr "Pump.io-instellingen opgeslagen." -#: ../../include/datetime.php:286 ../../boot.php:2598 -msgid "never" -msgstr "nooit" +#: ../../addon/ldapauth/ldapauth.php:61 +msgid "An account has been created for you." +msgstr "Er is voor jou een account aangemaakt." -#: ../../include/datetime.php:292 -msgid "less than a second ago" -msgstr "minder dan een seconde geleden" +#: ../../addon/ldapauth/ldapauth.php:68 +msgid "Authentication successful but rejected: account creation is disabled." +msgstr "Authenticatie geslaagd, maar afgekeurd: aanmaken accounts uitgeschakeld." -#: ../../include/datetime.php:310 +#: ../../addon/opensearch/opensearch.php:26 #, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s ago" -msgstr "%1$d %2$s geleden" - -#: ../../include/datetime.php:321 -msgctxt "relative_date" -msgid "year" -msgid_plural "years" -msgstr[0] "jaar" -msgstr[1] "jaren" +msgctxt "opensearch" +msgid "Search %1$s (%2$s)" +msgstr "Zoek %1$s (%2$s)" -#: ../../include/datetime.php:324 -msgctxt "relative_date" -msgid "month" -msgid_plural "months" -msgstr[0] "maand" -msgstr[1] "maanden" +#: ../../addon/opensearch/opensearch.php:28 +msgctxt "opensearch" +msgid "$Projectname" +msgstr "$Projectname" -#: ../../include/datetime.php:327 -msgctxt "relative_date" -msgid "week" -msgid_plural "weeks" -msgstr[0] "week" -msgstr[1] "weken" +#: ../../addon/opensearch/opensearch.php:43 +msgid "Search $Projectname" +msgstr "Zoek in " -#: ../../include/datetime.php:330 -msgctxt "relative_date" -msgid "day" -msgid_plural "days" -msgstr[0] "dag" -msgstr[1] "dagen" +#: ../../addon/redfiles/redfiles.php:119 +msgid "Redmatrix File Storage Import" +msgstr "Importeer bestanden vanuit Redmatrix" -#: ../../include/datetime.php:333 -msgctxt "relative_date" -msgid "hour" -msgid_plural "hours" -msgstr[0] "uur" -msgstr[1] "uren" +#: ../../addon/redfiles/redfiles.php:120 +msgid "This will import all your Redmatrix cloud files to this channel." +msgstr "Hiermee importeer je al jouw Redmatrix-bestanden in dit kanaal." -#: ../../include/datetime.php:336 -msgctxt "relative_date" -msgid "minute" -msgid_plural "minutes" -msgstr[0] "minuut" -msgstr[1] "minuten" +#: ../../addon/redfiles/redfilehelper.php:64 +msgid "file" +msgstr "bestand" -#: ../../include/datetime.php:339 -msgctxt "relative_date" -msgid "second" -msgid_plural "seconds" -msgstr[0] "seconde" -msgstr[1] "seconden" +#: ../../addon/hubwall/hubwall.php:19 +msgid "Send email to all members" +msgstr "Naar alle leden e-mail versturen" -#: ../../include/datetime.php:576 +#: ../../addon/hubwall/hubwall.php:73 #, php-format -msgid "%1$s's birthday" -msgstr "Verjaardag van %1$s" +msgid "%1$d of %2$d messages sent." +msgstr "%1$d van %2$d berichten verzonden." -#: ../../include/datetime.php:577 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "Gefeliciteerd met je verjaardag %1$s" +#: ../../addon/hubwall/hubwall.php:81 +msgid "Send email to all hub members." +msgstr "Naar alle leden van deze hub e-mail versturen." + +#: ../../addon/hubwall/hubwall.php:93 +msgid "Sender Email address" +msgstr "E-mailadres afzender" + +#: ../../addon/hubwall/hubwall.php:94 +msgid "Test mode (only send to hub administrator)" +msgstr "Testmodus (alleen naar hubbeheerder sturen)" #: ../../include/selectors.php:30 msgid "Frequently" @@ -11355,11 +11848,11 @@ msgstr "Transseksueel" msgid "Hermaphrodite" msgstr "Hermafrodiet" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:49 ../../include/channel.php:1484 msgid "Neuter" msgstr "Genderneutraal" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:49 ../../include/channel.php:1486 msgid "Non-specific" msgstr "Niet gespecificeerd" @@ -11539,2245 +12032,2280 @@ msgstr "Maakt mij niks uit" msgid "Ask me" msgstr "Vraag het me" -#: ../../include/acl_selectors.php:208 -msgid "Who can see this?" -msgstr "Wie kan dit zien?" +#: ../../include/conversation.php:169 +#, php-format +msgid "likes %1$s's %2$s" +msgstr "vindt het %2$s van %1$s leuk" + +#: ../../include/conversation.php:172 +#, php-format +msgid "doesn't like %1$s's %2$s" +msgstr "vindt het %2$s van %1$s niet leuk" + +#: ../../include/conversation.php:212 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "%1$s is nu met %2$s verbonden" + +#: ../../include/conversation.php:247 +#, php-format +msgid "%1$s poked %2$s" +msgstr "%1$s heeft %2$s aangestoten" + +#: ../../include/conversation.php:251 ../../include/text.php:1129 +#: ../../include/text.php:1133 +msgid "poked" +msgstr "aangestoten" + +#: ../../include/conversation.php:736 +#, php-format +msgid "View %s's profile @ %s" +msgstr "Bekijk het profiel van %s @ %s" + +#: ../../include/conversation.php:756 +msgid "Categories:" +msgstr "Categorieën:" + +#: ../../include/conversation.php:757 +msgid "Filed under:" +msgstr "Bewaard onder:" + +#: ../../include/conversation.php:783 +msgid "View in context" +msgstr "In context bekijken" + +#: ../../include/conversation.php:884 +msgid "remove" +msgstr "verwijderen" -#: ../../include/acl_selectors.php:209 -msgid "Custom selection" -msgstr "Handmatige selectie" +#: ../../include/conversation.php:888 +msgid "Loading..." +msgstr "Aan het laden..." -#: ../../include/acl_selectors.php:210 -msgid "" -"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit" -" the scope of \"Show\"." -msgstr "Kies \"Tonen\" om weergave toe te staan. Met \"Niet tonen\" kan je uitzonderingen maken op \"Tonen\"." +#: ../../include/conversation.php:889 +msgid "Delete Selected Items" +msgstr "Verwijder de geselecteerde items" -#: ../../include/acl_selectors.php:211 -msgid "Show" -msgstr "Tonen" +#: ../../include/conversation.php:932 +msgid "View Source" +msgstr "Bron tonen" -#: ../../include/acl_selectors.php:212 -msgid "Don't show" -msgstr "Niet tonen" +#: ../../include/conversation.php:942 +msgid "Follow Thread" +msgstr "Conversatie volgen" -#: ../../include/acl_selectors.php:245 -#, php-format -msgid "" -"Post permissions %s cannot be changed %s after a post is shared.
    These" -" permissions set who is allowed to view the post." -msgstr "Permissies van berichten %s zijn niet meer te veranderen %s nadat een bericht is gedeeld.
    Met deze permissies bepaal je wie het bericht kan zien." +#: ../../include/conversation.php:951 +msgid "Unfollow Thread" +msgstr "Conversatie niet meer volgen" -#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040 -#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048 -#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054 -#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062 -#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070 -#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076 -#: ../../include/bbcode.php:1079 -msgid "Image/photo" -msgstr "Afbeelding/foto" +#: ../../include/conversation.php:1062 +msgid "Edit Connection" +msgstr "Connectie bewerken" -#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090 -msgid "Encrypted content" -msgstr "Versleutelde inhoud" +#: ../../include/conversation.php:1072 +msgid "Message" +msgstr "Bericht" -#: ../../include/bbcode.php:189 +#: ../../include/conversation.php:1206 #, php-format -msgid "Install %s element: " -msgstr "Installeer %s-element: " +msgid "%s likes this." +msgstr "%s vindt dit leuk." -#: ../../include/bbcode.php:193 +#: ../../include/conversation.php:1206 #, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." -msgstr "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren." +msgid "%s doesn't like this." +msgstr "%s vindt dit niet leuk." -#: ../../include/bbcode.php:272 +#: ../../include/conversation.php:1210 #, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "%1$s schreef het volgende %2$s %3$s" - -#: ../../include/bbcode.php:349 ../../include/bbcode.php:357 -msgid "Click to open/close" -msgstr "Klik om te openen of te sluiten" - -#: ../../include/bbcode.php:357 -msgid "spoiler" -msgstr "spoiler" - -#: ../../include/bbcode.php:1028 -msgid "$1 wrote:" -msgstr "$1 schreef:" +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "%2$d persoon vindt dit leuk." +msgstr[1] "%2$d personen vinden dit leuk." -#: ../../include/bookmarks.php:34 +#: ../../include/conversation.php:1212 #, php-format -msgid "%1$s's bookmarks" -msgstr "Bladwijzers van %1$s" - -#: ../../include/connections.php:127 -msgid "New window" -msgstr "Nieuw venster" - -#: ../../include/connections.php:128 -msgid "Open the selected location in a different window or browser tab" -msgstr "Open de geselecteerde locatie in een ander venster of tab" +msgid "%2$d people don't like this." +msgid_plural "%2$d people don't like this." +msgstr[0] "%2$d persoon vindt dit niet leuk." +msgstr[1] "%2$d personen vinden dit niet leuk." -#: ../../include/help.php:33 -msgid "Help:" -msgstr "Hulp:" +#: ../../include/conversation.php:1218 +msgid "and" +msgstr "en" -#: ../../include/help.php:65 -msgid "Not Found" -msgstr "Niet gevonden" +#: ../../include/conversation.php:1221 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] ", en %d ander persoon" +msgstr[1] ", en %d andere personen" -#: ../../include/page_widgets.php:7 -msgid "New Page" -msgstr "Nieuwe pagina" +#: ../../include/conversation.php:1222 +#, php-format +msgid "%s like this." +msgstr "%s vinden dit leuk." -#: ../../include/contact_widgets.php:11 +#: ../../include/conversation.php:1222 #, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "%d uitnodiging beschikbaar" -msgstr[1] "%d uitnodigingen beschikbaar" +msgid "%s don't like this." +msgstr "%s vinden dit niet leuk." -#: ../../include/contact_widgets.php:19 -msgid "Find Channels" -msgstr "Kanalen vinden" +#: ../../include/conversation.php:1265 +msgid "Set your location" +msgstr "Locatie instellen" -#: ../../include/contact_widgets.php:20 -msgid "Enter name or interest" -msgstr "Vul naam of interesse in" +#: ../../include/conversation.php:1266 +msgid "Clear browser location" +msgstr "Locatie van webbrowser wissen" -#: ../../include/contact_widgets.php:21 -msgid "Connect/Follow" -msgstr "Verbinden/volgen" +#: ../../include/conversation.php:1316 +msgid "Tag term:" +msgstr "Tag:" -#: ../../include/contact_widgets.php:22 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "Voorbeeld: Robert Morgenstein, vissen" +#: ../../include/conversation.php:1317 +msgid "Where are you right now?" +msgstr "Waar bevind je je op dit moment?" -#: ../../include/contact_widgets.php:26 -msgid "Random Profile" -msgstr "Willekeurig profiel" +#: ../../include/conversation.php:1322 +msgid "Choose a different album..." +msgstr "Kies een ander album..." -#: ../../include/contact_widgets.php:27 -msgid "Invite Friends" -msgstr "Vrienden uitnodigen" +#: ../../include/conversation.php:1326 +msgid "Comments enabled" +msgstr "Reacties ingeschakeld" -#: ../../include/contact_widgets.php:29 -msgid "Advanced example: name=fred and country=iceland" -msgstr "Geavanceerd voorbeeld (Engels): name=jan en country=nederland" +#: ../../include/conversation.php:1327 +msgid "Comments disabled" +msgstr "Reacties uitgeschakeld" -#: ../../include/contact_widgets.php:122 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "%d gemeenschappelijke connectie" -msgstr[1] "%d gemeenschappelijke connecties" +#: ../../include/conversation.php:1375 +msgid "Page link name" +msgstr "Linknaam pagina" -#: ../../include/contact_widgets.php:127 -msgid "show more" -msgstr "meer connecties weergeven" +#: ../../include/conversation.php:1378 +msgid "Post as" +msgstr "Bericht plaatsen als" -#: ../../include/js_strings.php:5 -msgid "Delete this item?" -msgstr "Dit item verwijderen?" +#: ../../include/conversation.php:1392 +msgid "Toggle voting" +msgstr "Peiling in- of uitschakelen" -#: ../../include/js_strings.php:8 -#, php-format -msgid "%s show less" -msgstr "%s minder reacties weergeven" +#: ../../include/conversation.php:1395 +msgid "Disable comments" +msgstr "Reacties uitschakelen" -#: ../../include/js_strings.php:9 -#, php-format -msgid "%s expand" -msgstr "%s uitklappen" +#: ../../include/conversation.php:1396 +msgid "Toggle comments" +msgstr "Reacties in- of uitschakelen" -#: ../../include/js_strings.php:10 -#, php-format -msgid "%s collapse" -msgstr "%s inklappen" +#: ../../include/conversation.php:1404 +msgid "Categories (optional, comma-separated list)" +msgstr "Categorieën (niet verplicht, door komma's gescheiden lijst)" -#: ../../include/js_strings.php:11 -msgid "Password too short" -msgstr "Wachtwoord te kort" +#: ../../include/conversation.php:1427 +msgid "Other networks and post services" +msgstr "Andere netwerken en diensten" -#: ../../include/js_strings.php:12 -msgid "Passwords do not match" -msgstr "Wachtwoorden komen niet overeen" +#: ../../include/conversation.php:1433 +msgid "Set publish date" +msgstr "Publicatiedatum instellen" -#: ../../include/js_strings.php:13 -msgid "everybody" -msgstr "iedereen" +#: ../../include/conversation.php:1693 +msgid "Commented Order" +msgstr "Nieuwe reacties bovenaan" -#: ../../include/js_strings.php:14 -msgid "Secret Passphrase" -msgstr "Geheim wachtwoord" +#: ../../include/conversation.php:1696 +msgid "Sort by Comment Date" +msgstr "Berichten met nieuwe reacties bovenaan" -#: ../../include/js_strings.php:15 -msgid "Passphrase hint" -msgstr "Wachtwoordhint" +#: ../../include/conversation.php:1700 +msgid "Posted Order" +msgstr "Nieuwe berichten bovenaan" -#: ../../include/js_strings.php:16 -msgid "Notice: Permissions have changed but have not yet been submitted." -msgstr "Mededeling: de permissies zijn veranderd, maar zijn nog niet opgeslagen." +#: ../../include/conversation.php:1703 +msgid "Sort by Post Date" +msgstr "Nieuwe berichten bovenaan" -#: ../../include/js_strings.php:17 -msgid "close all" -msgstr "Alles sluiten" +#: ../../include/conversation.php:1711 +msgid "Posts that mention or involve you" +msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent" -#: ../../include/js_strings.php:18 -msgid "Nothing new here" -msgstr "Niets nieuw hier" +#: ../../include/conversation.php:1720 +msgid "Activity Stream - by date" +msgstr "Tijdlijn - op datum" -#: ../../include/js_strings.php:19 -msgid "Rate This Channel (this is public)" -msgstr "Beoordeel dit kanaal (dit is openbaar)" +#: ../../include/conversation.php:1726 +msgid "Starred" +msgstr "Met ster" -#: ../../include/js_strings.php:21 -msgid "Describe (optional)" -msgstr "Omschrijving (niet verplicht)" +#: ../../include/conversation.php:1729 +msgid "Favourite Posts" +msgstr "Favoriete berichten" -#: ../../include/js_strings.php:23 -msgid "Please enter a link URL" -msgstr "Vul een URL in:" +#: ../../include/conversation.php:1736 +msgid "Spam" +msgstr "Spam" -#: ../../include/js_strings.php:24 -msgid "Unsaved changes. Are you sure you wish to leave this page?" -msgstr "Niet opgeslagen wijzigingen. Ben je er zeker van dat je deze pagina wil verlaten?" +#: ../../include/conversation.php:1739 +msgid "Posts flagged as SPAM" +msgstr "Berichten gemarkeerd als SPAM" -#: ../../include/js_strings.php:27 -msgid "timeago.prefixAgo" -msgstr "timeago.prefixAgo" +#: ../../include/conversation.php:1814 ../../include/nav.php:381 +msgid "Status Messages and Posts" +msgstr "Berichten in dit kanaal" -#: ../../include/js_strings.php:28 -msgid "timeago.prefixFromNow" -msgstr "timeago.prefixFromNow" +#: ../../include/conversation.php:1827 ../../include/nav.php:394 +msgid "Profile Details" +msgstr "Profiel" -#: ../../include/js_strings.php:29 -msgid "ago" -msgstr "geleden" +#: ../../include/conversation.php:1837 ../../include/nav.php:404 +#: ../../include/photos.php:666 +msgid "Photo Albums" +msgstr "Fotoalbums" -#: ../../include/js_strings.php:30 -msgid "from now" -msgstr "vanaf nu" +#: ../../include/conversation.php:1845 ../../include/nav.php:412 +msgid "Files and Storage" +msgstr "Bestanden en opslagruimte" -#: ../../include/js_strings.php:31 -msgid "less than a minute" -msgstr "minder dan een minuut" +#: ../../include/conversation.php:1882 ../../include/nav.php:447 +msgid "Bookmarks" +msgstr "Bladwijzers" -#: ../../include/js_strings.php:32 -msgid "about a minute" -msgstr "ongeveer een minuut" +#: ../../include/conversation.php:1885 ../../include/nav.php:450 +msgid "Saved Bookmarks" +msgstr "Opgeslagen bladwijzers" -#: ../../include/js_strings.php:33 -#, php-format -msgid "%d minutes" -msgstr "%d minuten" +#: ../../include/conversation.php:1896 ../../include/nav.php:461 +msgid "View Cards" +msgstr "Kaarten tonen" -#: ../../include/js_strings.php:34 -msgid "about an hour" -msgstr "ongeveer een uur" +#: ../../include/conversation.php:1904 +msgid "articles" +msgstr "artikelen" -#: ../../include/js_strings.php:35 -#, php-format -msgid "about %d hours" -msgstr "ongeveer %d uren" +#: ../../include/conversation.php:1907 ../../include/nav.php:472 +msgid "View Articles" +msgstr "Artikelen tonen" -#: ../../include/js_strings.php:36 -msgid "a day" -msgstr "een dag" +#: ../../include/conversation.php:1918 ../../include/nav.php:484 +msgid "View Webpages" +msgstr "Webpagina's tonen" -#: ../../include/js_strings.php:37 -#, php-format -msgid "%d days" -msgstr "%d dagen" +#: ../../include/conversation.php:1987 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "aanwezig" +msgstr[1] "aanwezig" -#: ../../include/js_strings.php:38 -msgid "about a month" -msgstr "ongeveer een maand" +#: ../../include/conversation.php:1990 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "niet aanwezig" +msgstr[1] "niet aanwezig" -#: ../../include/js_strings.php:39 -#, php-format -msgid "%d months" -msgstr "%d maanden" +#: ../../include/conversation.php:1993 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "nog niet beslist" +msgstr[1] "nog niet beslist" -#: ../../include/js_strings.php:40 -msgid "about a year" -msgstr "ongeveer een jaar" +#: ../../include/conversation.php:1996 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "eens" +msgstr[1] "eens" -#: ../../include/js_strings.php:41 -#, php-format -msgid "%d years" -msgstr "%d jaren" +#: ../../include/conversation.php:1999 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "oneens" +msgstr[1] "oneens" -#: ../../include/js_strings.php:42 -msgid " " -msgstr " " +#: ../../include/conversation.php:2002 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "onthouding" +msgstr[1] "onthoudingen" -#: ../../include/js_strings.php:43 -msgid "timeago.numbers" -msgstr "timeago.numbers" +#: ../../include/dir_fns.php:141 +msgid "Directory Options" +msgstr "Opties kanalengids" -#: ../../include/js_strings.php:45 ../../include/text.php:1331 -msgid "January" -msgstr "januari" +#: ../../include/dir_fns.php:143 +msgid "Safe Mode" +msgstr "Veilig zoeken" -#: ../../include/js_strings.php:46 ../../include/text.php:1331 -msgid "February" -msgstr "februari" +#: ../../include/dir_fns.php:144 +msgid "Public Forums Only" +msgstr "Alleen openbare forums" -#: ../../include/js_strings.php:47 ../../include/text.php:1331 -msgid "March" -msgstr "maart" +#: ../../include/dir_fns.php:145 +msgid "This Website Only" +msgstr "Alleen deze hub" -#: ../../include/js_strings.php:48 ../../include/text.php:1331 -msgid "April" -msgstr "april" +#: ../../include/bookmarks.php:34 +#, php-format +msgid "%1$s's bookmarks" +msgstr "Bladwijzers van %1$s" -#: ../../include/js_strings.php:49 -msgctxt "long" -msgid "May" -msgstr "mei" +#: ../../include/import.php:25 +msgid "Unable to import a removed channel." +msgstr "Niet in staat om een verwijderd kanaal te importeren." -#: ../../include/js_strings.php:50 ../../include/text.php:1331 -msgid "June" -msgstr "juni" +#: ../../include/import.php:46 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt." -#: ../../include/js_strings.php:51 ../../include/text.php:1331 -msgid "July" -msgstr "juli" +#: ../../include/import.php:111 +msgid "Cloned channel not found. Import failed." +msgstr "Gekloond kanaal niet gevonden. Importeren mislukt." -#: ../../include/js_strings.php:52 ../../include/text.php:1331 -msgid "August" -msgstr "augustus" +#: ../../include/text.php:492 +msgid "prev" +msgstr "vorige" -#: ../../include/js_strings.php:53 ../../include/text.php:1331 -msgid "September" -msgstr "september" +#: ../../include/text.php:494 +msgid "first" +msgstr "eerste" -#: ../../include/js_strings.php:54 ../../include/text.php:1331 -msgid "October" -msgstr "oktober" +#: ../../include/text.php:523 +msgid "last" +msgstr "laatste" -#: ../../include/js_strings.php:55 ../../include/text.php:1331 -msgid "November" -msgstr "november" +#: ../../include/text.php:526 +msgid "next" +msgstr "volgende" -#: ../../include/js_strings.php:56 ../../include/text.php:1331 -msgid "December" -msgstr "december" +#: ../../include/text.php:537 +msgid "older" +msgstr "ouder" -#: ../../include/js_strings.php:57 -msgid "Jan" -msgstr "jan" +#: ../../include/text.php:539 +msgid "newer" +msgstr "nieuwer" -#: ../../include/js_strings.php:58 -msgid "Feb" -msgstr "feb" +#: ../../include/text.php:961 +msgid "No connections" +msgstr "Geen connecties" -#: ../../include/js_strings.php:59 -msgid "Mar" -msgstr "mrt" +#: ../../include/text.php:993 +#, php-format +msgid "View all %s connections" +msgstr "Toon alle %s connecties" -#: ../../include/js_strings.php:60 -msgid "Apr" -msgstr "apr" +#: ../../include/text.php:1129 ../../include/text.php:1133 +msgid "poke" +msgstr "aanstoten" -#: ../../include/js_strings.php:61 -msgctxt "short" -msgid "May" -msgstr "mei" +#: ../../include/text.php:1134 +msgid "ping" +msgstr "ping" -#: ../../include/js_strings.php:62 -msgid "Jun" -msgstr "jun" +#: ../../include/text.php:1134 +msgid "pinged" +msgstr "gepingd" -#: ../../include/js_strings.php:63 -msgid "Jul" -msgstr "jul" +#: ../../include/text.php:1135 +msgid "prod" +msgstr "por" -#: ../../include/js_strings.php:64 -msgid "Aug" -msgstr "aug" +#: ../../include/text.php:1135 +msgid "prodded" +msgstr "gepord" -#: ../../include/js_strings.php:65 -msgid "Sep" -msgstr "sep" +#: ../../include/text.php:1136 +msgid "slap" +msgstr "slaan" -#: ../../include/js_strings.php:66 -msgid "Oct" -msgstr "okt" +#: ../../include/text.php:1136 +msgid "slapped" +msgstr "sloeg" -#: ../../include/js_strings.php:67 -msgid "Nov" -msgstr "nov" +#: ../../include/text.php:1137 +msgid "finger" +msgstr "finger" -#: ../../include/js_strings.php:68 -msgid "Dec" -msgstr "dec" +#: ../../include/text.php:1137 +msgid "fingered" +msgstr "gefingerd" -#: ../../include/js_strings.php:69 ../../include/text.php:1327 -msgid "Sunday" -msgstr "zondag" +#: ../../include/text.php:1138 +msgid "rebuff" +msgstr "afpoeieren" -#: ../../include/js_strings.php:70 ../../include/text.php:1327 -msgid "Monday" -msgstr "maandag" +#: ../../include/text.php:1138 +msgid "rebuffed" +msgstr "afgepoeierd" -#: ../../include/js_strings.php:71 ../../include/text.php:1327 -msgid "Tuesday" -msgstr "dinsdag" +#: ../../include/text.php:1161 +msgid "happy" +msgstr "gelukkig" -#: ../../include/js_strings.php:72 ../../include/text.php:1327 -msgid "Wednesday" -msgstr "woensdag" +#: ../../include/text.php:1162 +msgid "sad" +msgstr "bedroefd" -#: ../../include/js_strings.php:73 ../../include/text.php:1327 -msgid "Thursday" -msgstr "donderdag" +#: ../../include/text.php:1163 +msgid "mellow" +msgstr "mellow" -#: ../../include/js_strings.php:74 ../../include/text.php:1327 -msgid "Friday" -msgstr "vrijdag" +#: ../../include/text.php:1164 +msgid "tired" +msgstr "moe" -#: ../../include/js_strings.php:75 ../../include/text.php:1327 -msgid "Saturday" -msgstr "zaterdag" +#: ../../include/text.php:1165 +msgid "perky" +msgstr "parmantig" -#: ../../include/js_strings.php:76 -msgid "Sun" -msgstr "zo" +#: ../../include/text.php:1166 +msgid "angry" +msgstr "boos" -#: ../../include/js_strings.php:77 -msgid "Mon" -msgstr "ma" +#: ../../include/text.php:1167 +msgid "stupefied" +msgstr "verbijsterd" -#: ../../include/js_strings.php:78 -msgid "Tue" -msgstr "di" +#: ../../include/text.php:1168 +msgid "puzzled" +msgstr "verward" -#: ../../include/js_strings.php:79 -msgid "Wed" -msgstr "wo" +#: ../../include/text.php:1169 +msgid "interested" +msgstr "geïnteresseerd" -#: ../../include/js_strings.php:80 -msgid "Thu" -msgstr "do" +#: ../../include/text.php:1170 +msgid "bitter" +msgstr "verbitterd" -#: ../../include/js_strings.php:81 -msgid "Fri" -msgstr "vr" +#: ../../include/text.php:1171 +msgid "cheerful" +msgstr "vrolijk" -#: ../../include/js_strings.php:82 -msgid "Sat" -msgstr "za" +#: ../../include/text.php:1172 +msgid "alive" +msgstr "levendig" -#: ../../include/js_strings.php:83 -msgctxt "calendar" -msgid "today" -msgstr "vandaag" +#: ../../include/text.php:1173 +msgid "annoyed" +msgstr "geërgerd" -#: ../../include/js_strings.php:84 -msgctxt "calendar" -msgid "month" -msgstr "maand" +#: ../../include/text.php:1174 +msgid "anxious" +msgstr "bezorgd" -#: ../../include/js_strings.php:85 -msgctxt "calendar" -msgid "week" -msgstr "week" +#: ../../include/text.php:1175 +msgid "cranky" +msgstr "humeurig" + +#: ../../include/text.php:1176 +msgid "disturbed" +msgstr "verontrust" -#: ../../include/js_strings.php:86 -msgctxt "calendar" -msgid "day" -msgstr "dag" +#: ../../include/text.php:1177 +msgid "frustrated" +msgstr "gefrustreerd " -#: ../../include/js_strings.php:87 -msgctxt "calendar" -msgid "All day" -msgstr "hele dag" +#: ../../include/text.php:1178 +msgid "depressed" +msgstr "gedeprimeerd" -#: ../../include/dir_fns.php:141 -msgid "Directory Options" -msgstr "Opties kanalengids" +#: ../../include/text.php:1179 +msgid "motivated" +msgstr "gemotiveerd" -#: ../../include/dir_fns.php:143 -msgid "Safe Mode" -msgstr "Veilig zoeken" +#: ../../include/text.php:1180 +msgid "relaxed" +msgstr "ontspannen" -#: ../../include/dir_fns.php:144 -msgid "Public Forums Only" -msgstr "Alleen openbare forums" +#: ../../include/text.php:1181 +msgid "surprised" +msgstr "verrast" -#: ../../include/dir_fns.php:145 -msgid "This Website Only" -msgstr "Alleen deze hub" +#: ../../include/text.php:1360 ../../include/js_strings.php:76 +msgid "Monday" +msgstr "maandag" -#: ../../include/network.php:756 -msgid "view full size" -msgstr "volledige grootte tonen" +#: ../../include/text.php:1360 ../../include/js_strings.php:77 +msgid "Tuesday" +msgstr "dinsdag" -#: ../../include/network.php:2011 -msgid "No Subject" -msgstr "Geen onderwerp" +#: ../../include/text.php:1360 ../../include/js_strings.php:78 +msgid "Wednesday" +msgstr "woensdag" -#: ../../include/network.php:2267 -msgid "OStatus" -msgstr "OStatus" +#: ../../include/text.php:1360 ../../include/js_strings.php:79 +msgid "Thursday" +msgstr "donderdag" -#: ../../include/network.php:2268 -msgid "GNU-Social" -msgstr "GNU social" +#: ../../include/text.php:1360 ../../include/js_strings.php:80 +msgid "Friday" +msgstr "vrijdag" -#: ../../include/network.php:2269 -msgid "RSS/Atom" -msgstr "RSS/Atom" +#: ../../include/text.php:1360 ../../include/js_strings.php:81 +msgid "Saturday" +msgstr "zaterdag" -#: ../../include/network.php:2272 -msgid "Facebook" -msgstr "Facebook" +#: ../../include/text.php:1360 ../../include/js_strings.php:75 +msgid "Sunday" +msgstr "zondag" -#: ../../include/network.php:2273 -msgid "Zot" -msgstr "Zot" +#: ../../include/text.php:1364 ../../include/js_strings.php:51 +msgid "January" +msgstr "januari" -#: ../../include/network.php:2274 -msgid "LinkedIn" -msgstr "LinkedIn" +#: ../../include/text.php:1364 ../../include/js_strings.php:52 +msgid "February" +msgstr "februari" -#: ../../include/network.php:2275 -msgid "XMPP/IM" -msgstr "XMPP/IM" +#: ../../include/text.php:1364 ../../include/js_strings.php:53 +msgid "March" +msgstr "maart" -#: ../../include/network.php:2276 -msgid "MySpace" -msgstr "MySpace" +#: ../../include/text.php:1364 ../../include/js_strings.php:54 +msgid "April" +msgstr "april" -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "%1$s is nu met %2$s verbonden" +#: ../../include/text.php:1364 +msgid "May" +msgstr "mei" -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" -msgstr "%1$s heeft %2$s aangestoten" +#: ../../include/text.php:1364 ../../include/js_strings.php:56 +msgid "June" +msgstr "juni" -#: ../../include/conversation.php:243 ../../include/text.php:1098 -#: ../../include/text.php:1103 -msgid "poked" -msgstr "aangestoten" +#: ../../include/text.php:1364 ../../include/js_strings.php:57 +msgid "July" +msgstr "juli" -#: ../../include/conversation.php:690 -#, php-format -msgid "View %s's profile @ %s" -msgstr "Bekijk het profiel van %s @ %s" +#: ../../include/text.php:1364 ../../include/js_strings.php:58 +msgid "August" +msgstr "augustus" -#: ../../include/conversation.php:710 -msgid "Categories:" -msgstr "Categorieën:" +#: ../../include/text.php:1364 ../../include/js_strings.php:59 +msgid "September" +msgstr "september" -#: ../../include/conversation.php:711 -msgid "Filed under:" -msgstr "Bewaard onder:" +#: ../../include/text.php:1364 ../../include/js_strings.php:60 +msgid "October" +msgstr "oktober" -#: ../../include/conversation.php:736 -msgid "View in context" -msgstr "In context bekijken" +#: ../../include/text.php:1364 ../../include/js_strings.php:61 +msgid "November" +msgstr "november" -#: ../../include/conversation.php:832 -msgid "remove" -msgstr "verwijderen" +#: ../../include/text.php:1364 ../../include/js_strings.php:62 +msgid "December" +msgstr "december" -#: ../../include/conversation.php:836 ../../include/nav.php:292 -msgid "Loading..." -msgstr "Aan het laden..." +#: ../../include/text.php:1428 ../../include/text.php:1432 +msgid "Unknown Attachment" +msgstr "Onbekende bijlage" -#: ../../include/conversation.php:837 -msgid "Delete Selected Items" -msgstr "Verwijder de geselecteerde items" +#: ../../include/text.php:1434 ../../include/feedutils.php:860 +msgid "unknown" +msgstr "onbekend" -#: ../../include/conversation.php:930 ../../include/conversation.php:972 -msgid "View Source" -msgstr "Bron weergeven" +#: ../../include/text.php:1470 +msgid "remove category" +msgstr "categorie verwijderen" -#: ../../include/conversation.php:931 ../../include/conversation.php:982 -msgid "Follow Thread" -msgstr "Conversatie volgen" +#: ../../include/text.php:1544 +msgid "remove from file" +msgstr "uit map verwijderen" -#: ../../include/conversation.php:932 ../../include/conversation.php:991 -msgid "Unfollow Thread" -msgstr "Conversatie niet meer volgen" +#: ../../include/text.php:1686 ../../include/message.php:12 +msgid "Download binary/encrypted content" +msgstr "Binaire/versleutelende inhoud downloaden" -#: ../../include/conversation.php:937 ../../include/conversation.php:1059 -msgid "Activity/Posts" -msgstr "Activiteit/berichten connectie" +#: ../../include/text.php:1849 ../../include/language.php:397 +msgid "default" +msgstr "standaard" -#: ../../include/conversation.php:939 ../../include/conversation.php:1079 -msgid "Edit Connection" -msgstr "Connectie bewerken" +#: ../../include/text.php:1857 +msgid "Page layout" +msgstr "Pagina-lay-out" -#: ../../include/conversation.php:940 ../../include/conversation.php:1089 -msgid "Message" -msgstr "Bericht" +#: ../../include/text.php:1857 +msgid "You can create your own with the layouts tool" +msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs" -#: ../../include/conversation.php:1223 -#, php-format -msgid "%s likes this." -msgstr "%s vindt dit leuk." +#: ../../include/text.php:1868 +msgid "HTML" +msgstr "HTML" -#: ../../include/conversation.php:1223 -#, php-format -msgid "%s doesn't like this." -msgstr "%s vindt dit niet leuk." +#: ../../include/text.php:1871 +msgid "Comanche Layout" +msgstr "Comanche-layout" -#: ../../include/conversation.php:1227 -#, php-format -msgid "%2$d people like this." -msgid_plural "%2$d people like this." -msgstr[0] "%2$d persoon vindt dit leuk." -msgstr[1] "%2$d personen vinden dit leuk." +#: ../../include/text.php:1876 +msgid "PHP" +msgstr "PHP" -#: ../../include/conversation.php:1229 -#, php-format -msgid "%2$d people don't like this." -msgid_plural "%2$d people don't like this." -msgstr[0] "%2$d persoon vindt dit niet leuk." -msgstr[1] "%2$d personen vinden dit niet leuk." +#: ../../include/text.php:1885 +msgid "Page content type" +msgstr "Opmaaktype" -#: ../../include/conversation.php:1235 -msgid "and" -msgstr "en" +#: ../../include/text.php:2018 +msgid "activity" +msgstr "activiteit" -#: ../../include/conversation.php:1238 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] ", en %d ander persoon" -msgstr[1] ", en %d andere personen" +#: ../../include/text.php:2100 +msgid "a-z, 0-9, -, and _ only" +msgstr "alleen a-z, 0-9, - en _" -#: ../../include/conversation.php:1239 -#, php-format -msgid "%s like this." -msgstr "%s vinden dit leuk." +#: ../../include/text.php:2419 +msgid "Design Tools" +msgstr "Ontwerp-hulpmiddelen" -#: ../../include/conversation.php:1239 -#, php-format -msgid "%s don't like this." -msgstr "%s vinden dit niet leuk." +#: ../../include/text.php:2425 +msgid "Pages" +msgstr "Pagina's" -#: ../../include/conversation.php:1282 -msgid "Set your location" -msgstr "Locatie instellen" +#: ../../include/text.php:2447 +msgid "Import website..." +msgstr "Website importeren..." -#: ../../include/conversation.php:1283 -msgid "Clear browser location" -msgstr "Locatie van webbrowser wissen" +#: ../../include/text.php:2448 +msgid "Select folder to import" +msgstr "Kies een map om te importeren" -#: ../../include/conversation.php:1331 -msgid "Tag term:" -msgstr "Tag:" +#: ../../include/text.php:2449 +msgid "Import from a zipped folder:" +msgstr "Vanuit een zipbestand importeren:" -#: ../../include/conversation.php:1332 -msgid "Where are you right now?" -msgstr "Waar bevind je je op dit moment?" +#: ../../include/text.php:2450 +msgid "Import from cloud files:" +msgstr "Vanuit de cloud importeren:" -#: ../../include/conversation.php:1337 -msgid "Choose a different album..." -msgstr "Kies een ander album..." +#: ../../include/text.php:2451 +msgid "/cloud/channel/path/to/folder" +msgstr "/cloud/channel/maplocatie" -#: ../../include/conversation.php:1341 -msgid "Comments enabled" -msgstr "Reacties ingeschakeld" +#: ../../include/text.php:2452 +msgid "Enter path to website files" +msgstr "Voer de locatie in van de websitebestanden" -#: ../../include/conversation.php:1342 -msgid "Comments disabled" -msgstr "Reacties uitgeschakeld" +#: ../../include/text.php:2453 +msgid "Select folder" +msgstr "Kies een map" -#: ../../include/conversation.php:1380 -msgid "Page link name" -msgstr "Linknaam pagina" +#: ../../include/text.php:2454 +msgid "Export website..." +msgstr "Website exporteren..." -#: ../../include/conversation.php:1383 -msgid "Post as" -msgstr "Bericht plaatsen als" +#: ../../include/text.php:2455 +msgid "Export to a zip file" +msgstr "Naar een zipbestand exporteren" -#: ../../include/conversation.php:1397 -msgid "Toggle voting" -msgstr "Peiling in- of uitschakelen" +#: ../../include/text.php:2456 +msgid "website.zip" +msgstr "website.zip" -#: ../../include/conversation.php:1400 -msgid "Disable comments" -msgstr "Reacties uitschakelen" +#: ../../include/text.php:2457 +msgid "Enter a name for the zip file." +msgstr "Vul een naam in voor het zipbestand." -#: ../../include/conversation.php:1401 -msgid "Toggle comments" -msgstr "Reacties in- of uitschakelen" +#: ../../include/text.php:2458 +msgid "Export to cloud files" +msgstr "Naar de cloud exporteren" -#: ../../include/conversation.php:1409 -msgid "Categories (optional, comma-separated list)" -msgstr "Categorieën (niet verplicht, door komma's gescheiden lijst)" +#: ../../include/text.php:2459 +msgid "/path/to/export/folder" +msgstr "/locatie/van/export/map" -#: ../../include/conversation.php:1432 -msgid "Other networks and post services" -msgstr "Andere netwerken en diensten" +#: ../../include/text.php:2460 +msgid "Enter a path to a cloud files destination." +msgstr "Voer de locatie in van de cloudbestemming" -#: ../../include/conversation.php:1438 -msgid "Set publish date" -msgstr "Publicatiedatum instellen" +#: ../../include/text.php:2461 +msgid "Specify folder" +msgstr "Selecteer een map" -#: ../../include/conversation.php:1692 -msgid "Discover" -msgstr "Ontdekken" +#: ../../include/contact_widgets.php:11 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "%d uitnodiging beschikbaar" +msgstr[1] "%d uitnodigingen beschikbaar" -#: ../../include/conversation.php:1695 -msgid "Imported public streams" -msgstr "Openbare streams importeren" +#: ../../include/contact_widgets.php:19 +msgid "Find Channels" +msgstr "Kanalen vinden" -#: ../../include/conversation.php:1700 -msgid "Commented Order" -msgstr "Nieuwe reacties bovenaan" +#: ../../include/contact_widgets.php:20 +msgid "Enter name or interest" +msgstr "Vul naam of interesse in" -#: ../../include/conversation.php:1703 -msgid "Sort by Comment Date" -msgstr "Berichten met nieuwe reacties bovenaan" +#: ../../include/contact_widgets.php:21 +msgid "Connect/Follow" +msgstr "Verbinden/volgen" -#: ../../include/conversation.php:1707 -msgid "Posted Order" -msgstr "Nieuwe berichten bovenaan" +#: ../../include/contact_widgets.php:22 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "Voorbeeld: Robert Morgenstein, vissen" -#: ../../include/conversation.php:1710 -msgid "Sort by Post Date" -msgstr "Nieuwe berichten bovenaan" +#: ../../include/contact_widgets.php:26 +msgid "Random Profile" +msgstr "Willekeurig profiel" -#: ../../include/conversation.php:1718 -msgid "Posts that mention or involve you" -msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent" +#: ../../include/contact_widgets.php:27 +msgid "Invite Friends" +msgstr "Vrienden uitnodigen" -#: ../../include/conversation.php:1727 -msgid "Activity Stream - by date" -msgstr "Activiteitenstroom - volgens datum" +#: ../../include/contact_widgets.php:29 +msgid "Advanced example: name=fred and country=iceland" +msgstr "Geavanceerd voorbeeld (Engels): name=jan en country=nederland" -#: ../../include/conversation.php:1733 -msgid "Starred" -msgstr "Met ster" +#: ../../include/contact_widgets.php:223 +msgid "Common Connections" +msgstr "Gemeenschappelijke connecties" -#: ../../include/conversation.php:1736 -msgid "Favourite Posts" -msgstr "Favoriete berichten" +#: ../../include/contact_widgets.php:228 +#, php-format +msgid "View all %d common connections" +msgstr "Toon alle %d gemeenschappelijke connecties" -#: ../../include/conversation.php:1743 -msgid "Spam" -msgstr "Spam" +#: ../../include/markdown.php:158 ../../include/bbcode.php:356 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "%1$s schreef het volgende %2$s %3$s" -#: ../../include/conversation.php:1746 -msgid "Posts flagged as SPAM" -msgstr "Berichten gemarkeerd als SPAM" +#: ../../include/follow.php:37 +msgid "Channel is blocked on this site." +msgstr "Kanaal is op deze hub geblokkeerd." -#: ../../include/conversation.php:1818 -msgid "Status Messages and Posts" -msgstr "Berichten in dit kanaal" +#: ../../include/follow.php:42 +msgid "Channel location missing." +msgstr "Ontbrekende kanaallocatie." -#: ../../include/conversation.php:1830 -msgid "Profile Details" -msgstr "Profiel" +#: ../../include/follow.php:84 +msgid "Response from remote channel was incomplete." +msgstr "Antwoord van het kanaal op afstand was niet volledig." -#: ../../include/conversation.php:1839 ../../include/photos.php:515 -msgid "Photo Albums" -msgstr "Fotoalbums" +#: ../../include/follow.php:96 +msgid "Premium channel - please visit:" +msgstr "Premiumkanaal - bezoek:" -#: ../../include/conversation.php:1846 -msgid "Files and Storage" -msgstr "Bestanden en opslagruimte" +#: ../../include/follow.php:110 +msgid "Channel was deleted and no longer exists." +msgstr "Kanaal is verwijderd en bestaat niet meer." -#: ../../include/conversation.php:1879 -msgid "Bookmarks" -msgstr "Bladwijzers" +#: ../../include/follow.php:165 +msgid "Remote channel or protocol unavailable." +msgstr "Kanaal op afstand of protocol niet beschikbaar." -#: ../../include/conversation.php:1882 -msgid "Saved Bookmarks" -msgstr "Opgeslagen bladwijzers" +#: ../../include/follow.php:188 +msgid "Channel discovery failed." +msgstr "Kanaal ontdekken mislukt." -#: ../../include/conversation.php:1892 -msgid "View Webpages" -msgstr "Webpagina's weergeven" +#: ../../include/follow.php:200 +msgid "Protocol disabled." +msgstr "Protocol uitgeschakeld." -#: ../../include/conversation.php:1958 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "aanwezig" -msgstr[1] "aanwezig" +#: ../../include/follow.php:211 +msgid "Cannot connect to yourself." +msgstr "Kan niet met jezelf verbinden" -#: ../../include/conversation.php:1961 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "niet aanwezig" -msgstr[1] "niet aanwezig" +#: ../../include/js_strings.php:5 +msgid "Delete this item?" +msgstr "Dit item verwijderen?" -#: ../../include/conversation.php:1964 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "nog niet beslist" -msgstr[1] "nog niet beslist" +#: ../../include/js_strings.php:8 +#, php-format +msgid "%s show less" +msgstr "%s minder reacties tonen" -#: ../../include/conversation.php:1967 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "eens" -msgstr[1] "eens" +#: ../../include/js_strings.php:9 +#, php-format +msgid "%s expand" +msgstr "%s uitklappen" -#: ../../include/conversation.php:1970 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "oneens" -msgstr[1] "oneens" +#: ../../include/js_strings.php:10 +#, php-format +msgid "%s collapse" +msgstr "%s inklappen" -#: ../../include/conversation.php:1973 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "onthouding" -msgstr[1] "onthoudingen" +#: ../../include/js_strings.php:11 +msgid "Password too short" +msgstr "Wachtwoord te kort" -#: ../../include/group.php:26 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"may apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." -msgstr "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten kunnen van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken." +#: ../../include/js_strings.php:12 +msgid "Passwords do not match" +msgstr "Wachtwoorden komen niet overeen" -#: ../../include/group.php:268 -msgid "Add new connections to this privacy group" -msgstr "Voeg nieuwe connecties aan deze privacygroep toe" +#: ../../include/js_strings.php:13 +msgid "everybody" +msgstr "iedereen" -#: ../../include/group.php:309 -msgid "edit" -msgstr "bewerken" +#: ../../include/js_strings.php:14 +msgid "Secret Passphrase" +msgstr "Geheim wachtwoord" -#: ../../include/group.php:331 ../../include/features.php:292 -msgid "Privacy Groups" -msgstr "Privacygroepen" +#: ../../include/js_strings.php:15 +msgid "Passphrase hint" +msgstr "Wachtwoordhint" -#: ../../include/group.php:332 -msgid "Edit group" -msgstr "Privacygroep bewerken" +#: ../../include/js_strings.php:16 +msgid "Notice: Permissions have changed but have not yet been submitted." +msgstr "Mededeling: de permissies zijn veranderd, maar zijn nog niet opgeslagen." -#: ../../include/group.php:333 -msgid "Add privacy group" -msgstr "Privacygroep toevoegen" +#: ../../include/js_strings.php:17 +msgid "close all" +msgstr "Alles sluiten" -#: ../../include/group.php:334 -msgid "Channels not in any privacy group" -msgstr "Kanalen die zich in geen enkele privacygroep bevinden" +#: ../../include/js_strings.php:18 +msgid "Nothing new here" +msgstr "Niets nieuw hier" -#: ../../include/items.php:843 ../../include/items.php:890 -msgid "(Unknown)" -msgstr "(Onbekend)" +#: ../../include/js_strings.php:19 +msgid "Rate This Channel (this is public)" +msgstr "Beoordeel dit kanaal (dit is openbaar)" -#: ../../include/items.php:1091 -msgid "Visible to anybody on the internet." -msgstr "Voor iedereen op het internet zichtbaar." +#: ../../include/js_strings.php:21 +msgid "Describe (optional)" +msgstr "Omschrijving (niet verplicht)" -#: ../../include/items.php:1093 -msgid "Visible to you only." -msgstr "Alleen voor jou zichtbaar." +#: ../../include/js_strings.php:23 +msgid "Please enter a link URL" +msgstr "Vul een URL in:" -#: ../../include/items.php:1095 -msgid "Visible to anybody in this network." -msgstr "Voor iedereen in dit netwerk zichtbaar." +#: ../../include/js_strings.php:24 +msgid "Unsaved changes. Are you sure you wish to leave this page?" +msgstr "Niet opgeslagen wijzigingen. Ben je er zeker van dat je deze pagina wil verlaten?" -#: ../../include/items.php:1097 -msgid "Visible to anybody authenticated." -msgstr "Voor iedereen die geauthenticeerd is zichtbaar." +#: ../../include/js_strings.php:31 +msgid "timeago.prefixAgo" +msgstr "timeago.prefixAgo" -#: ../../include/items.php:1099 -#, php-format -msgid "Visible to anybody on %s." -msgstr "Voor iedereen op %s zichtbaar." +#: ../../include/js_strings.php:32 +msgid "timeago.prefixFromNow" +msgstr "timeago.prefixFromNow" -#: ../../include/items.php:1101 -msgid "Visible to all connections." -msgstr "Voor alle connecties zichtbaar." +#: ../../include/js_strings.php:33 +msgid "timeago.suffixAgo" +msgstr "geleden" -#: ../../include/items.php:1103 -msgid "Visible to approved connections." -msgstr "Voor alle geaccepteerde connecties zichtbaar." +#: ../../include/js_strings.php:34 +msgid "timeago.suffixFromNow" +msgstr "vanaf nu" -#: ../../include/items.php:1105 -msgid "Visible to specific connections." -msgstr "Voor specifieke connecties zichtbaar." +#: ../../include/js_strings.php:37 +msgid "less than a minute" +msgstr "minder dan een minuut" -#: ../../include/items.php:3917 -msgid "Privacy group is empty." -msgstr "Privacygroep is leeg" +#: ../../include/js_strings.php:38 +msgid "about a minute" +msgstr "ongeveer een minuut" -#: ../../include/items.php:3924 +#: ../../include/js_strings.php:39 #, php-format -msgid "Privacy group: %s" -msgstr "Privacygroep: %s" - -#: ../../include/items.php:3936 -msgid "Connection not found." -msgstr "Connectie niet gevonden." +msgid "%d minutes" +msgstr "%d minuten" -#: ../../include/items.php:4285 -msgid "profile photo" -msgstr "profielfoto" +#: ../../include/js_strings.php:40 +msgid "about an hour" +msgstr "ongeveer een uur" -#: ../../include/items.php:4481 +#: ../../include/js_strings.php:41 #, php-format -msgid "[Edited %s]" -msgstr "[%s bewerkt]" +msgid "about %d hours" +msgstr "ongeveer %d uren" -#: ../../include/items.php:4481 -msgctxt "edit_activity" -msgid "Post" -msgstr "Bericht" +#: ../../include/js_strings.php:42 +msgid "a day" +msgstr "een dag" -#: ../../include/items.php:4481 -msgctxt "edit_activity" -msgid "Comment" -msgstr "Reactie" +#: ../../include/js_strings.php:43 +#, php-format +msgid "%d days" +msgstr "%d dagen" -#: ../../include/markdown.php:445 -msgid "Attachments:" -msgstr "Bijlagen:" +#: ../../include/js_strings.php:44 +msgid "about a month" +msgstr "ongeveer een maand" -#: ../../include/markdown.php:542 -msgid "$Projectname event notification:" -msgstr "Notificatie $Projectname-gebeurtenis:" +#: ../../include/js_strings.php:45 +#, php-format +msgid "%d months" +msgstr "%d maanden" -#: ../../include/security.php:117 -msgid "guest:" -msgstr "gast:" +#: ../../include/js_strings.php:46 +msgid "about a year" +msgstr "ongeveer een jaar" -#: ../../include/security.php:532 -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 "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. " +#: ../../include/js_strings.php:47 +#, php-format +msgid "%d years" +msgstr "%d jaren" -#: ../../include/nav.php:88 -msgid "Remote authentication" -msgstr "Authenticatie op afstand" +#: ../../include/js_strings.php:48 +msgid " " +msgstr " " -#: ../../include/nav.php:88 -msgid "Click to authenticate to your home hub" -msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub" +#: ../../include/js_strings.php:49 +msgid "timeago.numbers" +msgstr "timeago.numbers" -#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1748 -msgid "Logout" -msgstr "Uitloggen" +#: ../../include/js_strings.php:55 +msgctxt "long" +msgid "May" +msgstr "mei" -#: ../../include/nav.php:99 ../../include/nav.php:140 -msgid "End this session" -msgstr "Beëindig deze sessie" +#: ../../include/js_strings.php:63 +msgid "Jan" +msgstr "jan" -#: ../../include/nav.php:103 -msgid "Your profile page" -msgstr "Jouw profielpagina" +#: ../../include/js_strings.php:64 +msgid "Feb" +msgstr "feb" -#: ../../include/nav.php:105 -msgid "Manage/Edit profiles" -msgstr "Beheer/wijzig profielen" +#: ../../include/js_strings.php:65 +msgid "Mar" +msgstr "mrt" -#: ../../include/nav.php:107 -msgid "Edit your profile" -msgstr "Jouw profiel bewerken" +#: ../../include/js_strings.php:66 +msgid "Apr" +msgstr "apr" -#: ../../include/nav.php:130 -msgid "Sign in" -msgstr "Inloggen" +#: ../../include/js_strings.php:67 +msgctxt "short" +msgid "May" +msgstr "mei" -#: ../../include/nav.php:155 -msgid "Get me home" -msgstr "Terug naar mijn hub" +#: ../../include/js_strings.php:68 +msgid "Jun" +msgstr "jun" -#: ../../include/nav.php:157 -msgid "Log me out of this site" -msgstr "Uitloggen op deze hub" +#: ../../include/js_strings.php:69 +msgid "Jul" +msgstr "jul" -#: ../../include/nav.php:162 -msgid "Create an account" -msgstr "Maak een account aan" +#: ../../include/js_strings.php:70 +msgid "Aug" +msgstr "aug" -#: ../../include/nav.php:174 -msgid "Help and documentation" -msgstr "Hulp en documentatie" +#: ../../include/js_strings.php:71 +msgid "Sep" +msgstr "sep" -#: ../../include/nav.php:178 -msgid "Applications, utilities, links, games" -msgstr "Apps" +#: ../../include/js_strings.php:72 +msgid "Oct" +msgstr "okt" -#: ../../include/nav.php:180 -msgid "Search site @name, #tag, ?docs, content" -msgstr "Zoek een @kanaal, doorzoek inhoud hub met tekst en #tags, of doorzoek ?documentatie " +#: ../../include/js_strings.php:73 +msgid "Nov" +msgstr "nov" -#: ../../include/nav.php:182 -msgid "Channel Directory" -msgstr "Kanalengids" +#: ../../include/js_strings.php:74 +msgid "Dec" +msgstr "dec" -#: ../../include/nav.php:194 -msgid "Your grid" -msgstr "Jouw grid" +#: ../../include/js_strings.php:82 +msgid "Sun" +msgstr "zo" -#: ../../include/nav.php:195 -msgid "View your network/grid" -msgstr "Jouw grid/netwerk weergeven" +#: ../../include/js_strings.php:83 +msgid "Mon" +msgstr "ma" -#: ../../include/nav.php:196 -msgid "Mark all grid notifications seen" -msgstr "Markeer alle gridnotificaties als bekeken" +#: ../../include/js_strings.php:84 +msgid "Tue" +msgstr "di" -#: ../../include/nav.php:198 -msgid "Channel home" -msgstr "Jouw kanaal" +#: ../../include/js_strings.php:85 +msgid "Wed" +msgstr "wo" -#: ../../include/nav.php:199 -msgid "View your channel home" -msgstr "Jouw kanaal weergeven" +#: ../../include/js_strings.php:86 +msgid "Thu" +msgstr "do" -#: ../../include/nav.php:200 -msgid "Mark all channel notifications seen" -msgstr "Alle kanaalnotificaties als gelezen markeren" +#: ../../include/js_strings.php:87 +msgid "Fri" +msgstr "vr" -#: ../../include/nav.php:206 -msgid "Notices" -msgstr "Notificaties" +#: ../../include/js_strings.php:88 +msgid "Sat" +msgstr "za" -#: ../../include/nav.php:206 -msgid "Notifications" -msgstr "Notificaties" +#: ../../include/js_strings.php:89 +msgctxt "calendar" +msgid "today" +msgstr "vandaag" -#: ../../include/nav.php:207 -msgid "View all notifications" -msgstr "Alle notificaties weergeven" +#: ../../include/js_strings.php:90 +msgctxt "calendar" +msgid "month" +msgstr "maand" -#: ../../include/nav.php:210 -msgid "Private mail" -msgstr "Privéberichten" +#: ../../include/js_strings.php:91 +msgctxt "calendar" +msgid "week" +msgstr "week" -#: ../../include/nav.php:211 -msgid "View your private messages" -msgstr "Privéberichten weergeven" +#: ../../include/js_strings.php:92 +msgctxt "calendar" +msgid "day" +msgstr "dag" -#: ../../include/nav.php:212 -msgid "Mark all private messages seen" -msgstr "Markeer alle privéberichten als bekeken" +#: ../../include/js_strings.php:93 +msgctxt "calendar" +msgid "All day" +msgstr "hele dag" -#: ../../include/nav.php:218 -msgid "Event Calendar" -msgstr "Agenda" +#: ../../include/message.php:40 +msgid "Unable to determine sender." +msgstr "Afzender kan niet bepaald worden." -#: ../../include/nav.php:219 -msgid "View events" -msgstr "Agenda weergeven" +#: ../../include/message.php:79 +msgid "No recipient provided." +msgstr "Geen ontvanger opgegeven." -#: ../../include/nav.php:220 -msgid "Mark all events seen" -msgstr "Markeer alle gebeurtenissen als bekeken" +#: ../../include/message.php:84 +msgid "[no subject]" +msgstr "[geen onderwerp]" -#: ../../include/nav.php:223 -msgid "Manage Your Channels" -msgstr "Beheer je kanalen" +#: ../../include/message.php:214 +msgid "Stored post could not be verified." +msgstr "Opgeslagen bericht kon niet worden geverifieerd." -#: ../../include/nav.php:225 -msgid "Account/Channel Settings" -msgstr "Account-/kanaal-instellingen" +#: ../../include/activities.php:41 +msgid " and " +msgstr " en " -#: ../../include/nav.php:233 -msgid "Site Setup and Configuration" -msgstr "Hub instellen en beheren" +#: ../../include/activities.php:49 +msgid "public profile" +msgstr "openbaar profiel" -#: ../../include/nav.php:297 -msgid "@name, #tag, ?doc, content" -msgstr "@kanaal, #tag, inhoud, ?hulp" +#: ../../include/activities.php:58 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s veranderde %2$s naar “%3$s”" -#: ../../include/nav.php:298 -msgid "Please wait..." -msgstr "Wachten aub..." +#: ../../include/activities.php:59 +#, php-format +msgid "Visit %1$s's %2$s" +msgstr "Bezoek het %2$s van %1$s" -#: ../../include/nav.php:300 -msgid "Add Apps" -msgstr "Apps toevoegen" +#: ../../include/activities.php:62 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd." -#: ../../include/attach.php:250 ../../include/attach.php:338 +#: ../../include/attach.php:265 ../../include/attach.php:361 msgid "Item was not found." msgstr "Item niet gevonden" -#: ../../include/attach.php:499 +#: ../../include/attach.php:554 msgid "No source file." msgstr "Geen bronbestand." -#: ../../include/attach.php:521 +#: ../../include/attach.php:576 msgid "Cannot locate file to replace" msgstr "Kan het te vervangen bestand niet vinden" -#: ../../include/attach.php:539 +#: ../../include/attach.php:595 msgid "Cannot locate file to revise/update" msgstr "Kan het bestand wat aangepast moet worden niet vinden" -#: ../../include/attach.php:670 +#: ../../include/attach.php:737 #, php-format msgid "File exceeds size limit of %d" msgstr "Bestand is groter dan de toegelaten %d" -#: ../../include/attach.php:684 +#: ../../include/attach.php:758 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt." -#: ../../include/attach.php:854 +#: ../../include/attach.php:940 msgid "File upload failed. Possible system limit or action terminated." msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken." -#: ../../include/attach.php:867 +#: ../../include/attach.php:969 msgid "Stored file could not be verified. Upload failed." msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt." -#: ../../include/attach.php:922 ../../include/attach.php:938 +#: ../../include/attach.php:1043 ../../include/attach.php:1059 msgid "Path not available." msgstr "Locatie niet beschikbaar." -#: ../../include/attach.php:984 ../../include/attach.php:1142 +#: ../../include/attach.php:1108 ../../include/attach.php:1273 msgid "Empty pathname" msgstr "Ontbrekende locatienaam" -#: ../../include/attach.php:1010 +#: ../../include/attach.php:1134 msgid "duplicate filename or path" msgstr "dubbele bestandsnaam of locatie" -#: ../../include/attach.php:1032 +#: ../../include/attach.php:1159 msgid "Path not found." msgstr "Locatie niet gevonden" -#: ../../include/attach.php:1096 +#: ../../include/attach.php:1227 msgid "mkdir failed." msgstr "directory aanmaken (mkdir) mislukt." -#: ../../include/attach.php:1100 +#: ../../include/attach.php:1231 msgid "database storage failed." msgstr "opslag in database mislukt." -#: ../../include/attach.php:1148 +#: ../../include/attach.php:1279 msgid "Empty path" msgstr "Ontbrekende locatie" -#: ../../include/text.php:461 -msgid "prev" -msgstr "vorige" - -#: ../../include/text.php:463 -msgid "first" -msgstr "eerste" +#: ../../include/security.php:541 +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 "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. " -#: ../../include/text.php:492 -msgid "last" -msgstr "laatste" +#: ../../include/items.php:885 ../../include/items.php:945 +msgid "(Unknown)" +msgstr "(Onbekend)" -#: ../../include/text.php:495 -msgid "next" -msgstr "volgende" +#: ../../include/items.php:1133 +msgid "Visible to anybody on the internet." +msgstr "Voor iedereen op het internet zichtbaar." -#: ../../include/text.php:506 -msgid "older" -msgstr "ouder" +#: ../../include/items.php:1135 +msgid "Visible to you only." +msgstr "Alleen voor jou zichtbaar." -#: ../../include/text.php:508 -msgid "newer" -msgstr "nieuwer" +#: ../../include/items.php:1137 +msgid "Visible to anybody in this network." +msgstr "Voor iedereen in dit netwerk zichtbaar." -#: ../../include/text.php:928 -msgid "No connections" -msgstr "Geen connecties" +#: ../../include/items.php:1139 +msgid "Visible to anybody authenticated." +msgstr "Voor iedereen die geauthenticeerd is zichtbaar." -#: ../../include/text.php:953 +#: ../../include/items.php:1141 #, php-format -msgid "View all %s connections" -msgstr "Toon alle %s connecties" - -#: ../../include/text.php:1098 ../../include/text.php:1103 -msgid "poke" -msgstr "aanstoten" - -#: ../../include/text.php:1104 -msgid "ping" -msgstr "ping" - -#: ../../include/text.php:1104 -msgid "pinged" -msgstr "gepingd" - -#: ../../include/text.php:1105 -msgid "prod" -msgstr "por" - -#: ../../include/text.php:1105 -msgid "prodded" -msgstr "gepord" - -#: ../../include/text.php:1106 -msgid "slap" -msgstr "slaan" - -#: ../../include/text.php:1106 -msgid "slapped" -msgstr "sloeg" +msgid "Visible to anybody on %s." +msgstr "Voor iedereen op %s zichtbaar." -#: ../../include/text.php:1107 -msgid "finger" -msgstr "finger" +#: ../../include/items.php:1143 +msgid "Visible to all connections." +msgstr "Voor alle connecties zichtbaar." -#: ../../include/text.php:1107 -msgid "fingered" -msgstr "gefingerd" +#: ../../include/items.php:1145 +msgid "Visible to approved connections." +msgstr "Voor alle geaccepteerde connecties zichtbaar." -#: ../../include/text.php:1108 -msgid "rebuff" -msgstr "afpoeieren" +#: ../../include/items.php:1147 +msgid "Visible to specific connections." +msgstr "Voor specifieke connecties zichtbaar." -#: ../../include/text.php:1108 -msgid "rebuffed" -msgstr "afgepoeierd" +#: ../../include/items.php:4197 +msgid "Privacy group is empty." +msgstr "Privacygroep is leeg" -#: ../../include/text.php:1120 -msgid "happy" -msgstr "gelukkig" +#: ../../include/items.php:4204 +#, php-format +msgid "Privacy group: %s" +msgstr "Privacygroep: %s" -#: ../../include/text.php:1121 -msgid "sad" -msgstr "bedroefd" +#: ../../include/items.php:4216 +msgid "Connection not found." +msgstr "Connectie niet gevonden." -#: ../../include/text.php:1122 -msgid "mellow" -msgstr "mellow" +#: ../../include/items.php:4565 +msgid "profile photo" +msgstr "profielfoto" -#: ../../include/text.php:1123 -msgid "tired" -msgstr "moe" +#: ../../include/items.php:4756 +#, php-format +msgid "[Edited %s]" +msgstr "[%s bewerkt]" -#: ../../include/text.php:1124 -msgid "perky" -msgstr "parmantig" +#: ../../include/items.php:4756 +msgctxt "edit_activity" +msgid "Post" +msgstr "Bericht" -#: ../../include/text.php:1125 -msgid "angry" -msgstr "boos" +#: ../../include/items.php:4756 +msgctxt "edit_activity" +msgid "Comment" +msgstr "Reactie" -#: ../../include/text.php:1126 -msgid "stupefied" -msgstr "verbijsterd" +#: ../../include/channel.php:35 +msgid "Unable to obtain identity information from database" +msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen" -#: ../../include/text.php:1127 -msgid "puzzled" -msgstr "verward" +#: ../../include/channel.php:68 +msgid "Empty name" +msgstr "Ontbrekende naam" -#: ../../include/text.php:1128 -msgid "interested" -msgstr "geïnteresseerd" +#: ../../include/channel.php:71 +msgid "Name too long" +msgstr "Naam te lang" -#: ../../include/text.php:1129 -msgid "bitter" -msgstr "verbitterd" +#: ../../include/channel.php:188 +msgid "No account identifier" +msgstr "Geen account-identificator" -#: ../../include/text.php:1130 -msgid "cheerful" -msgstr "vrolijk" +#: ../../include/channel.php:200 +msgid "Nickname is required." +msgstr "Bijnaam is verplicht" -#: ../../include/text.php:1131 -msgid "alive" -msgstr "levendig" +#: ../../include/channel.php:277 +msgid "Unable to retrieve created identity" +msgstr "Niet in staat om aangemaakte identiteit te ontvangen" -#: ../../include/text.php:1132 -msgid "annoyed" -msgstr "geërgerd" +#: ../../include/channel.php:373 +msgid "Default Profile" +msgstr "Standaardprofiel" -#: ../../include/text.php:1133 -msgid "anxious" -msgstr "bezorgd" +#: ../../include/channel.php:532 ../../include/channel.php:621 +msgid "Unable to retrieve modified identity" +msgstr "Niet in staat om aangepaste identiteit te ontvangen" -#: ../../include/text.php:1134 -msgid "cranky" -msgstr "humeurig" +#: ../../include/channel.php:1297 +msgid "Create New Profile" +msgstr "Nieuw profiel aanmaken" -#: ../../include/text.php:1135 -msgid "disturbed" -msgstr "verontrust" +#: ../../include/channel.php:1318 +msgid "Visible to everybody" +msgstr "Voor iedereen zichtbaar" -#: ../../include/text.php:1136 -msgid "frustrated" -msgstr "gefrustreerd " +#: ../../include/channel.php:1395 ../../include/channel.php:1523 +msgid "Gender:" +msgstr "Geslacht:" -#: ../../include/text.php:1137 -msgid "depressed" -msgstr "gedeprimeerd" +#: ../../include/channel.php:1397 ../../include/channel.php:1591 +msgid "Homepage:" +msgstr "Homepagina:" -#: ../../include/text.php:1138 -msgid "motivated" -msgstr "gemotiveerd" +#: ../../include/channel.php:1398 +msgid "Online Now" +msgstr "Nu online" -#: ../../include/text.php:1139 -msgid "relaxed" -msgstr "ontspannen" +#: ../../include/channel.php:1451 +msgid "Change your profile photo" +msgstr "Jouw profielfoto veranderen" -#: ../../include/text.php:1140 -msgid "surprised" -msgstr "verrast" +#: ../../include/channel.php:1482 +msgid "Trans" +msgstr "Transgender" -#: ../../include/text.php:1331 -msgid "May" -msgstr "mei" +#: ../../include/channel.php:1528 +msgid "Like this channel" +msgstr "Vind dit kanaal leuk" -#: ../../include/text.php:1408 ../../include/text.php:1412 -msgid "Unknown Attachment" -msgstr "Onbekende bijlage" +#: ../../include/channel.php:1552 +msgid "j F, Y" +msgstr "F j Y" -#: ../../include/text.php:1414 -msgid "unknown" -msgstr "onbekend" +#: ../../include/channel.php:1553 +msgid "j F" +msgstr "F j" -#: ../../include/text.php:1450 -msgid "remove category" -msgstr "categorie verwijderen" +#: ../../include/channel.php:1560 +msgid "Birthday:" +msgstr "Geboortedatum:" -#: ../../include/text.php:1527 -msgid "remove from file" -msgstr "uit map verwijderen" +#: ../../include/channel.php:1573 +#, php-format +msgid "for %1$d %2$s" +msgstr "voor %1$d %2$s" -#: ../../include/text.php:1796 -msgid "Page layout" -msgstr "Pagina-lay-out" +#: ../../include/channel.php:1585 +msgid "Tags:" +msgstr "Tags:" -#: ../../include/text.php:1796 -msgid "You can create your own with the layouts tool" -msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs" +#: ../../include/channel.php:1589 +msgid "Sexual Preference:" +msgstr "Seksuele voorkeur:" -#: ../../include/text.php:1838 -msgid "Page content type" -msgstr "Opmaaktype" +#: ../../include/channel.php:1595 +msgid "Political Views:" +msgstr "Politieke overtuigingen:" -#: ../../include/text.php:1971 -msgid "activity" -msgstr "activiteit" +#: ../../include/channel.php:1597 +msgid "Religion:" +msgstr "Religie:" -#: ../../include/text.php:2285 -msgid "Design Tools" -msgstr "Ontwerp-hulpmiddelen" +#: ../../include/channel.php:1601 +msgid "Hobbies/Interests:" +msgstr "Hobby's/interesses:" -#: ../../include/text.php:2291 -msgid "Pages" -msgstr "Pagina's" +#: ../../include/channel.php:1603 +msgid "Likes:" +msgstr "Houdt van:" -#: ../../include/text.php:2313 -msgid "Import website..." -msgstr "Website importeren..." +#: ../../include/channel.php:1605 +msgid "Dislikes:" +msgstr "Houdt niet van:" -#: ../../include/text.php:2314 -msgid "Select folder to import" -msgstr "Kies een map om te importeren" +#: ../../include/channel.php:1607 +msgid "Contact information and Social Networks:" +msgstr "Contactinformatie en sociale netwerken:" -#: ../../include/text.php:2315 -msgid "Import from a zipped folder:" -msgstr "Vanuit een zipbestand importeren:" +#: ../../include/channel.php:1609 +msgid "My other channels:" +msgstr "Mijn andere kanalen" -#: ../../include/text.php:2316 -msgid "Import from cloud files:" -msgstr "Vanuit de cloud importeren:" +#: ../../include/channel.php:1611 +msgid "Musical interests:" +msgstr "Muzikale interesses:" -#: ../../include/text.php:2317 -msgid "/cloud/channel/path/to/folder" -msgstr "/cloud/channel/maplocatie" +#: ../../include/channel.php:1613 +msgid "Books, literature:" +msgstr "Boeken, literatuur:" -#: ../../include/text.php:2318 -msgid "Enter path to website files" -msgstr "Voer de locatie in van de websitebestanden" +#: ../../include/channel.php:1615 +msgid "Television:" +msgstr "Televisie:" -#: ../../include/text.php:2319 -msgid "Select folder" -msgstr "Kies een map" +#: ../../include/channel.php:1617 +msgid "Film/dance/culture/entertainment:" +msgstr "Films/dansen/cultuur/vermaak:" -#: ../../include/text.php:2320 -msgid "Export website..." -msgstr "Website exporteren..." +#: ../../include/channel.php:1619 +msgid "Love/Romance:" +msgstr "Liefde/romantiek:" -#: ../../include/text.php:2321 -msgid "Export to a zip file" -msgstr "Naar een zipbestand exporteren" +#: ../../include/channel.php:1621 +msgid "Work/employment:" +msgstr "Werk/beroep:" -#: ../../include/text.php:2322 -msgid "website.zip" -msgstr "website.zip" +#: ../../include/channel.php:1623 +msgid "School/education:" +msgstr "School/opleiding:" -#: ../../include/text.php:2323 -msgid "Enter a name for the zip file." -msgstr "Vul een naam in voor het zipbestand." +#: ../../include/channel.php:1646 +msgid "Like this thing" +msgstr "Vind dit ding leuk" -#: ../../include/text.php:2324 -msgid "Export to cloud files" -msgstr "Naar de cloud exporteren" +#: ../../include/event.php:24 ../../include/event.php:71 +msgid "l F d, Y \\@ g:i A" +msgstr "l d F Y \\@ G:i" -#: ../../include/text.php:2325 -msgid "/path/to/export/folder" -msgstr "/locatie/van/export/map" +#: ../../include/event.php:32 ../../include/event.php:75 +msgid "Starts:" +msgstr "Start:" -#: ../../include/text.php:2326 -msgid "Enter a path to a cloud files destination." -msgstr "Voer de locatie in van de cloudbestemming" +#: ../../include/event.php:42 ../../include/event.php:79 +msgid "Finishes:" +msgstr "Einde:" -#: ../../include/text.php:2327 -msgid "Specify folder" -msgstr "Selecteer een map" +#: ../../include/event.php:1011 +msgid "This event has been added to your calendar." +msgstr "Dit evenement is aan jouw agenda toegevoegd." -#: ../../include/auth.php:148 -msgid "Logged out." -msgstr "Uitgelogd." +#: ../../include/event.php:1227 +msgid "Not specified" +msgstr "Niet aangegeven" -#: ../../include/auth.php:275 -msgid "Failed authentication" -msgstr "Mislukte authenticatie" +#: ../../include/event.php:1228 +msgid "Needs Action" +msgstr "Actie vereist" -#: ../../include/follow.php:26 -msgid "Channel is blocked on this site." -msgstr "Kanaal is op deze hub geblokkeerd." +#: ../../include/event.php:1229 +msgid "Completed" +msgstr "Voltooid" -#: ../../include/follow.php:31 -msgid "Channel location missing." -msgstr "Ontbrekende kanaallocatie." +#: ../../include/event.php:1230 +msgid "In Process" +msgstr "In behandeling" -#: ../../include/follow.php:73 -msgid "Response from remote channel was incomplete." -msgstr "Antwoord van het kanaal op afstand was niet volledig." +#: ../../include/event.php:1231 +msgid "Cancelled" +msgstr "Geannuleerd" -#: ../../include/follow.php:90 -msgid "Channel was deleted and no longer exists." -msgstr "Kanaal is verwijderd en bestaat niet meer." +#: ../../include/event.php:1310 ../../include/connections.php:692 +msgid "Home, Voice" +msgstr "Thuis, spraak" -#: ../../include/follow.php:140 ../../include/follow.php:175 -msgid "Protocol disabled." -msgstr "Protocol uitgeschakeld." +#: ../../include/event.php:1311 ../../include/connections.php:693 +msgid "Home, Fax" +msgstr "Thuis, fax" -#: ../../include/follow.php:163 -msgid "Channel discovery failed." -msgstr "Kanaal ontdekken mislukt." +#: ../../include/event.php:1313 ../../include/connections.php:695 +msgid "Work, Voice" +msgstr "Werk, spraak" -#: ../../include/follow.php:202 -msgid "Cannot connect to yourself." -msgstr "Kan niet met jezelf verbinden" +#: ../../include/event.php:1314 ../../include/connections.php:696 +msgid "Work, Fax" +msgstr "Werk, fax" -#: ../../include/import.php:30 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." -msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt." +#: ../../include/network.php:762 +msgid "view full size" +msgstr "volledige grootte tonen" -#: ../../include/import.php:90 -msgid "Channel clone failed. Import failed." -msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt." +#: ../../include/network.php:1764 ../../include/network.php:1765 +msgid "Friendica" +msgstr "Friendica" -#: ../../include/import.php:100 -msgid "Cloned channel not found. Import failed." -msgstr "Gekloond kanaal niet gevonden. Importeren mislukt." +#: ../../include/network.php:1766 +msgid "OStatus" +msgstr "OStatus" -#: ../../include/import.php:1373 -msgid "Unable to import element \"" -msgstr "Niet in staat om dit element te importeren: \"" +#: ../../include/network.php:1767 +msgid "GNU-Social" +msgstr "GNU social" -#: ../../include/message.php:32 -msgid "Unable to determine sender." -msgstr "Afzender kan niet bepaald worden." +#: ../../include/network.php:1768 +msgid "RSS/Atom" +msgstr "RSS/Atom" -#: ../../include/message.php:69 -msgid "No recipient provided." -msgstr "Geen ontvanger opgegeven." +#: ../../include/network.php:1771 +msgid "Diaspora" +msgstr "Diaspora" -#: ../../include/message.php:74 -msgid "[no subject]" -msgstr "[geen onderwerp]" +#: ../../include/network.php:1772 +msgid "Facebook" +msgstr "Facebook" -#: ../../include/message.php:225 -msgid "Stored post could not be verified." -msgstr "Opgeslagen bericht kon niet worden geverifieerd." +#: ../../include/network.php:1773 +msgid "Zot" +msgstr "Zot" -#: ../../include/oembed.php:308 -msgid " by " -msgstr " door " +#: ../../include/network.php:1774 +msgid "LinkedIn" +msgstr "LinkedIn" -#: ../../include/oembed.php:309 -msgid " on " -msgstr " op " +#: ../../include/network.php:1775 +msgid "XMPP/IM" +msgstr "XMPP/IM" -#: ../../include/oembed.php:338 -msgid "Embedded content" -msgstr "Ingesloten (embedded) inhoud" +#: ../../include/network.php:1776 +msgid "MySpace" +msgstr "MySpace" -#: ../../include/oembed.php:347 -msgid "Embedding disabled" -msgstr "Insluiten (embedding) uitgeschakeld" +#: ../../include/language.php:410 +msgid "Select an alternate language" +msgstr "Kies een andere taal" -#: ../../include/zot.php:649 -msgid "Invalid data packet" -msgstr "Datapakket ongeldig" +#: ../../include/acl_selectors.php:113 +msgid "Who can see this?" +msgstr "Wie kan dit zien?" -#: ../../include/zot.php:665 -msgid "Unable to verify channel signature" -msgstr "Kanaalkenmerk kon niet worden geverifieerd. " +#: ../../include/acl_selectors.php:114 +msgid "Custom selection" +msgstr "Handmatige selectie" -#: ../../include/zot.php:2316 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "Hubkenmerk voor %s kon niet worden geverifieerd" +#: ../../include/acl_selectors.php:115 +msgid "" +"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit" +" the scope of \"Show\"." +msgstr "Kies \"Tonen\" om weergave toe te staan. Met \"Niet tonen\" kun je uitzonderingen maken op \"Tonen\"." -#: ../../include/zot.php:3722 -msgid "invalid target signature" -msgstr "ongeldig doelkenmerk" +#: ../../include/acl_selectors.php:116 +msgid "Show" +msgstr "Tonen" -#: ../../include/permissions.php:35 -msgid "Can view my normal stream and posts" -msgstr "Kan mijn normale kanaalstream en berichten bekijken" +#: ../../include/acl_selectors.php:117 +msgid "Don't show" +msgstr "Niet tonen" -#: ../../include/permissions.php:39 -msgid "Can view my webpages" -msgstr "Kan mijn pagina's bekijken" +#: ../../include/acl_selectors.php:150 +#, php-format +msgid "" +"Post permissions %s cannot be changed %s after a post is shared.
    These" +" permissions set who is allowed to view the post." +msgstr "Permissies van berichten %s zijn niet meer te veranderen %s nadat een bericht is gedeeld.
    Met deze permissies bepaal je wie het bericht kan zien." -#: ../../include/permissions.php:43 -msgid "Can post on my channel page (\"wall\")" -msgstr "Kan een bericht in mijn kanaal plaatsen" +#: ../../include/dba/dba_driver.php:178 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden" -#: ../../include/permissions.php:46 -msgid "Can like/dislike stuff" -msgstr "Kan dingen leuk of niet leuk vinden" +#: ../../include/bbcode.php:198 ../../include/bbcode.php:1200 +#: ../../include/bbcode.php:1203 ../../include/bbcode.php:1208 +#: ../../include/bbcode.php:1211 ../../include/bbcode.php:1214 +#: ../../include/bbcode.php:1217 ../../include/bbcode.php:1222 +#: ../../include/bbcode.php:1225 ../../include/bbcode.php:1230 +#: ../../include/bbcode.php:1233 ../../include/bbcode.php:1236 +#: ../../include/bbcode.php:1239 +msgid "Image/photo" +msgstr "Afbeelding/foto" -#: ../../include/permissions.php:46 -msgid "Profiles and things other than posts/comments" -msgstr "Profielen en dingen, buiten berichten en reacties" +#: ../../include/bbcode.php:237 ../../include/bbcode.php:1250 +msgid "Encrypted content" +msgstr "Versleutelde inhoud" -#: ../../include/permissions.php:48 -msgid "Can forward to all my channel contacts via post @mentions" -msgstr "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+" +#: ../../include/bbcode.php:253 +#, php-format +msgid "Install %1$s element %2$s" +msgstr "Installeer %1$s element %2$s" -#: ../../include/permissions.php:48 -msgid "Advanced - useful for creating group forum channels" -msgstr "Geavanceerd - nuttig voor groepforums" +#: ../../include/bbcode.php:257 +#, php-format +msgid "" +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." +msgstr "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren." -#: ../../include/permissions.php:49 -msgid "Can chat with me (when available)" -msgstr "Kan met mij chatten (wanneer beschikbaar)" +#: ../../include/bbcode.php:348 +msgid "card" +msgstr "kaart" -#: ../../include/permissions.php:50 -msgid "Can write to my file storage and photos" -msgstr "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen" +#: ../../include/bbcode.php:350 +msgid "article" +msgstr "artikel" + +#: ../../include/bbcode.php:433 ../../include/bbcode.php:441 +msgid "Click to open/close" +msgstr "Klik om te openen of te sluiten" -#: ../../include/permissions.php:51 -msgid "Can edit my webpages" -msgstr "Kan mijn pagina's bewerken" +#: ../../include/bbcode.php:441 +msgid "spoiler" +msgstr "spoiler" -#: ../../include/permissions.php:53 -msgid "Somewhat advanced - very useful in open communities" -msgstr "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)" +#: ../../include/bbcode.php:454 +msgid "View article" +msgstr "Artikel tonen" -#: ../../include/permissions.php:55 -msgid "Can administer my channel resources" -msgstr "Kan mijn kanaal beheren" +#: ../../include/bbcode.php:454 +msgid "View summary" +msgstr "Samenvatting tonen" -#: ../../include/permissions.php:55 -msgid "" -"Extremely advanced. Leave this alone unless you know what you are doing" -msgstr "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet." +#: ../../include/bbcode.php:1188 +msgid "$1 wrote:" +msgstr "$1 schreef:" -#: ../../include/activities.php:41 -msgid " and " -msgstr " en " +#: ../../include/oembed.php:329 +msgid " by " +msgstr " door " -#: ../../include/activities.php:49 -msgid "public profile" -msgstr "openbaar profiel" +#: ../../include/oembed.php:330 +msgid " on " +msgstr " op " -#: ../../include/activities.php:58 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s veranderde %2$s naar “%3$s”" +#: ../../include/oembed.php:359 +msgid "Embedded content" +msgstr "Ingesloten (embedded) inhoud" -#: ../../include/activities.php:59 -#, php-format -msgid "Visit %1$s's %2$s" -msgstr "Bezoek het %2$s van %1$s" +#: ../../include/oembed.php:368 +msgid "Embedding disabled" +msgstr "Insluiten (embedding) uitgeschakeld" -#: ../../include/activities.php:62 +#: ../../include/zid.php:347 #, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd." +msgid "OpenWebAuth: %1$s welcomes %2$s" +msgstr "OpenWebAuth: %1$s verwelkomt %2$s" -#: ../../include/features.php:58 +#: ../../include/features.php:56 msgid "General Features" msgstr "Algemene functies" -#: ../../include/features.php:63 -msgid "Multiple Profiles" -msgstr "Meerdere profielen" - -#: ../../include/features.php:64 -msgid "Ability to create multiple profiles" -msgstr "Mogelijkheid om meerdere profielen aan te maken" +#: ../../include/features.php:61 +msgid "Display new member quick links menu" +msgstr "Menu met links voor nieuwe leden tonen" -#: ../../include/features.php:72 +#: ../../include/features.php:69 msgid "Advanced Profiles" msgstr "Geavanceerde profielen" -#: ../../include/features.php:73 +#: ../../include/features.php:70 msgid "Additional profile sections and selections" msgstr "Extra onderdelen en keuzes voor je profiel" -#: ../../include/features.php:81 +#: ../../include/features.php:78 msgid "Profile Import/Export" msgstr "Profiel importen/exporteren" -#: ../../include/features.php:82 +#: ../../include/features.php:79 msgid "Save and load profile details across sites/channels" msgstr "Profielgegevens opslaan en in andere hubs/kanalen gebruiken." -#: ../../include/features.php:90 +#: ../../include/features.php:87 msgid "Web Pages" msgstr "Webpagina's" -#: ../../include/features.php:91 +#: ../../include/features.php:88 msgid "Provide managed web pages on your channel" msgstr "Sta beheerde webpagina's op jouw kanaal toe" -#: ../../include/features.php:100 +#: ../../include/features.php:97 msgid "Provide a wiki for your channel" msgstr "Voeg een wiki aan jouw kanaal toe" -#: ../../include/features.php:117 +#: ../../include/features.php:114 msgid "Private Notes" msgstr "Privé-aantekeningen" -#: ../../include/features.php:118 +#: ../../include/features.php:115 msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "Een eenvoudige toepassing om aantekeningen en herinneringen in te bewaren (let op: niet versleuteld)" -#: ../../include/features.php:126 +#: ../../include/features.php:124 +msgid "Create personal planning cards" +msgstr "Persoonlijke planningskaarten maken" + +#: ../../include/features.php:134 +msgid "Create interactive articles" +msgstr "Interactieve artikelen maken" + +#: ../../include/features.php:142 msgid "Navigation Channel Select" msgstr "Kanaal kiezen in navigatiemenu" -#: ../../include/features.php:127 +#: ../../include/features.php:143 msgid "Change channels directly from within the navigation dropdown menu" msgstr "Kies een ander kanaal direct vanuit het dropdown-menu op de navigatiebalk" -#: ../../include/features.php:135 +#: ../../include/features.php:151 msgid "Photo Location" msgstr "Fotolocatie" -#: ../../include/features.php:136 +#: ../../include/features.php:152 msgid "If location data is available on uploaded photos, link this to a map." msgstr "Wanneer in de geüploade foto's locatiegegevens aanwezig zijn, link dit dan aan een kaart." -#: ../../include/features.php:144 +#: ../../include/features.php:160 msgid "Access Controlled Chatrooms" msgstr "Chatkanalen met toegangscontrole " -#: ../../include/features.php:145 +#: ../../include/features.php:161 msgid "Provide chatrooms and chat services with access control." msgstr "Chatkanalen en chatdiensten met toegangscontrole aanbieden." -#: ../../include/features.php:154 -msgid "Provide alternate connection permission roles." -msgstr "Extra permissietypes voor connecties aanmaken" - -#: ../../include/features.php:162 +#: ../../include/features.php:170 msgid "Smart Birthdays" msgstr "Slimme verjaardagen" -#: ../../include/features.php:163 +#: ../../include/features.php:171 msgid "" "Make birthday events timezone aware in case your friends are scattered " "across the planet." msgstr "Maak verjaardagen bewust van tijdzones. Voor het geval dat jouw vrienden over de hele wereld verspreid zijn." -#: ../../include/features.php:171 +#: ../../include/features.php:179 msgid "Event Timezone Selection" msgstr "Tijdzone gebeurtenis" -#: ../../include/features.php:172 +#: ../../include/features.php:180 msgid "Allow event creation in timezones other than your own." msgstr "Sta het aanmaken van gebeurtenissen in andere tijdzones toe." -#: ../../include/features.php:180 +#: ../../include/features.php:189 +msgid "Premium Channel" +msgstr "Premiumkanaal" + +#: ../../include/features.php:190 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal" + +#: ../../include/features.php:198 msgid "Advanced Directory Search" msgstr "Geavanceerd in de kanalengids zoeken" -#: ../../include/features.php:181 +#: ../../include/features.php:199 msgid "Allows creation of complex directory search queries" msgstr "Gebruik complexe zoekopdrachten in de kanalengids" -#: ../../include/features.php:189 +#: ../../include/features.php:207 msgid "Advanced Theme and Layout Settings" msgstr "Geavanceerde thema- en lay-out-instellingen" -#: ../../include/features.php:190 +#: ../../include/features.php:208 msgid "Allows fine tuning of themes and page layouts" msgstr "Maakt het mogelijk dat thema's en pagina-lay-outs preciezer ingesteld kunnen worden " -#: ../../include/features.php:200 +#: ../../include/features.php:217 +msgid "Access Control and Permissions" +msgstr "Toegangscontrole en permissies" + +#: ../../include/features.php:221 ../../include/group.php:328 +msgid "Privacy Groups" +msgstr "Privacygroepen" + +#: ../../include/features.php:222 +msgid "Enable management and selection of privacy groups" +msgstr "Beheer en selectie van privacygroepen inschakelen" + +#: ../../include/features.php:230 +msgid "Multiple Profiles" +msgstr "Meerdere profielen" + +#: ../../include/features.php:231 +msgid "Ability to create multiple profiles" +msgstr "Mogelijkheid om meerdere profielen aan te maken" + +#: ../../include/features.php:241 +msgid "Provide alternate connection permission roles." +msgstr "Extra permissietypes voor connecties aanmaken" + +#: ../../include/features.php:249 +msgid "OAuth1 Clients" +msgstr "OAuth1-clients" + +#: ../../include/features.php:250 +msgid "Manage OAuth1 authenticatication tokens for mobile and remote apps." +msgstr "OAuth1-authenticatietokens beheren voor mobiele en remote apps." + +#: ../../include/features.php:258 +msgid "OAuth2 Clients" +msgstr "OAuth2-clients" + +#: ../../include/features.php:259 +msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps." +msgstr "OAuth2-authenticatietokens beheren voor mobiele en remote apps." + +#: ../../include/features.php:267 +msgid "Access Tokens" +msgstr "Gasttoegang" + +#: ../../include/features.php:268 +msgid "Create access tokens so that non-members can access private content." +msgstr "Maak toegangstokens aan zodat niet-leden toegang kunnen krijgen tot afgeschermde inhoud." + +#: ../../include/features.php:279 msgid "Post Composition Features" msgstr "Functies voor het opstellen van berichten" -#: ../../include/features.php:204 +#: ../../include/features.php:283 msgid "Large Photos" msgstr "Grote foto's" -#: ../../include/features.php:205 +#: ../../include/features.php:284 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "Gebruik grotere foto's (1024px) in berichten. Wanneer dit is uitgeschakeld worden er kleinere foto's (640px) gebruikt." -#: ../../include/features.php:214 +#: ../../include/features.php:293 msgid "Automatically import channel content from other channels or feeds" msgstr "Automatisch inhoud uit andere kanalen of feeds importeren." -#: ../../include/features.php:222 +#: ../../include/features.php:301 msgid "Even More Encryption" msgstr "Extra encryptie" -#: ../../include/features.php:223 +#: ../../include/features.php:302 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel." -#: ../../include/features.php:231 +#: ../../include/features.php:310 msgid "Enable Voting Tools" msgstr "Peilingen inschakelen" -#: ../../include/features.php:232 +#: ../../include/features.php:311 msgid "Provide a class of post which others can vote on" msgstr "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen." -#: ../../include/features.php:240 +#: ../../include/features.php:319 msgid "Disable Comments" msgstr "Reacties uitschakelen" -#: ../../include/features.php:241 +#: ../../include/features.php:320 msgid "Provide the option to disable comments for a post" msgstr "Maak het mogelijk dat reacties op een bericht kunnen worden uitgeschakeld" -#: ../../include/features.php:249 +#: ../../include/features.php:328 msgid "Delayed Posting" msgstr "Berichten uitstellen" -#: ../../include/features.php:250 +#: ../../include/features.php:329 msgid "Allow posts to be published at a later date" msgstr "Maakt het mogelijk dat berichten op een toekomstig moment gepubliceerd kunnen worden." -#: ../../include/features.php:258 +#: ../../include/features.php:337 msgid "Content Expiration" msgstr "Inhoud laten verlopen" -#: ../../include/features.php:259 +#: ../../include/features.php:338 msgid "Remove posts/comments and/or private messages at a future time" msgstr "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen" -#: ../../include/features.php:267 +#: ../../include/features.php:346 msgid "Suppress Duplicate Posts/Comments" msgstr "Dubbele berichten/reacties tegenhouden" -#: ../../include/features.php:268 +#: ../../include/features.php:347 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "Voorkomt dat berichten en reacties met identieke inhoud en die binnen twee minuten zijn verstuurd, worden gepubliceerd. " -#: ../../include/features.php:279 +#: ../../include/features.php:355 +msgid "Auto-save drafts of posts and comments" +msgstr "Automatisch concepten van berichten en reacties opslaan" + +#: ../../include/features.php:356 +msgid "" +"Automatically saves post and comment drafts in local browser storage to help" +" prevent accidental loss of compositions" +msgstr "Slaat automatisch concepten van berichten en reacties op in de lokale browseropslag, om zo onopzettelijke gegevensverlies te voorkomen" + +#: ../../include/features.php:367 msgid "Network and Stream Filtering" -msgstr "Netwerk- en streamfilter" +msgstr "Netwerk- en tijdlijnfilter" -#: ../../include/features.php:283 +#: ../../include/features.php:371 msgid "Search by Date" msgstr "Zoek op datum" -#: ../../include/features.php:284 +#: ../../include/features.php:372 msgid "Ability to select posts by date ranges" msgstr "Mogelijkheid om berichten op datum te filteren " -#: ../../include/features.php:293 -msgid "Enable management and selection of privacy groups" -msgstr "Beheer en selectie van privacygroepen inschakelen" - -#: ../../include/features.php:302 +#: ../../include/features.php:382 msgid "Save search terms for re-use" msgstr "Sla zoekopdrachten op voor hergebruik" -#: ../../include/features.php:310 +#: ../../include/features.php:390 msgid "Network Personal Tab" -msgstr "Persoonlijke netwerktab" +msgstr "Persoonlijke tijdlijntab" -#: ../../include/features.php:311 +#: ../../include/features.php:391 msgid "Enable tab to display only Network posts that you've interacted on" -msgstr "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had" +msgstr "Tab inschakelen die alleen tijdlijnberichten toont waarmee jij interactie had" -#: ../../include/features.php:319 +#: ../../include/features.php:399 msgid "Network New Tab" -msgstr "Nieuwe netwerktab" +msgstr "Nieuwe tijdlijnactiviteittab" -#: ../../include/features.php:320 +#: ../../include/features.php:400 msgid "Enable tab to display all new Network activity" -msgstr "Laat de tab alle nieuwe netwerkactiviteit tonen" +msgstr "Tab inschakelen om alle nieuwe tijdlijnactiviteit te tonen" -#: ../../include/features.php:328 +#: ../../include/features.php:408 msgid "Affinity Tool" msgstr "Affiniteitsfilter" -#: ../../include/features.php:329 +#: ../../include/features.php:409 msgid "Filter stream activity by depth of relationships" -msgstr "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag" +msgstr "Filter wat je op jouw tijdlijn ziet aan de hand van hoe goed je iemand kent of mag" -#: ../../include/features.php:338 +#: ../../include/features.php:418 msgid "Show friend and connection suggestions" msgstr "Toon kanaalvoorstellen" -#: ../../include/features.php:346 +#: ../../include/features.php:426 msgid "Connection Filtering" msgstr "Berichtenfilters" -#: ../../include/features.php:347 +#: ../../include/features.php:427 msgid "Filter incoming posts from connections based on keywords/content" msgstr "Filter binnenkomende berichten van connecties aan de hand van trefwoorden en taal" -#: ../../include/features.php:359 +#: ../../include/features.php:439 msgid "Post/Comment Tools" msgstr "Bericht- en reactiehulpmiddelen" -#: ../../include/features.php:363 +#: ../../include/features.php:443 msgid "Community Tagging" msgstr "Taggen door anderen" -#: ../../include/features.php:364 +#: ../../include/features.php:444 msgid "Ability to tag existing posts" msgstr "Geeft andere mensen de mogelijkheid om jouw (bestaande) berichten te taggen" -#: ../../include/features.php:372 +#: ../../include/features.php:452 msgid "Post Categories" msgstr "Categorieën berichten" -#: ../../include/features.php:373 +#: ../../include/features.php:453 msgid "Add categories to your posts" msgstr "Voeg categorieën toe aan je berichten" -#: ../../include/features.php:381 +#: ../../include/features.php:461 msgid "Emoji Reactions" msgstr "Emoji-reacties" -#: ../../include/features.php:382 +#: ../../include/features.php:462 msgid "Add emoji reaction ability to posts" msgstr "Emoji-reacties in berichten toestaan" -#: ../../include/features.php:391 +#: ../../include/features.php:471 msgid "Ability to file posts under folders" msgstr "Mogelijkheid om berichten in mappen op te slaan" -#: ../../include/features.php:399 +#: ../../include/features.php:479 msgid "Dislike Posts" msgstr "Vind berichten niet leuk" -#: ../../include/features.php:400 +#: ../../include/features.php:480 msgid "Ability to dislike posts/comments" msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden" -#: ../../include/features.php:408 +#: ../../include/features.php:488 msgid "Star Posts" msgstr "Geef berichten een ster" -#: ../../include/features.php:409 +#: ../../include/features.php:489 msgid "Ability to mark special posts with a star indicator" msgstr "Mogelijkheid om speciale berichten met een ster te markeren" -#: ../../include/features.php:417 +#: ../../include/features.php:497 msgid "Tag Cloud" msgstr "Tagwolk" -#: ../../include/features.php:418 +#: ../../include/features.php:498 msgid "Provide a personal tag cloud on your channel page" msgstr "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina" -#: ../../include/features.php:430 -msgid "Premium Channel" -msgstr "Premiumkanaal" - -#: ../../include/features.php:431 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" -msgstr "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal" - -#: ../../include/photos.php:115 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes" - -#: ../../include/photos.php:122 -msgid "Image file is empty." -msgstr "Afbeeldingsbestand is leeg" - -#: ../../include/photos.php:260 -msgid "Photo storage failed." -msgstr "Foto kan niet worden opgeslagen" - -#: ../../include/photos.php:300 -msgid "a new photo" -msgstr "een nieuwe foto" - -#: ../../include/photos.php:304 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" -msgstr "%1$s plaatste %2$s op %3$s" - -#: ../../include/photos.php:519 -msgid "Upload New Photos" -msgstr "Nieuwe foto's uploaden" - -#: ../../include/channel.php:33 -msgid "Unable to obtain identity information from database" -msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen" - -#: ../../include/channel.php:67 -msgid "Empty name" -msgstr "Ontbrekende naam" +#: ../../include/taxonomy.php:320 +msgid "Trending" +msgstr "Trending" -#: ../../include/channel.php:70 -msgid "Name too long" -msgstr "Naam te lang" - -#: ../../include/channel.php:181 -msgid "No account identifier" -msgstr "Geen account-identificator" +#: ../../include/taxonomy.php:552 +msgid "Keywords" +msgstr "Trefwoorden" -#: ../../include/channel.php:193 -msgid "Nickname is required." -msgstr "Bijnaam is verplicht" +#: ../../include/taxonomy.php:573 +msgid "have" +msgstr "heb" -#: ../../include/channel.php:207 -msgid "Reserved nickname. Please choose another." -msgstr "Deze naam is gereserveerd. Kies een andere." +#: ../../include/taxonomy.php:573 +msgid "has" +msgstr "heeft" -#: ../../include/channel.php:212 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik." +#: ../../include/taxonomy.php:574 +msgid "want" +msgstr "wil" -#: ../../include/channel.php:272 -msgid "Unable to retrieve created identity" -msgstr "Niet in staat om aangemaakte identiteit te vinden" +#: ../../include/taxonomy.php:574 +msgid "wants" +msgstr "wil" -#: ../../include/channel.php:344 -msgid "Default Profile" -msgstr "Standaardprofiel" +#: ../../include/taxonomy.php:575 +msgid "likes" +msgstr "vindt dit leuk" -#: ../../include/channel.php:1045 -msgid "Create New Profile" -msgstr "Nieuw profiel aanmaken" +#: ../../include/taxonomy.php:576 +msgid "dislikes" +msgstr "vindt dit niet leuk" -#: ../../include/channel.php:1065 -msgid "Visible to everybody" -msgstr "Voor iedereen zichtbaar" +#: ../../include/account.php:36 +msgid "Not a valid email address" +msgstr "Geen geldig e-mailadres" -#: ../../include/channel.php:1138 ../../include/channel.php:1257 -msgid "Gender:" -msgstr "Geslacht:" +#: ../../include/account.php:38 +msgid "Your email domain is not among those allowed on this site" +msgstr "Jouw e-maildomein is op deze hub niet toegestaan" -#: ../../include/channel.php:1140 ../../include/channel.php:1312 -msgid "Homepage:" -msgstr "Homepagina:" +#: ../../include/account.php:44 +msgid "Your email address is already registered at this site." +msgstr "Jouw e-mailadres is al op deze hub geregistreerd." -#: ../../include/channel.php:1141 -msgid "Online Now" -msgstr "Nu online" +#: ../../include/account.php:76 +msgid "An invitation is required." +msgstr "Een uitnodiging is vereist" -#: ../../include/channel.php:1262 -msgid "Like this channel" -msgstr "Vind dit kanaal leuk" +#: ../../include/account.php:80 +msgid "Invitation could not be verified." +msgstr "Uitnodiging kon niet geverifieerd worden" -#: ../../include/channel.php:1286 -msgid "j F, Y" -msgstr "F j Y" +#: ../../include/account.php:158 +msgid "Please enter the required information." +msgstr "Vul de vereiste informatie in." -#: ../../include/channel.php:1287 -msgid "j F" -msgstr "F j" +#: ../../include/account.php:225 +msgid "Failed to store account information." +msgstr "Account-informatie kon niet opgeslagen worden." -#: ../../include/channel.php:1294 -msgid "Birthday:" -msgstr "Geboortedatum:" +#: ../../include/account.php:314 +#, php-format +msgid "Registration confirmation for %s" +msgstr "Registratiebevestiging voor %s" -#: ../../include/channel.php:1307 +#: ../../include/account.php:383 #, php-format -msgid "for %1$d %2$s" -msgstr "voor %1$d %2$s" +msgid "Registration request at %s" +msgstr "Registratiebevestiging voor %s" -#: ../../include/channel.php:1310 -msgid "Sexual Preference:" -msgstr "Seksuele voorkeur:" +#: ../../include/account.php:405 +msgid "your registration password" +msgstr "jouw registratiewachtwoord" -#: ../../include/channel.php:1316 -msgid "Tags:" -msgstr "Tags:" +#: ../../include/account.php:411 ../../include/account.php:473 +#, php-format +msgid "Registration details for %s" +msgstr "Registratiegegevens voor %s" -#: ../../include/channel.php:1318 -msgid "Political Views:" -msgstr "Politieke overtuigingen:" +#: ../../include/account.php:484 +msgid "Account approved." +msgstr "Account goedgekeurd" -#: ../../include/channel.php:1320 -msgid "Religion:" -msgstr "Religie:" +#: ../../include/account.php:524 +#, php-format +msgid "Registration revoked for %s" +msgstr "Registratie ingetrokken voor %s" -#: ../../include/channel.php:1324 -msgid "Hobbies/Interests:" -msgstr "Hobby's/interesses:" +#: ../../include/account.php:803 ../../include/account.php:805 +msgid "Click here to upgrade." +msgstr "Klik hier om te upgraden." -#: ../../include/channel.php:1326 -msgid "Likes:" -msgstr "Houdt van:" +#: ../../include/account.php:811 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden." -#: ../../include/channel.php:1328 -msgid "Dislikes:" -msgstr "Houdt niet van:" +#: ../../include/account.php:816 +msgid "This action is not available under your subscription plan." +msgstr "Deze handeling is niet mogelijk met jouw abonnement." -#: ../../include/channel.php:1330 -msgid "Contact information and Social Networks:" -msgstr "Contactinformatie en sociale netwerken:" +#: ../../include/datetime.php:140 +msgid "Birthday" +msgstr "Verjaardag of geboortedatum" -#: ../../include/channel.php:1332 -msgid "My other channels:" -msgstr "Mijn andere kanalen" +#: ../../include/datetime.php:140 +msgid "Age: " +msgstr "Leeftijd:" -#: ../../include/channel.php:1334 -msgid "Musical interests:" -msgstr "Muzikale interesses:" +#: ../../include/datetime.php:140 +msgid "YYYY-MM-DD or MM-DD" +msgstr "JJJJ-MM-DD of MM-DD" -#: ../../include/channel.php:1336 -msgid "Books, literature:" -msgstr "Boeken, literatuur:" +#: ../../include/datetime.php:244 +msgid "less than a second ago" +msgstr "minder dan een seconde geleden" -#: ../../include/channel.php:1338 -msgid "Television:" -msgstr "Televisie:" +#: ../../include/datetime.php:262 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" +msgstr "%1$d %2$s geleden" -#: ../../include/channel.php:1340 -msgid "Film/dance/culture/entertainment:" -msgstr "Films/dansen/cultuur/vermaak:" +#: ../../include/datetime.php:273 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "jaar" +msgstr[1] "jaren" -#: ../../include/channel.php:1342 -msgid "Love/Romance:" -msgstr "Liefde/romantiek:" +#: ../../include/datetime.php:276 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "maand" +msgstr[1] "maanden" -#: ../../include/channel.php:1344 -msgid "Work/employment:" -msgstr "Werk/beroep:" +#: ../../include/datetime.php:279 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "week" +msgstr[1] "weken" -#: ../../include/channel.php:1346 -msgid "School/education:" -msgstr "School/opleiding:" +#: ../../include/datetime.php:282 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "dag" +msgstr[1] "dagen" -#: ../../include/channel.php:1369 -msgid "Like this thing" -msgstr "Vind dit ding leuk" +#: ../../include/datetime.php:285 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "uur" +msgstr[1] "uren" -#: ../../include/channel.php:2103 -#, php-format -msgid "User '%s' deleted" -msgstr "Account '%s' verwijderd" +#: ../../include/datetime.php:288 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "minuut" +msgstr[1] "minuten" -#: ../../util/nconfig.php:34 -msgid "Source channel not found." -msgstr "Bron van kanaal niet gevonden" +#: ../../include/datetime.php:291 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "seconde" +msgstr[1] "seconden" -#: ../../view/theme/redbasic/php/config.php:9 -msgid "Focus (Hubzilla default)" -msgstr "Focus (Hubzilla-standaard)" +#: ../../include/datetime.php:520 +#, php-format +msgid "%1$s's birthday" +msgstr "Verjaardag van %1$s" -#: ../../view/theme/redbasic/php/config.php:110 -msgid "Theme settings" -msgstr "Thema-instellingen" +#: ../../include/datetime.php:521 +#, php-format +msgid "Happy Birthday %1$s" +msgstr "Gefeliciteerd met je verjaardag %1$s" -#: ../../view/theme/redbasic/php/config.php:111 -msgid "Narrow navbar" -msgstr "Smalle navigatiebalk" +#: ../../include/nav.php:96 +msgid "Remote authentication" +msgstr "Authenticatie op afstand" -#: ../../view/theme/redbasic/php/config.php:112 -msgid "Navigation bar background color" -msgstr "Achtergrondkleur navigatiebalk" +#: ../../include/nav.php:96 +msgid "Click to authenticate to your home hub" +msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub" -#: ../../view/theme/redbasic/php/config.php:113 -msgid "Navigation bar gradient top color" -msgstr "Bovenste gradiëntkleur navigatiebalk" +#: ../../include/nav.php:102 ../../include/nav.php:190 +msgid "Manage Your Channels" +msgstr "Beheer je kanalen" -#: ../../view/theme/redbasic/php/config.php:114 -msgid "Navigation bar gradient bottom color" -msgstr "Onderste gradiëntkleur navigatiebalk" +#: ../../include/nav.php:105 ../../include/nav.php:192 +msgid "Account/Channel Settings" +msgstr "Account-/kanaalinstellingen" -#: ../../view/theme/redbasic/php/config.php:115 -msgid "Navigation active button gradient top color" -msgstr "Bovenste gradiëntkleur actieve knop navigatiebalk" +#: ../../include/nav.php:111 ../../include/nav.php:140 +msgid "End this session" +msgstr "Beëindig deze sessie" -#: ../../view/theme/redbasic/php/config.php:116 -msgid "Navigation active button gradient bottom color" -msgstr "Onderste gradiëntkleur actieve knop op navigatiebalk" +#: ../../include/nav.php:114 +msgid "Your profile page" +msgstr "Jouw profielpagina" -#: ../../view/theme/redbasic/php/config.php:117 -msgid "Navigation bar border color " -msgstr "Randkleur navigatiebalk " +#: ../../include/nav.php:117 +msgid "Manage/Edit profiles" +msgstr "Beheer/wijzig profielen" -#: ../../view/theme/redbasic/php/config.php:118 -msgid "Navigation bar icon color " -msgstr "Pictogramkleur navigatiebalk" +#: ../../include/nav.php:126 ../../include/nav.php:130 +msgid "Sign in" +msgstr "Inloggen" -#: ../../view/theme/redbasic/php/config.php:119 -msgid "Navigation bar active icon color " -msgstr "Actieve pictogramkleur navigatiebalk" +#: ../../include/nav.php:157 +msgid "Take me home" +msgstr "Terug naar mijn hub" -#: ../../view/theme/redbasic/php/config.php:120 -msgid "link color" -msgstr "Linkkleur instellen" +#: ../../include/nav.php:159 +msgid "Log me out of this site" +msgstr "Uitloggen op deze hub" -#: ../../view/theme/redbasic/php/config.php:121 -msgid "Set font-color for banner" -msgstr "Tekstkleur van banner instellen" +#: ../../include/nav.php:164 +msgid "Create an account" +msgstr "Maak een account aan" -#: ../../view/theme/redbasic/php/config.php:122 -msgid "Set the background color" -msgstr "Achtergrondkleur instellen" +#: ../../include/nav.php:176 +msgid "Help and documentation" +msgstr "Hulp en documentatie" -#: ../../view/theme/redbasic/php/config.php:123 -msgid "Set the background image" -msgstr "Achtergrondafbeelding instellen" +#: ../../include/nav.php:179 +msgid "Search site @name, !forum, #tag, ?docs, content" +msgstr "Zoek in deze hub naar @naam, !forum, #tag, ?hulp" -#: ../../view/theme/redbasic/php/config.php:124 -msgid "Set the background color of items" -msgstr "Achtergrondkleur items instellen" +#: ../../include/nav.php:199 +msgid "Site Setup and Configuration" +msgstr "Hub instellen en beheren" -#: ../../view/theme/redbasic/php/config.php:125 -msgid "Set the background color of comments" -msgstr "Achtergrondkleur reacties instellen" +#: ../../include/nav.php:290 +msgid "@name, !forum, #tag, ?doc, content" +msgstr "@naam, !forum, #tag, ?hulp, inhoud" -#: ../../view/theme/redbasic/php/config.php:126 -msgid "Set the border color of comments" -msgstr "Randkleur reacties instellen" +#: ../../include/nav.php:291 +msgid "Please wait..." +msgstr "Wachten aub..." -#: ../../view/theme/redbasic/php/config.php:127 -msgid "Set the indent for comments" -msgstr "Inspringen reacties instellen" +#: ../../include/nav.php:297 +msgid "Add Apps" +msgstr "Apps toevoegen" -#: ../../view/theme/redbasic/php/config.php:128 -msgid "Set the basic color for item icons" -msgstr "Basiskleur itempictogrammen instellen" +#: ../../include/nav.php:298 +msgid "Arrange Apps" +msgstr "Volgorde apps" -#: ../../view/theme/redbasic/php/config.php:129 -msgid "Set the hover color for item icons" -msgstr "Hoverkleur itempictogrammen instellen" +#: ../../include/nav.php:299 +msgid "Toggle System Apps" +msgstr "Systeem-apps toevoegen of verwijderen" -#: ../../view/theme/redbasic/php/config.php:130 -msgid "Set font-size for the entire application" -msgstr "Tekstgrootte van de volledige applicatie instellen" +#: ../../include/photos.php:150 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes" -#: ../../view/theme/redbasic/php/config.php:130 -msgid "Example: 14px" -msgstr "Voorbeeld: 14px" +#: ../../include/photos.php:161 +msgid "Image file is empty." +msgstr "Afbeeldingsbestand is leeg" -#: ../../view/theme/redbasic/php/config.php:131 -msgid "Set font-size for posts and comments" -msgstr "Lettergrootte voor berichten en reacties instellen" +#: ../../include/photos.php:326 +msgid "Photo storage failed." +msgstr "Foto kan niet worden opgeslagen" -#: ../../view/theme/redbasic/php/config.php:132 -msgid "Set font-color for posts and comments" -msgstr "Tekstkleur van berichten en reacties" +#: ../../include/photos.php:375 +msgid "a new photo" +msgstr "een nieuwe foto" -#: ../../view/theme/redbasic/php/config.php:133 -msgid "Set radius of corners" -msgstr "Radius van hoeken instellen" +#: ../../include/photos.php:379 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" +msgstr "%1$s plaatste %2$s op %3$s" -#: ../../view/theme/redbasic/php/config.php:134 -msgid "Set shadow depth of photos" -msgstr "Schaduwdiepte van foto's instellen" +#: ../../include/photos.php:671 +msgid "Upload New Photos" +msgstr "Nieuwe foto's uploaden" -#: ../../view/theme/redbasic/php/config.php:135 -msgid "Set maximum width of content region in pixel" -msgstr "Maximumbreedte conversatieruimte instellen (in pixels)" +#: ../../include/zot.php:772 +msgid "Invalid data packet" +msgstr "Datapakket ongeldig" -#: ../../view/theme/redbasic/php/config.php:135 -msgid "Leave empty for default width" -msgstr "Laat leeg voor standaardbreedte" +#: ../../include/zot.php:799 +msgid "Unable to verify channel signature" +msgstr "Kanaalkenmerk kon niet worden geverifieerd. " -#: ../../view/theme/redbasic/php/config.php:136 -msgid "Left align page content" -msgstr "Inhoud links uitlijnen" +#: ../../include/zot.php:2552 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "Hubkenmerk voor %s kon niet worden geverifieerd" -#: ../../view/theme/redbasic/php/config.php:137 -msgid "Set minimum opacity of nav bar - to hide it" -msgstr "Minimale ondoorzichtigheid navigatiebalk (- om te verbergen)" +#: ../../include/zot.php:4219 +msgid "invalid target signature" +msgstr "ongeldig doelkenmerk" -#: ../../view/theme/redbasic/php/config.php:138 -msgid "Set size of conversation author photo" -msgstr "Grootte profielfoto's van berichten instellen" +#: ../../include/group.php:22 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"may apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." +msgstr "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten kunnen van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken." -#: ../../view/theme/redbasic/php/config.php:139 -msgid "Set size of followup author photos" -msgstr "Grootte profielfoto's van reacties instellen" +#: ../../include/group.php:264 +msgid "Add new connections to this privacy group" +msgstr "Voeg nieuwe connecties aan deze privacygroep toe" -#: ../../boot.php:1522 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "Update %s mislukt. Zie foutenlogboek." +#: ../../include/group.php:306 +msgid "edit" +msgstr "bewerken" -#: ../../boot.php:1525 -#, php-format -msgid "Update Error at %s" -msgstr "Update-fout op %s" +#: ../../include/group.php:329 +msgid "Edit group" +msgstr "Privacygroep bewerken" -#: ../../boot.php:1729 -msgid "Create an account to access services and applications" -msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen" +#: ../../include/group.php:330 +msgid "Add privacy group" +msgstr "Privacygroep toevoegen" -#: ../../boot.php:1751 -msgid "Login/Email" -msgstr "E-mailadres of inlognaam" +#: ../../include/group.php:331 +msgid "Channels not in any privacy group" +msgstr "Kanalen die zich in geen enkele privacygroep bevinden" -#: ../../boot.php:1752 -msgid "Password" -msgstr "Wachtwoord" +#: ../../include/connections.php:133 +msgid "New window" +msgstr "Nieuw venster" -#: ../../boot.php:1753 -msgid "Remember me" -msgstr "Aangemeld blijven" +#: ../../include/connections.php:134 +msgid "Open the selected location in a different window or browser tab" +msgstr "Open de geselecteerde locatie in een ander venster of tab" -#: ../../boot.php:1756 -msgid "Forgot your password?" -msgstr "Wachtwoord vergeten?" +#: ../../include/auth.php:152 +msgid "Delegation session ended." +msgstr "Delegatiesessie beëindigd." -#: ../../boot.php:2320 -msgid "toggle mobile" -msgstr "mobiele weergave omschakelen" +#: ../../include/auth.php:156 +msgid "Logged out." +msgstr "Uitgelogd." -#: ../../boot.php:2475 -msgid "Website SSL certificate is not valid. Please correct." -msgstr "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b." +#: ../../include/auth.php:273 +msgid "Email validation is incomplete. Please check your email." +msgstr "E-mailverificatie is nog niet voltooid. Controleer jouw e-mail." -#: ../../boot.php:2478 -#, php-format -msgid "[hubzilla] Website SSL error for %s" -msgstr "[hubzilla] Probleem met SSL-certificaat voor %s" +#: ../../include/auth.php:289 +msgid "Failed authentication" +msgstr "Mislukte authenticatie" -#: ../../boot.php:2597 -msgid "Cron/Scheduled tasks not running." -msgstr "Cron is niet actief" +#: ../../include/help.php:34 +msgid "Help:" +msgstr "Hulp:" -#: ../../boot.php:2601 -#, php-format -msgid "[hubzilla] Cron tasks not running on %s" -msgstr "[hubzilla] Cron-taken zijn niet actief op %s" +#: ../../include/help.php:78 +msgid "Not Found" +msgstr "Niet gevonden" diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php index c221f6670..07ecb0602 100644 --- a/view/nl/hstrings.php +++ b/view/nl/hstrings.php @@ -5,22 +5,6 @@ function string_plural_select_nl($n){ return ($n != 1);; }} App::$rtl = 0; -App::$strings["Social Networking"] = "Sociaal netwerk"; -App::$strings["Social - Mostly Public"] = "Sociaal - Vrijwel alles openbaar"; -App::$strings["Social - Restricted"] = "Sociaal - Beperkt zichtbaar"; -App::$strings["Social - Private"] = "Sociaal - Verborgen kanaal"; -App::$strings["Community Forum"] = "Groepsforum"; -App::$strings["Forum - Mostly Public"] = "Forum - Vrijwel alles openbaar"; -App::$strings["Forum - Restricted"] = "Forum - Beperkt zichtbaar"; -App::$strings["Forum - Private"] = "Forum - Verborgen kanaal"; -App::$strings["Feed Republish"] = "Feed herpubliceren"; -App::$strings["Feed - Mostly Public"] = "Feed - Vrijwel alles openbaar"; -App::$strings["Feed - Restricted"] = "Feed - Beperkt zichtbaar"; -App::$strings["Special Purpose"] = "Speciaal doel"; -App::$strings["Special - Celebrity/Soapbox"] = "Speciaal - Beroemdheid/alleen volgen"; -App::$strings["Special - Group Repository"] = "Speciaal - Groepsopslag"; -App::$strings["Other"] = "Anders"; -App::$strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen"; App::$strings["Can view my channel stream and posts"] = "Kan mijn kanaal en berichten bekijken"; App::$strings["Can send me their channel stream and posts"] = "Kan mij de inhoud van hun kanaal en berichten sturen"; App::$strings["Can view my default channel profile"] = "Kan mijn standaard kanaalprofiel bekijken"; @@ -39,72 +23,256 @@ App::$strings["Can forward to all my channel connections via @+ mentions in post App::$strings["Can chat with me"] = "Kan met mij chatten"; App::$strings["Can source my public posts in derived channels"] = "Kan mijn openbare berichten als bron voor andere kanalen gebruiken"; App::$strings["Can administer my channel"] = "Kan mijn kanaal beheren"; -App::$strings["parent"] = "omhoog"; -App::$strings["Collection"] = "map"; -App::$strings["Principal"] = "principal"; -App::$strings["Addressbook"] = "Adresboek"; -App::$strings["Calendar"] = "Agenda"; -App::$strings["Schedule Inbox"] = "Planning-postvak IN"; -App::$strings["Schedule Outbox"] = "Planning-postvak UIT"; -App::$strings["Unknown"] = "Onbekend"; -App::$strings["Files"] = "Bestanden"; -App::$strings["Total"] = "Totaal"; -App::$strings["Shared"] = "Gedeeld"; +App::$strings["Social Networking"] = "Sociaal netwerk"; +App::$strings["Social - Federation"] = "Sociaal - Federatie"; +App::$strings["Social - Mostly Public"] = "Sociaal - Vrijwel alles openbaar"; +App::$strings["Social - Restricted"] = "Sociaal - Beperkt zichtbaar"; +App::$strings["Social - Private"] = "Sociaal - Verborgen kanaal"; +App::$strings["Community Forum"] = "Groepsforum"; +App::$strings["Forum - Mostly Public"] = "Forum - Vrijwel alles openbaar"; +App::$strings["Forum - Restricted"] = "Forum - Beperkt zichtbaar"; +App::$strings["Forum - Private"] = "Forum - Verborgen kanaal"; +App::$strings["Feed Republish"] = "Feed herpubliceren"; +App::$strings["Feed - Mostly Public"] = "Feed - Vrijwel alles openbaar"; +App::$strings["Feed - Restricted"] = "Feed - Beperkt zichtbaar"; +App::$strings["Special Purpose"] = "Speciaal doel"; +App::$strings["Special - Celebrity/Soapbox"] = "Speciaal - Beroemdheid/alleen volgen"; +App::$strings["Special - Group Repository"] = "Speciaal - Groepsopslag"; +App::$strings["Other"] = "Anders"; +App::$strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen"; +App::$strings["Requested profile is not available."] = "Opgevraagd profiel is niet beschikbaar"; +App::$strings["Permission denied."] = "Toegang geweigerd."; +App::$strings["Block Name"] = "Bloknaam"; +App::$strings["Blocks"] = "Blokken"; +App::$strings["Block Title"] = "Bloktitel"; +App::$strings["Created"] = "Aangemaakt"; +App::$strings["Edited"] = "Bewerkt"; App::$strings["Create"] = "Aanmaken"; -App::$strings["Upload"] = "Uploaden"; -App::$strings["Name"] = "Naam"; -App::$strings["Type"] = "Type"; -App::$strings["Size"] = "Grootte"; -App::$strings["Last Modified"] = "Laatst gewijzigd"; App::$strings["Edit"] = "Bewerken"; +App::$strings["Share"] = "Delen"; App::$strings["Delete"] = "Verwijderen"; -App::$strings["You are using %1\$s of your available file storage."] = "Je gebruikt %1\$s van de beschikbare bestandsopslag."; -App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s%)"] = "Je gebruikt %1\$s van totaal %2\$s beschikbare bestandsopslag. (%3\$s%)"; -App::$strings["WARNING:"] = "WAARSCHUWING:"; -App::$strings["Please use DAV to upload large (video, audio) files.
    See Cloud Desktop Clients"] = "Gebruik DAV om grote (video-, audio-) bestanden te uploaden.
    Zie hiervoor de documentatie over de cloud en desktopclients."; -App::$strings["Create new folder"] = "Nieuwe map aanmaken"; -App::$strings["Upload file"] = "Bestand uploaden"; -App::$strings["Drop files here to immediately upload"] = "Sleep bestanden hierheen om ze onmiddellijk te uploaden"; +App::$strings["View"] = "Tonen"; +App::$strings["Total invitation limit exceeded."] = "Limiet voor aantal uitnodigingen overschreden."; +App::$strings["%s : Not a valid email address."] = "%s : Geen geldig e-mailadres."; +App::$strings["Please join us on \$Projectname"] = "Uitnodiging voor \$Projectname"; +App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder."; +App::$strings["%s : Message delivery failed."] = "%s: Aflevering bericht mislukt."; +App::$strings["%d message sent."] = array( + 0 => "%d bericht verzonden.", + 1 => "%d berichten verzonden.", +); +App::$strings["You have no more invitations available"] = "Je hebt geen uitnodigingen meer beschikbaar"; +App::$strings["Send invitations"] = "Uitnodigingen verzenden"; +App::$strings["Enter email addresses, one per line:"] = "Voer e-mailadressen in, één per regel:"; +App::$strings["Your message:"] = "Jouw bericht:"; +App::$strings["Please join my community on \$Projectname."] = "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op \$Projectname te vergezellen. Lees meer over \$Projectname op http://hubzilla.org"; +App::$strings["You will need to supply this invitation code:"] = "Je moet deze uitnodigingscode opgeven:"; +App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registreer je op een willekeurige \$Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):"; +App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn \$Projectname-kanaaladres in het zoekveld invullen:"; +App::$strings["or visit"] = "of bezoek"; +App::$strings["3. Click [Connect]"] = "3. Klik op [+ Verbinden]"; +App::$strings["Submit"] = "Opslaan"; +App::$strings["Articles"] = "Artikelen"; +App::$strings["Add Article"] = "Artikel toevoegen"; +App::$strings["Item not found"] = "Item niet gevonden"; +App::$strings["Layout Name"] = "Naam lay-out"; +App::$strings["Layout Description (Optional)"] = "Lay-out-omschrijving (niet verplicht)"; +App::$strings["Edit Layout"] = "Lay-out bewerken"; App::$strings["Permission denied"] = "Toegang geweigerd"; -App::$strings["Permission denied."] = "Toegang geweigerd."; -App::$strings["Page not found."] = "Pagina niet gevonden."; -App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen."; -App::$strings["Welcome %s. Remote authentication successful."] = "Welkom %s. Authenticatie op afstand geslaagd."; -App::$strings["Requested profile is not available."] = "Opgevraagd profiel is niet beschikbaar"; -App::$strings["Some blurb about what to do when you're new here"] = "Welkom op \$Projectname. Klik op de tab ontdekken of klik rechtsboven op de kanalengids, om kanalen te vinden. Rechtsboven vind je ook apps, waar je vrijwel alle functies van \$Projectname kunt vinden. Voor hulp met \$Projectname klik je op het vraagteken."; +App::$strings["Invalid profile identifier."] = "Ongeldige profiel-identificator"; +App::$strings["Profile Visibility Editor"] = "Zichtbaarheid profiel "; +App::$strings["Profile"] = "Profiel"; +App::$strings["Click on a contact to add or remove."] = "Klik op een connectie om deze toe te voegen of te verwijderen"; +App::$strings["Visible To"] = "Zichtbaar voor"; +App::$strings["All Connections"] = "Alle connecties"; +App::$strings["INVALID EVENT DISMISSED!"] = "ONGELDIGE GEBEURTENIS VERWIJDERD!"; +App::$strings["Summary: "] = "Samenvatting: "; +App::$strings["Unknown"] = "Onbekend"; +App::$strings["Date: "] = "Datum: "; +App::$strings["Reason: "] = "Reden: "; +App::$strings["INVALID CARD DISMISSED!"] = "ONGELDIGE CONTACTKAART VERWIJDERD!"; +App::$strings["Name: "] = "Naam: "; +App::$strings["Event title"] = "Titel"; +App::$strings["Start date and time"] = "Begindatum en -tijd"; +App::$strings["Example: YYYY-MM-DD HH:mm"] = "Bijvoorbeeld: JJJJ-MM-DD UU:mm"; +App::$strings["End date and time"] = "Einddatum en -tijd"; +App::$strings["Description"] = "Omschrijving"; +App::$strings["Location"] = "Locatie"; +App::$strings["Previous"] = "Vorige"; +App::$strings["Next"] = "Volgende"; +App::$strings["Today"] = "Vandaag"; +App::$strings["Month"] = "Maand"; +App::$strings["Week"] = "Week"; +App::$strings["Day"] = "Dag"; +App::$strings["List month"] = "Maand tonen"; +App::$strings["List week"] = "Week tonen"; +App::$strings["List day"] = "Dag tonen"; +App::$strings["More"] = "Meer"; +App::$strings["Less"] = "Minder"; +App::$strings["Select calendar"] = "Kies agenda"; +App::$strings["Delete all"] = "Alles verwijderen"; +App::$strings["Cancel"] = "Annuleren"; +App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "Excuses! Bewerken van herhalende gebeurtenissen is nog niet geïmplementeerd."; +App::$strings["Name"] = "Naam"; +App::$strings["Organisation"] = "Organisatie"; +App::$strings["Title"] = "Titel"; +App::$strings["Phone"] = "Telefoon"; +App::$strings["Email"] = "E-mail"; +App::$strings["Instant messenger"] = "Instant messenger"; +App::$strings["Website"] = "Website"; +App::$strings["Address"] = "Adres"; +App::$strings["Note"] = "Opmerking"; +App::$strings["Mobile"] = "Mobiel"; +App::$strings["Home"] = "Thuis"; +App::$strings["Work"] = "Werk"; +App::$strings["Add Contact"] = "Contact toevoegen"; +App::$strings["Add Field"] = "Veld toevoegen"; +App::$strings["Update"] = "Bijwerken"; +App::$strings["P.O. Box"] = "Postbus"; +App::$strings["Additional"] = "Extra"; +App::$strings["Street"] = "Straat en huisnummer"; +App::$strings["Locality"] = "Plaats"; +App::$strings["Region"] = "Provincie/staat/regio/enz."; +App::$strings["ZIP Code"] = "Postcode"; +App::$strings["Country"] = "Land"; +App::$strings["Default Calendar"] = "Standaard agenda"; +App::$strings["Default Addressbook"] = "Standaard adresboek"; +App::$strings["This site is not a directory server"] = "Deze hub is geen kanalengidshub (directoryserver)"; +App::$strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken."; +App::$strings["Posts and comments"] = "Berichten en reacties"; +App::$strings["Only posts"] = "Alleen berichten"; +App::$strings["Insufficient permissions. Request redirected to profile page."] = "Onvoldoende permissies. Doorgestuurd naar profielpagina."; +App::$strings["Export Channel"] = "Kanaal exporteren"; +App::$strings["Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exporteer de basisinformatie van jouw kanaal naar een bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal."; +App::$strings["Export Content"] = "Inhoud exporteren"; +App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin."] = "Exporteer informatie en recente inhoud van jouw kanaal naar een JSON-back-up, wat kan worden gebruikt om jouw kanaal te herstellen of te importeren op een andere hub. Dit slaat al jouw connecties, permissies, profielgegevens en enkele maanden aan inhoud van jouw kanaal op. Dit bestand kan ZEER groot worden. Wees geduldig - het kan enkele minuten duren voordat de download begint."; +App::$strings["Export your posts from a given year."] = "Exporteer jouw berichten uit een bepaald jaar."; +App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Je kan ook berichten en conversaties uit een bepaald jaar of van een bepaalde maand exporteren. Verander de datum in de adresbalk van jouw webbrowser om andere jaren en maanden te selecteren. Wanneer het exporteren mislukt (waarschijnlijk door een gebrek aan beschikbaar servergeheugen), probeer het dan nogmaals met een beperkter tijdvak."; +App::$strings["To select all posts for a given year, such as this year, visit %2\$s"] = "Bezoek %2\$s om alle berichten van bijvoorbeeld dit jaar te selecteren. "; +App::$strings["To select all posts for a given month, such as January of this year, visit %2\$s"] = "Bezoek %2\$s om alle berichten van bijvoorbeeld januari dit jaar te selecteren."; +App::$strings["These content files may be imported or restored by visiting %2\$s on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Deze back-up-bestanden kunnen geïmporteerd of hersteld worden door op jouw hub en met jouw kanaal %2\$s te bezoeken. Voor het beste resultaat kan je de bestanden in chronologische volgorde importeren of herstellen."; +App::$strings["Welcome to Hubzilla!"] = "Welkom op Hubzilla!"; +App::$strings["You have got no unseen posts..."] = "Je hebt geen ongeziene berichten..."; +App::$strings["Public access denied."] = "Openbare toegang geweigerd."; +App::$strings["Search"] = "Zoeken"; +App::$strings["Items tagged with: %s"] = "Items getagd met %s"; +App::$strings["Search results for: %s"] = "Zoekresultaten voor %s"; +App::$strings["Public Stream"] = "Openbare tijdlijn"; +App::$strings["Location not found."] = "Locatie niet gevonden."; +App::$strings["Location lookup failed."] = "Opzoeken locatie mislukt"; +App::$strings["Please select another location to become primary before removing the primary location."] = "Kies eerst een andere primaire locatie alvorens de huidige primaire locatie te verwijderen."; +App::$strings["Syncing locations"] = "Locaties synchronizeren"; +App::$strings["No locations found."] = "Geen locaties gevonden."; +App::$strings["Manage Channel Locations"] = "Kanaallocaties beheren"; +App::$strings["Primary"] = "Primair"; +App::$strings["Drop"] = "Verwijderen"; +App::$strings["Sync Now"] = "Nu synchroniseren"; +App::$strings["Please wait several minutes between consecutive operations."] = "Wacht enkele minuten tussen opeenvolgende handelingen."; +App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen door op de hub van de kloon in te loggen en het kanaal daar te verwijderen."; +App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is."; +App::$strings["Change Order of Pinned Navbar Apps"] = "Volgorde veranderen van apps op de navigatiebalk"; +App::$strings["Change Order of App Tray Apps"] = "Volgorde veranderen van apps in het appmenu"; +App::$strings["Use arrows to move the corresponding app left (top) or right (bottom) in the navbar"] = "Gebruik de pijlen om de app naar links (omhoog) of naar recht (omlaag) op de navigatiebalk te verplaatsen"; +App::$strings["Use arrows to move the corresponding app up or down in the app tray"] = "Gebruik de pijlen om de app hoger of lager in het appmenu te tonen"; +App::$strings["Menu not found."] = "Menu niet gevonden."; +App::$strings["Unable to create element."] = "Niet in staat om onderdeel aan te maken."; +App::$strings["Unable to update menu element."] = "Menu-onderdeel kan niet worden geüpdatet."; +App::$strings["Unable to add menu element."] = "Menu-onderdeel kan niet worden toegevoegd."; +App::$strings["Not found."] = "Niet gevonden."; +App::$strings["Menu Item Permissions"] = "Permissies menu-item"; +App::$strings["(click to open/close)"] = "(klik om te openen/sluiten)"; +App::$strings["Link Name"] = "Linknaam"; +App::$strings["Link or Submenu Target"] = "Linkdoel of submenu-doel"; +App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Geef de URL van de link of kies een menunaam om een submenu aan te maken"; +App::$strings["Use magic-auth if available"] = "Gebruik magic-auth wanneer beschikbaar"; +App::$strings["No"] = "Nee"; +App::$strings["Yes"] = "Ja"; +App::$strings["Open link in new window"] = "Open link in nieuw venster"; +App::$strings["Order in list"] = "Volgorde in lijst"; +App::$strings["Higher numbers will sink to bottom of listing"] = "Hogere nummers komen onderaan de lijst terecht"; +App::$strings["Submit and finish"] = "Opslaan en afsluiten"; +App::$strings["Submit and continue"] = "Opslaan en doorgaan"; +App::$strings["Menu:"] = "Menu:"; +App::$strings["Link Target"] = "Linkdoel"; +App::$strings["Edit menu"] = "Menu bewerken"; +App::$strings["Edit element"] = "Onderdeel bewerken"; +App::$strings["Drop element"] = "Onderdeel verwijderen"; +App::$strings["New element"] = "Nieuw element"; +App::$strings["Edit this menu container"] = "Deze menu-container bewerken"; +App::$strings["Add menu element"] = "Menu-element toevoegen"; +App::$strings["Delete this menu item"] = "Dit menu-item verwijderen"; +App::$strings["Edit this menu item"] = "Dit menu-item bewerken"; +App::$strings["Menu item not found."] = "Menu-item niet gevonden."; +App::$strings["Menu item deleted."] = "Menu-item verwijderd."; +App::$strings["Menu item could not be deleted."] = "Menu-item kon niet worden verwijderd."; +App::$strings["Edit Menu Element"] = "Menu-element bewerken"; +App::$strings["Link text"] = "Linktekst"; +App::$strings["Calendar entries imported."] = "Agenda-items geïmporteerd."; +App::$strings["No calendar entries found."] = "Geen agenda-items gevonden."; +App::$strings["Event can not end before it has started."] = "Gebeurtenis kan niet eindigen voordat het is begonnen"; +App::$strings["Unable to generate preview."] = "Niet in staat om voorvertoning te genereren"; +App::$strings["Event title and start time are required."] = "Titel en begintijd van gebeurtenis zijn vereist."; +App::$strings["Event not found."] = "Gebeurtenis niet gevonden"; +App::$strings["event"] = "gebeurtenis"; +App::$strings["Edit event title"] = "Titel bewerken"; +App::$strings["Required"] = "Vereist"; +App::$strings["Categories (comma-separated list)"] = "Categorieën (door komma's gescheiden lijst)"; +App::$strings["Edit Category"] = "Categorie"; +App::$strings["Category"] = "Categorie"; +App::$strings["Edit start date and time"] = "Begindatum en -tijd bewerken"; +App::$strings["Finish date and time are not known or not relevant"] = "Einddatum en -tijd zijn niet bekend of niet van toepassing"; +App::$strings["Edit finish date and time"] = "Einddatum en -tijd bewerken"; +App::$strings["Finish date and time"] = "Einddatum en -tijd"; +App::$strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt"; +App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen."; +App::$strings["Edit Description"] = "Omschrijving bewerken"; +App::$strings["Edit Location"] = "Locatie bewerken"; +App::$strings["Preview"] = "Voorvertoning"; +App::$strings["Permission settings"] = "Permissies"; +App::$strings["Timezone:"] = "Tijdzone:"; +App::$strings["Advanced Options"] = "Geavanceerde opties"; +App::$strings["l, F j"] = "l j F"; +App::$strings["Edit event"] = "Gebeurtenis bewerken"; +App::$strings["Delete event"] = "Gebeurtenis verwijderen"; +App::$strings["Link to Source"] = "Originele locatie"; +App::$strings["calendar"] = "agenda"; +App::$strings["Edit Event"] = "Gebeurtenis bewerken"; +App::$strings["Create Event"] = "Gebeurtenis aanmaken"; +App::$strings["Export"] = "Exporteren"; +App::$strings["Event removed"] = "Gebeurtenis verwijderd"; +App::$strings["Failed to remove event"] = "Verwijderen gebeurtenis mislukt"; App::$strings["App installed."] = "App geïnstalleerd"; App::$strings["Malformed app."] = "Misvormde app."; App::$strings["Embed code"] = "Insluitcode"; App::$strings["Edit App"] = "App bewerken"; App::$strings["Create App"] = "App maken"; App::$strings["Name of app"] = "Naam van app"; -App::$strings["Required"] = "Vereist"; App::$strings["Location (URL) of app"] = "Locatie (URL) van app"; -App::$strings["Description"] = "Omschrijving"; App::$strings["Photo icon URL"] = "URL van pictogram"; App::$strings["80 x 80 pixels - optional"] = "80 x 80 pixels (niet verplicht)"; App::$strings["Categories (optional, comma separated list)"] = "Categorieën (niet verplicht, door komma's gescheiden lijst)"; App::$strings["Version ID"] = "Versie-ID"; App::$strings["Price of app"] = "Prijs van de app"; App::$strings["Location (URL) to purchase app"] = "Locatie (URL) om de app aan te schaffen"; -App::$strings["Submit"] = "Opslaan"; -App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximum toegestane dagelijkse registraties op deze \$Projectname-hub bereikt. Probeer het morgen (UTC) nogmaals."; -App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden."; -App::$strings["Passwords do not match."] = "Wachtwoorden komen niet met elkaar overeen."; -App::$strings["Registration successful. Please check your email for validation instructions."] = "Registratie geslaagd. Controleer je e-mail voor instructies."; -App::$strings["Your registration is pending approval by the site owner."] = "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze \$Projectname-hub."; -App::$strings["Your registration can not be processed."] = "Jouw registratie kan niet verwerkt worden."; -App::$strings["Registration on this hub is disabled."] = "Registreren van nieuwe accounts is op deze hub uitgeschakeld."; -App::$strings["Registration on this hub is by approval only."] = "Registraties op deze hub moeten eerst worden goedgekeurd."; -App::$strings["Register at another affiliated hub."] = "Registreer op een andere hub."; -App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Deze \$Projectname-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals."; -App::$strings["Terms of Service"] = "Gebruiksvoorwaarden"; -App::$strings["I accept the %s for this website"] = "Ik accepteer de %s van deze \$Projectname-hub"; -App::$strings["I am over 13 years of age and accept the %s for this website"] = "Ik ben 13 jaar of ouder en accepteer de %s van deze \$Projectname-hub"; -App::$strings["Your email address"] = "Jouw e-mailadres"; -App::$strings["Choose a password"] = "Geef een wachtwoord op"; -App::$strings["Please re-enter your password"] = "Geef het wachtwoord opnieuw op"; -App::$strings["Please enter your invitation code"] = "Vul jouw uitnodigingscode in"; +App::$strings["Please login."] = "Inloggen."; +App::$strings["Hub not found."] = "Hub niet gevonden."; +App::$strings["photo"] = "foto"; +App::$strings["status"] = "bericht"; +App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s volgt het %3\$s van %2\$s"; +App::$strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s volgt het %3\$s van %2\$s niet meer"; +App::$strings["Channel not found."] = "Kanaal niet gevonden."; +App::$strings["Insert web link"] = "Weblink invoegen"; +App::$strings["Title (optional)"] = "Titel (niet verplicht)"; +App::$strings["Edit Article"] = "Artikel bewerken"; +App::$strings["Nothing to import."] = "Niets gevonden om te importeren"; +App::$strings["Unable to download data from old server"] = "Niet in staat om gegevens van de oude hub te downloaden"; +App::$strings["Imported file is empty."] = "Geïmporteerde bestand is leeg"; +App::$strings["Warning: Database versions differ by %1\$d updates."] = "Waarschuwing: database-versies lopen %1\$d updates achter."; +App::$strings["Import completed"] = "Importeren voltooid"; +App::$strings["Import Items"] = "Importeer items"; +App::$strings["Use this form to import existing posts and content from an export file."] = "Gebruik dit formulier om bestaande berichten en andere inhoud vanuit een exportbestand te importeren."; +App::$strings["File to Upload"] = "Bestand om te uploaden"; +App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt."; App::$strings["Name or caption"] = "Naam"; App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Voorbeelden: \"Jan Pietersen\", \"Willems weblog\", \"Computerforum\""; App::$strings["Choose a short nickname"] = "Korte bijnaam"; @@ -112,50 +280,115 @@ App::$strings["Your nickname will be used to create an easy to remember channel App::$strings["Channel role and privacy"] = "Kanaaltype en privacy"; App::$strings["Select a channel role with your privacy requirements."] = "Kies een kanaaltype met het door jou gewenste privacyniveau."; App::$strings["Read more about roles"] = "Lees meer over kanaaltypes"; -App::$strings["no"] = "Nee"; -App::$strings["yes"] = "Ja"; -App::$strings["Registration"] = "Registratie"; -App::$strings["Membership on this site is by invitation only."] = "Registreren op deze \$Projectname-hub kan alleen op uitnodiging."; -App::$strings["Register"] = "Registreren"; -App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "Mogelijk moet op deze hub eerst jouw e-mail geverifieerd worden. Wanneer je na het indienen van dit formulier op de inlogpagina terecht komt, dan dien je jouw e-mail te controleren voor instructies. Controleer eventueel ook jouw spamfolder."; -App::$strings["Fetching URL returns error: %1\$s"] = "Ophalen URL gaf een foutmelding terug: %1\$s"; -App::$strings["Authentication failed."] = "Authenticatie mislukt."; -App::$strings["Remote Authentication"] = "Authenticatie op afstand"; -App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Vul jouw kanaaladres in (bijv. channel@example.com)"; -App::$strings["Authenticate"] = "Authenticeren"; -App::$strings["Nothing to import."] = "Niets gevonden om te importeren"; -App::$strings["Unable to download data from old server"] = "Niet in staat om gegevens van de oude hub te downloaden"; -App::$strings["Imported file is empty."] = "Geïmporteerde bestand is leeg"; -App::$strings["Warning: Database versions differ by %1\$d updates."] = "Waarschuwing: database-versies lopen %1\$d updates achter."; -App::$strings["Your service plan only allows %d channels."] = "Jouw abonnement staat maar %d kanalen toe."; -App::$strings["No channel. Import failed."] = "Geen kanaal. Importeren mislukt."; -App::$strings["Import completed."] = "Import voltooid."; -App::$strings["You must be logged in to use this feature."] = "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken."; -App::$strings["Import Channel"] = "Kanaal importeren"; -App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken."; -App::$strings["File to Upload"] = "Bestand om te uploaden"; -App::$strings["Or provide the old server/hub details"] = "Of vul de gegevens van de oude hub in"; -App::$strings["Your old identity address (xyz@example.com)"] = "Jouw oude kanaaladres (xyz@example.com)"; -App::$strings["Your old login email address"] = "Het e-mailadres van je oude account"; -App::$strings["Your old login password"] = "Wachtwoord van jouw oude account"; -App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen."; -App::$strings["Make this hub my primary location"] = "Stel deze hub als mijn primaire locatie in"; -App::$strings["Move this channel (disable all previous locations)"] = "Verplaats dit kanaal (schakelt alle voormalige locaties uit)"; -App::$strings["Import a few months of posts if possible (limited by available memory"] = "Importeer enkele maanden aan berichten wanneer mogelijk (afhankelijk van hoeveelheid geheugen hub)"; -App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid."; -App::$strings["Away"] = "Afwezig"; -App::$strings["Online"] = "Online"; -App::$strings["Documentation Search"] = "Zoek documentatie"; -App::$strings["About"] = "Over"; -App::$strings["Members"] = "Kanalen"; -App::$strings["Administrators"] = "Beheerders"; -App::$strings["Developers"] = "Ontwikkelaars"; -App::$strings["Tutorials"] = "Zelfstudie"; -App::$strings["\$Projectname Documentation"] = "\$Projectname-documentatie"; -App::$strings["Contents"] = "Inhoud"; -App::$strings["Bookmark added"] = "Bladwijzer toegevoegd"; -App::$strings["My Bookmarks"] = "Mijn bladwijzers"; -App::$strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties"; +App::$strings["Create Channel"] = "Kanaal aanmaken"; +App::$strings["A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things. Channels can make connections with other channels to share information with each other."] = "Een kanaal is een unieke netwerkidentiteit. Het kan een persoon (sociaal-netwerkprofiel), een forum (groep), een zakelijke of celebrity-pagina, een nieuwsfeed en vele andere dingen vertegenwoordigen. Kanalen kunnen met elkaar verbinden om informatie uit te wisselen."; +App::$strings["The type of channel you create affects the basic privacy settings, the permissions that are granted to connections/friends, and also the channel's visibility across the network."] = "Het type kanaal dat jij aanmaakt beïnvloedt de standaard privacyinstellingen, de permissies die aan connecties/vrienden worden gegeven, en tevens de zichtbaarheid van het kanaal in het netwerk."; +App::$strings["or import an existing channel from another location."] = "Of importeer een bestaand kanaal vanaf een andere locatie"; +App::$strings["Validate"] = "Valideren"; +App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd."; +App::$strings["Remove This Channel"] = "Verwijder dit kanaal"; +App::$strings["WARNING: "] = "WAARSCHUWING: "; +App::$strings["This channel will be completely removed from the network. "] = "Dit kanaal wordt volledig uit het \$Projectname-netwerk verwijderd."; +App::$strings["This action is permanent and can not be undone!"] = "Deze handeling is van permanente aard en kan niet meer worden teruggedraaid!"; +App::$strings["Please enter your password for verification:"] = "Vul je wachtwoord in ter verificatie:"; +App::$strings["Remove this channel and all its clones from the network"] = "Dit kanaal en alle klonen hiervan uit het \$Projectname-netwerk verwijderen"; +App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het \$Projectname-netwerk verwijderd"; +App::$strings["Remove Channel"] = "Kanaal verwijderen"; +App::$strings["Files: shared with me"] = "Bestanden: met mij gedeeld"; +App::$strings["NEW"] = "NIEUW"; +App::$strings["Size"] = "Grootte"; +App::$strings["Last Modified"] = "Laatst gewijzigd"; +App::$strings["Remove all files"] = "Verwijder alle bestanden"; +App::$strings["Remove this file"] = "Verwijder dit bestand"; +App::$strings["\$Projectname Server - Setup"] = "\$Projectname Hub - Setup"; +App::$strings["Could not connect to database."] = "Could not connect to database."; +App::$strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Could not connect to specified hub URL. Possible SSL certificate or DNS issue."; +App::$strings["Could not create table."] = "Could not create table."; +App::$strings["Your site database has been installed."] = "Your hub database has been installed."; +App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "You may need to import the file \"install/schema_xxx.sql\" manually using a database client."; +App::$strings["Please see the file \"install/INSTALL.txt\"."] = "Please see the file \"install/INSTALL.txt\"."; +App::$strings["System check"] = "System check"; +App::$strings["Check again"] = "Check again"; +App::$strings["Database connection"] = "Database connection"; +App::$strings["In order to install \$Projectname we need to know how to connect to your database."] = "In order to install \$Projectname we need to know how to connect to your database."; +App::$strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Please contact your hosting provider or server administrator if you have questions about these settings."; +App::$strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "The database you specify below should already exist. If it does not, please create it before continuing."; +App::$strings["Database Server Name"] = "Database Server Name"; +App::$strings["Default is 127.0.0.1"] = "Default is 127.0.0.1"; +App::$strings["Database Port"] = "Database Port"; +App::$strings["Communication port number - use 0 for default"] = "Communication port number - use 0 for default"; +App::$strings["Database Login Name"] = "Database Login Name"; +App::$strings["Database Login Password"] = "Database Login Password"; +App::$strings["Database Name"] = "Database Name"; +App::$strings["Database Type"] = "Database Type"; +App::$strings["Site administrator email address"] = "Hub administrator email address"; +App::$strings["Your account email address must match this in order to use the web admin panel."] = "Your account email address must match this in order to use the web admin panel."; +App::$strings["Website URL"] = "Hub URL"; +App::$strings["Please use SSL (https) URL if available."] = "Please use SSL (https) URL if available."; +App::$strings["Please select a default timezone for your website"] = "Please select a default timezone for your hub"; +App::$strings["Site settings"] = "Hub settings"; +App::$strings["PHP version 5.5 or greater is required."] = "PHP version 5.5 or greater is required."; +App::$strings["PHP version"] = "PHP version"; +App::$strings["Could not find a command line version of PHP in the web server PATH."] = "Could not find a command line version of PHP in the web server PATH."; +App::$strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."; +App::$strings["PHP executable path"] = "PHP executable path"; +App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Enter full path to php executable. You can leave this blank to continue the installation."; +App::$strings["Command line PHP"] = "Command line PHP"; +App::$strings["Unable to check command line PHP, as shell_exec() is disabled. This is required."] = "Unable to check command line PHP, as shell_exec() is disabled. This is required."; +App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "The command line version of PHP on your system does not have \"register_argc_argv\" enabled."; +App::$strings["This is required for message delivery to work."] = "This is required for message delivery to work."; +App::$strings["PHP register_argc_argv"] = "PHP register_argc_argv"; +App::$strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."; +App::$strings["You can adjust these settings in the server php.ini file."] = "You can adjust these settings in the server php.ini file."; +App::$strings["PHP upload limits"] = "PHP upload limits"; +App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"; +App::$strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."; +App::$strings["Generate encryption keys"] = "Generate encryption keys"; +App::$strings["libCurl PHP module"] = "libCurl PHP module"; +App::$strings["GD graphics PHP module"] = "GD graphics PHP module"; +App::$strings["OpenSSL PHP module"] = "OpenSSL PHP module"; +App::$strings["PDO database PHP module"] = "PDO database PHP module"; +App::$strings["mb_string PHP module"] = "mb_string PHP module"; +App::$strings["xml PHP module"] = "xml PHP module"; +App::$strings["zip PHP module"] = "zip PHP module"; +App::$strings["Apache mod_rewrite module"] = "Apache mod_rewrite module"; +App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: Apache webserver mod-rewrite module is required but not installed."; +App::$strings["exec"] = "exec"; +App::$strings["Error: exec is required but is either not installed or has been disabled in php.ini"] = "Error: exec is required but is either not installed or has been disabled in php.ini"; +App::$strings["shell_exec"] = "shell_exec"; +App::$strings["Error: shell_exec is required but is either not installed or has been disabled in php.ini"] = "Error: shell_exec is required but is either not installed or has been disabled in php.ini"; +App::$strings["Error: libCURL PHP module required but not installed."] = "Error: libCURL PHP module required but not installed."; +App::$strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: GD graphics PHP module with JPEG support required but not installed."; +App::$strings["Error: openssl PHP module required but not installed."] = "Error: openssl PHP module required but not installed."; +App::$strings["Error: PDO database PHP module required but not installed."] = "Error: PDO database PHP module required but not installed."; +App::$strings["Error: mb_string PHP module required but not installed."] = "Error: mb_string PHP module required but not installed."; +App::$strings["Error: xml PHP module required for DAV but not installed."] = "Error: xml PHP module required for DAV but not installed."; +App::$strings["Error: zip PHP module required but not installed."] = "Error: zip PHP module required but not installed."; +App::$strings[".htconfig.php is writable"] = ".htconfig.php is writable"; +App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."; +App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."; +App::$strings["Please see install/INSTALL.txt for additional information."] = "Please see install/INSTALL.txt for additional information."; +App::$strings["This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."; +App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."; +App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."; +App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."; +App::$strings["%s is writable"] = "%s is writable"; +App::$strings["This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"] = "This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"; +App::$strings["store is writable"] = "store is writable"; +App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "SSL certificate cannot be validated. Fix certificate or disable https access to this hub."; +App::$strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"; +App::$strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "This restriction is incorporated because public posts from you may for example contain references to images on your own hub."; +App::$strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues."; +App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement."; +App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Providers are available that issue free certificates which are browser-valid."; +App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = "If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."; +App::$strings["SSL certificate validation"] = "SSL certificate validation"; +App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "Url rewrite in .htaccess is not working. Check your server configuration.Test: "; +App::$strings["Url rewrite is working"] = "Url rewrite is working"; +App::$strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."; +App::$strings["Errors encountered creating database tables."] = "Errors encountered creating database tables."; +App::$strings["

    What next?

    "] = "

    What next?

    "; +App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."; App::$strings["Continue"] = "Ga verder"; App::$strings["Premium Channel Setup"] = "Instellen premiumkanaal "; App::$strings["Enable premium channel connection restrictions"] = "Restricties voor connecties van premiumkanaal toestaan"; @@ -163,158 +396,57 @@ App::$strings["Please enter your restrictions or conditions, such as paypal rece App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Dit kanaal kan extra stappen of het accepteren van de volgende voorwaarden vereisen, voordat de connectie wordt geaccepteerd:"; App::$strings["Potential connections will then see the following text before proceeding:"] = "Mogelijke connecties zullen dan de volgende tekst zien voordat ze verder kunnen:"; App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Door verder te gaan ga ik automatisch akkoord met alle voorwaarden en aanwijzingen op deze pagina."; -App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaal-eigenaar verstrekt) "; +App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaaleigenaar verstrekt) "; App::$strings["Restricted or Premium Channel"] = "Beperkt of premiumkanaal"; -App::$strings["Item not found."] = "Item niet gevonden."; -App::$strings["# Accounts"] = "# accounts"; -App::$strings["# blocked accounts"] = "# geblokkeerde accounts"; -App::$strings["# expired accounts"] = "# verlopen accounts"; -App::$strings["# expiring accounts"] = "# accounts die nog moeten verlopen"; -App::$strings["# Channels"] = "# Kanalen"; -App::$strings["# primary"] = "# primair"; -App::$strings["# clones"] = "# klonen"; -App::$strings["Message queues"] = "Berichtenwachtrij"; -App::$strings["Your software should be updated"] = "Jouw software moet worden bijgewerkt "; -App::$strings["Administration"] = "Beheer"; -App::$strings["Summary"] = "Samenvatting"; -App::$strings["Registered accounts"] = "Geregistreerde accounts"; -App::$strings["Pending registrations"] = "Accounts die op goedkeuring wachten"; -App::$strings["Registered channels"] = "Geregistreerde kanalen"; -App::$strings["Active plugins"] = "Ingeschakelde plugins"; -App::$strings["Version"] = "Versie"; -App::$strings["Repository version (master)"] = "Versie repository (master)"; -App::$strings["Repository version (dev)"] = "Versie repository (dev)"; -App::$strings["Item not found"] = "Item niet gevonden"; -App::$strings["Block Name"] = "Bloknaam"; -App::$strings["Insert web link"] = "Weblink invoegen"; -App::$strings["Title (optional)"] = "Titel (niet verplicht)"; -App::$strings["Edit Block"] = "Blok bewerken"; -App::$strings["Invalid item."] = "Ongeldig item."; -App::$strings["Channel not found."] = "Kanaal niet gevonden."; -App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; -App::$strings["Save to Folder:"] = "Bewaar in map: "; -App::$strings["- select -"] = "- kies map -"; -App::$strings["Save"] = "Opslaan"; -App::$strings["sent you a private message"] = "stuurde jou een privébericht"; -App::$strings["added your channel"] = "voegde jouw kanaal toe"; -App::$strings["g A l F d"] = "G:i, l d F"; -App::$strings["[today]"] = "[vandaag]"; -App::$strings["posted an event"] = "plaatste een gebeurtenis"; -App::$strings["Blocked"] = "Geblokkeerd"; -App::$strings["Ignored"] = "Genegeerd"; -App::$strings["Hidden"] = "Verborgen"; -App::$strings["Archived"] = "Gearchiveerd"; -App::$strings["New"] = "Nieuw"; -App::$strings["All"] = "Alles"; -App::$strings["New Connections"] = "Nieuwe connecties"; -App::$strings["Show pending (new) connections"] = "Nog te accepteren (nieuwe) connecties weergeven"; -App::$strings["All Connections"] = "Alle connecties"; -App::$strings["Show all connections"] = "Toon alle connecties"; -App::$strings["Only show blocked connections"] = "Toon alleen geblokkeerde connecties"; -App::$strings["Only show ignored connections"] = "Toon alleen genegeerde connecties"; -App::$strings["Only show archived connections"] = "Toon alleen gearchiveerde connecties"; -App::$strings["Only show hidden connections"] = "Toon alleen verborgen connecties"; -App::$strings["Pending approval"] = "Moet nog geaccepteerd worden"; -App::$strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]"; -App::$strings["Edit connection"] = "Connectie bewerken"; -App::$strings["Delete connection"] = "Connectie verwijderen"; -App::$strings["Channel address"] = "Kanaaladres"; -App::$strings["Network"] = "Netwerk"; -App::$strings["Call"] = "Bellen"; -App::$strings["Status"] = "Status"; -App::$strings["Connected"] = "Verbonden"; -App::$strings["Approve connection"] = "Connectie accepteren"; -App::$strings["Approve"] = "Goedkeuren"; -App::$strings["Ignore connection"] = "Connectie negeren"; -App::$strings["Ignore"] = "Negeren"; -App::$strings["Recent activity"] = "Recente activiteit"; -App::$strings["Connections"] = "Connecties"; -App::$strings["Search"] = "Zoeken"; -App::$strings["Search your connections"] = "Doorzoek jouw connecties"; -App::$strings["Connections search"] = "Connecties zoeken"; -App::$strings["Find"] = "Vinden"; -App::$strings["Image uploaded but image cropping failed."] = "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. "; -App::$strings["Cover Photos"] = "Omslagfoto's"; -App::$strings["Image resize failed."] = "Afbeelding kon niet van grootte veranderd worden."; -App::$strings["Unable to process image"] = "Afbeelding kan niet verwerkt worden"; -App::$strings["Image upload failed."] = "Uploaden afbeelding mislukt"; -App::$strings["Unable to process image."] = "Niet in staat om afbeelding te verwerken."; -App::$strings["female"] = "vrouw"; -App::$strings["%1\$s updated her %2\$s"] = "%1\$s heeft haar %2\$s bijgewerkt"; -App::$strings["male"] = "man"; -App::$strings["%1\$s updated his %2\$s"] = "%1\$s heeft zijn %2\$s bijgewerkt"; -App::$strings["%1\$s updated their %2\$s"] = "De %2\$s van %1\$s is bijgewerkt"; -App::$strings["cover photo"] = "omslagfoto"; -App::$strings["Photo not available."] = "Foto niet beschikbaar."; -App::$strings["Upload File:"] = "Bestand uploaden:"; -App::$strings["Select a profile:"] = "Kies een profiel:"; -App::$strings["Upload Cover Photo"] = "Omslagfoto uploaden"; -App::$strings["or"] = "of"; -App::$strings["skip this step"] = "sla deze stap over"; -App::$strings["select a photo from your photo albums"] = "Kies een foto uit jouw fotoalbums"; -App::$strings["Crop Image"] = "Afbeelding bijsnijden"; -App::$strings["Please adjust the image cropping for optimum viewing."] = "Snij de afbeelding zo uit dat deze optimaal wordt weergegeven."; -App::$strings["Done Editing"] = "Klaar met bewerken"; +App::$strings["Queue Statistics"] = "Wachtrij-statistieken"; +App::$strings["Total Entries"] = "Aantal vermeldingen"; +App::$strings["Priority"] = "Prioriteit"; +App::$strings["Destination URL"] = "Doel-URL"; +App::$strings["Mark hub permanently offline"] = "Hub als permanent offline markeren"; +App::$strings["Empty queue for this hub"] = "Berichtenwachtrij voor deze hub legen"; +App::$strings["Last known contact"] = "Voor het laatst contact"; App::$strings["Off"] = "Uit"; App::$strings["On"] = "Aan"; App::$strings["Lock feature %s"] = " Vergrendel de functie '%s'"; App::$strings["Manage Additional Features"] = "Beheer - Extra functies"; -App::$strings["Log settings updated."] = "Logboek-instellingen bijgewerkt."; -App::$strings["Logs"] = "Logboeken"; -App::$strings["Clear"] = "Leegmaken"; -App::$strings["Debugging"] = "Debuggen"; -App::$strings["Log file"] = "Logbestand"; -App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je \$Projectname-installatie."; -App::$strings["Log level"] = "Logniveau"; -App::$strings["New Profile Field"] = "Nieuw profielveld"; -App::$strings["Field nickname"] = "Bijnaam voor veld"; -App::$strings["System name of field"] = "Systeemnaam voor veld"; -App::$strings["Input type"] = "Invoertype"; -App::$strings["Field Name"] = "Veldnaam"; -App::$strings["Label on profile pages"] = "Tekstlabel voor op profielpagina's"; -App::$strings["Help text"] = "Helptekst"; -App::$strings["Additional info (optional)"] = "Extra informatie (niet verplicht)"; -App::$strings["Field definition not found"] = "Velddefinitie niet gevonden"; -App::$strings["Edit Profile Field"] = "Profielveld bewerken"; -App::$strings["Profile Fields"] = "Profielvelden"; -App::$strings["Basic Profile Fields"] = "Standaard profielvelden"; -App::$strings["Advanced Profile Fields"] = "Geavanceerde profielvelden"; -App::$strings["(In addition to basic fields)"] = "(als toevoeging op de standaard velden)"; -App::$strings["All available fields"] = "Alle beschikbare velden"; -App::$strings["Custom Fields"] = "Extra (handmatig toegevoegde) velden"; -App::$strings["Create Custom Field"] = "Extra velden aanmaken"; -App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Standaard is ongefilterde HTML in ingesloten (embedded) media toegestaan. Dit is inherent onveilig."; -App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Het wordt aanbevolen om alleen ongefilterde HTML van de volgende websites toe te staan:"; -App::$strings["https://youtube.com/
    https://www.youtube.com/
    https://youtu.be/
    https://vimeo.com/
    https://soundcloud.com/
    "] = "https://youtube.com/
    https://www.youtube.com/
    https://youtu.be/
    https://vimeo.com/
    https://soundcloud.com/
    "; -App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = "Alle andere ingesloten (embedded) inhoud wordt gefilterd, tenzij ingesloten (embedded) inhoud van een website expliciet wordt geblokkeerd."; -App::$strings["Security"] = "Beveiliging"; -App::$strings["Block public"] = "Openbare toegang blokkeren"; -App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor leden die zich hebben geauthenticeerd."; -App::$strings["Set \"Transport Security\" HTTP header"] = "\"Transport Security\" HTTP-header inschakelen"; -App::$strings["Set \"Content Security Policy\" HTTP header"] = " \"Content Security Policy\" HTTP-header inschakelen"; -App::$strings["Allowed email domains"] = "Toegestane e-maildomeinen"; -App::$strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te laten."; -App::$strings["Not allowed email domains"] = "Niet toegestane e-maildomeinen"; -App::$strings["Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined."] = "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen niet op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te staan, tenzij er toegestane domeinen zijn ingesteld. "; -App::$strings["Allow communications only from these sites"] = "Alleen communicatie met deze hubs toestaan"; -App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Eén hub per regel. Laat leeg om communicatie standaard met alle hubs toe te staan"; -App::$strings["Block communications from these sites"] = "Communicatie met deze hubs blokkeren"; -App::$strings["Allow communications only from these channels"] = "Sta alleen communicatie toe met deze kanalen"; -App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = "Eén kanaal (hash) per regel. Laat leeg om communicatie standaard met alle kanalen toe te staan"; -App::$strings["Block communications from these channels"] = "Communicatie met deze kanalen blokkeren"; -App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Alleen ingesloten (embedded) inhoud van veilige (SSL) websites en links toestaan."; -App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Alleen ongefilterde ingesloten (embedded) HTML van deze websites toestaan"; -App::$strings["One site per line. By default embedded content is filtered."] = "Eén website per regel. Standaard wordt ingesloten (embedded) inhoud gefilterd."; -App::$strings["Block embedded HTML from these domains"] = "Ingesloten (embedded) HTML vanaf deze domeinen blokkeren"; -App::$strings["Password changed for account %d."] = "Wachtwoord veranderd voor account %d."; -App::$strings["Account settings updated."] = "Account-instellingen bijgewerkt."; -App::$strings["Account not found."] = "Account niet gevonden."; -App::$strings["Account Edit"] = "Account bewerken"; -App::$strings["New Password"] = "Nieuw wachtwoord"; -App::$strings["New Password again"] = "Nieuw wachtwoord bevestigen"; -App::$strings["Technical skill level"] = "Technisch niveau"; -App::$strings["Account language (for emails)"] = "Taal van account (voor e-mails)"; -App::$strings["Service class"] = "Abonnement"; +App::$strings["Update has been marked successful"] = "Update is als succesvol gemarkeerd"; +App::$strings["Executing %s failed. Check system logs."] = "Uitvoeren van %s is mislukt. Controleer systeemlogboek."; +App::$strings["Update %s was successfully applied."] = "Update %s was geslaagd."; +App::$strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is."; +App::$strings["Update function %s could not be found."] = "Update-functie %s kon niet gevonden worden."; +App::$strings["Failed Updates"] = "Mislukte updates"; +App::$strings["Mark success (if update was manually applied)"] = "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)"; +App::$strings["Attempt to execute this update step automatically"] = "Poging om deze stap van de update automatisch uit te voeren."; +App::$strings["No failed updates."] = "Geen mislukte updates."; +App::$strings["Item not found."] = "Item niet gevonden."; +App::$strings["Plugin %s disabled."] = "Plug-in %s uitgeschakeld."; +App::$strings["Plugin %s enabled."] = "Plug-in %s ingeschakeld"; +App::$strings["Disable"] = "Uitschakelen"; +App::$strings["Enable"] = "Inschakelen"; +App::$strings["Administration"] = "Beheer"; +App::$strings["Plugins"] = "Plug-ins"; +App::$strings["Toggle"] = "Omschakelen"; +App::$strings["Settings"] = "Instellingen"; +App::$strings["Author: "] = "Auteur: "; +App::$strings["Maintainer: "] = "Beheerder: "; +App::$strings["Minimum project version: "] = "Minimum versie Hubzilla: "; +App::$strings["Maximum project version: "] = "Maximum versie Hubzilla:"; +App::$strings["Minimum PHP version: "] = "Minimum versie PHP: "; +App::$strings["Compatible Server Roles: "] = "Werkt met configuratietypes: "; +App::$strings["Requires: "] = "Vereist: "; +App::$strings["Disabled - version incompatibility"] = "Uitgeschakeld - versie is incompatibel"; +App::$strings["Enter the public git repository URL of the plugin repo."] = "Vul de openbare Git-URL in van de plug-in-repository."; +App::$strings["Plugin repo git URL"] = "Git-URL plug-in-repository"; +App::$strings["Custom repo name"] = "Handmatige repository-naam"; +App::$strings["(optional)"] = "(niet verplicht)"; +App::$strings["Download Plugin Repo"] = "Plug-in-repository downloaden"; +App::$strings["Install new repo"] = "Nieuwe repository installeren"; +App::$strings["Install"] = "Installeren"; +App::$strings["Manage Repos"] = "Repositories beheren"; +App::$strings["Installed Plugin Repositories"] = "Toegevoegde plug-in-repositories"; +App::$strings["Install a New Plugin Repository"] = "Nieuwe plug-in-repository toevoegen"; +App::$strings["Switch branch"] = "Branch veranderen"; +App::$strings["Remove"] = "Verwijderen"; App::$strings["%s account blocked/unblocked"] = array( 0 => "%s account geblokkeerd/gedeblokkeerd", 1 => "%s accounts geblokkeerd/gedeblokkeerd", @@ -331,8 +463,8 @@ App::$strings["Accounts"] = "Accounts"; App::$strings["select all"] = "alles selecteren"; App::$strings["Registrations waiting for confirm"] = "Accounts die op goedkeuring wachten"; App::$strings["Request date"] = "Tijd/datum verzoek"; -App::$strings["Email"] = "E-mail"; App::$strings["No registrations."] = "Geen verzoeken."; +App::$strings["Approve"] = "Goedkeuren"; App::$strings["Deny"] = "Afkeuren"; App::$strings["Block"] = "Blokkeren"; App::$strings["Unblock"] = "Deblokkeren"; @@ -344,6 +476,13 @@ App::$strings["Expires"] = "Verloopt"; App::$strings["Service Class"] = "Abonnement"; App::$strings["Selected accounts will be deleted!\\n\\nEverything these accounts had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?"; App::$strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"; +App::$strings["Log settings updated."] = "Logboek-instellingen bijgewerkt."; +App::$strings["Logs"] = "Logboeken"; +App::$strings["Clear"] = "Leegmaken"; +App::$strings["Debugging"] = "Debuggen"; +App::$strings["Log file"] = "Logbestand"; +App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je \$Projectname-installatie."; +App::$strings["Log level"] = "Logniveau"; App::$strings["%s channel censored/uncensored"] = array( 0 => "%s kanaal gecensureerd/ongecensureerd", 1 => "%s kanalen gecensureerd/ongecensureerd", @@ -369,41 +508,25 @@ App::$strings["Allow Code"] = "Scripts toestaan"; App::$strings["Disallow Code"] = "Scripts niet toestaan"; App::$strings["Channel"] = "Kanaal"; App::$strings["UID"] = "UID"; -App::$strings["Address"] = "Adres"; App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"; App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"; -App::$strings["Update has been marked successful"] = "Update is als succesvol gemarkeerd"; -App::$strings["Executing %s failed. Check system logs."] = "Uitvoeren van %s is mislukt. Controleer systeemlogboek."; -App::$strings["Update %s was successfully applied."] = "Update %s was geslaagd."; -App::$strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is."; -App::$strings["Update function %s could not be found."] = "Update-functie %s kon niet gevonden worden."; -App::$strings["No failed updates."] = "Geen mislukte updates."; -App::$strings["Failed Updates"] = "Mislukte updates"; -App::$strings["Mark success (if update was manually applied)"] = "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)"; -App::$strings["Attempt to execute this update step automatically"] = "Poging om deze stap van de update automatisch uit te voeren."; -App::$strings["Queue Statistics"] = "Wachtrij-statistieken"; -App::$strings["Total Entries"] = "Aantal vermeldingen"; -App::$strings["Priority"] = "Prioriteit"; -App::$strings["Destination URL"] = "Doel-URL"; -App::$strings["Mark hub permanently offline"] = "Hub als permanent offline markeren"; -App::$strings["Empty queue for this hub"] = "Berichtenwachtrij voor deze hub legen"; -App::$strings["Last known contact"] = "Voor het laatst contact"; +App::$strings["Theme settings updated."] = "Thema-instellingen bijgewerkt."; +App::$strings["No themes found."] = "Geen thema's gevonden"; +App::$strings["Screenshot"] = "Schermafdruk"; +App::$strings["Themes"] = "Thema's"; +App::$strings["[Experimental]"] = "[Experimenteel]"; +App::$strings["[Unsupported]"] = "[Niet ondersteund]"; App::$strings["Site settings updated."] = "Hub-instellingen bijgewerkt."; App::$strings["Default"] = "Standaard"; App::$strings["%s - (Incompatible)"] = "%s - (niet compatible)"; App::$strings["mobile"] = "mobiel"; App::$strings["experimental"] = "experimenteel"; App::$strings["unsupported"] = "Niet ondersteund"; -App::$strings["No"] = "Nee"; App::$strings["Yes - with approval"] = "Ja - met goedkeuring"; -App::$strings["Yes"] = "Ja"; App::$strings["My site is not a public server"] = "Mijn \$Projectname-hub is niet openbaar"; App::$strings["My site has paid access only"] = "Mijn \$Projectname-hub kent alleen betaalde toegang"; App::$strings["My site has free access only"] = "Mijn \$Projectname-hub kent alleen gratis toegang"; App::$strings["My site offers free accounts with optional paid upgrades"] = "Mijn \$Projectname-hub biedt gratis accounts aan met betaalde uitbreidingen als optie"; -App::$strings["Basic/Minimal Social Networking"] = "Basic/eenvoudig sociaal netwerk"; -App::$strings["Standard Configuration (default)"] = "Standaard (standaard)"; -App::$strings["Professional"] = "Professioneel "; App::$strings["Beginner/Basic"] = "Beginner/basic"; App::$strings["Novice - not skilled but willing to learn"] = "Onervaren - niet bekwaam, maar wil graag leren"; App::$strings["Intermediate - somewhat comfortable"] = "Ervaren - voelt zich enigszins comfortabel"; @@ -411,16 +534,17 @@ App::$strings["Advanced - very comfortable"] = "Gevorderd - voelt zich comfortab App::$strings["Expert - I can write computer code"] = "Expert - kan programmeren"; App::$strings["Wizard - I probably know more than you do"] = "Tovenaar - ik weet waarschijnlijk meer dan jij"; App::$strings["Site"] = "Hub-instellingen"; +App::$strings["Registration"] = "Registratie"; App::$strings["File upload"] = "Bestand uploaden"; App::$strings["Policies"] = "Beleid"; App::$strings["Advanced"] = "Geavanceerd"; App::$strings["Site name"] = "Hubnaam"; -App::$strings["Server Configuration/Role"] = "Configuratietype hub"; App::$strings["Site default technical skill level"] = "Standaard technisch niveau voor deze hub"; App::$strings["Used to provide a member experience matched to technical comfort level"] = "Wordt gebruikt om leden een gebruikerservaring te bieden die met hun technisch niveau overeenkomt"; App::$strings["Lock the technical skill level setting"] = "Vergrendel de functie 'Standaard technisch niveau voor deze hub'"; App::$strings["Members can set their own technical comfort level by default"] = "Leden kunnen hun eigen technisch niveau standaard instellen"; App::$strings["Banner/Logo"] = "Banner/logo"; +App::$strings["Unfiltered HTML/CSS/JS is allowed"] = "Ongefilterd HTML/CSS/JS is toegestaan"; App::$strings["Administrator Information"] = "Informatie over de beheerder"; App::$strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden."; App::$strings["Site Information"] = "Hub-informatie"; @@ -428,8 +552,6 @@ App::$strings["Publicly visible description of this site. Displayed on siteinfo App::$strings["System language"] = "Standaardtaal"; App::$strings["System theme"] = "Standaardthema"; App::$strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Standaardthema voor \$Projectname-hub (kan door lid veranderd worden) - verander thema-instellingen"; -App::$strings["Mobile system theme"] = "Standaardthema voor mobiel"; -App::$strings["Theme for mobile devices"] = "Thema voor mobiele apparaten"; App::$strings["Allow Feeds as Connections"] = "Sta feeds toe als connecties"; App::$strings["(Heavy system resource usage)"] = "(sterk negatieve invloed op systeembronnen hub)"; App::$strings["Maximum image size"] = "Maximale grootte van afbeeldingen"; @@ -437,11 +559,13 @@ App::$strings["Maximum size in bytes of uploaded images. Default is 0, which mea App::$strings["Does this site allow new member registration?"] = "Staat deze hub nieuwe accounts toe?"; App::$strings["Invitation only"] = "Alleen op uitnodiging"; App::$strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Sta alleen nieuwe registraties toe van mensen die een uitnodigingscode hebben. Bovenstaand accountbeleid moet op Ja staan."; +App::$strings["Minimum age"] = "Minimum leeftijd"; +App::$strings["Minimum age (in years) for who may register on this site."] = "Minimum leeftijd (in jaren) voor wie zich op deze hub mag registreren."; App::$strings["Which best describes the types of account offered by this hub?"] = "Wat voor soort accounts biedt deze \$Projectname-hub aan? Kies wat het meest in de buurt komt."; App::$strings["Register text"] = "Tekst tijdens registratie"; App::$strings["Will be displayed prominently on the registration page."] = "Tekst dat op de pagina voor het registreren van nieuwe accounts wordt getoond."; App::$strings["Site homepage to show visitors (default: login box)"] = "Homepagina van deze hub die aan bezoekers wordt getoond (standaard: inlogformulier)"; -App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "voorbeeld: 'public' om de openbare stream te tonen, 'page/sys/home' om de webpagina 'home' van het systeemkanaal te tonen of 'include:home.html' om een gewoon bestand te gebruiken."; +App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "voorbeeld: 'public' om de openbare tijdlijn te tonen, 'page/sys/home' om de webpagina 'home' van het systeemkanaal te tonen of 'include:home.html' om een gewoon bestand te gebruiken."; App::$strings["Preserve site homepage URL"] = "Behoudt de URL van de hub (/)"; App::$strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Toon de homepagina van de hub in een frame op de oorspronkelijke locatie (/), i.p.v. een doorverwijzing naar een andere locatie (bv. .../home.html)"; App::$strings["Accounts abandoned after x days"] = "Accounts als verlaten beschouwen na zoveel aantal dagen:"; @@ -452,12 +576,19 @@ App::$strings["Verify Email Addresses"] = "E-mailadres verifieren"; App::$strings["Check to verify email addresses used in account registration (recommended)."] = "Inschakelen om e-mailadressen te verifiëren die tijdens de accountregistratie worden gebruikt (aanbevolen)."; App::$strings["Force publish"] = "Dwing kanaalvermelding af"; App::$strings["Check to force all profiles on this site to be listed in the site directory."] = "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld."; -App::$strings["Import Public Streams"] = "Openbare streams importeren"; +App::$strings["Import Public Streams"] = "Openbare tijdlijnen importeren"; App::$strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Toegang verlenen tot openbare berichten die vanuit andere hubs worden geïmporteerd. Waarschuwing: de inhoud van deze berichten wordt niet gemodereerd."; +App::$strings["Site only Public Streams"] = "Alleen openbare tijdlijnen van deze hub"; +App::$strings["Allow access to public content originating only from this site if Imported Public Streams are disabled."] = "Alleen toegang verlenen tot openbare berichten van deze hub, wanneer 'Openbare tijdlijnen importeren' is uitgeschakeld."; +App::$strings["Allow anybody on the internet to access the Public streams"] = "Aan iedereen op het internet toegang tot openbare tijdlijnen verlenen"; +App::$strings["Disable to require authentication before viewing. Warning: this content is unmoderated."] = "Uitschakelen wanneer authenticatie is vereist om de berichten te kunnen zien. Waarschuwing: de inhoud van deze berichten wordt niet gemodereerd."; App::$strings["Login on Homepage"] = "Inlogformulier op de homepagina"; App::$strings["Present a login box to visitors on the home page if no other content has been configured."] = "Toon een inlogformulier voor bezoekers op de homepagina wanneer geen andere inhoud is geconfigureerd. "; App::$strings["Enable context help"] = "Schakel contextuele hulp in"; App::$strings["Display contextual help for the current page when the help button is pressed."] = "Toon hulp en documentatie voor de op dat moment getoonde pagina, wanneer op de hulp-knop wordt geklikt."; +App::$strings["Reply-to email address for system generated email."] = "Antwoordadres voor door de hub verzonden e-mail."; +App::$strings["Sender (From) email address for system generated email."] = "Afzenderadres voor door de hub verzonden e-mail."; +App::$strings["Name of email sender for system generated email."] = "Volledige naam van afzenderadres voor door de hub verzonden e-mail."; App::$strings["Directory Server URL"] = "Server-URL voor de kanalengids"; App::$strings["Default directory server"] = "Standaardserver voor de kanalengids"; App::$strings["Proxy user"] = "Gebruikersnaam proxy"; @@ -468,1776 +599,1272 @@ App::$strings["Delivery interval"] = "Afleveringsinterval"; App::$strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers."; App::$strings["Deliveries per process"] = "Leveringen per serverproces"; App::$strings["Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5."] = "Aantal leveringen die aan één serverproces worden meegegeven. Pas dit aan wanneer het nodig is om systeemprestaties te verbeteren. Aangeraden: 1-5"; +App::$strings["Queue Threshold"] = "Wachtrijgrens"; +App::$strings["Always defer immediate delivery if queue contains more than this number of entries."] = "Stel onmiddellijke leveringen uit wanneer de wachtrij meer dan dit aantal vermeldingen bevat."; App::$strings["Poll interval"] = "Poll-interval"; App::$strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken."; +App::$strings["Path to ImageMagick convert program"] = "Locatie van het conversieprogramma van ImageMagick"; +App::$strings["If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert"] = "Wanneer dit is ingesteld wordt dit programma gebruikt om fotominiaturen voor enorme afbeeldingen (> 4000 pixels hoogte/breedte) aan te maken, anders kunnen er geheugenproblemen optreden. Bijvoorbeeld: /usr/bin/convert"; +App::$strings["Allow SVG thumbnails in file browser"] = "SVG-miniaturen in bestandsbeheerder toestaan"; +App::$strings["WARNING: SVG images may contain malicious code."] = "LET OP: SVG-afbeeldingen kunnen kwaadwillige code bevatten."; App::$strings["Maximum Load Average"] = "Maximaal gemiddelde systeembelasting"; App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50."; -App::$strings["Expiration period in days for imported (grid/network) content"] = "Aantal dagen waarna geïmporteerde inhoud uit iemands grid/netwerk-pagina wordt verwijderd."; +App::$strings["Expiration period in days for imported (grid/network) content"] = "Aantal dagen waarna geïmporteerde inhoud uit iemands tijdlijn/netwerk-pagina wordt verwijderd."; App::$strings["0 for no expiration of imported content"] = "Dit geldt alleen voor inhoud van andere kanalen, dus niet voor iemands eigen kanaal. 0 voor het niet verwijderen van geïmporteerde inhoud."; -App::$strings["Plugin %s disabled."] = "Plugin %s uitgeschakeld."; -App::$strings["Plugin %s enabled."] = "Plugin %s ingeschakeld"; -App::$strings["Disable"] = "Uitschakelen"; -App::$strings["Enable"] = "Inschakelen"; -App::$strings["Plugins"] = "Plugins"; -App::$strings["Toggle"] = "Omschakelen"; -App::$strings["Settings"] = "Instellingen"; -App::$strings["Author: "] = "Auteur: "; -App::$strings["Maintainer: "] = "Beheerder: "; -App::$strings["Minimum project version: "] = "Minimum versie Hubzilla: "; -App::$strings["Maximum project version: "] = "Maximum versie Hubzilla:"; -App::$strings["Minimum PHP version: "] = "Minimum versie PHP: "; -App::$strings["Compatible Server Roles: "] = "Werkt met configuratietypes: "; -App::$strings["Requires: "] = "Vereist: "; -App::$strings["Disabled - version incompatibility"] = "Uitgeschakeld - versie is incompatibel"; -App::$strings["Enter the public git repository URL of the plugin repo."] = "Vul de openbare Git-URL in van de plugin-repository."; -App::$strings["Plugin repo git URL"] = "Git-URL plugin-repository"; -App::$strings["Custom repo name"] = "Handmatige repository-naam"; -App::$strings["(optional)"] = "(niet verplicht)"; -App::$strings["Download Plugin Repo"] = "Plugin-repository downloaden"; -App::$strings["Install new repo"] = "Nieuwe repository installeren"; -App::$strings["Install"] = "Installeren"; -App::$strings["Cancel"] = "Annuleren"; -App::$strings["Manage Repos"] = "Repositories beheren"; -App::$strings["Installed Plugin Repositories"] = "Toegevoegde plugin-repositories"; -App::$strings["Install a New Plugin Repository"] = "Nieuwe plugin-repository toevoegen"; -App::$strings["Update"] = "Bijwerken"; -App::$strings["Switch branch"] = "Branch veranderen"; -App::$strings["Remove"] = "Verwijderen"; -App::$strings["Theme settings updated."] = "Thema-instellingen bijgewerkt."; -App::$strings["No themes found."] = "Geen thema's gevonden"; -App::$strings["Screenshot"] = "Schermafdruk"; -App::$strings["Themes"] = "Thema's"; -App::$strings["[Experimental]"] = "[Experimenteel]"; -App::$strings["[Unsupported]"] = "[Niet ondersteund]"; -App::$strings["Export Channel"] = "Kanaal exporteren"; -App::$strings["Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exporteer de basisinformatie van jouw kanaal naar een bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal."; -App::$strings["Export Content"] = "Inhoud exporteren"; -App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin."] = "Exporteer informatie en recente inhoud van jouw kanaal naar een JSON-back-up, wat kan worden gebruikt om jouw kanaal te herstellen of te importeren op een andere hub. Dit slaat al jouw connecties, permissies, profielgegevens en enkele maanden aan inhoud van jouw kanaal op. Dit bestand kan ZEER groot worden. Wees geduldig - het kan enkele minuten duren voordat de download begint."; -App::$strings["Export your posts from a given year."] = "Exporteer jouw berichten uit een bepaald jaar."; -App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Je kan ook berichten en conversaties uit een bepaald jaar of van een bepaalde maand exporteren. Verander de datum in de adresbalk van jouw webbrowser om andere jaren en maanden te selecteren. Wanneer het exporteren mislukt (waarschijnlijk door een gebrek aan beschikbaar servergeheugen), probeer het dan nogmaals met een beperkter tijdvak."; -App::$strings["To select all posts for a given year, such as this year, visit %2\$s"] = "Bezoek %2\$s om alle berichten van bijvoorbeeld dit jaar te selecteren. "; -App::$strings["To select all posts for a given month, such as January of this year, visit %2\$s"] = "Bezoek %2\$s om alle berichten van bijvoorbeeld januari dit jaar te selecteren."; -App::$strings["These content files may be imported or restored by visiting %2\$s on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Deze back-up-bestanden kunnen geïmporteerd of hersteld worden door op jouw hub en met jouw kanaal %2\$s te bezoeken. Voor het beste resultaat kan je de bestanden in chronologische volgorde importeren of herstellen."; -App::$strings["Layout Name"] = "Naam lay-out"; -App::$strings["Layout Description (Optional)"] = "Lay-out-omschrijving (niet verplicht)"; -App::$strings["Edit Layout"] = "Lay-out bewerken"; -App::$strings["Page link"] = "Paginalink"; -App::$strings["Edit Webpage"] = "Webpagina bewerken"; -App::$strings["Apps"] = "Apps"; -App::$strings["Manage apps"] = "Apps beheren"; -App::$strings["Create new app"] = "Nieuwe app aanmaken"; -App::$strings["This site is not a directory server"] = "Deze hub is geen kanalengidshub (directoryserver)"; -App::$strings["This directory server requires an access token"] = "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig"; -App::$strings["No such group"] = "Collectie niet gevonden"; -App::$strings["No such channel"] = "Niet zo'n kanaal"; -App::$strings["forum"] = "forum"; -App::$strings["Search Results For:"] = "Zoekresultaten voor:"; -App::$strings["Privacy group is empty"] = "Privacygroep is leeg"; -App::$strings["Privacy group: "] = "Privacygroep: "; -App::$strings["Invalid connection."] = "Ongeldige connectie."; -App::$strings["Invalid channel."] = "Onbekend kanaal."; -App::$strings["Unable to update menu."] = "Niet in staat om menu aan te passen"; -App::$strings["Unable to create menu."] = "Niet in staat om menu aan te maken."; -App::$strings["Menu Name"] = "Menunaam"; -App::$strings["Unique name (not visible on webpage) - required"] = "Unieke naam vereist (niet zichtbaar op webpagina)"; -App::$strings["Menu Title"] = "Menutitel"; -App::$strings["Visible on webpage - leave empty for no title"] = "Zichtbaar op webpagina (leeg laten voor geen titel)"; -App::$strings["Allow Bookmarks"] = "Bladwijzers toestaan"; -App::$strings["Menu may be used to store saved bookmarks"] = "Menu kan gebruikt worden om bladwijzers in op te slaan"; -App::$strings["Submit and proceed"] = "Opslaan en doorgaan"; -App::$strings["Menus"] = "Menu's"; -App::$strings["Drop"] = "Verwijderen"; -App::$strings["Created"] = "Aangemaakt"; -App::$strings["Edited"] = "Bewerkt"; -App::$strings["Bookmarks allowed"] = "Bladwijzers toegestaan"; -App::$strings["Delete this menu"] = "Menu verwijderen"; -App::$strings["Edit menu contents"] = "Bewerk de inhoud van het menu"; -App::$strings["Edit this menu"] = "Dit menu bewerken"; -App::$strings["Menu could not be deleted."] = "Menu kon niet verwijderd worden."; -App::$strings["Menu not found."] = "Menu niet gevonden."; -App::$strings["Edit Menu"] = "Menu bewerken"; -App::$strings["Add or remove entries to this menu"] = "Items aan dit menu toevoegen of verwijder"; -App::$strings["Menu name"] = "Naam van menu"; -App::$strings["Must be unique, only seen by you"] = "Moet uniek zijn en is alleen zichtbaar voor jou."; -App::$strings["Menu title"] = "Titel van menu"; -App::$strings["Menu title as seen by others"] = "Titel van menu zoals anderen dat zien."; -App::$strings["Allow bookmarks"] = "Bladwijzers toestaan"; -App::$strings["Not found."] = "Niet gevonden."; -App::$strings["Edit post"] = "Bericht bewerken"; -App::$strings["Location not found."] = "Locatie niet gevonden."; -App::$strings["Location lookup failed."] = "Opzoeken locatie mislukt"; -App::$strings["Please select another location to become primary before removing the primary location."] = "Kies eerst een andere primaire locatie alvorens de huidige primaire locatie te verwijderen."; -App::$strings["Syncing locations"] = "Locaties synchronizeren"; -App::$strings["No locations found."] = "Geen locaties gevonden."; -App::$strings["Manage Channel Locations"] = "Kanaallocaties beheren"; -App::$strings["Location"] = "Locatie"; -App::$strings["Primary"] = "Primair"; -App::$strings["Sync Now"] = "Nu synchroniseren"; -App::$strings["Please wait several minutes between consecutive operations."] = "Wacht enkele minuten tussen opeenvolgende handelingen."; -App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen door op de hub van de kloon in te loggen en het kanaal daar te verwijderen."; -App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is."; -App::$strings["Public Hubs"] = "Openbare hubs"; -App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself may provide additional details."] = "Op de hier weergegeven hubs kan iedereen zich voor het \$Projectname-netwerk aanmelden. Alle hubs in het netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen een financiële tegemoetkoming voor bepaalde uitbreidingen. Mogelijk wordt hierover op de hub zelf meer informatie gegeven."; -App::$strings["Hub URL"] = "Hub-URL"; -App::$strings["Access Type"] = "Toegangs-
     type"; -App::$strings["Registration Policy"] = "Registratie-
     beleid"; -App::$strings["Stats"] = "Stats"; -App::$strings["Software"] = "Software"; -App::$strings["Ratings"] = "Beoordelingen"; -App::$strings["Rate"] = "Beoordeel"; -App::$strings["View"] = "Weergeven"; -App::$strings["Could not access contact record."] = "Kon geen toegang krijgen tot de connectie-gegevens."; -App::$strings["Could not locate selected profile."] = "Kon het gekozen profiel niet vinden."; -App::$strings["Connection updated."] = "Connectie bijgewerkt."; -App::$strings["Failed to update connection record."] = "Bijwerken van connectie-gegevens mislukt."; -App::$strings["is now connected to"] = "is nu verbonden met"; -App::$strings["Could not access address book record."] = "Kon geen toegang krijgen tot de record van de connectie."; -App::$strings["Refresh failed - channel is currently unavailable."] = "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"; -App::$strings["Unable to set address book parameters."] = "Niet in staat om de parameters van connecties in te stellen."; -App::$strings["Connection has been removed."] = "Connectie is verwijderd"; -App::$strings["View Profile"] = "Profiel weergeven"; -App::$strings["View %s's profile"] = "Profiel van %s weergeven"; -App::$strings["Refresh Permissions"] = "Permissies vernieuwen"; -App::$strings["Fetch updated permissions"] = "Aangepaste permissies ophalen"; -App::$strings["Refresh Photo"] = "Foto vernieuwen"; -App::$strings["Fetch updated photo"] = "Aangepaste foto ophalen"; -App::$strings["Recent Activity"] = "Recente activiteit/berichten"; -App::$strings["View recent posts and comments"] = "Recente berichten en reacties weergeven"; -App::$strings["Block (or Unblock) all communications with this connection"] = "Blokkeer (of deblokkeer) alle communicatie met deze connectie"; -App::$strings["This connection is blocked!"] = "Deze connectie is geblokkeerd!"; -App::$strings["Unignore"] = "Niet meer negeren"; -App::$strings["Ignore (or Unignore) all inbound communications from this connection"] = "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"; -App::$strings["This connection is ignored!"] = "Deze connectie wordt genegeerd!"; -App::$strings["Unarchive"] = "Niet meer archiveren"; -App::$strings["Archive"] = "Archiveren"; -App::$strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud"; -App::$strings["This connection is archived!"] = "Deze connectie is gearchiveerd!"; -App::$strings["Unhide"] = "Niet meer verbergen"; -App::$strings["Hide"] = "Verbergen"; -App::$strings["Hide or Unhide this connection from your other connections"] = "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"; -App::$strings["This connection is hidden!"] = "Deze connectie is verborgen!"; -App::$strings["Delete this connection"] = "Deze connectie verwijderen"; -App::$strings["Fetch Vcard"] = "Vcard ophalen"; -App::$strings["Fetch electronic calling card for this connection"] = "Visitekaartje van deze connectie ophalen"; -App::$strings["Permissions"] = "Permissies"; -App::$strings["Open Individual Permissions section by default"] = "Sectie met individuele permissies standaard openen"; -App::$strings["Affinity"] = "Affiniteit"; -App::$strings["Open Set Affinity section by default"] = "Sectie met de affiniteitsinstelling standaard openen"; -App::$strings["Me"] = "Ik"; -App::$strings["Family"] = "Familie"; -App::$strings["Friends"] = "Vrienden"; -App::$strings["Acquaintances"] = "Kennissen"; -App::$strings["Filter"] = "Filter"; -App::$strings["Open Custom Filter section by default"] = "Sectie met de berichtenfilter standaard openen"; -App::$strings["Approve this connection"] = "Deze connectie accepteren"; -App::$strings["Accept connection to allow communication"] = "Keur deze connectie goed om communicatie toe te staan"; -App::$strings["Set Affinity"] = "Affiniteit instellen"; -App::$strings["Set Profile"] = "Profiel instellen"; -App::$strings["Set Affinity & Profile"] = "Affiniteit en profiel instellen"; -App::$strings["none"] = "geen"; -App::$strings["Connection Default Permissions"] = "Standaard permissies voor connecties"; -App::$strings["Connection: %s"] = "Connectie: %s"; -App::$strings["Apply these permissions automatically"] = "Deze permissies automatisch toepassen"; -App::$strings["Connection requests will be approved without your interaction"] = "Connectieverzoeken zullen automatisch worden geaccepteerd"; -App::$strings["Permission role"] = "Permissietype"; -App::$strings["Add permission role"] = "Permissietype toevoegen"; -App::$strings["This connection's primary address is"] = "Het primaire kanaaladres van deze connectie is"; -App::$strings["Available locations:"] = "Beschikbare locaties:"; -App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast."; -App::$strings["Connection Tools"] = "Hulpmiddelen"; -App::$strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag"; -App::$strings["Rating"] = "Beoordeling"; -App::$strings["Slide to adjust your rating"] = "Gebruik de schuif om je beoordeling te geven"; -App::$strings["Optionally explain your rating"] = "Verklaar jouw beoordeling (niet verplicht)"; -App::$strings["Custom Filter"] = "Berichtenfilter"; -App::$strings["Only import posts with this text"] = "Importeer alleen berichten met deze tekst"; -App::$strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1) - laat leeg om alle berichten te importeren"; -App::$strings["Do not import posts with this text"] = "Importeer geen berichten met deze tekst"; -App::$strings["This information is public!"] = "Deze informatie is openbaar!"; -App::$strings["Connection Pending Approval"] = "Connectie moet nog geaccepteerd worden"; -App::$strings["inherited"] = "geërfd"; -App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."; -App::$strings["Their Settings"] = "Hun instellingen"; +App::$strings["Do not expire any posts which have comments less than this many days ago"] = "Laat geen berichten verlopen die minder dan dit aantal dagen reacties hebben"; +App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Openbare hubs: Optionele landingpage (marketing) voor nieuwe registraties"; +App::$strings["Create this page first. Default is %s/register"] = "Maak eerst deze pagina aan. Standaard wordt %s/register gebruikt"; +App::$strings["Page to display after creating a new channel"] = "Pagina die na het aanmaken van een nieuw kanaal moet worden getoond"; +App::$strings["Recommend: profiles, go, or settings"] = "Aanbevolen: profiles, go of settings"; +App::$strings["Optional: site location"] = "Niet verplicht: locatie van deze hub"; +App::$strings["Region or country"] = "Regio of land"; +App::$strings["New Profile Field"] = "Nieuw profielveld"; +App::$strings["Field nickname"] = "Bijnaam voor veld"; +App::$strings["System name of field"] = "Systeemnaam voor veld"; +App::$strings["Input type"] = "Invoertype"; +App::$strings["Field Name"] = "Veldnaam"; +App::$strings["Label on profile pages"] = "Tekstlabel voor op profielpagina's"; +App::$strings["Help text"] = "Helptekst"; +App::$strings["Additional info (optional)"] = "Extra informatie (niet verplicht)"; +App::$strings["Save"] = "Opslaan"; +App::$strings["Field definition not found"] = "Velddefinitie niet gevonden"; +App::$strings["Edit Profile Field"] = "Profielveld bewerken"; +App::$strings["Profile Fields"] = "Profielvelden"; +App::$strings["Basic Profile Fields"] = "Standaard profielvelden"; +App::$strings["Advanced Profile Fields"] = "Geavanceerde profielvelden"; +App::$strings["(In addition to basic fields)"] = "(als toevoeging op de standaard velden)"; +App::$strings["All available fields"] = "Alle beschikbare velden"; +App::$strings["Custom Fields"] = "Extra (handmatig toegevoegde) velden"; +App::$strings["Create Custom Field"] = "Extra velden aanmaken"; +App::$strings["Password changed for account %d."] = "Wachtwoord veranderd voor account %d."; +App::$strings["Account settings updated."] = "Account-instellingen bijgewerkt."; +App::$strings["Account not found."] = "Account niet gevonden."; +App::$strings["Account Edit"] = "Account bewerken"; +App::$strings["New Password"] = "Nieuw wachtwoord"; +App::$strings["New Password again"] = "Nieuw wachtwoord bevestigen"; +App::$strings["Technical skill level"] = "Technisch niveau"; +App::$strings["Account language (for emails)"] = "Taal van account (voor e-mails)"; +App::$strings["Service class"] = "Abonnement"; +App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Standaard is ongefilterde HTML in ingesloten (embedded) media toegestaan. Dit is inherent onveilig."; +App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Het wordt aanbevolen om alleen ongefilterde HTML van de volgende websites toe te staan:"; +App::$strings["https://youtube.com/
    https://www.youtube.com/
    https://youtu.be/
    https://vimeo.com/
    https://soundcloud.com/
    "] = "https://youtube.com/
    https://www.youtube.com/
    https://youtu.be/
    https://vimeo.com/
    https://soundcloud.com/
    "; +App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = "Alle andere ingesloten (embedded) inhoud wordt gefilterd, tenzij ingesloten (embedded) inhoud van een website expliciet wordt geblokkeerd."; +App::$strings["Security"] = "Beveiliging"; +App::$strings["Block public"] = "Openbare toegang blokkeren"; +App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor leden die zich hebben geauthenticeerd."; +App::$strings["Set \"Transport Security\" HTTP header"] = "\"Transport Security\" HTTP-header inschakelen"; +App::$strings["Set \"Content Security Policy\" HTTP header"] = " \"Content Security Policy\" HTTP-header inschakelen"; +App::$strings["Allowed email domains"] = "Toegestane e-maildomeinen"; +App::$strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te laten."; +App::$strings["Not allowed email domains"] = "Niet toegestane e-maildomeinen"; +App::$strings["Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined."] = "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen niet op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te staan, tenzij er toegestane domeinen zijn ingesteld. "; +App::$strings["Allow communications only from these sites"] = "Alleen communicatie met deze hubs toestaan"; +App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Eén hub per regel. Laat leeg om communicatie standaard met alle hubs toe te staan"; +App::$strings["Block communications from these sites"] = "Communicatie met deze hubs blokkeren"; +App::$strings["Allow communications only from these channels"] = "Sta alleen communicatie toe met deze kanalen"; +App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = "Eén kanaal (hash) per regel. Laat leeg om communicatie standaard met alle kanalen toe te staan"; +App::$strings["Block communications from these channels"] = "Communicatie met deze kanalen blokkeren"; +App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Alleen ingesloten (embedded) inhoud van veilige (SSL) websites en links toestaan."; +App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Alleen ongefilterde ingesloten (embedded) HTML van deze websites toestaan"; +App::$strings["One site per line. By default embedded content is filtered."] = "Eén website per regel. Standaard wordt ingesloten (embedded) inhoud gefilterd."; +App::$strings["Block embedded HTML from these domains"] = "Ingesloten (embedded) HTML vanaf deze domeinen blokkeren"; +App::$strings["Remote privacy information not available."] = "Privacy-informatie op afstand niet beschikbaar."; +App::$strings["Visible to:"] = "Zichtbaar voor:"; +App::$strings["__ctx:acl__ Profile"] = "Profiel"; +App::$strings["Comment approved"] = "Reactie goedgekeurd"; +App::$strings["Comment deleted"] = "Reactie verwijderd"; +App::$strings["Permission Name is required."] = "Permissienaam is vereist"; +App::$strings["Permission category saved."] = "Permissiegroep opgeslagen."; +App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Gebruik dit formulier om permissieregels voor diverse soorten mensen en connecties aan te maken."; +App::$strings["Permission Categories"] = "Permissiegroepen"; +App::$strings["Permission Name"] = "Permissienaam"; App::$strings["My Settings"] = "Mijn instellingen"; +App::$strings["inherited"] = "geërfd"; App::$strings["Individual Permissions"] = "Individuele permissies"; -App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can not change those settings here."] = "Sommige permissies worden mogelijk overgeërfd van de privacy-instellingen van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier niet veranderen."; -App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Sommige permissies worden mogelijk overgeërfd van de privacy-instellingen van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. "; -App::$strings["Last update:"] = "Laatste wijziging:"; -App::$strings["Details"] = "Details"; -App::$strings["Organisation"] = "Organisatie"; -App::$strings["Title"] = "Titel"; -App::$strings["Phone"] = "Telefoon"; -App::$strings["Instant messenger"] = "Instant messenger"; -App::$strings["Website"] = "Website"; -App::$strings["Note"] = "Opmerking"; -App::$strings["Mobile"] = "Mobiel"; -App::$strings["Home"] = "Thuis"; -App::$strings["Work"] = "Werk"; -App::$strings["Add Contact"] = "Contact toevoegen"; -App::$strings["Add Field"] = "Veld toevoegen"; -App::$strings["P.O. Box"] = "Postbus"; -App::$strings["Additional"] = "Extra"; -App::$strings["Street"] = "Straat en huisnummer"; -App::$strings["Locality"] = "Plaats"; -App::$strings["Region"] = "Provincie/staat/regio/enz."; -App::$strings["ZIP Code"] = "Postcode"; -App::$strings["Country"] = "Land"; -App::$strings["Calendar entries imported."] = "Agenda-items geïmporteerd."; -App::$strings["No calendar entries found."] = "Geen agenda-items gevonden."; -App::$strings["Event can not end before it has started."] = "Gebeurtenis kan niet eindigen voordat het is begonnen"; -App::$strings["Unable to generate preview."] = "Niet in staat om voorvertoning te genereren"; -App::$strings["Event title and start time are required."] = "Titel en begintijd van gebeurtenis zijn vereist."; -App::$strings["Event not found."] = "Gebeurtenis niet gevonden"; -App::$strings["event"] = "gebeurtenis"; -App::$strings["Edit event title"] = "Titel bewerken"; -App::$strings["Event title"] = "Titel"; -App::$strings["Categories (comma-separated list)"] = "Categorieën (door komma's gescheiden lijst)"; -App::$strings["Edit Category"] = "Categorie"; -App::$strings["Category"] = "Categorie"; -App::$strings["Edit start date and time"] = "Begindatum en -tijd bewerken"; -App::$strings["Start date and time"] = "Begindatum en -tijd"; -App::$strings["Finish date and time are not known or not relevant"] = "Einddatum en -tijd zijn niet bekend of niet van toepassing"; -App::$strings["Edit finish date and time"] = "Einddatum en -tijd bewerken"; -App::$strings["Finish date and time"] = "Einddatum en -tijd"; -App::$strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt"; -App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen."; -App::$strings["Edit Description"] = "Omschrijving bewerken"; -App::$strings["Edit Location"] = "Locatie bewerken"; -App::$strings["Preview"] = "Voorvertoning"; -App::$strings["Permission settings"] = "Permissies"; -App::$strings["Timezone:"] = "Tijdzone:"; -App::$strings["Advanced Options"] = "Geavanceerde opties"; -App::$strings["l, F j"] = "l j F"; -App::$strings["Edit event"] = "Gebeurtenis bewerken"; -App::$strings["Delete event"] = "Gebeurtenis verwijderen"; -App::$strings["Link to Source"] = "Originele locatie"; -App::$strings["calendar"] = "agenda"; -App::$strings["Edit Event"] = "Gebeurtenis bewerken"; -App::$strings["Create Event"] = "Gebeurtenis aanmaken"; -App::$strings["Previous"] = "Vorige"; -App::$strings["Next"] = "Volgende"; -App::$strings["Export"] = "Exporteren"; -App::$strings["Month"] = "Maand"; -App::$strings["Week"] = "Week"; -App::$strings["Day"] = "Dag"; -App::$strings["Today"] = "Vandaag"; -App::$strings["Event removed"] = "Gebeurtenis verwijderd"; -App::$strings["Failed to remove event"] = "Verwijderen gebeurtenis mislukt"; -App::$strings["\$Projectname"] = "\$Projectname"; -App::$strings["Welcome to %s"] = "Welkom op %s"; -App::$strings["Permission Denied."] = "Toegang geweigerd"; -App::$strings["File not found."] = "Bestand niet gevonden."; -App::$strings["Edit file permissions"] = "Bestandsrechten bewerken"; -App::$strings["Set/edit permissions"] = "Rechten instellen/bewerken"; -App::$strings["Include all files and sub folders"] = "Toepassen op alle bestanden en submappen"; -App::$strings["Return to file list"] = "Terugkeren naar bestandlijst "; -App::$strings["Copy/paste this code to attach file to a post"] = "Kopieer/plak deze code om het bestand aan een bericht te koppelen"; -App::$strings["Copy/paste this URL to link file from a web page"] = "Kopieer/plak deze URL om het bestand aan een externe webpagina te koppelen"; -App::$strings["Share this file"] = "Dit bestand delen"; -App::$strings["Show URL to this file"] = "Toon URL van dit bestand"; -App::$strings["Notify your contacts about this file"] = "Jouw connecties over dit bestand berichten"; -App::$strings["Photos"] = "Foto's"; -App::$strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen."; -App::$strings["Profile Photos"] = "Profielfoto's"; -App::$strings["Album not found."] = "Album niet gevonden."; -App::$strings["Delete Album"] = "Verwijder album"; -App::$strings["Multiple storage folders exist with this album name, but within different directories. Please remove the desired folder or folders using the Files manager"] = "Er bestaan meerdere submappen met deze albumnaam, maar verspreidt over verschillende mappen. Verwijder de gewenste map(pen) met de bestandsbeheerder."; -App::$strings["Delete Photo"] = "Verwijder foto"; -App::$strings["Public access denied."] = "Openbare toegang geweigerd."; -App::$strings["No photos selected"] = "Geen foto's geselecteerd"; -App::$strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt."; -App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt."; -App::$strings["%1$.2f MB photo storage used."] = "%1$.2f MB aan foto-opslag gebruikt."; -App::$strings["Upload Photos"] = "Foto's uploaden"; -App::$strings["Enter an album name"] = "Vul een albumnaam in"; -App::$strings["or select an existing album (doubleclick)"] = "of kies een bestaand album (dubbelklikken)"; -App::$strings["Create a status post for this upload"] = "Plaats een bericht voor deze upload."; -App::$strings["Caption (optional):"] = "Bijschrift (niet verplicht):"; -App::$strings["Description (optional):"] = "Omschrijving (niet verplicht):"; -App::$strings["Album name could not be decoded"] = "Albumnaam kon niet gedecodeerd worden"; -App::$strings["Contact Photos"] = "Connectiefoto's"; -App::$strings["Show Newest First"] = "Nieuwste eerst weergeven"; -App::$strings["Show Oldest First"] = "Oudste eerst weergeven"; -App::$strings["View Photo"] = "Foto weergeven"; -App::$strings["Edit Album"] = "Album bewerken"; -App::$strings["Permission denied. Access to this item may be restricted."] = "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."; -App::$strings["Photo not available"] = "Foto niet aanwezig"; -App::$strings["Use as profile photo"] = "Als profielfoto gebruiken"; -App::$strings["Use as cover photo"] = "Als omslagfoto gebruiken"; -App::$strings["Private Photo"] = "Privéfoto"; -App::$strings["View Full Size"] = "Volledige grootte weergeven"; -App::$strings["Edit photo"] = "Foto bewerken"; -App::$strings["Rotate CW (right)"] = "Draai met de klok mee (naar rechts)"; -App::$strings["Rotate CCW (left)"] = "Draai tegen de klok in (naar links)"; -App::$strings["Move photo to album"] = "Verplaatst foto naar album"; -App::$strings["Enter a new album name"] = "Vul een nieuwe albumnaam in"; -App::$strings["or select an existing one (doubleclick)"] = "of kies een bestaand album (dubbelklikken)"; -App::$strings["Caption"] = "Bijschrift"; -App::$strings["Add a Tag"] = "Tag toevoegen"; -App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"; -App::$strings["Flag as adult in album view"] = "Markeer als voor volwassenen in albumweergave"; -App::$strings["I like this (toggle)"] = "Vind ik leuk"; -App::$strings["I don't like this (toggle)"] = "Vind ik niet leuk"; -App::$strings["Share"] = "Delen"; -App::$strings["Please wait"] = "Even wachten"; -App::$strings["This is you"] = "Dit ben jij"; -App::$strings["Comment"] = "Reactie"; -App::$strings["__ctx:title__ Likes"] = "vinden dit leuk"; -App::$strings["__ctx:title__ Dislikes"] = "vinden dit niet leuk"; -App::$strings["__ctx:title__ Agree"] = "eens"; -App::$strings["__ctx:title__ Disagree"] = "oneens"; -App::$strings["__ctx:title__ Abstain"] = "onthoudingen"; -App::$strings["__ctx:title__ Attending"] = "aanwezig"; -App::$strings["__ctx:title__ Not attending"] = "niet aanwezig"; -App::$strings["__ctx:title__ Might attend"] = "mogelijk aanwezig"; -App::$strings["View all"] = "Toon alles"; -App::$strings["__ctx:noun__ Like"] = array( - 0 => "vindt dit leuk", - 1 => "vinden dit leuk", -); -App::$strings["__ctx:noun__ Dislike"] = array( - 0 => "vindt dit niet leuk", - 1 => "vinden dit niet leuk", -); -App::$strings["Photo Tools"] = "Hulpmiddelen"; -App::$strings["In This Photo:"] = "Op deze foto:"; -App::$strings["Map"] = "Kaart"; -App::$strings["__ctx:noun__ Likes"] = "vinden dit leuk"; -App::$strings["__ctx:noun__ Dislikes"] = "vinden dit niet leuk"; -App::$strings["Close"] = "Sluiten"; -App::$strings["View Album"] = "Album weergeven"; -App::$strings["Recent Photos"] = "Recente foto's"; -App::$strings["Privacy group created."] = "Privacygroep aangemaakt"; -App::$strings["Could not create privacy group."] = "Kon privacygroep niet aanmaken"; -App::$strings["Privacy group not found."] = "Privacygroep niet gevonden"; -App::$strings["Privacy group updated."] = "Privacygroep bijgewerkt"; -App::$strings["Create a group of channels."] = "Privacygroep met kanalen aanmaken"; -App::$strings["Privacy group name: "] = "Naam privacygroep: "; -App::$strings["Members are visible to other channels"] = "Kanalen in deze privacygroep zijn zichtbaar voor andere kanalen"; -App::$strings["Privacy group removed."] = "Privacygroep verwijderd."; -App::$strings["Unable to remove privacy group."] = "Verwijderen privacygroep mislukt"; -App::$strings["Privacy group editor"] = "Privacygroep bewerken"; -App::$strings["All Connected Channels"] = "Alle kanaalconnecties"; -App::$strings["Click on a channel to add or remove."] = "Klik op een kanaal om deze toe te voegen of te verwijderen."; -App::$strings["Invalid message"] = "Ongeldig bericht"; -App::$strings["no results"] = "geen resultaten"; -App::$strings["channel sync processed"] = "kanaalsync verwerkt"; -App::$strings["queued"] = "in wachtrij"; -App::$strings["posted"] = "verstuurd"; -App::$strings["accepted for delivery"] = "geaccepteerd om afgeleverd te worden"; -App::$strings["updated"] = "geüpdatet"; -App::$strings["update ignored"] = "update genegeerd"; -App::$strings["permission denied"] = "toegang geweigerd"; -App::$strings["recipient not found"] = "ontvanger niet gevonden"; -App::$strings["mail recalled"] = "Privébericht ingetrokken"; -App::$strings["duplicate mail received"] = "dubbel privébericht ontvangen"; -App::$strings["mail delivered"] = "privébericht afgeleverd"; -App::$strings["Delivery report for %1\$s"] = "Afleveringsrapport voor %1\$s"; -App::$strings["Options"] = "Opties"; -App::$strings["Redeliver"] = "Opnieuw afleveren"; -App::$strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken."; -App::$strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren."; -App::$strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren"; -App::$strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."; -App::$strings["Messages"] = "Berichten"; -App::$strings["Message recalled."] = "Bericht ingetrokken."; -App::$strings["Conversation removed."] = "Conversatie verwijderd"; -App::$strings["Please enter a link URL:"] = "Vul een URL in:"; -App::$strings["Expires YYYY-MM-DD HH:MM"] = "Verloopt op DD-MM-YYYY om HH:MM"; -App::$strings["Requested channel is not in this network"] = "Opgevraagd kanaal is niet in dit netwerk beschikbaar"; -App::$strings["Send Private Message"] = "Privébericht versturen"; -App::$strings["To:"] = "Aan:"; -App::$strings["Subject:"] = "Onderwerp:"; -App::$strings["Your message:"] = "Jouw bericht:"; -App::$strings["Attach file"] = "Bestand toevoegen"; -App::$strings["Send"] = "Verzenden"; -App::$strings["Set expiration date"] = "Verloopdatum instellen"; -App::$strings["Encrypt text"] = "Tekst versleutelen"; -App::$strings["Delete message"] = "Bericht verwijderen"; -App::$strings["Delivery report"] = "Afleveringsrapport"; -App::$strings["Recall message"] = "Bericht intrekken"; -App::$strings["Message has been recalled."] = "Bericht is ingetrokken."; -App::$strings["Delete Conversation"] = "Verwijder conversatie"; -App::$strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. Mogelijk kan je reageren op de kanaalpagina van de afzender."; -App::$strings["Send Reply"] = "Antwoord versturen"; -App::$strings["Your message for %s (%s):"] = "Jouw privébericht aan %s (%s):"; -App::$strings["webpage"] = "Webpagina"; -App::$strings["block"] = "blok"; -App::$strings["layout"] = "lay-out"; -App::$strings["menu"] = "menu"; -App::$strings["%s element installed"] = "%s onderdeel geïnstalleerd"; -App::$strings["%s element installation failed"] = "Installatie %s-element mislukt"; -App::$strings["Import completed"] = "Importeren voltooid"; -App::$strings["Import Items"] = "Importeer items"; -App::$strings["Use this form to import existing posts and content from an export file."] = "Gebruik dit formulier om bestaande berichten en andere inhoud vanuit een exportbestand te importeren."; -App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt."; -App::$strings["Create a new channel"] = "Nieuw kanaal aanmaken"; -App::$strings["Create New"] = "Nieuwe aanmaken"; -App::$strings["Channel Manager"] = "Kanaalbeheer"; -App::$strings["Current Channel"] = "Huidig kanaal"; -App::$strings["Switch to one of your channels by selecting it."] = "Activeer een van jouw andere kanalen door er op te klikken."; -App::$strings["Default Channel"] = "Standaardkanaal"; -App::$strings["Make Default"] = "Als standaard instellen"; -App::$strings["%d new messages"] = "%d nieuwe berichten"; -App::$strings["%d new introductions"] = "%d nieuwe connectieverzoeken"; -App::$strings["Delegated Channel"] = "Uitbesteed kanaal"; -App::$strings["Hub not found."] = "Hub niet gevonden."; -App::$strings["Unable to create element."] = "Niet in staat om onderdeel aan te maken."; -App::$strings["Unable to update menu element."] = "Menu-onderdeel kan niet worden geüpdatet."; -App::$strings["Unable to add menu element."] = "Menu-onderdeel kan niet worden toegevoegd."; -App::$strings["Menu Item Permissions"] = "Permissies menu-item"; -App::$strings["(click to open/close)"] = "(klik om te openen/sluiten)"; -App::$strings["Link Name"] = "Linknaam"; -App::$strings["Link or Submenu Target"] = "Linkdoel of submenu-doel"; -App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Geef de URL van de link of kies een menunaam om een submenu aan te maken"; -App::$strings["Use magic-auth if available"] = "Gebruik magic-auth wanneer beschikbaar"; -App::$strings["Open link in new window"] = "Open link in nieuw venster"; -App::$strings["Order in list"] = "Volgorde in lijst"; -App::$strings["Higher numbers will sink to bottom of listing"] = "Hogere nummers komen onderaan de lijst terecht"; -App::$strings["Submit and finish"] = "Opslaan en afsluiten"; -App::$strings["Submit and continue"] = "Opslaan en doorgaan"; -App::$strings["Menu:"] = "Menu:"; -App::$strings["Link Target"] = "Linkdoel"; -App::$strings["Edit menu"] = "Menu bewerken"; -App::$strings["Edit element"] = "Onderdeel bewerken"; -App::$strings["Drop element"] = "Onderdeel verwijderen"; -App::$strings["New element"] = "Nieuw element"; -App::$strings["Edit this menu container"] = "Deze menu-container bewerken"; -App::$strings["Add menu element"] = "Menu-element toevoegen"; -App::$strings["Delete this menu item"] = "Dit menu-item verwijderen"; -App::$strings["Edit this menu item"] = "Dit menu-item bewerken"; -App::$strings["Menu item not found."] = "Menu-item niet gevonden."; -App::$strings["Menu item deleted."] = "Menu-item verwijderd."; -App::$strings["Menu item could not be deleted."] = "Menu-item kon niet worden verwijderd."; -App::$strings["Edit Menu Element"] = "Menu-element bewerken"; -App::$strings["Link text"] = "Linktekst"; -App::$strings["Item is not editable"] = "Item is niet te bewerken"; -App::$strings["No ratings"] = "Geen beoordelingen"; -App::$strings["Rating: "] = "Beoordeling: "; -App::$strings["Website: "] = "Website: "; -App::$strings["Description: "] = "Omschrijving: "; -App::$strings["Item not available."] = "Item is niet aanwezig."; -App::$strings["Permissions denied."] = "Permissies niet toegestaan"; -App::$strings["Import"] = "Importeren"; -App::$strings["No more system notifications."] = "Geen systeemnotificaties meer."; -App::$strings["System Notifications"] = "Systeemnotificaties"; -App::$strings["Authorize application connection"] = "Geef toestemming voor applicatiekoppeling"; -App::$strings["Return to your app and insert this Security Code:"] = "Ga terug naar je app en voeg deze beveiligingscode in:"; -App::$strings["Please login to continue."] = "Inloggen om verder te kunnen gaan."; -App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?"; -App::$strings["Total invitation limit exceeded."] = "Limiet voor aantal uitnodigingen overschreden."; -App::$strings["%s : Not a valid email address."] = "%s : Geen geldig e-mailadres."; -App::$strings["Please join us on \$Projectname"] = "Uitnodiging voor \$Projectname"; -App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder."; -App::$strings["%s : Message delivery failed."] = "%s: Aflevering bericht mislukt."; -App::$strings["%d message sent."] = array( - 0 => "%d bericht verzonden.", - 1 => "%d berichten verzonden.", -); -App::$strings["You have no more invitations available"] = "Je hebt geen uitnodigingen meer beschikbaar"; -App::$strings["Send invitations"] = "Uitnodigingen verzenden"; -App::$strings["Enter email addresses, one per line:"] = "Voer e-mailadressen in, één per regel:"; -App::$strings["Please join my community on \$Projectname."] = "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op \$Projectname te vergezellen. Lees meer over \$Projectname op http://hubzilla.org"; -App::$strings["You will need to supply this invitation code:"] = "Je moet deze uitnodigingscode opgeven:"; -App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registreer je op een willekeurige \$Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):"; -App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn \$Projectname-kanaaladres in het zoekveld invullen:"; -App::$strings["or visit"] = "of bezoek"; -App::$strings["3. Click [Connect]"] = "3. Klik op [+ Verbinden]"; -App::$strings["About this site"] = "Over deze hub"; -App::$strings["Site Name"] = "Hubnaam"; -App::$strings["Administrator"] = "Beheerder"; -App::$strings["Software and Project information"] = "Software- en projectinformatie"; -App::$strings["This site is powered by \$Projectname"] = "Dit is een \$Projectname-hub"; -App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "Federatieve en gedecentraliseerde netwerk- en identiteitsdiensten, mogelijk gemaakt door Zot"; -App::$strings["Version %s"] = "Versie %s"; -App::$strings["Project homepage"] = "Projectwebsite"; -App::$strings["Developer homepage"] = "Ontwikkelaarswebsite"; -App::$strings["Create Channel"] = "Kanaal aanmaken"; -App::$strings["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."] = "Een kanaal is jouw identiteit in dit netwerk. Het kan bijvoorbeeld een persoon, een blog of een forum vertegenwoordigen. Door met elkaar te verbinden kunnen kanalen, met behulp van uitgebreide permissies, informatie uitwisselen."; -App::$strings["or import an existing channel from another location."] = "Of importeer een bestaand kanaal vanaf een andere locatie"; -App::$strings["Import Webpage Elements"] = "Webpagina-elementen importeren"; -App::$strings["Import selected"] = "Importbestand geselecteerd"; -App::$strings["Export Webpage Elements"] = "Webpagina-elementen exporteren"; -App::$strings["Export selected"] = "Selectie exporteren"; -App::$strings["Webpages"] = "Webpagina's"; -App::$strings["Actions"] = "Acties"; -App::$strings["Page Link"] = "Paginalink"; -App::$strings["Page Title"] = "Paginatitel"; -App::$strings["Invalid file type."] = "Ongeldig bestandsformaat"; -App::$strings["Error opening zip file"] = "Fout tijdens openen zipbestand"; -App::$strings["Invalid folder path."] = "Ongeldige maplocatie"; -App::$strings["No webpage elements detected."] = "Geen webpagina-elementen gedecteerd"; -App::$strings["Import complete."] = "Importeren voltooid."; -App::$strings["Mark all system notifications seen"] = "Markeer alle systeemnotificaties als bekeken"; -App::$strings["Poke"] = "Aanstoten"; -App::$strings["Poke somebody"] = "Iemand aanstoten"; -App::$strings["Poke/Prod"] = "Aanstoten/porren"; -App::$strings["Poke, prod or do other things to somebody"] = "Iemand bijvoorbeeld aanstoten of poren"; -App::$strings["Recipient"] = "Ontvanger"; -App::$strings["Choose what you wish to do to recipient"] = "Kies wat je met de ontvanger wil doen"; -App::$strings["Make this post private"] = "Maak dit bericht privé"; -App::$strings["Invalid profile identifier."] = "Ongeldige profiel-identificator"; -App::$strings["Profile Visibility Editor"] = "Zichtbaarheid profiel "; -App::$strings["Profile"] = "Profiel"; -App::$strings["Click on a contact to add or remove."] = "Klik op een connectie om deze toe te voegen of te verwijderen"; -App::$strings["Visible To"] = "Zichtbaar voor"; -App::$strings["Posts and comments"] = "Berichten en reacties"; -App::$strings["Only posts"] = "Alleen berichten"; -App::$strings["Unable to locate original post."] = "Niet in staat om de originele locatie van het bericht te vinden. "; -App::$strings["Empty post discarded."] = "Leeg bericht geannuleerd"; -App::$strings["Executable content type not permitted to this channel."] = "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."; -App::$strings["Duplicate post suppressed."] = "Dubbel bericht tegengehouden."; -App::$strings["System error. Post not saved."] = "Systeemfout. Bericht niet opgeslagen."; -App::$strings["Unable to obtain post information from database."] = "Niet in staat om informatie over dit bericht uit de database te verkrijgen."; -App::$strings["You have reached your limit of %1$.0f top level posts."] = "Je hebt jouw limiet van %1$.0f berichten bereikt."; -App::$strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw limiet van %1$.0f webpagina's bereikt."; -App::$strings["This setting requires special processing and editing has been blocked."] = "Deze instelling vereist een speciaal proces en bewerken is geblokkeerd."; -App::$strings["Configuration Editor"] = "Configuratiebewerker"; -App::$strings["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."] = "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. "; -App::$strings["Items tagged with: %s"] = "Items getagd met %s"; -App::$strings["Search results for: %s"] = "Zoekresultaten voor %s"; -App::$strings["Remote privacy information not available."] = "Privacy-informatie op afstand niet beschikbaar."; -App::$strings["Visible to:"] = "Zichtbaar voor:"; -App::$strings["__ctx:acl__ Profile"] = "Profiel"; -App::$strings["Blocks"] = "Blokken"; -App::$strings["Block Title"] = "Bloktitel"; -App::$strings["Layouts"] = "Lay-outs"; -App::$strings["Help"] = "Hulp"; -App::$strings["Comanche page description language help"] = "Hulp met de paginabeschrijvingstaal Comanche"; -App::$strings["Layout Description"] = "Lay-out-omschrijving"; -App::$strings["Download PDL file"] = "Download PDL-bestand"; -App::$strings["Website:"] = "Website:"; -App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Kanaal op afstand [%s] (nog niet op deze hub bekend)"; -App::$strings["Rating (this information is public)"] = "Beoordeling (deze informatie is openbaar)"; -App::$strings["Optionally explain your rating (this information is public)"] = "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"; -App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven."; -App::$strings["Use Photo for Profile"] = "Als profielfoto gebruiken"; -App::$strings["Upload Profile Photo"] = "Profielfoto uploaden"; -App::$strings["Use"] = "Gebruiken"; -App::$strings["Like/Dislike"] = "Leuk/niet leuk"; -App::$strings["This action is restricted to members."] = "Deze actie kan alleen door \$Projectname-leden worden uitgevoerd."; -App::$strings["Please login with your \$Projectname ID or register as a new \$Projectname member to continue."] = "Je dient in te loggen met je \$Projectname-account of een nieuw \$Projectname-account aan te maken om verder te kunnen gaan."; -App::$strings["Invalid request."] = "Ongeldig verzoek"; -App::$strings["channel"] = "kanaal"; -App::$strings["thing"] = "ding"; -App::$strings["Channel unavailable."] = "Kanaal niet beschikbaar."; -App::$strings["Previous action reversed."] = "Vorige actie omgedraaid"; -App::$strings["photo"] = "foto"; -App::$strings["status"] = "bericht"; -App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk"; -App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s niet leuk"; -App::$strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s is het eens met %2\$s's %3\$s"; -App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s is het niet eens met %2\$s's %3\$s"; -App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s onthoudt zich van een besluit over %2\$s's %3\$s"; -App::$strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s is aanwezig op %2\$s's %3\$s"; -App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s is niet aanwezig op %2\$s's %3\$s"; -App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s is mogelijk aanwezig op %2\$s's %3\$s"; -App::$strings["Action completed."] = "Actie voltooid"; -App::$strings["Thank you."] = "Bedankt"; -App::$strings["No channel."] = "Geen kanaal."; -App::$strings["Common connections"] = "Veel voorkomende connecties"; -App::$strings["No connections in common."] = "Geen gemeenschappelijke connecties."; -App::$strings["toggle full screen mode"] = "Volledig scherm"; -App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s volgt het %3\$s van %2\$s"; -App::$strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s volgt het %3\$s van %2\$s niet meer"; -App::$strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken."; -App::$strings["Insufficient permissions. Request redirected to profile page."] = "Onvoldoende permissies. Doorgestuurd naar profielpagina."; -App::$strings["No valid account found."] = "Geen geldige account gevonden."; -App::$strings["Password reset request issued. Check your email."] = "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail."; -App::$strings["Site Member (%s)"] = "Lid van hub (%s)"; -App::$strings["Password reset requested at %s"] = "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend"; -App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."; -App::$strings["Password Reset"] = "Wachtwoord vergeten?"; -App::$strings["Your password has been reset as requested."] = "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht."; -App::$strings["Your new password is"] = "Jouw nieuwe wachtwoord is"; -App::$strings["Save or copy your new password - and then"] = "Kopieer of sla je nieuwe wachtwoord op - en"; -App::$strings["click here to login"] = "klik dan hier om in te loggen"; -App::$strings["Your password may be changed from the Settings page after successful login."] = "Jouw wachtwoord kan worden veranderd onder instellingen, nadat je succesvol bent ingelogd."; -App::$strings["Your password has changed at %s"] = "Jouw wachtwoord op %s is veranderd"; -App::$strings["Forgot your Password?"] = "Wachtwoord vergeten?"; -App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies."; -App::$strings["Email Address"] = "E-mailadres"; -App::$strings["Reset"] = "Opnieuw instellen"; -App::$strings["Select a bookmark folder"] = "Kies een bladwijzermap"; -App::$strings["Save Bookmark"] = "Bladwijzer opslaan"; -App::$strings["URL of bookmark"] = "URL van bladwijzer"; -App::$strings["Or enter new bookmark folder name"] = "Of geef de naam op van een nieuwe bladwijzermap"; -App::$strings["Channel added."] = "Kanaal toegevoegd."; -App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s is %2\$s"; -App::$strings["Mood"] = "Stemming"; -App::$strings["Set your current mood and tell your friends"] = "Noteer je huidige stemming en toon het aan je connecties"; -App::$strings["Please login."] = "Inloggen."; -App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Het verwijderen van een account is niet toegestaan binnen 48 uur nadat het wachtwoord is veranderd."; -App::$strings["Remove This Account"] = "Verwijder dit account"; -App::$strings["WARNING: "] = "WAARSCHUWING: "; -App::$strings["This account and all its channels will be completely removed from the network. "] = "Dit account en al zijn kanalen worden volledig uit het \$Projectname-netwerk verwijderd."; -App::$strings["This action is permanent and can not be undone!"] = "Deze handeling is van permanente aard en kan niet meer worden teruggedraaid!"; -App::$strings["Please enter your password for verification:"] = "Vul je wachtwoord in ter verificatie:"; -App::$strings["Remove this account, all its channels and all its channel clones from the network"] = "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het \$Projectname-netwerk verwijderen"; -App::$strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het \$Projectname-netwerk verwijderd"; -App::$strings["Remove Account"] = "Account verwijderen"; -App::$strings["Layout updated."] = "Lay-out bijgewerkt."; -App::$strings["Feature disabled."] = "Functie uitgeschakeld."; -App::$strings["Edit System Page Description"] = "Systeempagina's bewerken"; -App::$strings["Layout not found."] = "Lay-out niet gevonden."; -App::$strings["Module Name:"] = "Modulenaam:"; -App::$strings["Layout Help"] = "Lay-out-hulp"; -App::$strings["%d rating"] = array( - 0 => "%d beoordeling", - 1 => "%d beoordelingen", -); -App::$strings["Gender: "] = "Geslacht:"; -App::$strings["Status: "] = "Status: "; -App::$strings["Homepage: "] = "Homepage: "; -App::$strings["Age:"] = "Leeftijd:"; -App::$strings["Location:"] = "Plaats:"; -App::$strings["Description:"] = "Omschrijving:"; -App::$strings["Hometown:"] = "Oorspronkelijk uit:"; -App::$strings["About:"] = "Over:"; -App::$strings["Connect"] = "Verbinden"; -App::$strings["Public Forum:"] = "Openbaar forum:"; -App::$strings["Keywords: "] = "Trefwoorden: "; -App::$strings["Don't suggest"] = "Niet voorstellen"; -App::$strings["Common connections:"] = "Gemeenschappelijke connecties:"; -App::$strings["Global Directory"] = "Volledige kanalengids"; -App::$strings["Local Directory"] = "Lokale kanalengids"; -App::$strings["Finding:"] = "Gezocht naar:"; -App::$strings["Channel Suggestions"] = "Voorgestelde kanalen"; -App::$strings["next page"] = "volgende pagina"; -App::$strings["previous page"] = "vorige pagina"; -App::$strings["Sort options"] = "Sorteeropties"; -App::$strings["Alphabetic"] = "Alfabetisch"; -App::$strings["Reverse Alphabetic"] = "Omgekeerd alfabetisch"; -App::$strings["Newest to Oldest"] = "Nieuw naar oud"; -App::$strings["Oldest to Newest"] = "Oud naar nieuw"; -App::$strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn)."; -App::$strings["vcard"] = "vcard"; -App::$strings["Unable to find your hub."] = "Niet in staat om je hub te vinden"; -App::$strings["Post successful."] = "Verzenden bericht geslaagd."; -App::$strings["Source of Item"] = "Bron van item"; -App::$strings["No service class restrictions found."] = "Geen abonnementsbeperkingen gevonden."; -App::$strings["network"] = "netwerk"; -App::$strings["RSS"] = "RSS"; -App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd."; -App::$strings["Remove This Channel"] = "Verwijder dit kanaal"; -App::$strings["This channel will be completely removed from the network. "] = "Dit kanaal wordt volledig uit het \$Projectname-netwerk verwijderd."; -App::$strings["Remove this channel and all its clones from the network"] = "Dit kanaal en alle klonen hiervan uit het \$Projectname-netwerk verwijderen"; -App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het \$Projectname-netwerk verwijderd"; -App::$strings["Remove Channel"] = "Kanaal verwijderen"; -App::$strings["Files: shared with me"] = "Bestanden: met mij gedeeld"; -App::$strings["NEW"] = "NIEUW"; -App::$strings["Remove all files"] = "Verwijder alle bestanden"; -App::$strings["Remove this file"] = "Verwijder dit bestand"; -App::$strings["post"] = "bericht"; -App::$strings["comment"] = "reactie"; -App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s van %2\$s getagd met %4\$s"; -App::$strings["Failed to create source. No channel selected."] = "Aanmaken bron mislukt. Geen kanaal geselecteerd."; -App::$strings["Source created."] = "Bron aangemaakt."; -App::$strings["Source updated."] = "Bron aangemaakt."; -App::$strings["*"] = "*"; -App::$strings["Channel Sources"] = "Kanaalbronnen"; -App::$strings["Manage remote sources of content for your channel."] = "Beheer externe bronnen met inhoud voor jouw kanaal"; -App::$strings["New Source"] = "Nieuwe bron"; -App::$strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importeer complete of gedeelde inhoud vanuit het volgende kanaal naar dit kanaal, en verdeel het vervolgens volgens jouw kanaalinstellingen."; -App::$strings["Only import content with these words (one per line)"] = "Importeer alleen inhoud met deze woorden (één per regel)"; -App::$strings["Leave blank to import all public content"] = "Laat leeg om alle openbare inhoud te importeren"; -App::$strings["Channel Name"] = "Kanaalnaam"; -App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "De volgende categorieën aan berichten toevoegen die uit deze bron zijn geïmporteerd (door komma's gescheiden)"; -App::$strings["Optional"] = "Niet verplicht"; -App::$strings["Source not found."] = "Bron niet gevonden"; -App::$strings["Edit Source"] = "Bron bewerken"; -App::$strings["Delete Source"] = "Bron verwijderen"; -App::$strings["Source removed"] = "Bron verwijderd"; -App::$strings["Unable to remove source."] = "Verwijderen bron mislukt."; -App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer."; -App::$strings["Ignore/Hide"] = "Negeren/Verbergen"; -App::$strings["Profile not found."] = "Profiel niet gevonden."; -App::$strings["Profile deleted."] = "Profiel verwijderd."; -App::$strings["Profile-"] = "Profiel-"; -App::$strings["New profile created."] = "Nieuw profiel aangemaakt."; -App::$strings["Profile unavailable to clone."] = "Profiel niet beschikbaar om te klonen"; -App::$strings["Profile unavailable to export."] = "Geen profiel beschikbaar om te exporteren"; -App::$strings["Profile Name is required."] = "Profielnaam is vereist"; -App::$strings["Marital Status"] = "Huwelijke status"; -App::$strings["Romantic Partner"] = "Romantische partner"; -App::$strings["Likes"] = "Houdt van"; -App::$strings["Dislikes"] = "Houdt niet van"; -App::$strings["Work/Employment"] = "Werk/arbeid"; -App::$strings["Religion"] = "Religie"; -App::$strings["Political Views"] = "Politieke overtuigingen"; -App::$strings["Gender"] = "Geslacht"; -App::$strings["Sexual Preference"] = "Seksuele voorkeur"; -App::$strings["Homepage"] = "Homepage"; -App::$strings["Interests"] = "Interesses"; -App::$strings["Profile updated."] = "Profiel bijgewerkt"; -App::$strings["Hide your connections list from viewers of this profile"] = "Laat de lijst met connecties niet aan bezoekers van dit profiel zien."; -App::$strings["Edit Profile Details"] = "Profiel bewerken"; -App::$strings["View this profile"] = "Profiel weergeven"; -App::$strings["Edit visibility"] = "Zichtbaarheid bewerken"; -App::$strings["Profile Tools"] = "Hulpmiddelen"; -App::$strings["Change cover photo"] = "Omslagfoto wijzigen"; -App::$strings["Change profile photo"] = "Profielfoto veranderen"; -App::$strings["Create a new profile using these settings"] = "Een nieuw profiel aanmaken met dit profiel als basis"; -App::$strings["Clone this profile"] = "Dit profiel klonen"; -App::$strings["Delete this profile"] = "Dit profiel verwijderen"; -App::$strings["Add profile things"] = "Dingen aan je profiel toevoegen"; -App::$strings["Personal"] = "Persoonlijk"; -App::$strings["Relation"] = "Relatie"; -App::$strings["Miscellaneous"] = "Diversen"; -App::$strings["Import profile from file"] = "Profiel vanuit bestand importeren"; -App::$strings["Export profile to file"] = "Profiel naar bestand exporteren"; -App::$strings["Your gender"] = "Jouw geslacht"; -App::$strings["Marital status"] = "Burgerlijke staat"; -App::$strings["Sexual preference"] = "Seksuele voorkeur"; -App::$strings["Profile name"] = "Profielnaam"; -App::$strings["This is your default profile."] = "Dit is jouw standaardprofiel"; -App::$strings["Your full name"] = "Jouw volledige naam"; -App::$strings["Title/Description"] = "Titel/omschrijving"; -App::$strings["Street address"] = "Straat en huisnummer"; -App::$strings["Locality/City"] = "Woonplaats"; -App::$strings["Region/State"] = "Provincie/gewest/deelstaat"; -App::$strings["Postal/Zip code"] = "Postcode"; -App::$strings["Who (if applicable)"] = "Wie (wanneer van toepassing)"; -App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Voorbeelden: petra123, Petra Jansen, petra@voorbeeld.nl"; -App::$strings["Since (date)"] = "Sinds (datum)"; -App::$strings["Tell us about yourself"] = "Vertel ons iets over jezelf"; -App::$strings["Homepage URL"] = "URL homepagina"; -App::$strings["Hometown"] = "Oorspronkelijk uit"; -App::$strings["Political views"] = "Politieke overtuigingen"; -App::$strings["Religious views"] = "Religieuze overtuigingen"; -App::$strings["Keywords used in directory listings"] = "Trefwoorden voor in de kanalengids"; -App::$strings["Example: fishing photography software"] = "Voorbeeld: muziek, fotografie, software"; -App::$strings["Musical interests"] = "Muzikale interesses"; -App::$strings["Books, literature"] = "Boeken/literatuur"; -App::$strings["Television"] = "Televisie"; -App::$strings["Film/Dance/Culture/Entertainment"] = "Film/dans/cultuur/entertainment"; -App::$strings["Hobbies/Interests"] = "Hobby's/interesses"; -App::$strings["Love/Romance"] = "Liefde/romantiek"; -App::$strings["School/Education"] = "School/opleiding"; -App::$strings["Contact information and social networks"] = "Contactinformatie en sociale netwerken"; -App::$strings["My other channels"] = "Mijn andere kanalen"; -App::$strings["Communications"] = "Communicatie"; -App::$strings["Profile Image"] = "Profielfoto"; -App::$strings["Edit Profiles"] = "Bewerk profielen"; -App::$strings["Additional Features"] = "Extra functies"; -App::$strings["Name is required"] = "Naam is vereist"; -App::$strings["Key and Secret are required"] = "Key en secret zijn vereist"; -App::$strings["Add application"] = "Applicatie toevoegen"; -App::$strings["Name of application"] = "Naam van applicatie"; -App::$strings["Consumer Key"] = "Consumer key"; -App::$strings["Automatically generated - change if desired. Max length 20"] = "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20"; -App::$strings["Consumer Secret"] = "Consumer secret"; -App::$strings["Redirect"] = "Redirect/doorverwijzing"; -App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist"; -App::$strings["Icon url"] = "Pictogram-URL"; -App::$strings["Application not found."] = "Applicatie niet gevonden."; -App::$strings["Connected Apps"] = "Verbonden applicaties"; -App::$strings["Client key starts with"] = "Client key begint met"; -App::$strings["No name"] = "Geen naam"; -App::$strings["Remove authorization"] = "Autorisatie verwijderen"; -App::$strings["Not valid email."] = "Geen geldig e-mailadres."; -App::$strings["Protected email address. Cannot change to that email."] = "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken."; -App::$strings["System failure storing new email. Please try again."] = "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer."; -App::$strings["Technical skill level updated"] = "Technisch niveau bijgewerkt"; -App::$strings["Password verification failed."] = "Wachtwoordverificatie mislukt"; -App::$strings["Passwords do not match. Password unchanged."] = "Wachtwoorden komen niet overeen. Wachtwoord onveranderd."; -App::$strings["Empty passwords are not allowed. Password unchanged."] = "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd."; -App::$strings["Password changed."] = "Wachtwoord veranderd."; -App::$strings["Password update failed. Please try again."] = "Bijwerken wachtwoord mislukt. Probeer opnieuw."; -App::$strings["Account Settings"] = "Account-instellingen"; -App::$strings["Current Password"] = "Huidig wachtwoord"; -App::$strings["Enter New Password"] = "Nieuw wachtwoord invoeren"; -App::$strings["Confirm New Password"] = "Nieuw wachtwoord bevestigen"; -App::$strings["Leave password fields blank unless changing"] = "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen"; -App::$strings["Your technical skill level"] = "Jouw technisch niveau"; -App::$strings["Used to provide a member experience matched to your comfort level"] = "Wordt gebruikt om je een gebruikerservaring te bieden die met jouw technisch niveau overeenkomt"; -App::$strings["Email Address:"] = "E-mailadres:"; -App::$strings["Remove this account including all its channels"] = "Dit account en al zijn kanalen verwijderen"; -App::$strings["Settings updated."] = "Instellingen bijgewerkt."; -App::$strings["Nobody except yourself"] = "Niemand, behalve jezelf"; -App::$strings["Only those you specifically allow"] = "Alleen connecties met uitdrukkelijke toestemming"; -App::$strings["Approved connections"] = "Geaccepteerde connecties"; -App::$strings["Any connections"] = "Alle connecties"; -App::$strings["Anybody on this website"] = "Iedereen op deze hub"; -App::$strings["Anybody in this network"] = "Iedereen in dit netwerk"; -App::$strings["Anybody authenticated"] = "Geauthenticeerd"; -App::$strings["Anybody on the internet"] = "Iedereen op het internet"; -App::$strings["Publish your default profile in the network directory"] = "Publiceer je standaardprofiel in de kanalengids"; -App::$strings["Allow us to suggest you as a potential friend to new members?"] = "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen"; -App::$strings["Your channel address is"] = "Jouw kanaaladres is"; -App::$strings["Your files/photos are accessible via WebDAV at"] = "Jouw bestanden/foto's zijn beschikbaar via WebDAV op"; -App::$strings["Channel Settings"] = "Kanaal-instellingen"; -App::$strings["Basic Settings"] = "Basis-instellingen"; -App::$strings["Full Name:"] = "Volledige naam:"; -App::$strings["Your Timezone:"] = "Jouw tijdzone:"; -App::$strings["Default Post Location:"] = "Standaardlocatie bericht:"; -App::$strings["Geographical location to display on your posts"] = "Geografische locatie die bij het bericht moet worden vermeld"; -App::$strings["Use Browser Location:"] = "Locatie van webbrowser gebruiken:"; -App::$strings["Adult Content"] = "Inhoud voor volwassenen"; -App::$strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassenen. (Gebruik de tag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)"; -App::$strings["Security and Privacy Settings"] = "Veiligheids- en privacy-instellingen"; -App::$strings["Your permissions are already configured. Click to view/adjust"] = "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen."; -App::$strings["Hide my online presence"] = "Verberg mijn aanwezigheid"; -App::$strings["Prevents displaying in your profile that you are online"] = "Voorkomt dat op je kanaalpagina te zien valt dat je momenteel op \$Projectname aanwezig bent"; -App::$strings["Simple Privacy Settings:"] = "Eenvoudige privacy-instellingen:"; -App::$strings["Very Public - extremely permissive (should be used with caution)"] = "Zeer openbaar (kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)"; -App::$strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Normaal (standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)"; -App::$strings["Private - default private, never open or public"] = "Privé (standaard privé en nooit openbaar)"; -App::$strings["Blocked - default blocked to/from everybody"] = "Geblokkeerd (standaard geblokkeerd naar/van iedereen)"; -App::$strings["Allow others to tag your posts"] = "Anderen toestaan om je berichten te taggen"; -App::$strings["Often used by the community to retro-actively flag inappropriate content"] = "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren"; -App::$strings["Channel Permission Limits"] = "Geavanceerde permissies"; -App::$strings["Expire other channel content after this many days"] = "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:"; -App::$strings["0 or blank to use the website limit."] = "0 of leeg om het standaard aantal dagen van deze hub te gebruiken."; -App::$strings["This website expires after %d days."] = "Deze hub laat de inhoud van andere kanalen na %d dagen verlopen."; -App::$strings["This website does not expire imported content."] = "Deze hub laat de inhoud van andere kanalen niet verlopen."; -App::$strings["The website limit takes precedence if lower than your limit."] = "Wanneer de standaard aantal dagen van deze hub lager ligt dan jouw aantal, dan heeft de limiet van deze hub voorrang."; -App::$strings["Maximum Friend Requests/Day:"] = "Maximum aantal connectieverzoeken per dag:"; -App::$strings["May reduce spam activity"] = "Kan eventuele spam verminderen"; -App::$strings["Default Access Control List (ACL)"] = "Standaard permissies voor nieuwe berichten"; -App::$strings["Use my default audience setting for the type of object published"] = "Gebruik mijn standaard privacy-instelling voor dit type publicatie"; -App::$strings["Channel permissions category:"] = "Kanaaltype en -permissies:"; -App::$strings["Default Permissions Group"] = "Standaard permissiegroep"; -App::$strings["Maximum private messages per day from unknown people:"] = "Maximum aantal privé-berichten per dag van onbekende personen:"; -App::$strings["Useful to reduce spamming"] = "Kan eventuele spam verminderen"; -App::$strings["Notification Settings"] = "Notificatie-instellingen"; -App::$strings["By default post a status message when:"] = "Plaats automatisch een bericht wanneer:"; -App::$strings["accepting a friend request"] = "Een connectieverzoek wordt geaccepteerd"; -App::$strings["joining a forum/community"] = "Je lid wordt van een forum/groep"; -App::$strings["making an interesting profile change"] = "Er sprake is van een interessante profielwijziging"; -App::$strings["Send a notification email when:"] = "Verzend een notificatie per e-mail wanneer:"; -App::$strings["You receive a connection request"] = "Je een connectieverzoek ontvangt"; -App::$strings["Your connections are confirmed"] = "Jouw connecties zijn bevestigd"; -App::$strings["Someone writes on your profile wall"] = "Iemand iets op jouw kanaal heeft geschreven"; -App::$strings["Someone writes a followup comment"] = "Iemand een reactie schrijft"; -App::$strings["You receive a private message"] = "Je een privé-bericht ontvangt"; -App::$strings["You receive a friend suggestion"] = "Je een kanaalvoorstel ontvangt"; -App::$strings["You are tagged in a post"] = "Je expliciet in een bericht bent genoemd"; -App::$strings["You are poked/prodded/etc. in a post"] = "Je bent in een bericht aangestoten/gepord/etc."; -App::$strings["Someone likes your post/comment"] = "Iemand jouw bericht/reactie leuk vindt"; -App::$strings["Show visual notifications including:"] = "Toon de volgende zichtbare notificaties:"; -App::$strings["Unseen grid activity"] = "Niet bekeken grid-activiteit"; -App::$strings["Unseen channel activity"] = "Niet bekeken kanaal-activiteit"; -App::$strings["Unseen private messages"] = "Niet bekeken privéberichten"; -App::$strings["Recommended"] = "Aanbevolen"; -App::$strings["Upcoming events"] = "Aankomende gebeurtenissen"; -App::$strings["Events today"] = "Gebeurtenissen van vandaag"; -App::$strings["Upcoming birthdays"] = "Aankomende verjaardagen"; -App::$strings["Not available in all themes"] = "Niet in alle thema's beschikbaar"; -App::$strings["System (personal) notifications"] = "(Persoonlijke) systeemnotificaties"; -App::$strings["System info messages"] = "Systeemmededelingen"; -App::$strings["System critical alerts"] = "Kritische systeemwaarschuwingen"; -App::$strings["New connections"] = "Nieuwe connecties"; -App::$strings["System Registrations"] = "Nieuwe accountregistraties op deze hub"; -App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Toon tevens nieuwe kanaalberichten, privéberichten en connecties onder Notificaties"; -App::$strings["Notify me of events this many days in advance"] = "Herinner mij zoveel dagen van te voren aan gebeurtenissen"; -App::$strings["Must be greater than 0"] = "Moet hoger dan 0 zijn"; -App::$strings["Advanced Account/Page Type Settings"] = "Instellingen geavanceerd account/paginatype"; -App::$strings["Change the behaviour of this account for special situations"] = "Verander het gedrag van dit account voor speciale situaties"; -App::$strings["Miscellaneous Settings"] = "Diverse instellingen"; -App::$strings["Default photo upload folder"] = "Standaard fotoalbum voor uploads"; -App::$strings["%Y - current year, %m - current month"] = "%Y - dit jaar, %m - deze maand"; -App::$strings["Default file upload folder"] = "Standaard bestandsmap voor uploads"; -App::$strings["Personal menu to display in your channel pages"] = "Persoonlijk menu om op je kanaalpagina's weer te geven"; -App::$strings["Remove this channel."] = "Verwijder dit kanaal."; -App::$strings["Firefox Share \$Projectname provider"] = "\$Projectname-service voor Firefox Share"; -App::$strings["Start calendar week on monday"] = "Begin in de agenda de week op maandag"; -App::$strings["Affinity Slider settings updated."] = "Affiniteitsinstellingen bijgewerkt."; -App::$strings["No feature settings configured"] = "Geen plugin-instellingen aanwezig"; -App::$strings["Default maximum affinity level"] = "Standaard hoogste affiniteitsniveau"; -App::$strings["Default minimum affinity level"] = "Standaard laagste affiniteitsniveau"; -App::$strings["Affinity Slider Settings"] = "Affiniteitsinstellingen"; -App::$strings["Feature/Addon Settings"] = "Plugin-instellingen"; -App::$strings["Permission category saved."] = "Permissiegroep opgeslagen."; -App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Gebruik dit formulier om permissieregels voor diverse soorten mensen en connecties aan te maken."; -App::$strings["Permission Categories"] = "Permissiegroepen"; -App::$strings["Permission Name"] = "Permissienaam"; -App::$strings["This channel is limited to %d tokens"] = "Dit kanaal heeft een limiet van %d tokens"; -App::$strings["Name and Password are required."] = "Naam en wachtwoord zijn vereist"; -App::$strings["Token saved."] = "Token opgeslagen."; -App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content."] = "Gebruik dit formulier om tijdelijke identiteiten aan te maken, waarmee je bepaalde informatie met niet-leden kan delen. Deze identiteiten kunnen onder Permissies (handmatige selectie) worden gebruikt. Gasten kunnen inloggen met onderstaande gegevens om zo toegang te krijgen tot privéinhoud."; -App::$strings["You may also provide dropbox style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "Je kan ook dropbox-achtige links aan mensen geven door bovenstaand wachtwoord op onderstaande manier aan een hub-URL toe te voegen. Voorbeelden:"; -App::$strings["Guest Access Tokens"] = "Gasttoegang"; -App::$strings["Login Name"] = "Inlognaam"; -App::$strings["Login Password"] = "Wachtwoord:"; -App::$strings["Expires (yyyy-mm-dd)"] = "Geldig t/m (yyyy-mm-dd)"; -App::$strings["No special theme for mobile devices"] = "Geen speciaal thema voor mobiele apparaten"; -App::$strings["%s - (Experimental)"] = "%s - (experimenteel)"; -App::$strings["Display Settings"] = "Weergave-instellingen"; -App::$strings["Theme Settings"] = "Thema-instellingen"; -App::$strings["Custom Theme Settings"] = "Handmatige thema-instellingen"; -App::$strings["Content Settings"] = "Inhoudsinstellingen"; -App::$strings["Display Theme:"] = "Gebruik thema:"; -App::$strings["Select scheme"] = "Kies schema van thema"; -App::$strings["Mobile Theme:"] = "Mobiel thema:"; -App::$strings["Preload images before rendering the page"] = "Afbeeldingen laden voordat de pagina wordt weergegeven"; -App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "De laadtijd van een pagina lijkt langer, maar de pagina is wel meteen helemaal geladen wanneer deze wordt weergeven"; -App::$strings["Enable user zoom on mobile devices"] = "Inzoomen op smartphones en tablets toestaan"; -App::$strings["Update browser every xx seconds"] = "Ververs de webbrowser om de zoveel seconde"; -App::$strings["Minimum of 10 seconds, no maximum"] = "Minimaal 10 seconde, geen maximum"; -App::$strings["Maximum number of conversations to load at any time:"] = "Maximaal aantal conversaties die per keer geladen worden:"; -App::$strings["Maximum of 100 items"] = "Maximaal 100 conversaties"; -App::$strings["Show emoticons (smilies) as images"] = "Toon emoticons (smilies) als afbeeldingen"; -App::$strings["Manual conversation updates"] = "Handmatige conversatie-updates"; -App::$strings["Default is on, turning this off may increase screen jumping"] = "Dit is standaard ingeschakeld en door dit uit te schakelen kunnen items soms verspringen."; -App::$strings["Link post titles to source"] = "Berichtkoppen naar originele locatie linken"; -App::$strings["System Page Layout Editor - (advanced)"] = "Lay-out bewerken van systeempagina's (geavanceerd)"; -App::$strings["Use blog/list mode on channel page"] = "Gebruik blog/lijst-modus op kanaalpagina"; -App::$strings["(comments displayed separately)"] = "(reacties worden afzonderlijk weergeven)"; -App::$strings["Use blog/list mode on grid page"] = "Gebruik blog/lijst-modus op gridpagina"; -App::$strings["Channel page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)"; -App::$strings["click to expand content exceeding this height"] = "klik om inhoud uit te klappen die deze hoogte overschrijdt"; -App::$strings["Grid page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op gridpagina (in pixels)"; -App::$strings["Tag removed"] = "Tag verwijderd"; -App::$strings["Remove Item Tag"] = "Verwijder item-tag"; -App::$strings["Select a tag to remove: "] = "Kies een tag om te verwijderen"; -App::$strings["Thing updated"] = "Ding bijgewerkt"; -App::$strings["Object store: failed"] = "Opslaan van ding mislukt"; -App::$strings["Thing added"] = "Ding toegevoegd"; -App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s"; -App::$strings["Show Thing"] = "Ding weergeven"; -App::$strings["item not found."] = "Item niet gevonden"; -App::$strings["Edit Thing"] = "Ding bewerken"; -App::$strings["Select a profile"] = "Kies een profiel"; -App::$strings["Post an activity"] = "Plaats een bericht"; -App::$strings["Only sends to viewers of the applicable profile"] = "Toont dit alleen aan diegene die het gekozen profiel mogen zien."; -App::$strings["Name of thing e.g. something"] = "Naam van ding"; -App::$strings["URL of thing (optional)"] = "URL van ding (niet verplicht)"; -App::$strings["URL for photo of thing (optional)"] = "URL voor foto van ding (niet verplicht)"; -App::$strings["Add Thing to your Profile"] = "Ding aan je profiel toevoegen"; -App::$strings["\$Projectname Server - Setup"] = "\$Projectname Hub - Setup"; -App::$strings["Could not connect to database."] = "Could not connect to database."; -App::$strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Could not connect to specified hub URL. Possible SSL certificate or DNS issue."; -App::$strings["Could not create table."] = "Could not create table."; -App::$strings["Your site database has been installed."] = "Your hub database has been installed."; -App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "You may need to import the file \"install/schema_xxx.sql\" manually using a database client."; -App::$strings["Please see the file \"install/INSTALL.txt\"."] = "Please see the file \"install/INSTALL.txt\"."; -App::$strings["System check"] = "System check"; -App::$strings["Check again"] = "Check again"; -App::$strings["Database connection"] = "Database connection"; -App::$strings["In order to install \$Projectname we need to know how to connect to your database."] = "In order to install \$Projectname we need to know how to connect to your database."; -App::$strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Please contact your hosting provider or server administrator if you have questions about these settings."; -App::$strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "The database you specify below should already exist. If it does not, please create it before continuing."; -App::$strings["Database Server Name"] = "Database Server Name"; -App::$strings["Default is 127.0.0.1"] = "Default is 127.0.0.1"; -App::$strings["Database Port"] = "Database Port"; -App::$strings["Communication port number - use 0 for default"] = "Communication port number - use 0 for default"; -App::$strings["Database Login Name"] = "Database Login Name"; -App::$strings["Database Login Password"] = "Database Login Password"; -App::$strings["Database Name"] = "Database Name"; -App::$strings["Database Type"] = "Database Type"; -App::$strings["Site administrator email address"] = "Hub administrator email address"; -App::$strings["Your account email address must match this in order to use the web admin panel."] = "Your account email address must match this in order to use the web admin panel."; -App::$strings["Website URL"] = "Hub URL"; -App::$strings["Please use SSL (https) URL if available."] = "Please use SSL (https) URL if available."; -App::$strings["Please select a default timezone for your website"] = "Please select a default timezone for your hub"; -App::$strings["Site settings"] = "Hub settings"; -App::$strings["PHP version 5.5 or greater is required."] = "PHP version 5.5 or greater is required."; -App::$strings["PHP version"] = "PHP version"; -App::$strings["Could not find a command line version of PHP in the web server PATH."] = "Could not find a command line version of PHP in the web server PATH."; -App::$strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."; -App::$strings["PHP executable path"] = "PHP executable path"; -App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Enter full path to php executable. You can leave this blank to continue the installation."; -App::$strings["Command line PHP"] = "Command line PHP"; -App::$strings["Unable to check command line PHP, as shell_exec() is disabled. This is required."] = "Unable to check command line PHP, as shell_exec() is disabled. This is required."; -App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "The command line version of PHP on your system does not have \"register_argc_argv\" enabled."; -App::$strings["This is required for message delivery to work."] = "This is required for message delivery to work."; -App::$strings["PHP register_argc_argv"] = "PHP register_argc_argv"; -App::$strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."; -App::$strings["You can adjust these settings in the server php.ini file."] = "You can adjust these settings in the server php.ini file."; -App::$strings["PHP upload limits"] = "PHP upload limits"; -App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"; -App::$strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."; -App::$strings["Generate encryption keys"] = "Generate encryption keys"; -App::$strings["libCurl PHP module"] = "libCurl PHP module"; -App::$strings["GD graphics PHP module"] = "GD graphics PHP module"; -App::$strings["OpenSSL PHP module"] = "OpenSSL PHP module"; -App::$strings["PDO database PHP module"] = "PDO database PHP module"; -App::$strings["mb_string PHP module"] = "mb_string PHP module"; -App::$strings["xml PHP module"] = "xml PHP module"; -App::$strings["Apache mod_rewrite module"] = "Apache mod_rewrite module"; -App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: Apache webserver mod-rewrite module is required but not installed."; -App::$strings["exec"] = "exec"; -App::$strings["Error: exec is required but is either not installed or has been disabled in php.ini"] = "Error: exec is required but is either not installed or has been disabled in php.ini"; -App::$strings["shell_exec"] = "shell_exec"; -App::$strings["Error: shell_exec is required but is either not installed or has been disabled in php.ini"] = "Error: shell_exec is required but is either not installed or has been disabled in php.ini"; -App::$strings["Error: libCURL PHP module required but not installed."] = "Error: libCURL PHP module required but not installed."; -App::$strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: GD graphics PHP module with JPEG support required but not installed."; -App::$strings["Error: openssl PHP module required but not installed."] = "Error: openssl PHP module required but not installed."; -App::$strings["Error: PDO database PHP module required but not installed."] = "Error: PDO database PHP module required but not installed."; -App::$strings["Error: mb_string PHP module required but not installed."] = "Error: mb_string PHP module required but not installed."; -App::$strings["Error: xml PHP module required for DAV but not installed."] = "Error: xml PHP module required for DAV but not installed."; -App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."; -App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."; -App::$strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."; -App::$strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."; -App::$strings[".htconfig.php is writable"] = ".htconfig.php is writable"; -App::$strings["This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."; -App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."; -App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."; -App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."; -App::$strings["%s is writable"] = "%s is writable"; -App::$strings["This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"] = "This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"; -App::$strings["store is writable"] = "store is writable"; -App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "SSL certificate cannot be validated. Fix certificate or disable https access to this hub."; -App::$strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"; -App::$strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "This restriction is incorporated because public posts from you may for example contain references to images on your own hub."; -App::$strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues."; -App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement."; -App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Providers are available that issue free certificates which are browser-valid."; -App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = "If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."; -App::$strings["SSL certificate validation"] = "SSL certificate validation"; -App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "Url rewrite in .htaccess is not working. Check your server configuration.Test: "; -App::$strings["Url rewrite is working"] = "Url rewrite is working"; -App::$strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."; -App::$strings["Errors encountered creating database tables."] = "Errors encountered creating database tables."; -App::$strings["

    What next

    "] = "

    What next

    "; -App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."; -App::$strings["No connections."] = "Geen connecties."; -App::$strings["Visit %s's profile [%s]"] = "Bezoek het profiel van %s [%s]"; -App::$strings["View Connections"] = "Connecties weergeven"; -App::$strings["Profile Unavailable."] = "Profiel niet beschikbaar."; -App::$strings["Not found"] = "Niet gevonden"; -App::$strings["Invalid channel"] = "Onbekend kanaal"; -App::$strings["Wikis"] = "Wiki's"; -App::$strings["Download"] = "Download"; -App::$strings["Wiki name"] = "Naam wiki"; -App::$strings["Content type"] = "Opmaaktype"; -App::$strings["Create a status post for this wiki"] = "Plaats een bericht over deze wiki"; -App::$strings["Wiki not found"] = "Wiki is niet gevonden"; -App::$strings["Rename page"] = "Pagina hernoemen"; -App::$strings["Error retrieving page content"] = "Fout tijdens ophalen inhoud pagina"; -App::$strings["Revision Comparison"] = "Revisies vergelijken"; -App::$strings["Revert"] = "Ongedaan maken"; -App::$strings["Short description of your changes (optional)"] = "Korte omschrijving van jouw wijzigingen (niet verplicht)"; -App::$strings["Source"] = "Bron"; -App::$strings["New page name"] = "Nieuwe paginanaam"; -App::$strings["Embed image from photo albums"] = "Afbeelding uit een fotoalbum invoegen"; -App::$strings["Embed an image from your albums"] = "Afbeelding uit jouw albums invoegen"; -App::$strings["OK"] = "OK"; -App::$strings["Choose images to embed"] = "Kies afbeeldingen om in te voegen"; -App::$strings["Choose an album"] = "Kies een album"; -App::$strings["Choose a different album"] = "Kies een ander album"; -App::$strings["Error getting album list"] = "Fout tijdens ophalen albumlijst"; -App::$strings["Error getting photo link"] = "Fout tijdens ophalen fotolink"; -App::$strings["Error getting album"] = "Fout tijdens ophalen album"; -App::$strings["Error creating wiki. Invalid name."] = "Fout tijdens aanmaken wiki. Ongeldige naam."; -App::$strings["Wiki created, but error creating Home page."] = "Wiki aangemaakt, maar fout tijdens aanmaken homepagina."; -App::$strings["Error creating wiki"] = "Fout tijdens aanmaken wiki."; -App::$strings["Wiki delete permission denied."] = "Toegang geweigerd tijdens verwijderen wiki."; -App::$strings["Error deleting wiki"] = "Fout tijdens verwijderen wiki"; -App::$strings["New page created"] = "Nieuwe pagina aangemaakt"; -App::$strings["Cannot delete Home"] = "Kan Home niet verwijderen"; -App::$strings["Current Revision"] = "Huidige revisie"; -App::$strings["Selected Revision"] = "Geselecteerde revisie"; -App::$strings["You must be authenticated."] = "Je moet geauthenticeerd zijn"; -App::$strings["Room not found"] = "Chatkanaal niet gevonden"; -App::$strings["Leave Room"] = "Chatkanaal verlaten"; -App::$strings["Delete Room"] = "Chatkanaal verwijderen"; -App::$strings["I am away right now"] = "Ik ben momenteel afwezig"; -App::$strings["I am online"] = "Ik ben online"; -App::$strings["Bookmark this room"] = "Chatkanaal aan bladwijzers toevoegen"; -App::$strings["New Chatroom"] = "Nieuw chatkanaal"; -App::$strings["Chatroom name"] = "Naam chatkanaal"; -App::$strings["Expiration of chats (minutes)"] = "Aantal minuten voordat chatberichten worden verwijderd"; -App::$strings["%1\$s's Chatrooms"] = "Chatkanalen van %1\$s"; -App::$strings["No chatrooms available"] = "Geen chatkanalen beschikbaar"; -App::$strings["Expiration"] = "Verloopt na"; -App::$strings["min"] = "min"; -App::$strings["Xchan Lookup"] = "Xchan opzoeken"; -App::$strings["Lookup xchan beginning with (or webbie): "] = "Zoek een xchan (of webbie) die begint met:"; -App::$strings["Missing room name"] = "Naam chatkanaal ontbreekt"; -App::$strings["Duplicate room name"] = "Naam chatkanaal bestaat al"; -App::$strings["Invalid room specifier."] = "Ongeldige omschrijving chatkanaal"; -App::$strings["Room not found."] = "Chatkanaal niet gevonden"; -App::$strings["Room is full"] = "Chatkanaal is vol"; -App::$strings["\$Projectname Notification"] = "\$Projectname-notificatie"; -App::$strings["\$projectname"] = "\$projectname"; -App::$strings["Thank You,"] = "Bedankt,"; -App::$strings["%s Administrator"] = "Beheerder %s"; -App::$strings["%s "] = "%s "; -App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Notificatie] Nieuw privébericht ontvangen op %s"; -App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s."; -App::$strings["%1\$s sent you %2\$s."] = "%1\$s zond jou %2\$s."; -App::$strings["a private message"] = "een privébericht"; -App::$strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privéberichten te bekijken en/of er op te reageren."; -App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %4\$s[/zrl]"; -App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %5\$s van %4\$s[/zrl]"; -App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]jouw %4\$s[/zrl]"; -App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notificatie] %2\$s gaf een reactie in conversatie #%1\$d"; -App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s gaf een reactie in een conversatie die jij volgt."; -App::$strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om de conversatie te bekijken en/of er op te reageren."; -App::$strings["%1\$s, %2\$s liked [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s vindt [zrl=%3\$s]jouw %4\$s[/zrl] leuk"; -App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notificatie] %2\$s vindt iets leuk in conversatie #%1\$d"; -App::$strings["%1\$s, %2\$s liked an item/conversation you created."] = "%1\$s, %2\$s vindt iets leuk in een conversatie die jij bent gestart."; -App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = "[\$Projectname:Notificatie] %s heeft een bericht op jouw kanaal geplaatst"; -App::$strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s heeft om %3\$s een bericht op jouw kanaal geplaatst"; -App::$strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s heeft een bericht op [zrl=%3\$s]jouw kanaal[/zrl] geplaatst"; -App::$strings["[\$Projectname:Notify] %s tagged you"] = "[\$Projectname:Notificatie] %s heeft jou genoemd"; -App::$strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s noemde jou op %3\$s"; -App::$strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]noemde jou[/zrl]."; -App::$strings["[\$Projectname:Notify] %1\$s poked you"] = "[\$Projectname:Notificatie] %1\$s heeft jou aangestoten"; -App::$strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s heeft je aangestoten op %3\$s"; -App::$strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]heeft je aangestoten[/zrl]."; -App::$strings["[\$Projectname:Notify] %s tagged your post"] = "[\$Projectname:Notificatie] %s heeft jouw bericht getagd"; -App::$strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s heeft jouw bericht om %3\$s getagd"; -App::$strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s heeft [zrl=%3\$s]jouw bericht[/zrl] getagd"; -App::$strings["[\$Projectname:Notify] Introduction received"] = "[\$Projectname:Notificatie] Connectieverzoek ontvangen"; -App::$strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, je hebt een nieuw connectieverzoek ontvangen van '%2\$s' op %3\$s"; -App::$strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, je hebt een [zrl=%2\$s]nieuw connectieverzoek[/zrl] ontvangen van %3\$s."; -App::$strings["You may visit their profile at %s"] = "Je kan het profiel bekijken op %s"; -App::$strings["Please visit %s to approve or reject the connection request."] = "Bezoek %s om het connectieverzoek te accepteren of af te wijzen."; -App::$strings["[\$Projectname:Notify] Friend suggestion received"] = "[\$Projectname:Notificatie] Kanaalvoorstel ontvangen"; -App::$strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, je hebt een kanaalvoorstel ontvangen van '%2\$s' om %3\$s"; -App::$strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, je hebt [zrl=%2\$s]een kanaalvoorstel[/zrl] ontvangen voor %3\$s van %4\$s."; -App::$strings["Name:"] = "Naam:"; -App::$strings["Photo:"] = "Foto:"; -App::$strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen."; -App::$strings["[\$Projectname:Notify]"] = "[\$Projectname:Notificatie]"; -App::$strings["created a new post"] = "maakte een nieuw bericht aan"; -App::$strings["commented on %s's post"] = "gaf een reactie op een bericht van %s"; -App::$strings["Visible to your default audience"] = "Voor iedereen zichtbaar, mits niet anders ingesteld"; -App::$strings["Only me"] = "Alleen ik"; -App::$strings["Public"] = "Openbaar"; -App::$strings["Anybody in the \$Projectname network"] = "Iedereen in het \$Projectname-netwerk"; -App::$strings["Any account on %s"] = "Iedereen op %s"; -App::$strings["Any of my connections"] = "Al mijn geaccepteerde connecties"; -App::$strings["Only connections I specifically allow"] = "Alleen connecties die uitdrukkelijk door jou zijn toegestaan"; -App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Geauthenticeerde leden (kan bezoekers van andere netwerken bevatten)"; -App::$strings["Any connections including those who haven't yet been approved"] = "Al mijn geaccepteerde en nog niet geaccepteerde connecties"; -App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Dit is de standaard privacy-instelling voor wie jouw berichten kan bekijken"; -App::$strings["This is your default setting for who can view your default channel profile"] = "Dit is de standaard privacy-instelling voor wie jouw standaardprofiel kan bekijken"; -App::$strings["This is your default setting for who can view your connections"] = "Dit is de standaard privacy-instelling voor wie een lijst met jouw connecties kan bekijken"; -App::$strings["This is your default setting for who can view your file storage and photos"] = "Dit is de standaard privacy-instelling voor wie jouw bestanden en foto's kan bekijken"; -App::$strings["This is your default setting for the audience of your webpages"] = "Dit is de standaard privacy-instelling voor wie jouw webpagina's kan bekijken"; -App::$strings["(No Title)"] = "(Geen titel)"; -App::$strings["Wiki page create failed."] = "Aanmaken wiki-pagina mislukt."; -App::$strings["Wiki not found."] = "Wiki niet gevonden"; -App::$strings["Destination name already exists"] = "Naam van doel bestaat al"; -App::$strings["Page not found"] = "Pagina niet gevonden"; -App::$strings["Error reading page content"] = "Fout tijdens lezen pagina-inhoud"; -App::$strings["Error reading wiki"] = "Fout tijdens lezen wiki"; -App::$strings["Page update failed."] = "Bijwerken van pagina mislukt."; -App::$strings["Nothing deleted"] = "Niets verwijderd"; -App::$strings["Compare: object not found."] = "Vergelijken: object niet gevonden."; -App::$strings["Page updated"] = "Pagina bijgewerkt"; -App::$strings["Untitled"] = "Naamloos"; -App::$strings["Wiki resource_id required for git commit"] = "Resource_id wiki voor git commit vereist"; -App::$strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven."; -App::$strings["__ctx:permcat__ default"] = "standaard"; -App::$strings["__ctx:permcat__ follower"] = "volger"; -App::$strings["__ctx:permcat__ contributor"] = "bijdrager"; -App::$strings["__ctx:permcat__ publisher"] = "publichist "; -App::$strings["Private Message"] = "Niet voor iedereen zichtbaar"; -App::$strings["Select"] = "Kies"; -App::$strings["Save to Folder"] = "In map opslaan"; -App::$strings["I will attend"] = "Aanwezig"; -App::$strings["I will not attend"] = "Niet aanwezig"; -App::$strings["I might attend"] = "Mogelijk aanwezig"; -App::$strings["I agree"] = "Eens"; -App::$strings["I disagree"] = "Oneens"; -App::$strings["I abstain"] = "Onthouding"; -App::$strings["Add Star"] = "Ster toevoegen"; -App::$strings["Remove Star"] = "Ster verwijderen"; -App::$strings["Toggle Star Status"] = "Ster toevoegen of verwijderen"; -App::$strings["starred"] = "met ster"; -App::$strings["Message signature validated"] = "Berichtkenmerk gevalideerd"; -App::$strings["Message signature incorrect"] = "Berichtkenmerk onjuist"; -App::$strings["Add Tag"] = "Tag toevoegen"; -App::$strings["like"] = "vind dit leuk"; -App::$strings["dislike"] = "vind dit niet leuk"; -App::$strings["Share This"] = "Delen"; -App::$strings["share"] = "delen"; -App::$strings["Delivery Report"] = "Afleveringsrapport"; -App::$strings["%d comment"] = array( - 0 => "%d reactie", - 1 => "%d reacties weergeven", -); -App::$strings["View %s's profile - %s"] = "Profiel van %s bekijken - %s"; -App::$strings["to"] = "aan"; -App::$strings["via"] = "via"; -App::$strings["Wall-to-Wall"] = "Kanaal-naar-kanaal"; -App::$strings["via Wall-To-Wall:"] = "via kanaal-naar-kanaal"; -App::$strings["from %s"] = "van %s"; -App::$strings["last edited: %s"] = "laatst bewerkt: %s"; -App::$strings["Expires: %s"] = "Verloopt: %s"; -App::$strings["Attend"] = "Aanwezig"; -App::$strings["Attendance Options"] = "Aanwezigheidsopties"; -App::$strings["Vote"] = "Stem"; -App::$strings["Voting Options"] = "Stemopties"; -App::$strings["Save Bookmarks"] = "Bladwijzers opslaan"; -App::$strings["Add to Calendar"] = "Aan agenda toevoegen"; -App::$strings["Mark all seen"] = "Markeer alles als bekeken"; -App::$strings["%s show all"] = "%s alle"; -App::$strings["Bold"] = "Vet"; -App::$strings["Italic"] = "Cursief"; -App::$strings["Underline"] = "Onderstrepen"; -App::$strings["Quote"] = "Citeren"; -App::$strings["Code"] = "Broncode"; -App::$strings["Image"] = "Afbeelding"; -App::$strings["Insert Link"] = "Link invoegen"; -App::$strings["Video"] = "Video"; -App::$strings["Wiki files deleted successfully"] = "Verwijderen wiki-bestanden geslaagd"; -App::$strings["Site Admin"] = "Hubbeheerder"; -App::$strings["Report Bug"] = "Bugrapport indienen"; -App::$strings["View Bookmarks"] = "Bladwijzers bekijken"; -App::$strings["My Chatrooms"] = "Mijn chatkanalen"; -App::$strings["Firefox Share"] = "Firefox Share"; -App::$strings["Remote Diagnostics"] = "Diagnose op afstand"; -App::$strings["Suggest Channels"] = "Kanalen voorstellen"; -App::$strings["Login"] = "Inloggen"; -App::$strings["Grid"] = "Grid"; -App::$strings["Wiki"] = "Wiki"; -App::$strings["Channel Home"] = "Jouw kanaal"; -App::$strings["Events"] = "Agenda"; -App::$strings["Directory"] = "Kanalengids"; -App::$strings["Mail"] = "Privéberichten"; -App::$strings["Chat"] = "Chatten"; -App::$strings["Probe"] = "Onderzoeken"; -App::$strings["Suggest"] = "Voorstellen"; -App::$strings["Random Channel"] = "Willekeurig kanaal"; -App::$strings["Invite"] = "Uitnodigen "; -App::$strings["Features"] = "Extra functies"; -App::$strings["Language"] = "Taal"; -App::$strings["Post"] = "Bericht"; -App::$strings["Profile Photo"] = "Profielfoto"; -App::$strings["Purchase"] = "Aanschaffen"; -App::$strings["Undelete"] = "Verwijdering ongedaan maken"; -App::$strings["Add to app-tray"] = "Aan appmenu toevoegen"; -App::$strings["Remove from app-tray"] = "Uit appmenu verwijderen"; -App::$strings["Flag Adult Photos"] = "Markeer foto's als voor volwassenen"; -App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Zorgt voor een optie om foto's met inhoud voor volwassenen in de standaard albumweergave te verbergen"; -App::$strings["This is a fairly comprehensive and complete guitar chord dictionary which will list most of the available ways to play a certain chord, starting from the base of the fingerboard up to a few frets beyond the twelfth fret (beyond which everything repeats). A couple of non-standard tunings are provided for the benefit of slide players, etc."] = "This is a fairly comprehensive and complete guitar chord dictionary which will list most of the available ways to play a certain chord, starting from the base of the fingerboard up to a few frets beyond the twelfth fret (beyond which everything repeats). A couple of non-standard tunings are provided for the benefit of slide players, etc."; -App::$strings["Chord names start with a root note (A-G) and may include sharps (#) and flats (b). This software will parse most of the standard naming conventions such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."] = "Chord names start with a root note (A-G) and may include sharps (#) and flats (b). This software will parse most of the standard naming conventions such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."; -App::$strings["Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."] = "Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."; -App::$strings["Guitar Chords"] = "Gitaarakkoorden"; -App::$strings["The complete online chord dictionary"] = "Het complete online akkoordenboek"; -App::$strings["Tuning"] = "Stemmen"; -App::$strings["Chord name: example: Em7"] = "Akkoordnaam: bijvoorbeeld: Em7"; -App::$strings["Show for left handed stringing"] = "Toon voor linkshandige gitaar"; -App::$strings["Quick Reference"] = "Beknopt overzicht"; -App::$strings["No username found in import file."] = "Geen gebruikersnaam in het importbestand gevonden."; -App::$strings["Unable to create a unique channel address. Import failed."] = "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt."; -App::$strings["Diaspora Protocol Settings updated."] = "Diaspora-protocol-instellingen bijgewerkt."; -App::$strings["Enable the Diaspora protocol for this channel"] = "Het Diaspora-protocol voor dit kanaal inschakelen"; -App::$strings["Allow any Diaspora member to comment on your public posts"] = "Geef elk Diaspora-lid toestemming om op jouw openbare berichten te reageren"; -App::$strings["Prevent your hashtags from being redirected to other sites"] = "Voorkom dat jouw hashtags naar andere websites worden doorverwezen"; -App::$strings["Followed hashtags (comma separated, do not include the #)"] = "Gevolgde hashtags (door komma's gescheiden lijst, zonder de #)"; -App::$strings["Diaspora Protocol Settings"] = "Diaspora-protocol (incl. Friendica)"; -App::$strings["Hubzilla Directory Stats"] = "Kanalengidsstatistieken Hubzilla"; -App::$strings["Total Hubs"] = "Totaal aantal hubs"; -App::$strings["Hubzilla Hubs"] = "Hubzilla-hubs"; -App::$strings["Friendica Hubs"] = "Friendica-hubs"; -App::$strings["Diaspora Pods"] = "Diaspora-pods"; -App::$strings["Hubzilla Channels"] = "Hubzilla-kanalen"; -App::$strings["Friendica Channels"] = "Friendica-kanalen"; -App::$strings["Diaspora Channels"] = "Diaspora-kanalen"; -App::$strings["Aged 35 and above"] = "Leeftijd is ouder dan 35 jaar"; -App::$strings["Aged 34 and under"] = "Leeftijd is jonger dan 34"; -App::$strings["Average Age"] = "Gemiddelde leeftijd"; -App::$strings["Known Chatrooms"] = "Bekend aantal chatkanalen"; -App::$strings["Known Tags"] = "Bekend aantal tags"; -App::$strings["Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network. This also applies to chatrooms,"] = "Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network. This also applies to chatrooms,"; -App::$strings["Project Servers and Resources"] = "Projectservers en -middelen"; -App::$strings["Project Creator and Tech Lead"] = "Projectgrondlegger en hoofdontwikkelaar"; -App::$strings["Admin, developer, directorymin, support bloke"] = "Beheerder, ontwikkelaar, kanalengidsbeheerder en supportgozer"; -App::$strings["And the hundreds of other people and organisations who helped make the Hubzilla possible."] = "En de honderden andere mensen en organisaties die Hubzilla mogelijk hebben gemaakt. "; -App::$strings["The Redmatrix/Hubzilla projects are provided primarily by volunteers giving their time and expertise - and often paying out of pocket for services they share with others."] = "De Hubzillaprojecten worden hoofdzakelijk aangeboden door vrijwilligers die er hun tijd en expertise insteken - en meestal zelf de diensten betalen die ze met anderen delen."; -App::$strings["There is no corporate funding and no ads, and we do not collect and sell your personal information. (We don't control your personal information - you do.)"] = "Wij worden niet gefinancierd door bedrijven en reclame, en wij verzamelen en verkopen niet jouw persoonlijke gegevens. We hebben geen controle over jouw persoonlijke gegevens - dat heb jezelf."; -App::$strings["Help support our ground-breaking work in decentralisation, web identity, and privacy."] = "Steun ons baanbrekende werk in decentralisatie, webidentiteit en privacy. "; -App::$strings["Your donations keep servers and services running and also helps us to provide innovative new features and continued development."] = "Jouw donaties laten onze servers en diensten draaien, en helpt ons om nieuwe innovatieve mogelijkheden te blijven ontwikkelen."; -App::$strings["Donate"] = "Doneer"; -App::$strings["Choose a project, developer, or public hub to support with a one-time donation"] = "Kies een project, ontwikkelaar of openbaar toegankelijke hub, die je met een eenmalige donatie wil steunen"; -App::$strings["Donate Now"] = "Doneer nu"; -App::$strings["Or become a project sponsor (Hubzilla Project only)"] = "Of wordt een projectsponsor (alleen het Hubzilla-project)"; -App::$strings["Please indicate if you would like your first name or full name (or nothing) to appear in our sponsor listing"] = "Geef aan of jouw voornaam of volledige naam (of niets) op onze sponsorlijst moet verschijnen"; -App::$strings["Sponsor"] = "Sponsor"; -App::$strings["Special thanks to: "] = "Speciale dank gaat naar: "; -App::$strings["Post to Dreamwidth"] = "Dreamwidth"; -App::$strings["Enable Dreamwidth Post Plugin"] = "Doorplaatsen naar Dreamwidth inschakelen"; -App::$strings["Dreamwidth username"] = "Gebruikersnaam Dreamwidth"; -App::$strings["Dreamwidth password"] = "Wachtwoord Dreamwidth"; -App::$strings["Post to Dreamwidth by default"] = "Standaard doorplaatsen naar Dreamwidth"; -App::$strings["Dreamwidth Post Settings"] = "Dreamwidth (berichten doorplaatsen)"; -App::$strings["Flattr this!"] = "Flattr this!"; -App::$strings["Flattr widget settings updated."] = "Instellingen Flattrwidget bijgewerkt."; -App::$strings["Flattr user"] = "Gebruikersnaam Flattr"; -App::$strings["URL of the Thing to flattr"] = "URL van het Flattr-item"; -App::$strings["If empty channel URL is used"] = "Wanneer een lege kanaal-URL wordt gebruikt"; -App::$strings["Title of the Thing to flattr"] = "Naam van het Flattr-item"; -App::$strings["If empty \"channel name on The Hubzilla\" will be used"] = "Wanneer een lege \"kanaalnaam op Hubzilla\" wordt gebruikt"; -App::$strings["Static or dynamic flattr button"] = "Statische of dynamische Flattr-knop"; -App::$strings["static"] = "statisch"; -App::$strings["dynamic"] = "dynamisch"; -App::$strings["Alignment of the widget"] = "Uitlijning van de widget"; -App::$strings["left"] = "links"; -App::$strings["right"] = "rechts"; -App::$strings["Enable Flattr widget"] = "Flattrwidget inschakelen"; -App::$strings["Flattr Widget Settings"] = "Flattrwidget"; -App::$strings["Contact not found."] = "Contact niet gevonden"; -App::$strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "This may occasionally happen if contact was requested by both persons and it has already been approved."; -App::$strings["Response from remote site was not understood."] = "Response from remote site was not understood."; -App::$strings["Unexpected response from remote site: "] = "Unexpected response from remote site: "; -App::$strings["Confirmation completed successfully."] = "Confirmation completed successfully."; -App::$strings["Remote site reported: "] = "Remote site reported: "; -App::$strings["Temporary failure. Please wait and try again."] = "Temporary failure. Please wait and try again."; -App::$strings["Introduction failed or was revoked."] = "Introduction failed or was revoked."; -App::$strings["Unable to set contact photo."] = "Unable to set contact photo."; -App::$strings["%1\$s is now friends with %2\$s"] = "%1\$s is now friends with %2\$s"; -App::$strings["No user record found for '%s' "] = "No user record found for '%s' "; -App::$strings["Our site encryption key is apparently messed up."] = "Our site encryption key is apparently messed up."; -App::$strings["Empty site URL was provided or URL could not be decrypted by us."] = "Empty site URL was provided or URL could not be decrypted by us."; -App::$strings["Contact record was not found for you on our site."] = "Contact record was not found for you on our site."; -App::$strings["Site public key not available in contact record for URL %s."] = "Site public key not available in contact record for URL %s."; -App::$strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "The ID provided by your system is a duplicate on our system. It should work if you try again."; -App::$strings["Unable to set your contact credentials on our system."] = "Unable to set your contact credentials on our system."; -App::$strings["Unable to update your contact profile details on our system"] = "Unable to update your contact profile details on our system"; -App::$strings["[Name Withheld]"] = "[Name Withheld]"; -App::$strings["%1\$s has joined %2\$s"] = "%1\$s has joined %2\$s"; -App::$strings["%1\$s welcomes %2\$s"] = "%1\$s welcomes %2\$s"; -App::$strings["This introduction has already been accepted."] = "This introduction has already been accepted."; -App::$strings["Profile location is not valid or does not contain profile information."] = "Profile location is not valid or does not contain profile information."; -App::$strings["Warning: profile location has no identifiable owner name."] = "Warning: profile location has no identifiable owner name."; -App::$strings["Warning: profile location has no profile photo."] = "Warning: profile location has no profile photo."; -App::$strings["%d required parameter was not found at the given location"] = array( - 0 => "%d required parameter was not found at the given location", - 1 => "%d required parameters were not found at the given location", -); -App::$strings["Introduction complete."] = "Introduction complete."; -App::$strings["Unrecoverable protocol error."] = "Unrecoverable protocol error."; -App::$strings["Profile unavailable."] = "Profile unavailable."; -App::$strings["%s has received too many connection requests today."] = "%s has received too many connection requests today."; -App::$strings["Spam protection measures have been invoked."] = "Spam protection measures have been invoked."; -App::$strings["Friends are advised to please try again in 24 hours."] = "Friends are advised to please try again in 24 hours."; -App::$strings["Invalid locator"] = "Invalid locator"; -App::$strings["Invalid email address."] = "Invalid email address."; -App::$strings["This account has not been configured for email. Request failed."] = "This account has not been configured for email. Request failed."; -App::$strings["Unable to resolve your name at the provided location."] = "Unable to resolve your name at the provided location."; -App::$strings["You have already introduced yourself here."] = "You have already introduced yourself here."; -App::$strings["Apparently you are already friends with %s."] = "Apparently you are already friends with %s."; -App::$strings["Invalid profile URL."] = "Invalid profile URL."; -App::$strings["Disallowed profile URL."] = "Disallowed profile URL."; -App::$strings["Failed to update contact record."] = "Failed to update contact record."; -App::$strings["Your introduction has been sent."] = "Your introduction has been sent."; -App::$strings["Please login to confirm introduction."] = "Please login to confirm introduction."; -App::$strings["Incorrect identity currently logged in. Please login to this profile."] = "Incorrect identity currently logged in. Please login to this profile."; -App::$strings["Confirm"] = "Confirm"; -App::$strings["Hide this contact"] = "Hide this contact"; -App::$strings["Welcome home %s."] = "Welcome home %s."; -App::$strings["Please confirm your introduction/connection request to %s."] = "Please confirm your introduction/connection request to %s."; -App::$strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Please enter your 'Identity Address' from one of the following supported communications networks:"; -App::$strings["If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today."] = "If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today."; -App::$strings["Friend/Connection Request"] = "Friend/Connection Request"; -App::$strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"; -App::$strings["Please answer the following:"] = "Please answer the following:"; -App::$strings["Does %s know you?"] = "Does %s know you?"; -App::$strings["Add a personal note:"] = "Add a personal note:"; -App::$strings["Friendica"] = "Friendica"; -App::$strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web"; -App::$strings["Diaspora"] = "Diaspora"; -App::$strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - please do not use this form. Instead, enter %s into your Diaspora search bar."; -App::$strings["Your Identity Address:"] = "Your Identity Address:"; -App::$strings["Submit Request"] = "Submit Request"; -App::$strings["GNU-Social Protocol Settings updated."] = "GNU social-protocol-instellingen bijgewerkt."; -App::$strings["Enable the (experimental) GNU-Social protocol for this channel"] = "GNU social-protocol voor dit kanaal inschakelen (experimenteel)"; -App::$strings["GNU-Social Protocol Settings"] = "GNU social-protocol"; -App::$strings["Follow"] = "Volgen"; -App::$strings["%1\$s is now following %2\$s"] = "%1\$s volgt nu %2\$s"; -App::$strings["Friendica Photo Album Import"] = "Fotoalbums importeren vanuit Friendica"; -App::$strings["This will import all your Friendica photo albums to this Red channel."] = "Hiermee importeer je al jouw Friendica-fotoalbums in dit Hubzilla-kanaal."; -App::$strings["Friendica Server base URL"] = "Basis-URL van Friendica-server"; -App::$strings["Friendica Login Username"] = "Gebruikersnaam Friendica"; -App::$strings["Friendica Login Password"] = "Wachtwoord Friendica"; -App::$strings["Send email to all members"] = "Naar alle leden e-mail versturen"; -App::$strings["$1%s Administrator"] = "Beheerder $1%s"; -App::$strings["No recipients found."] = "Geen ontvangers gevonden"; -App::$strings["%1\$d of %2\$d messages sent."] = "%1\$d van %2\$d berichten verzonden."; -App::$strings["Send email to all hub members."] = "Naar alle leden van deze hub e-mail versturen."; -App::$strings["Message subject"] = "Onderwerp e-mailbericht"; -App::$strings["Sender Email address"] = "E-mailadres afzender"; -App::$strings["Test mode (only send to hub administrator)"] = "Testmodus (alleen naar hubbeheerder sturen)"; -App::$strings["Post to Insanejournal"] = "InsaneJournal"; -App::$strings["Enable InsaneJournal Post Plugin"] = "Doorplaatsen naar InsaneJournal inschakelen"; -App::$strings["InsaneJournal username"] = "Gebruikersnaam InsaneJournal"; -App::$strings["InsaneJournal password"] = "Wachtwoord InsaneJournal"; -App::$strings["Post to InsaneJournal by default"] = "Standaard doorplaatsen naar InsaneJournal"; -App::$strings["InsaneJournal Post Settings"] = "InsaneJournal (berichten doorplaatsen)"; -App::$strings["Insane Journal Settings saved."] = "InsaneJournal-instellingen opgeslagen."; -App::$strings["Channels to auto connect"] = "Kanalen om automatisch mee te verbinden"; -App::$strings["Comma separated list"] = "Door komma's gescheiden lijst"; -App::$strings["Popular Channels"] = "Populaire chatkanalen"; -App::$strings["IRC Settings"] = "IRC"; -App::$strings["IRC settings saved."] = "IRC-instellingen opgeslagen."; -App::$strings["IRC Chatroom"] = "IRC-chatkanaal"; -App::$strings["Status:"] = "Status:"; -App::$strings["Activate addon"] = "Plugin inschakelen"; -App::$strings["Hide Jappixmini Chat-Widget from the webinterface"] = "Hide Jappixmini Chat-Widget from the webinterface"; -App::$strings["Jabber username"] = "Gebruikersnaam Jabber"; -App::$strings["Jabber server"] = "Jabberserver"; -App::$strings["Jabber BOSH host URL"] = "Jabber BOSH host URL"; -App::$strings["Jabber password"] = "Wachtwoord Jabber"; -App::$strings["Encrypt Jabber password with Hubzilla password"] = "Versleutel Jabber-wachtwoord met Hubzilla-wachtwoord"; -App::$strings["Hubzilla password"] = "Wachtwoord Hubzilla"; -App::$strings["Approve subscription requests from Hubzilla contacts automatically"] = "Approve subscription requests from Hubzilla contacts automatically"; -App::$strings["Purge internal list of jabber addresses of contacts"] = "Purge internal list of jabber addresses of contacts"; -App::$strings["Configuration Help"] = "Configuratiehulp"; -App::$strings["Jappix Mini Settings"] = "Jappix Mini"; -App::$strings["Upload a file"] = "Bestand uploaden"; -App::$strings["Drop files here to upload"] = "Sleep bestanden hierheen om ze te uploaden"; -App::$strings["Failed"] = "Mislukt"; -App::$strings["No files were uploaded."] = "Er zijn geen bestanden geüpload."; -App::$strings["Uploaded file is empty"] = "Geüpload bestand is leeg"; -App::$strings["Image exceeds size limit of "] = "Afbeeldingsgrootte overschrijdt het limiet van "; -App::$strings["File has an invalid extension, it should be one of "] = "Bestand heeft een ongeldige extensie. Geldige extensies zijn "; -App::$strings["Upload was cancelled, or server error encountered"] = "Upload werd geannuleerd of er was een serverfout"; -App::$strings["An account has been created for you."] = "Er is voor jou een account aangemaakt."; -App::$strings["Authentication successful but rejected: account creation is disabled."] = "Authenticatie geslaagd, maar afgekeurd: aanmaken accounts uitgeschakeld."; -App::$strings["Post to Libertree"] = "Libertree"; -App::$strings["Enable Libertree Post Plugin"] = "Doorplaatsen naar Libertree inschakelen"; -App::$strings["Libertree API token"] = "API-token Libertree"; -App::$strings["Libertree site URL"] = "Website-URL Libertree"; -App::$strings["Post to Libertree by default"] = "Standaard doorplaatsen naar Libertree"; -App::$strings["Libertree Post Settings"] = "Libertree (berichten doorplaatsen)"; -App::$strings["Libertree Settings saved."] = "Libertree-instellingen opgeslagen."; -App::$strings["Post to LiveJournal"] = "LiveJournal"; -App::$strings["Enable LiveJournal Post Plugin"] = "Doorplaatsen naar LiveJournal inschakelen"; -App::$strings["LiveJournal username"] = "Gebruikersnaam LiveJournal"; -App::$strings["LiveJournal password"] = "Wachtwoord LiveJournal"; -App::$strings["Post to LiveJournal by default"] = "Standaard doorplaatsen naar LiveJournal"; -App::$strings["LiveJournal Post Settings"] = "LiveJournal (berichten doorplaatsen)"; -App::$strings["LiveJournal Settings saved."] = "LiveJournal-instellingen opgeslagen."; -App::$strings["Logfile archive directory"] = "Logbestand archiefmap"; -App::$strings["Directory to store rotated logs"] = "Map om geroteerde logbestanden in op te slaan"; -App::$strings["Logfile size in bytes before rotating"] = "Grootte van logbestand in bytes, voordat het wordt geroteerd"; -App::$strings["Number of logfiles to retain"] = "Aantal te behouden logbestanden"; -App::$strings["Email notification hub"] = "Hub voor e-mailnotificaties"; -App::$strings["Hostname"] = "Hostnaam"; -App::$strings["Mailhost Settings"] = "Mailhost"; -App::$strings["MAILHOST Settings saved."] = "Mailhost-instellingen opgeslagen."; -App::$strings["lonely"] = "Eenzaam"; -App::$strings["drunk"] = "dronken"; -App::$strings["horny"] = "geil"; -App::$strings["stoned"] = "stoned"; -App::$strings["fucked up"] = "opgefokt"; -App::$strings["clusterfucked"] = "clusterfucked"; -App::$strings["crazy"] = "gek"; -App::$strings["hurt"] = "gekwetst"; -App::$strings["sleepy"] = "slaperig"; -App::$strings["grumpy"] = "chagrijnig"; -App::$strings["high"] = "high"; -App::$strings["semi-conscious"] = "half bij kennis"; -App::$strings["in love"] = "verliefd"; -App::$strings["in lust"] = "wellustig"; -App::$strings["naked"] = "naakt"; -App::$strings["stinky"] = "stinkend"; -App::$strings["sweaty"] = "zweterig"; -App::$strings["bleeding out"] = "aan het doodbloeden"; -App::$strings["victorious"] = "zegevierend"; -App::$strings["defeated"] = "verslagen"; -App::$strings["envious"] = "jaloers"; -App::$strings["jealous"] = "jaloers"; -App::$strings["bitchslap"] = "bitchslappen"; -App::$strings["bitchslapped"] = "bitchslapped"; -App::$strings["shag"] = "wippen"; -App::$strings["shagged"] = "wipte met"; -App::$strings["patent"] = "patent"; -App::$strings["patented"] = "patented"; -App::$strings["hug"] = "knuffelen"; -App::$strings["hugged"] = "knuffelde"; -App::$strings["murder"] = "vermoorden"; -App::$strings["murdered"] = "vermoorde"; -App::$strings["worship"] = "aanbidden"; -App::$strings["worshipped"] = "aanbad"; -App::$strings["kiss"] = "kussen"; -App::$strings["kissed"] = "kuste"; -App::$strings["tempt"] = "verleiden"; -App::$strings["tempted"] = "verleidde"; -App::$strings["raise eyebrows at"] = "wenkbrauwen optrekken"; -App::$strings["raised their eyebrows at"] = "trok zijn/haar wenkbrauwen op naar"; -App::$strings["insult"] = "beledigen"; -App::$strings["insulted"] = "beledigde"; -App::$strings["praise"] = "prijzen"; -App::$strings["praised"] = "prees"; -App::$strings["be dubious of"] = "twijfels hebben"; -App::$strings["was dubious of"] = "had twijfels over"; -App::$strings["eat"] = "opeten"; -App::$strings["ate"] = "at"; -App::$strings["giggle and fawn at"] = "giechelen en vleien"; -App::$strings["giggled and fawned at"] = "giechelde naar en vleide met"; -App::$strings["doubt"] = "betwijfelen"; -App::$strings["doubted"] = "betwijfelde"; -App::$strings["glare"] = "boos kijken"; -App::$strings["glared at"] = "keek boos naar"; -App::$strings["fuck"] = "neuken"; -App::$strings["fucked"] = "neukte"; -App::$strings["bonk"] = "naaien"; -App::$strings["bonked"] = "naaide"; -App::$strings["declare undying love for"] = "eeuwige liefde verklaren"; -App::$strings["declared undying love for"] = "verklaarde de eeuwige liefde aan"; -App::$strings["Save Settings"] = "Instellingen opslaan"; -App::$strings["text to include in all outgoing posts from this site"] = "tekst om onderaan elk uitgaand bericht van deze hub te plaatsen"; -App::$strings["Federate"] = "Federeren"; -App::$strings["nofed Settings saved."] = "Geen federatie-instellingen opgeslagen."; -App::$strings["Allow Federation Toggle"] = "Federatie toestaan?"; -App::$strings["Federate posts by default"] = "Standaard berichten federeren"; -App::$strings["NoFed Settings"] = "Geen federatie"; -App::$strings["Nsabait Settings updated."] = "NSAbait-instellingen bijgewerkt."; -App::$strings["Enable NSAbait Plugin"] = "NSAbait inschakelen"; -App::$strings["NSAbait Settings"] = "NSAbait"; -App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Deze plug-in controleert berichten op woorden die je hieronder kunt opgeven en klapt berichten in die deze woorden bevatten, zodat die berichten niet worden weergegeven op ongeschikte momenten. Denk hierbij aan berichten met erotische afbeeldingen, die waarschijnlijk niet geschikt zijn binnen (bijvoorbeeld) een werkomgeving. Het is beleefd en het wordt aangeraden om zulke berichten met #NSFW te taggen. Dit filter kan ook gebruikt worden met andere woorden en is dus voor alles inzetbaar."; -App::$strings["Enable Content filter"] = "Inhoudsfilter inschakelen"; -App::$strings["Comma separated list of keywords to hide"] = "Door komma's gescheiden lijst met woorden die gefilterd moeten worden."; -App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "Woord, /reguliere expressie/, lang=xx, lang!=xx"; -App::$strings["Not Safe For Work Settings"] = "Not Safe For Work (inhoudsfilter)"; -App::$strings["General Purpose Content Filter"] = "Voor alles te gebruiken inhoudsfilter"; -App::$strings["NSFW Settings saved."] = "NSFW-instellingen opgeslagen."; -App::$strings["Possible adult content"] = "Mogelijk inhoud voor volwassenen"; -App::$strings["%s - view"] = "%s - tonen"; -App::$strings["System defaults:"] = "Systeemstandaarden:"; -App::$strings["Preferred Clipart IDs"] = "Voorkeursclipart"; -App::$strings["List of preferred clipart ids. These will be shown first."] = "Lijst met clipartnummers die als eerste moeten worden getoond."; -App::$strings["Default Search Term"] = "Standaard zoekterm"; -App::$strings["The default search term. These will be shown second."] = "Standaard zoekterm. Deze worden als tweede getoond."; -App::$strings["Return After"] = "Ga na afloop naar"; -App::$strings["Page to load after image selection."] = "Pagina die na het kiezen van een afbeelding moet laden."; -App::$strings["Edit Profile"] = "Profiel bewerken"; -App::$strings["Profile List"] = "Profiellijst"; -App::$strings["Order of Preferred"] = "Voorkeursclipart sorteren op"; -App::$strings["Sort order of preferred clipart ids."] = "Als eerste getoonde clipart hierop sorteren."; -App::$strings["Newest first"] = "Nieuwste eerst"; -App::$strings["As entered"] = "Zoals ingevoerd"; -App::$strings["Order of other"] = "Overige clipart sorteren op"; -App::$strings["Sort order of other clipart ids."] = "Overige clipart hierop sorteren."; -App::$strings["Most downloaded first"] = "Meest gedownload eerst"; -App::$strings["Most liked first"] = "Meest geliked eerst"; -App::$strings["Preferred IDs Message"] = "Tekst voorkeursclipart"; -App::$strings["Message to display above preferred results."] = "Tekst die bovenaan de resultaten met voorkeursclipart moet worden getoond."; -App::$strings["Uploaded by: "] = "Geüpload door: "; -App::$strings["Drawn by: "] = "Getekend door: "; -App::$strings["Or select from a free OpenClipart.org image:"] = "Of kies uit een vrije OpenClipart.org-afbeelding:"; -App::$strings["Search Term"] = "Zoekterm"; -App::$strings["Unknown error. Please try again later."] = "Onbekende fout. Probeer later nog eens."; -App::$strings["Profile photo updated successfully."] = "Bijwerken profielfoto geslaagd."; -App::$strings["View Larger"] = "Groter tonen"; -App::$strings["Tile Server URL"] = "URL tile-server"; -App::$strings["A list of public tile servers"] = "Een lijst met openbare tile-servers"; -App::$strings["Nominatim (reverse geocoding) Server URL"] = "Server-URL Nominatim (reverse geocoding)"; -App::$strings["A list of Nominatim servers"] = "Een lijst met Nominatim-servers"; -App::$strings["Default zoom"] = "Standaard zoomniveau"; -App::$strings["The default zoom level. (1:world, 18:highest, also depends on tile server)"] = "Standaard zoomniveau. Van 1 (wereld) t/m 18 (maximaal). Is ook afhankelijk van tile-server."; -App::$strings["Include marker on map"] = "Markering op kaart plaatsen"; -App::$strings["Include a marker on the map."] = "Plaatst een markering op de kaart."; -App::$strings["Message to display on every page on this server"] = "Bericht om op elke pagina van deze hub weer te geven"; -App::$strings["Pageheader Settings"] = "Pageheader"; -App::$strings["pageheader Settings saved."] = "Pageheader-instellingen opgeslagen."; -App::$strings["This website is tracked using the Piwik analytics tool."] = "Het bezoek aan deze website wordt gemeten door Piwik."; -App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Wanneer je niet wil dat jouw bezoek aan deze website wordt bijgehouden, kan je een cookie achterlaten om te verhinderen dat Piwik jou op deze website blijft volgen (opt-out)."; -App::$strings["Piwik Base URL"] = "Basis-URL Piwik"; -App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluut pad naar jouw Piwik-installatie (zonder protocol (http/s), met een slash op het einde)"; -App::$strings["Site ID"] = "Site ID"; -App::$strings["Show opt-out cookie link?"] = "Toon opt-out cookie-link?"; -App::$strings["Asynchronous tracking"] = "Asynchroon volgen"; -App::$strings["Enable frontend JavaScript error tracking"] = "Volgen van front-end JavaScript-fouten inschakelen"; -App::$strings["This feature requires Piwik >= 2.2.0"] = "Deze functie vereist Piwik >= 2.2.0"; -App::$strings["Planets Settings updated."] = "Planets-instellingen opgeslagen."; -App::$strings["Enable Planets Plugin"] = "Planets inschakelen"; -App::$strings["Planets Settings"] = "Planets"; -App::$strings["You are now authenticated to pumpio."] = "De verbinding met pump.io is geverifieerd"; -App::$strings["return to the featured settings page"] = "Ga terug naar pagina met plugin-instellingen"; -App::$strings["Post to Pump.io"] = "Pump.io"; -App::$strings["Pump.io servername"] = "Pump.io-servernaam"; -App::$strings["Without \"http://\" or \"https://\""] = "Zonder \"http://\" of \"https://\""; -App::$strings["Pump.io username"] = "Gebruikersnaam Pump.io"; -App::$strings["Without the servername"] = "Zonder servernaam"; -App::$strings["You are not authenticated to pumpio"] = "De verbinding met pump.io is niet geverifieerd"; -App::$strings["(Re-)Authenticate your pump.io connection"] = "Verifieer (opnieuw) jouw pump.io-verbinding"; -App::$strings["Enable pump.io Post Plugin"] = "Doorplaatsen naar Pump.io inschakelen"; -App::$strings["Post to pump.io by default"] = "Standaard doorplaatsen naar Pump.io"; -App::$strings["Should posts be public"] = "Moeten berichten openbaar zijn"; -App::$strings["Mirror all public posts"] = "Alle openbare berichten doorplaatsen"; -App::$strings["Pump.io Post Settings"] = "Pump.io (berichten doorplaatsen)"; -App::$strings["PumpIO Settings saved."] = "Pump.io-instellingen opgeslagen."; -App::$strings["QR code"] = "QR-code"; -App::$strings["QR Generator"] = "QR-code-generator"; -App::$strings["Enter some text"] = "Vul wat tekst in"; -App::$strings["Enable Rainbowtag"] = "Rainbowtag inschakelen"; -App::$strings["Rainbowtag Settings"] = "Rainbowtag"; -App::$strings["Rainbowtag Settings saved."] = "Rainbowtag-instellingen opgeslagen."; -App::$strings["You're welcome."] = "Je bent van harte welkom."; -App::$strings["Ah shucks..."] = "Hé verdorie..."; -App::$strings["Don't mention it."] = "Graag gedaan."; -App::$strings["<blush>"] = ""; -App::$strings["Redmatrix File Storage Import"] = "Importeer bestanden vanuit Redmatrix"; -App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Hiermee importeer je al jouw Redmatrix-bestanden in dit kanaal."; -App::$strings["Redmatrix Server base URL"] = "Basis-URL van Redmatrix-hub"; -App::$strings["Redmatrix Login Username"] = "Gebruikersnaam Redmatrix"; -App::$strings["Redmatrix Login Password"] = "Wachtwoord Redmatrix"; -App::$strings["file"] = "bestand"; -App::$strings["Photos imported"] = "Foto's geïmporteerd"; -App::$strings["Redmatrix Photo Album Import"] = "Fotoalbums importeren vanuit Redmatrix"; -App::$strings["This will import all your Redmatrix photo albums to this channel."] = "Hiermee importeer je al jouw Redmatrix-fotoalbums in dit Hubzilla-kanaal."; -App::$strings["Import just this album"] = "Alleen dit album importeren"; -App::$strings["Leave blank to import all albums"] = "Laat leeg om alle albums te importeren"; -App::$strings["Maximum count to import"] = "Maximaal aantal om te importeren"; -App::$strings["0 or blank to import all available"] = "0 of leeg om alles te importeren"; -App::$strings["Post to Red"] = "Hubzilla"; -App::$strings["Channel is required."] = "Een kanaal is vereist."; -App::$strings["redred Settings saved."] = "RedRed-instellingen opgeslagen."; -App::$strings["Allow posting to another Hubzilla Channel"] = "Doorplaatsen naar een ander Hubzilla-kanaal toestaan"; -App::$strings["Send public postings to Hubzilla channel by default"] = "Standaard doorplaatsen naar een ander Hubzilla-kanaal toestaan"; -App::$strings["Hubzilla API Path"] = "API-pad Hubzilla"; -App::$strings["https://{sitename}/api"] = "https://{hubnaam}/api"; -App::$strings["Hubzilla login name"] = "Gebruikersnaam Hubzilla"; -App::$strings["Hubzilla channel name"] = "Kanaalnaam Hubzilla"; -App::$strings["Nickname"] = "Bijnaam"; -App::$strings["Hubzilla Crosspost Settings"] = "Hubzilla (berichten doorplaatsen)"; -App::$strings["Post to Friendica"] = "Friendica"; -App::$strings["rtof Settings saved."] = "RTOF-instellingen opgeslagen."; -App::$strings["Allow posting to Friendica"] = "Doorplaatsen naar Friendica toestaan"; -App::$strings["Send public postings to Friendica by default"] = "Standaard doorplaatsen naar Friendica"; -App::$strings["Friendica API Path"] = "API-pad Friendica"; -App::$strings["Friendica login name"] = "Gebruikersnaam Friendica"; -App::$strings["Friendica password"] = "Wachtwoord Friendica"; -App::$strings["Hubzilla to Friendica Post Settings"] = "Friendica (berichten doorplaatsen)"; -App::$strings["Extended Identity Sharing"] = "Uitgebreid identiteit delen"; -App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Deel jouw Hubzilla-identiteit met alle websites op het internet. Wanneer dit is uitgeschakeld wordt je identiteit alleen binnen het Hubzilla-netwerk gedeeld. Schakel dit alleen in als je weet wat je doet."; -App::$strings["Some setting"] = "Een of andere instelling"; -App::$strings["A setting"] = "Een instelling"; -App::$strings["Skeleton Settings"] = "Plugin-skeleton"; -App::$strings["Deactivate the feature"] = "Deze functie uitschakelen"; -App::$strings["Hide the button and show the smilies directly."] = "Verberg de knop en toon de smilies direct."; -App::$strings["Smileybutton Settings"] = "Smileyknop"; -App::$strings["Page to load after login"] = "Pagina die na het inloggen getoond moet worden"; -App::$strings["Examples: "apps", "network?f=&gid=37" (privacy collection), "channel" or "notifications/system" (leave blank for default network page (grid)."] = "Voorbeelden: "apps", "network?f=&gid=37" (privacygroep), "channel" of "notifications/system" (laat leeg voor de standaard netwerkpagina (grid)."; -App::$strings["Startpage Settings"] = "Startpagina"; -App::$strings["Post to GNU social"] = "GNU social"; -App::$strings["Please contact your site administrator.
    The provided API URL is not valid."] = "De verstrekte API-URL is ongeldig.
    Neem contact op met jouw hubbeheerder."; -App::$strings["We could not contact the GNU social API with the Path you entered."] = "Wij konden de GNU social-API niet bereiken door middel van het ingevulde pad."; -App::$strings["GNU social settings updated."] = "GNU social-instellingen bijgewerkt."; -App::$strings["Globally Available GNU social OAuthKeys"] = "Op de gehele hub te gebruiken GNU social OAuthkeys."; -App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
    If not feel free to connect to any other GNU social instance (see below)."] = "Er zijn op deze hub enkele voorgeconfigureerde OAuthkey-paren voor GNU social servers beschikbaar. Wanneer je een van deze servers gebruikt, gebruik dan deze voorgeconfigureerde gegevens.
    Wanneer dit niet het geval is, maak dan gerust met een andere GNU social-server verbinding (zie hieronder)."; -App::$strings["Provide your own OAuth Credentials"] = "Verstrek jouw eigen OAuth-gegevens"; -App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
    Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Geen consumerkey voor GNU social gevonden. Registreer jouw Hubzilla-account als een desktopclient in jouw GNU-social-account, kopieer en plak hier de consumerkey en de consumersecret, en vul de API-base-root in.
    Voordat je jouw eigen OAuthkey-paar registreert, vraag dan eerst aan jouw hubbeheerder of er al een key-paar voor deze hub op jouw favoriete GNU social-server bestaat."; -App::$strings["OAuth Consumer Key"] = "OAuth-consumerkey"; -App::$strings["OAuth Consumer Secret"] = "Oauth-consumersecret"; -App::$strings["Base API Path"] = "Basispad API"; -App::$strings["Remember the trailing /"] = "Vergeet niet de afsluitende /"; -App::$strings["GNU social application name"] = "Naam GNU social-applicatie"; -App::$strings["To connect to your GNU social account click the button below to get a security code from GNU social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU social."] = "Om jouw GNU social-account te koppelen klik je op de knop hieronder. Je krijgt dan een veiligheidscode van GNU social die je kan kopiëren en dan hieronder in het invulveld kan plakken. Vervolgens klik je op Opslaan. Alleen jouw openbare berichten kunnen worden doorgeplaatst naar GNU social."; -App::$strings["Log in with GNU social"] = "Inloggen op "; -App::$strings["Copy the security code from GNU social here"] = "Plak de veiligheidscode van GNU social hier"; -App::$strings["Cancel Connection Process"] = "Annuleer het verbindingsproces"; -App::$strings["Current GNU social API is"] = "Huidige GNU social-API is"; -App::$strings["Cancel GNU social Connection"] = "Annuleer de GNU social-verbinding"; -App::$strings["Currently connected to: "] = "Momenteel gekoppeld aan: "; -App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Opmerking: In verband met jouw privacyinstellingen (wanneer jouw kanaalprofiel voor onbekenden is verborgen) leidt de profiellink die mogelijk in jouw naar GNU social doorgestuurde openbare berichten staat, naar een lege pagina met de melding dat toegang tot jouw kanaalprofiel is beperkt."; -App::$strings["Allow posting to GNU social"] = "Doorplaatsen naar GNU social toestaan"; -App::$strings["If enabled your public postings can be posted to the associated GNU-social account"] = "Wanneer dit is ingeschakeld kunnen jouw openbare berichten naar het gekoppelde Twitter-account worden doorgeplaatst"; -App::$strings["Post to GNU social by default"] = "Standaard doorplaatsen naar GNU social"; -App::$strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Wanneer dit is ingeschakeld worden al jouw openbare berichten standaard naar het gekoppelde GNU social-account doorgeplaatst"; -App::$strings["Clear OAuth configuration"] = "OAuth-configuratie wissen"; -App::$strings["GNU social Post Settings"] = "GNU social (berichten doorplaatsen)"; -App::$strings["API URL"] = "API-URL"; -App::$strings["Application name"] = "Naam applicatie"; -App::$strings["Currently blocked"] = "Momenteel geblokkeerd"; -App::$strings["No channels currently blocked"] = "Momenteel geen kanalen geblokkeerd"; -App::$strings["\"Superblock\" Settings"] = "Superblock"; -App::$strings["Block Completely"] = "Volledig blokkeren"; -App::$strings["superblock settings updated"] = "Superblock-instellingen bijgewerkt"; -App::$strings["Your account on %s will expire in a few days."] = "Jouw account op %s verloopt over een paar dagen. "; -App::$strings["Your $Productname test account is about to expire."] = "Jouw $Productname-testaccount staat op het punt om te verlopen."; -App::$strings["Three Dimensional Tic-Tac-Toe"] = "Driedimensionaal Boter-kaas-en-eieren"; -App::$strings["3D Tic-Tac-Toe"] = "Boter-kaas-en-eieren in 3D"; -App::$strings["New game"] = "Nieuw spel"; -App::$strings["New game with handicap"] = "Nieuw spel met handicap"; -App::$strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Driedimensionaal Boter-kaas-en-eieren is hetzelfde als het klassieke spel, behalve dat het gelijktijdig op meerdere hoogtes wordt gespeeld."; -App::$strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "In dit geval zijn er drie hoogtes. Je wint wanneer je drie op een rij hebt op een van de drie hoogtes, van boven naar beneden of diagonaal."; -App::$strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Het spel met een handicap schakelt de middelste positie op de middelste hoogte uit, omdat de speler die deze positie krijgt vaak een oneerlijk voordeel geniet."; -App::$strings["You go first..."] = "Jij bent eerst..."; -App::$strings["I'm going first this time..."] = "Ik ga deze keer eerst..."; -App::$strings["You won!"] = "Jij wint!"; -App::$strings["\"Cat\" game!"] = "Gelijkspel!"; -App::$strings["I won!"] = "Ik win!"; -App::$strings["Edit your profile and change settings."] = "Jouw profiel bewerken en instellingen veranderen."; -App::$strings["Click here to see activity from your connections."] = "Klik hier voor een tijdlijn met berichten en overige activiteiten van jouw connecties."; -App::$strings["Click here to see your channel home."] = "Klik hier voor de tijdlijn van jouw eigen kanaal."; -App::$strings["You can access your private messages from here."] = "Hiermee krijg je toegang tot jouw privéberichten."; -App::$strings["Create new events here."] = "Nieuwe gebeurtenissen kan je hier aanmaken."; -App::$strings["You can accept new connections and change permissions for existing ones here. You can also e.g. create groups of contacts."] = "Hier kan je nieuwe connecties accepteren en instellingen van bestaande connecties wijzigen. Je kan hier bijv. ook privacygroepen aanmaken."; -App::$strings["System notifications will arrive here"] = "Systeemnotificaties komen hier tevoorschijn"; -App::$strings["Search for content and users"] = "Zoek hier naar tekst in berichten of naar andere kanalen."; -App::$strings["Browse for new contacts"] = "Blader hier in een gids met kanalen, die je toe kan voegen als connectie."; -App::$strings["Launch installed apps"] = "Open (op deze hub) geïnstalleerde apps."; -App::$strings["Looking for help? Click here."] = "Zoek je hulp? Klik dan hier."; -App::$strings["New events have occurred in your network. Click here to see what has happened!"] = "Er is iets nieuws gebeurd in jouw netwerk. Klik hier om te zien wat precies."; -App::$strings["You have received a new private message. Click here to see from who!"] = "Je hebt een nieuw privébericht ontvangen. Klik hier om te zien van wie."; -App::$strings["There are events this week. Click here too see which!"] = "Er vinden deze week gebeurtenissen plaats. Klik hier om te zien welke dit zijn."; -App::$strings["You have received a new introduction. Click here to see who!"] = "Je hebt een nieuw connectieverzoek ontvangen. Klik hier om te kijken van wie."; -App::$strings["There is a new system notification. Click here to see what has happened!"] = "Er is een nieuwe systeemnotificatie. Klik hier om te zien wat er aan de hand is."; -App::$strings["Click here to share text, images, videos and sound."] = "Klik hier om tekst, afbeeldingen, video en audio te delen."; -App::$strings["You can write an optional title for your update (good for long posts)."] = "Je kan een titel voor je nieuwe bericht verzinnen, maar dit is niet verplicht. Vooral goed voor langere berichten."; -App::$strings["Entering some categories here makes it easier to find your post later."] = "Het invullen van enkele categorieën, maakt het later terugvinden van je berichten gemakkelijker. Dit is niet verplicht."; -App::$strings["Share photos, links, location, etc."] = "Deel foto's, links, locaties, enz."; -App::$strings["Only want to share content for a while? Make it expire at a certain date."] = "Wil je alleen iets tot een bepaald moment delen? Dan kan je het hiermee op een bepaalde datum en tijd laten verlopen."; -App::$strings["You can password protect content."] = "Je kan met een wachtwoord gegevens beveiligen."; -App::$strings["Choose who you share with."] = "Kies met wie je dit wil delen. "; -App::$strings["Click here when you are done."] = "Klik hier wanneer je klaar bent."; -App::$strings["Adjust from which channels posts should be displayed."] = "Aanpassen van welke kanalen berichten moeten worden getoond. "; -App::$strings["Only show posts from channels in the specified privacy group."] = "Toon alleen berichten van kanalen in de hier gekozen privacygroep."; -App::$strings["Easily find posts containing tags (keywords preceded by the \"#\" symbol)."] = "Vind gemakkelijk berichten met tags (trefwoorden die beginnen met een \"#\")."; -App::$strings["Easily find posts in given category."] = "Vind gemakkelijk berichten in een bepaalde categorie."; -App::$strings["Easily find posts by date."] = "Vind gemakkelijk berichten op datum."; -App::$strings["Suggested users who have volounteered to be shown as suggestions, and who we think you might find interesting."] = "Voorstellen voor kanalen die wellicht interessant voor jou zijn en hier ook vrijwillig voor hebben gekozen."; -App::$strings["Here you see channels you have connected to."] = "Hier kan je zien met welke kanalen je bent verbonden (connecties)."; -App::$strings["Save your search so you can repeat it at a later date."] = "Sla jouw zoekopdracht op, zodat je het later opnieuw kan gebruiken."; -App::$strings["If you see this icon you can be sure that the sender is who it say it is. It is normal that it is not always possible to verify the sender, so the icon will be missing sometimes. There is usually no need to worry about that."] = "Wanneer je dit pictogram ziet, kan je er van uitgaan dat de afzender is wie hij/zij beweert te zijn. Het is niet altijd mogelijk om de afzender te verifiëren, waardoor het pictogram soms ontbreekt. Dit is meestal geen reden voor ongerustheid."; -App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "Gevaar! Het lijkt er op dat iemand een bericht heeft proberen te vervalsen! Dit bericht is mogelijk niet afkomstig van de vermelde afzender!"; -App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?

    You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.

    You can also advance by pressing the return key"] = "Welkom op Hubzilla! Wil jij een rondleiding hebben langs de gebruikersinterface?

    Je kan dit op elk moment pauzeren en weer hervatten door de pagina te herladen of naar een andere pagina te gaan.

    Je kan ook vooruitgaan met behulp van de entertoets."; -App::$strings["Post to Twitter"] = "Twitter"; -App::$strings["Twitter settings updated."] = "Twitter-instellingen bijgewerkt."; -App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Geen consumerkeys voor Twitter gevonden. Neem contact op met jouw hubbeheerder."; -App::$strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "De Twitter-plugin is op deze Hubzilla-hub ingeschakeld, maar je hebt nog niet jouw Hubzilla-kanaal met jouw Twitter-account gekoppeld. Om dit te doen klik je op de knop hieronder om een PIN-code van Twitter te krijgen. Deze dien je te kopiëren en in het invoegveld beneden te plakken. Vervolgens klik je op Opslaan. Alleen jouw openbare berichten kunnen op Twitter worden geplaatst."; -App::$strings["Log in with Twitter"] = "Op Twitter inloggen"; -App::$strings["Copy the PIN from Twitter here"] = "Plak of type de PIN-code hier"; -App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Opmerking: In verband met jouw privacyinstellingen (wanneer jouw kanaalprofiel voor onbekenden is verborgen) leidt de profiellink die mogelijk in jouw naar Twitter doorgestuurde openbare berichten staat, naar een lege pagina met de melding dat toegang tot jouw kanaalprofiel is beperkt."; -App::$strings["Allow posting to Twitter"] = "Doorplaatsen naar Twitter toestaan"; -App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Wanneer dit is ingeschakeld kunnen jouw openbare berichten naar het gekoppelde Twitter-account worden doorgeplaatst"; -App::$strings["Send public postings to Twitter by default"] = "Standaard doorplaatsen naar Twitter"; -App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Wanneer dit is ingeschakeld worden al jouw openbare berichten standaard naar het gekoppelde Twitter-account doorgeplaatst"; -App::$strings["Twitter Post Settings"] = "Twitter (berichten doorplaatsen)"; -App::$strings["Submit Settings"] = "Instellingen toepassen"; -App::$strings["Show Upload Limits"] = "Uploadlimieten tonen"; -App::$strings["Hubzilla configured maximum size: "] = "Op Hubzilla configureerde maximale grootte: "; -App::$strings["PHP upload_max_filesize: "] = "PHP upload_max_filesize: "; -App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = "PHP post_max_size (moet hoger zijn dan upload_max_filesize): "; -App::$strings["Recent Channel/Profile Viewers"] = "Recente bezoekers van jouw kanaal/profiel"; -App::$strings["This plugin/addon has not been configured."] = "Deze plugin is niet geconfigureerd. "; -App::$strings["Please visit the Visage settings on %s"] = "Bezoek de Visage-instellingen op %s"; -App::$strings["your feature settings page"] = "Jouw plugin-instellingen"; -App::$strings["No entries."] = "Niets aanwezig."; -App::$strings["Enable Visage Visitor Logging"] = "Visage inschakelen "; -App::$strings["Visage Settings"] = "Visage"; -App::$strings["Who likes me?"] = "Wie vindt mij leuk?"; -App::$strings["Post to WordPress"] = "WordPress"; -App::$strings["Enable WordPress Post Plugin"] = "Doorplaatsen naar WordPress inschakelen"; -App::$strings["WordPress username"] = "Gebruikersnaam WordPress"; -App::$strings["WordPress password"] = "Wachtwoord WordPress"; -App::$strings["WordPress API URL"] = "API-URL WordPress"; -App::$strings["Typically https://your-blog.tld/xmlrpc.php"] = "Meestal https://jouw-blog.tld/xmlrpc.php"; -App::$strings["WordPress blogid"] = "Blog ID WordPress"; -App::$strings["For multi-user sites such as wordpress.com, otherwise leave blank"] = "Voor websites met meerdere gebruikers, zoals wordpress.com. Anders leeg laten."; -App::$strings["Post to WordPress by default"] = "Standaard naar WordPress doorplaatsen"; -App::$strings["Forward comments (requires hubzilla_wp plugin)"] = "Reacties doorplaatsen (Hubzilla_WP-plugin vereist)"; -App::$strings["WordPress Post Settings"] = "WordPress (berichten doorplaatsen)"; -App::$strings["Wordpress Settings saved."] = "WordPress-instellingen opgeslagen."; -App::$strings["XMPP settings updated."] = "XMPP-instellingen bijgewerkt."; -App::$strings["Enable Chat"] = "Chatten inschakelen"; -App::$strings["Individual credentials"] = "Individuele credentials"; -App::$strings["Jabber BOSH server"] = "BOSH-server van Jabber"; -App::$strings["XMPP Settings"] = "XMPP"; -App::$strings["Jabber BOSH host"] = "BOSH-host van Jabber"; -App::$strings["Use central userbase"] = "Gebruik een centrale gebruikersgroep"; -App::$strings["If enabled, members will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Wanneer ingeschakeld worden leden automatisch op een Ejabberd-server ingelogd. Deze dient wel op deze machine te zijn geïnstalleerd met zgn. 'synchronized credentials' via het 'auth_ejabberd.php'-script."; +App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can not change those settings here."] = "Sommige permissies worden mogelijk overgeërfd van de privacyinstellingen van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier niet veranderen."; +App::$strings["Friends"] = "Vrienden"; +App::$strings["Settings updated."] = "Instellingen bijgewerkt."; +App::$strings["Nobody except yourself"] = "Niemand, behalve jezelf"; +App::$strings["Only those you specifically allow"] = "Alleen connecties met uitdrukkelijke toestemming"; +App::$strings["Approved connections"] = "Geaccepteerde connecties"; +App::$strings["Any connections"] = "Alle connecties"; +App::$strings["Anybody on this website"] = "Iedereen op deze hub"; +App::$strings["Anybody in this network"] = "Iedereen in dit netwerk"; +App::$strings["Anybody authenticated"] = "Geauthenticeerd"; +App::$strings["Anybody on the internet"] = "Iedereen op het internet"; +App::$strings["Publish your default profile in the network directory"] = "Publiceer je standaardprofiel in de kanalengids"; +App::$strings["Allow us to suggest you as a potential friend to new members?"] = "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen"; +App::$strings["or"] = "of"; +App::$strings["Your channel address is"] = "Jouw kanaaladres is"; +App::$strings["Your files/photos are accessible via WebDAV at"] = "Jouw bestanden/foto's zijn beschikbaar via WebDAV op"; +App::$strings["Channel Settings"] = "Kanaalinstellingen"; +App::$strings["Basic Settings"] = "Basis-instellingen"; +App::$strings["Full Name:"] = "Volledige naam:"; +App::$strings["Email Address:"] = "E-mailadres:"; +App::$strings["Your Timezone:"] = "Jouw tijdzone:"; +App::$strings["Default Post Location:"] = "Standaardlocatie bericht:"; +App::$strings["Geographical location to display on your posts"] = "Geografische locatie die bij het bericht moet worden vermeld"; +App::$strings["Use Browser Location:"] = "Locatie van webbrowser gebruiken:"; +App::$strings["Adult Content"] = "Inhoud voor volwassenen"; +App::$strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassenen. (Gebruik de tag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)"; +App::$strings["Security and Privacy Settings"] = "Veiligheids- en privacyinstellingen "; +App::$strings["Your permissions are already configured. Click to view/adjust"] = "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen."; +App::$strings["Hide my online presence"] = "Verberg mijn aanwezigheid"; +App::$strings["Prevents displaying in your profile that you are online"] = "Voorkomt dat op je kanaalpagina te zien valt dat je momenteel op \$Projectname aanwezig bent"; +App::$strings["Simple Privacy Settings:"] = "Eenvoudige privacyinstellingen:"; +App::$strings["Very Public - extremely permissive (should be used with caution)"] = "Zeer openbaar (kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)"; +App::$strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Normaal (standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)"; +App::$strings["Private - default private, never open or public"] = "Privé (standaard privé en nooit openbaar)"; +App::$strings["Blocked - default blocked to/from everybody"] = "Geblokkeerd (standaard geblokkeerd naar/van iedereen)"; +App::$strings["Allow others to tag your posts"] = "Anderen toestaan om je berichten te taggen"; +App::$strings["Often used by the community to retro-actively flag inappropriate content"] = "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren"; +App::$strings["Channel Permission Limits"] = "Geavanceerde permissies"; +App::$strings["Expire other channel content after this many days"] = "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:"; +App::$strings["0 or blank to use the website limit."] = "0 of leeg om het standaard aantal dagen van deze hub te gebruiken."; +App::$strings["This website expires after %d days."] = "Deze hub laat de inhoud van andere kanalen na %d dagen verlopen."; +App::$strings["This website does not expire imported content."] = "Deze hub laat de inhoud van andere kanalen niet verlopen."; +App::$strings["The website limit takes precedence if lower than your limit."] = "Wanneer de standaard aantal dagen van deze hub lager ligt dan jouw aantal, dan heeft de limiet van deze hub voorrang."; +App::$strings["Maximum Friend Requests/Day:"] = "Maximum aantal connectieverzoeken per dag:"; +App::$strings["May reduce spam activity"] = "Kan eventuele spam verminderen"; +App::$strings["Default Privacy Group"] = "Standaard privacygroep"; +App::$strings["Use my default audience setting for the type of object published"] = "Gebruik mijn standaard privacyinstelling voor dit type publicatie"; +App::$strings["Profile to assign new connections"] = "Profiel om aan nieuwe connecties toe te wijzen"; +App::$strings["Default Permissions Group"] = "Standaard permissiegroep"; +App::$strings["Maximum private messages per day from unknown people:"] = "Maximum aantal privé-berichten per dag van onbekende personen:"; +App::$strings["Useful to reduce spamming"] = "Kan eventuele spam verminderen"; +App::$strings["Notification Settings"] = "Meldingen"; +App::$strings["By default post a status message when:"] = "Plaats automatisch een bericht wanneer:"; +App::$strings["accepting a friend request"] = "Een connectieverzoek wordt geaccepteerd"; +App::$strings["joining a forum/community"] = "Je lid wordt van een forum/groep"; +App::$strings["making an interesting profile change"] = "Er sprake is van een interessante profielwijziging"; +App::$strings["Send a notification email when:"] = "Verzend een melding per e-mail wanneer:"; +App::$strings["You receive a connection request"] = "Je een connectieverzoek ontvangt"; +App::$strings["Your connections are confirmed"] = "Jouw connecties zijn bevestigd"; +App::$strings["Someone writes on your profile wall"] = "Iemand iets op jouw kanaal heeft geschreven"; +App::$strings["Someone writes a followup comment"] = "Iemand een reactie schrijft"; +App::$strings["You receive a private message"] = "Je een privé-bericht ontvangt"; +App::$strings["You receive a friend suggestion"] = "Je een kanaalvoorstel ontvangt"; +App::$strings["You are tagged in a post"] = "Je expliciet in een bericht bent genoemd"; +App::$strings["You are poked/prodded/etc. in a post"] = "Je bent in een bericht aangestoten/gepord/etc."; +App::$strings["Someone likes your post/comment"] = "Iemand jouw bericht/reactie leuk vindt"; +App::$strings["Show visual notifications including:"] = "Toon de volgende zichtbare meldingen:"; +App::$strings["Unseen grid activity"] = "Niet bekeken tijdlijnactiviteit"; +App::$strings["Unseen channel activity"] = "Niet bekeken kanaalactiviteit"; +App::$strings["Unseen private messages"] = "Niet bekeken privéberichten"; +App::$strings["Recommended"] = "Aanbevolen"; +App::$strings["Upcoming events"] = "Aankomende gebeurtenissen"; +App::$strings["Events today"] = "Gebeurtenissen van vandaag"; +App::$strings["Upcoming birthdays"] = "Aankomende verjaardagen"; +App::$strings["Not available in all themes"] = "Niet in alle thema's beschikbaar"; +App::$strings["System (personal) notifications"] = "(Persoonlijke) systeemmeldingen"; +App::$strings["System info messages"] = "Systeemmededelingen"; +App::$strings["System critical alerts"] = "Kritische systeemwaarschuwingen"; +App::$strings["New connections"] = "Nieuwe connecties"; +App::$strings["System Registrations"] = "Nieuwe accountregistraties op deze hub"; +App::$strings["Unseen shared files"] = "Niet bekeken gedeelde bestanden"; +App::$strings["Unseen public activity"] = "Niet bekeken openbare activiteit"; +App::$strings["Unseen likes and dislikes"] = "Niet bekeken vind-ik-leuks en vind-ik-niet-leuks"; +App::$strings["Email notification hub (hostname)"] = "Hub voor e-mailmeldingen (hostnaam)"; +App::$strings["If your channel is mirrored to multiple hubs, set this to your preferred location. This will prevent duplicate email notifications. Example: %s"] = "Wanneer jouw kanaal naar een of meerdere hubs is gekloond, kun je hier bepalen welke hub je voor e-mailmeldingen wilt gebruiken. Dit voorkomt dubbele e-mailmeldingen. Voorbeeld:%s"; +App::$strings["Show new wall posts, private messages and connections under Notices"] = "Toon nieuwe kanaalberichten, privéberichten en connecties onder Meldingen"; +App::$strings["Notify me of events this many days in advance"] = "Herinner mij zoveel dagen van te voren aan gebeurtenissen"; +App::$strings["Must be greater than 0"] = "Moet hoger dan 0 zijn"; +App::$strings["Advanced Account/Page Type Settings"] = "Instellingen geavanceerd account/paginatype"; +App::$strings["Change the behaviour of this account for special situations"] = "Verander het gedrag van dit account voor speciale situaties"; +App::$strings["Miscellaneous Settings"] = "Diverse instellingen"; +App::$strings["Default photo upload folder"] = "Standaard fotoalbum voor uploads"; +App::$strings["%Y - current year, %m - current month"] = "%Y - dit jaar, %m - deze maand"; +App::$strings["Default file upload folder"] = "Standaard bestandsmap voor uploads"; +App::$strings["Personal menu to display in your channel pages"] = "Persoonlijk menu om op je kanaalpagina's te tonen"; +App::$strings["Remove this channel."] = "Verwijder dit kanaal."; +App::$strings["Firefox Share \$Projectname provider"] = "\$Projectname-service voor Firefox Share"; +App::$strings["Start calendar week on Monday"] = "Begin kalenderweek op maandag"; +App::$strings["Additional Features"] = "Extra functies"; +App::$strings["Your technical skill level"] = "Jouw technisch niveau"; +App::$strings["Used to provide a member experience and additional features consistent with your comfort level"] = "Wordt gebruikt om je een gebruikerservaring en extra functies te bieden die met jouw technisch niveau overeenkomt"; +App::$strings["This channel is limited to %d tokens"] = "Dit kanaal heeft een limiet van %d tokens"; +App::$strings["Name and Password are required."] = "Naam en wachtwoord zijn vereist"; +App::$strings["Token saved."] = "Token opgeslagen."; +App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content."] = "Gebruik dit formulier om tijdelijke identiteiten aan te maken, waarmee je bepaalde informatie met niet-leden kan delen. Deze identiteiten kunnen onder Permissies (handmatige selectie) worden gebruikt. Gasten kunnen inloggen met onderstaande gegevens om zo toegang te krijgen tot privéinhoud."; +App::$strings["You may also provide dropbox style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "Je kan ook dropbox-achtige links aan mensen geven door bovenstaand wachtwoord op onderstaande manier aan een hub-URL toe te voegen. Voorbeelden:"; +App::$strings["Guest Access Tokens"] = "Gasttoegang"; +App::$strings["Login Name"] = "Inlognaam"; +App::$strings["Login Password"] = "Wachtwoord:"; +App::$strings["Expires (yyyy-mm-dd)"] = "Geldig t/m (yyyy-mm-dd)"; +App::$strings["Their Settings"] = "Hun instellingen"; +App::$strings["Name and Secret are required"] = "Naam en secret zijn vereist"; +App::$strings["Add OAuth2 application"] = "OAuth2-applicatie toevoegen"; +App::$strings["Name of application"] = "Naam van applicatie"; +App::$strings["Consumer Secret"] = "Consumer secret"; +App::$strings["Automatically generated - change if desired. Max length 20"] = "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20"; +App::$strings["Redirect"] = "Redirect/doorverwijzing"; +App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist"; +App::$strings["Grant Types"] = "Grant-types"; +App::$strings["leave blank unless your application sepcifically requires this"] = "laat leeg, behalve wanneer de applicatie dit vereist"; +App::$strings["Authorization scope"] = "Autorisatie-scope "; +App::$strings["OAuth2 Application not found."] = "OAuth2-applicatie niet gevonden."; +App::$strings["Add application"] = "Applicatie toevoegen"; +App::$strings["Connected OAuth2 Apps"] = "Verbonden OAuth2-applicaties"; +App::$strings["Client key starts with"] = "Client key begint met"; +App::$strings["No name"] = "Geen naam"; +App::$strings["Remove authorization"] = "Autorisatie verwijderen"; +App::$strings["Not valid email."] = "Geen geldig e-mailadres."; +App::$strings["Protected email address. Cannot change to that email."] = "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken."; +App::$strings["System failure storing new email. Please try again."] = "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer."; +App::$strings["Technical skill level updated"] = "Technisch niveau bijgewerkt"; +App::$strings["Password verification failed."] = "Wachtwoordverificatie mislukt"; +App::$strings["Passwords do not match. Password unchanged."] = "Wachtwoorden komen niet overeen. Wachtwoord onveranderd."; +App::$strings["Empty passwords are not allowed. Password unchanged."] = "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd."; +App::$strings["Password changed."] = "Wachtwoord veranderd."; +App::$strings["Password update failed. Please try again."] = "Bijwerken wachtwoord mislukt. Probeer opnieuw."; +App::$strings["Account Settings"] = "Account-instellingen"; +App::$strings["Current Password"] = "Huidig wachtwoord"; +App::$strings["Enter New Password"] = "Nieuw wachtwoord invoeren"; +App::$strings["Confirm New Password"] = "Nieuw wachtwoord bevestigen"; +App::$strings["Leave password fields blank unless changing"] = "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen"; +App::$strings["Remove Account"] = "Account verwijderen"; +App::$strings["Remove this account including all its channels"] = "Dit account en al zijn kanalen verwijderen"; +App::$strings["Affinity Slider settings updated."] = "Affiniteitsinstellingen bijgewerkt."; +App::$strings["No feature settings configured"] = "Geen plug-in-instellingen aanwezig"; +App::$strings["Default maximum affinity level"] = "Standaard hoogste affiniteitsniveau"; +App::$strings["0-99 default 99"] = "0-99 - standaard 99"; +App::$strings["Default minimum affinity level"] = "Standaard laagste affiniteitsniveau"; +App::$strings["0-99 - default 0"] = "0-99 - standaard 0"; +App::$strings["Affinity Slider Settings"] = "Affiniteitsinstellingen"; +App::$strings["Addon Settings"] = "Plug-ins"; +App::$strings["Please save/submit changes to any panel before opening another."] = "Gewijzigde instellingen van een plug-in opslaan alvorens een nieuwe plug-in te openen."; +App::$strings["%s - (Experimental)"] = "%s - (experimenteel)"; +App::$strings["Display Settings"] = "Weergave-instellingen"; +App::$strings["Theme Settings"] = "Thema-instellingen"; +App::$strings["Custom Theme Settings"] = "Handmatige thema-instellingen"; +App::$strings["Content Settings"] = "Inhoudsinstellingen"; +App::$strings["Display Theme:"] = "Gebruik thema:"; +App::$strings["Select scheme"] = "Kies schema van thema"; +App::$strings["Preload images before rendering the page"] = "Afbeeldingen laden voordat de pagina wordt getoond"; +App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "De laadtijd van een pagina lijkt langer, maar de pagina is wel meteen helemaal geladen wanneer deze wordt getoond"; +App::$strings["Enable user zoom on mobile devices"] = "Inzoomen op smartphones en tablets toestaan"; +App::$strings["Update browser every xx seconds"] = "Ververs de webbrowser om de zoveel seconde"; +App::$strings["Minimum of 10 seconds, no maximum"] = "Minimaal 10 seconde, geen maximum"; +App::$strings["Maximum number of conversations to load at any time:"] = "Maximaal aantal conversaties die per keer geladen worden:"; +App::$strings["Maximum of 100 items"] = "Maximaal 100 conversaties"; +App::$strings["Show emoticons (smilies) as images"] = "Toon emoticons (smilies) als afbeeldingen"; +App::$strings["Provide channel menu in navigation bar"] = "Kanaalmenu op navigatiebalk tonen"; +App::$strings["Default: channel menu located in app menu"] = "Standaard valt het kanaalmenu in het appmenu te vinden"; +App::$strings["Manual conversation updates"] = "Handmatige conversatie-updates"; +App::$strings["Default is on, turning this off may increase screen jumping"] = "Dit is standaard ingeschakeld en door dit uit te schakelen kunnen items soms verspringen."; +App::$strings["Link post titles to source"] = "Berichtkoppen naar originele locatie linken"; +App::$strings["System Page Layout Editor - (advanced)"] = "Lay-out bewerken van systeempagina's (geavanceerd)"; +App::$strings["Use blog/list mode on channel page"] = "Gebruik blog/lijst-modus op kanaalpagina"; +App::$strings["(comments displayed separately)"] = "(reacties worden afzonderlijk getoond)"; +App::$strings["Use blog/list mode on grid page"] = "Gebruik blog/lijst-modus op jouw kanaalpagina"; +App::$strings["Channel page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)"; +App::$strings["click to expand content exceeding this height"] = "klik om inhoud uit te klappen die deze hoogte overschrijdt"; +App::$strings["Grid page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud (in pixels)"; +App::$strings["Name is required"] = "Naam is vereist"; +App::$strings["Key and Secret are required"] = "Key en secret zijn vereist"; +App::$strings["Consumer Key"] = "Consumer key"; +App::$strings["Icon url"] = "Pictogram-URL"; +App::$strings["Optional"] = "Niet verplicht"; +App::$strings["Application not found."] = "Applicatie niet gevonden."; +App::$strings["Connected Apps"] = "Verbonden applicaties"; +App::$strings["View Photo"] = "Foto tonen"; +App::$strings["Edit Album"] = "Album bewerken"; +App::$strings["Upload"] = "Uploaden"; +App::$strings["Some blurb about what to do when you're new here"] = "Welkom op \$Projectname. Klik op de tab ontdekken of klik rechtsboven op de kanalengids, om kanalen te vinden. Rechtsboven vind je ook apps, waar je vrijwel alle functies van \$Projectname kunt vinden. Voor hulp met \$Projectname klik je op het vraagteken."; +App::$strings["Thing updated"] = "Ding bijgewerkt"; +App::$strings["Object store: failed"] = "Opslaan van ding mislukt"; +App::$strings["Thing added"] = "Ding toegevoegd"; +App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s"; +App::$strings["Show Thing"] = "Ding tonen"; +App::$strings["item not found."] = "Item niet gevonden"; +App::$strings["Edit Thing"] = "Ding bewerken"; +App::$strings["Select a profile"] = "Kies een profiel"; +App::$strings["Post an activity"] = "Plaats een bericht"; +App::$strings["Only sends to viewers of the applicable profile"] = "Toont dit alleen aan diegene die het gekozen profiel mogen zien."; +App::$strings["Name of thing e.g. something"] = "Naam van ding"; +App::$strings["URL of thing (optional)"] = "URL van ding (niet verplicht)"; +App::$strings["URL for photo of thing (optional)"] = "URL voor foto van ding (niet verplicht)"; +App::$strings["Permissions"] = "Permissies"; +App::$strings["Add Thing to your Profile"] = "Ding aan je profiel toevoegen"; +App::$strings["No more system notifications."] = "Geen systeemmeldingen meer."; +App::$strings["System Notifications"] = "Systeemmeldingen"; +App::$strings["Connection added."] = "Connectie toegevoegd."; +App::$strings["Your service plan only allows %d channels."] = "Jouw abonnement staat maar %d kanalen toe."; +App::$strings["No channel. Import failed."] = "Geen kanaal. Importeren mislukt."; +App::$strings["Import completed."] = "Import voltooid."; +App::$strings["You must be logged in to use this feature."] = "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken."; +App::$strings["Import Channel"] = "Kanaal importeren"; +App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaalidentiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken."; +App::$strings["Or provide the old server/hub details"] = "Of vul de gegevens van de oude hub in"; +App::$strings["Your old identity address (xyz@example.com)"] = "Jouw oude kanaaladres (xyz@example.com)"; +App::$strings["Your old login email address"] = "Het e-mailadres van je oude account"; +App::$strings["Your old login password"] = "Wachtwoord van jouw oude account"; +App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen."; +App::$strings["Make this hub my primary location"] = "Stel deze hub als mijn primaire locatie in"; +App::$strings["Move this channel (disable all previous locations)"] = "Verplaats dit kanaal (schakelt alle voormalige locaties uit)"; +App::$strings["Import a few months of posts if possible (limited by available memory"] = "Importeer enkele maanden aan berichten wanneer mogelijk (afhankelijk van hoeveelheid geheugen hub)"; +App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid."; +App::$strings["Authentication failed."] = "Authenticatie mislukt."; +App::$strings["Remote Authentication"] = "Authenticatie op afstand"; +App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Vul jouw kanaaladres in (bijv. channel@example.com)"; +App::$strings["Authenticate"] = "Authenticeren"; +App::$strings["Permissions denied."] = "Permissies niet toegestaan"; +App::$strings["Import"] = "Importeren"; +App::$strings["Authorize application connection"] = "Geef toestemming voor applicatiekoppeling"; +App::$strings["Return to your app and insert this Security Code:"] = "Ga terug naar je app en voeg deze beveiligingscode in:"; +App::$strings["Please login to continue."] = "Inloggen om verder te kunnen gaan."; +App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?"; +App::$strings["Item not available."] = "Item is niet aanwezig."; +App::$strings["Edit Block"] = "Blok bewerken"; +App::$strings["vcard"] = "vcard"; +App::$strings["Apps"] = "Apps"; +App::$strings["Manage apps"] = "Apps beheren"; +App::$strings["Create new app"] = "Nieuwe app aanmaken"; +App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s is %2\$s"; +App::$strings["Mood"] = "Stemming"; +App::$strings["Set your current mood and tell your friends"] = "Noteer je huidige stemming en toon het aan je connecties"; +App::$strings["Active"] = "Actief"; +App::$strings["Blocked"] = "Geblokkeerd"; +App::$strings["Ignored"] = "Genegeerd"; +App::$strings["Hidden"] = "Verborgen"; +App::$strings["Archived/Unreachable"] = "Gearchiveerd/onbereikbaar"; +App::$strings["New"] = "Nieuw"; +App::$strings["All"] = "Alles"; +App::$strings["Active Connections"] = "Actieve connecties"; +App::$strings["Show active connections"] = "Actieve connecties tonen"; +App::$strings["New Connections"] = "Nieuwe connecties"; +App::$strings["Show pending (new) connections"] = "Nog te accepteren (nieuwe) connecties tonen"; +App::$strings["Only show blocked connections"] = "Toon alleen geblokkeerde connecties"; +App::$strings["Only show ignored connections"] = "Toon alleen genegeerde connecties"; +App::$strings["Only show archived/unreachable connections"] = "Alleen gearchiveerde/onbereikbare connecties tonen"; +App::$strings["Only show hidden connections"] = "Toon alleen verborgen connecties"; +App::$strings["Show all connections"] = "Toon alle connecties"; +App::$strings["Pending approval"] = "Moet nog geaccepteerd worden"; +App::$strings["Archived"] = "Gearchiveerd"; +App::$strings["Not connected at this location"] = "Niet op deze locatie verbonden"; +App::$strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]"; +App::$strings["Edit connection"] = "Connectie bewerken"; +App::$strings["Delete connection"] = "Connectie verwijderen"; +App::$strings["Channel address"] = "Kanaaladres"; +App::$strings["Network"] = "Netwerk"; +App::$strings["Call"] = "Bellen"; +App::$strings["Status"] = "Status"; +App::$strings["Connected"] = "Verbonden"; +App::$strings["Approve connection"] = "Connectie accepteren"; +App::$strings["Ignore connection"] = "Connectie negeren"; +App::$strings["Ignore"] = "Negeren"; +App::$strings["Recent activity"] = "Recente activiteit"; +App::$strings["Connections"] = "Connecties"; +App::$strings["Search your connections"] = "Doorzoek jouw connecties"; +App::$strings["Connections search"] = "Connecties zoeken"; +App::$strings["Find"] = "Vinden"; +App::$strings["item"] = "item"; +App::$strings["Source of Item"] = "Bron van item"; +App::$strings["Bookmark added"] = "Bladwijzer toegevoegd"; +App::$strings["My Bookmarks"] = "Mijn bladwijzers"; +App::$strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties"; +App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Het verwijderen van een account is niet toegestaan binnen 48 uur nadat het wachtwoord is veranderd."; +App::$strings["Remove This Account"] = "Verwijder dit account"; +App::$strings["This account and all its channels will be completely removed from the network. "] = "Dit account en al zijn kanalen worden volledig uit het \$Projectname-netwerk verwijderd."; +App::$strings["Remove this account, all its channels and all its channel clones from the network"] = "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het \$Projectname-netwerk verwijderen"; +App::$strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het \$Projectname-netwerk verwijderd"; +App::$strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen."; +App::$strings["Album not found."] = "Album niet gevonden."; +App::$strings["Delete Album"] = "Verwijder album"; +App::$strings["Delete Photo"] = "Verwijder foto"; +App::$strings["No photos selected"] = "Geen foto's geselecteerd"; +App::$strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt."; +App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt."; +App::$strings["%1$.2f MB photo storage used."] = "%1$.2f MB aan foto-opslag gebruikt."; +App::$strings["Upload Photos"] = "Foto's uploaden"; +App::$strings["Enter an album name"] = "Vul een albumnaam in"; +App::$strings["or select an existing album (doubleclick)"] = "of kies een bestaand album (dubbelklikken)"; +App::$strings["Create a status post for this upload"] = "Plaats een bericht voor deze upload."; +App::$strings["Description (optional)"] = "Omschrijving (niet verplicht)"; +App::$strings["Show Newest First"] = "Nieuwste eerst tonen"; +App::$strings["Show Oldest First"] = "Oudste eerst tonen"; +App::$strings["Add Photos"] = "Foto's toevoegen"; +App::$strings["Permission denied. Access to this item may be restricted."] = "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."; +App::$strings["Photo not available"] = "Foto niet aanwezig"; +App::$strings["Use as profile photo"] = "Als profielfoto gebruiken"; +App::$strings["Use as cover photo"] = "Als omslagfoto gebruiken"; +App::$strings["Private Photo"] = "Privéfoto"; +App::$strings["View Full Size"] = "Volledige grootte tonen"; +App::$strings["Edit photo"] = "Foto bewerken"; +App::$strings["Rotate CW (right)"] = "Draai met de klok mee (naar rechts)"; +App::$strings["Rotate CCW (left)"] = "Draai tegen de klok in (naar links)"; +App::$strings["Move photo to album"] = "Verplaatst foto naar album"; +App::$strings["Enter a new album name"] = "Vul een nieuwe albumnaam in"; +App::$strings["or select an existing one (doubleclick)"] = "of kies een bestaand album (dubbelklikken)"; +App::$strings["Add a Tag"] = "Tag toevoegen"; +App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"; +App::$strings["Flag as adult in album view"] = "Markeer als voor volwassenen in albumweergave"; +App::$strings["I like this (toggle)"] = "Vind ik leuk"; +App::$strings["I don't like this (toggle)"] = "Vind ik niet leuk"; +App::$strings["Please wait"] = "Even wachten"; +App::$strings["This is you"] = "Dit ben jij"; +App::$strings["Comment"] = "Reactie"; +App::$strings["__ctx:title__ Likes"] = "vinden dit leuk"; +App::$strings["__ctx:title__ Dislikes"] = "vinden dit niet leuk"; +App::$strings["__ctx:title__ Agree"] = "eens"; +App::$strings["__ctx:title__ Disagree"] = "oneens"; +App::$strings["__ctx:title__ Abstain"] = "onthoudingen"; +App::$strings["__ctx:title__ Attending"] = "aanwezig"; +App::$strings["__ctx:title__ Not attending"] = "niet aanwezig"; +App::$strings["__ctx:title__ Might attend"] = "mogelijk aanwezig"; +App::$strings["View all"] = "Toon alles"; +App::$strings["__ctx:noun__ Like"] = array( + 0 => "vindt dit leuk", + 1 => "vinden dit leuk", +); +App::$strings["__ctx:noun__ Dislike"] = array( + 0 => "vindt dit niet leuk", + 1 => "vinden dit niet leuk", +); +App::$strings["Photo Tools"] = "Hulpmiddelen"; +App::$strings["In This Photo:"] = "Op deze foto:"; +App::$strings["Map"] = "Kaart"; +App::$strings["__ctx:noun__ Likes"] = "vinden dit leuk"; +App::$strings["__ctx:noun__ Dislikes"] = "vinden dit niet leuk"; +App::$strings["Close"] = "Sluiten"; +App::$strings["Recent Photos"] = "Recente foto's"; +App::$strings["Profile Unavailable."] = "Profiel niet beschikbaar."; +App::$strings["Not found"] = "Niet gevonden"; +App::$strings["Invalid channel"] = "Onbekend kanaal"; +App::$strings["Error retrieving wiki"] = "Fout tijdens ophalen wiki"; +App::$strings["Error creating zip file export folder"] = "Fout tijdens aanmaken exportmap zipbestand"; +App::$strings["Error downloading wiki: "] = "Fout tijdens downloaden wiki: "; +App::$strings["Wikis"] = "Wiki's"; +App::$strings["Download"] = "Download"; +App::$strings["Create New"] = "Nieuwe aanmaken"; +App::$strings["Wiki name"] = "Naam wiki"; +App::$strings["Content type"] = "Opmaaktype"; +App::$strings["Markdown"] = "Markdown"; +App::$strings["BBcode"] = "BBcode"; +App::$strings["Text"] = "Tekst"; +App::$strings["Type"] = "Type"; +App::$strings["Any type"] = "Elk type"; +App::$strings["Lock content type"] = "Opmaaktype vastzetten"; +App::$strings["Create a status post for this wiki"] = "Plaats een bericht over deze wiki"; +App::$strings["Edit Wiki Name"] = "Naam wiki bewerken"; +App::$strings["Wiki not found"] = "Wiki is niet gevonden"; +App::$strings["Rename page"] = "Pagina hernoemen"; +App::$strings["Error retrieving page content"] = "Fout tijdens ophalen inhoud pagina"; +App::$strings["New page"] = "Nieuwe pagina"; +App::$strings["Revision Comparison"] = "Revisies vergelijken"; +App::$strings["Revert"] = "Ongedaan maken"; +App::$strings["Short description of your changes (optional)"] = "Korte omschrijving van jouw wijzigingen (niet verplicht)"; +App::$strings["Source"] = "Bron"; +App::$strings["New page name"] = "Nieuwe paginanaam"; +App::$strings["Embed image from photo albums"] = "Afbeelding uit een fotoalbum invoegen"; +App::$strings["Embed an image from your albums"] = "Afbeelding uit jouw albums invoegen"; +App::$strings["OK"] = "OK"; +App::$strings["Choose images to embed"] = "Kies afbeeldingen om in te voegen"; +App::$strings["Choose an album"] = "Kies een album"; +App::$strings["Choose a different album"] = "Kies een ander album"; +App::$strings["Error getting album list"] = "Fout tijdens ophalen albumlijst"; +App::$strings["Error getting photo link"] = "Fout tijdens ophalen fotolink"; +App::$strings["Error getting album"] = "Fout tijdens ophalen album"; +App::$strings["Error creating wiki. Invalid name."] = "Fout tijdens aanmaken wiki. Ongeldige naam."; +App::$strings["A wiki with this name already exists."] = "Er bestaat al een wiki onder deze naam"; +App::$strings["Wiki created, but error creating Home page."] = "Wiki aangemaakt, maar fout tijdens aanmaken homepagina."; +App::$strings["Error creating wiki"] = "Fout tijdens aanmaken wiki."; +App::$strings["Error updating wiki. Invalid name."] = "Fout tijdens bijwerken wiki. Ongeldige naam."; +App::$strings["Error updating wiki"] = "Fout tijdens bijwerken wiki"; +App::$strings["Wiki delete permission denied."] = "Toegang geweigerd tijdens verwijderen wiki."; +App::$strings["Error deleting wiki"] = "Fout tijdens verwijderen wiki"; +App::$strings["New page created"] = "Nieuwe pagina aangemaakt"; +App::$strings["Cannot delete Home"] = "Kan Home niet verwijderen"; +App::$strings["Current Revision"] = "Huidige revisie"; +App::$strings["Selected Revision"] = "Geselecteerde revisie"; +App::$strings["You must be authenticated."] = "Je moet geauthenticeerd zijn"; +App::$strings["toggle full screen mode"] = "Volledig scherm"; +App::$strings["Layout updated."] = "Lay-out bijgewerkt."; +App::$strings["Feature disabled."] = "Functie uitgeschakeld."; +App::$strings["Edit System Page Description"] = "Systeempagina's bewerken"; +App::$strings["(modified)"] = "(aangepast)"; +App::$strings["Reset"] = "Opnieuw instellen"; +App::$strings["Layout not found."] = "Lay-out niet gevonden."; +App::$strings["Module Name:"] = "Modulenaam:"; +App::$strings["Layout Help"] = "Lay-out-hulp"; +App::$strings["Edit another layout"] = "Andere systeempagina bewerken"; +App::$strings["System layout"] = "Systeemlay-out"; +App::$strings["Poke"] = "Aanstoten"; +App::$strings["Poke somebody"] = "Iemand aanstoten"; +App::$strings["Poke/Prod"] = "Aanstoten/porren"; +App::$strings["Poke, prod or do other things to somebody"] = "Iemand bijvoorbeeld aanstoten of poren"; +App::$strings["Recipient"] = "Ontvanger"; +App::$strings["Choose what you wish to do to recipient"] = "Kies wat je met de ontvanger wil doen"; +App::$strings["Make this post private"] = "Maak dit bericht privé"; +App::$strings["Image uploaded but image cropping failed."] = "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. "; +App::$strings["Profile Photos"] = "Profielfoto's"; +App::$strings["Image resize failed."] = "Afbeelding kon niet van grootte veranderd worden."; +App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt getoond."; +App::$strings["Unable to process image"] = "Afbeelding kan niet verwerkt worden"; +App::$strings["Image upload failed."] = "Uploaden afbeelding mislukt"; +App::$strings["Unable to process image."] = "Niet in staat om afbeelding te verwerken."; +App::$strings["Photo not available."] = "Foto niet beschikbaar."; +App::$strings["Upload File:"] = "Bestand uploaden:"; +App::$strings["Select a profile:"] = "Kies een profiel:"; +App::$strings["Use Photo for Profile"] = "Als profielfoto gebruiken"; +App::$strings["Change Profile Photo"] = "Profielfoto wijzigen"; +App::$strings["Use"] = "Gebruiken"; +App::$strings["Use a photo from your albums"] = "Gebruik een foto uit jouw albums"; +App::$strings["Select existing photo"] = "Kies een bestaande foto"; +App::$strings["Crop Image"] = "Afbeelding bijsnijden"; +App::$strings["Please adjust the image cropping for optimum viewing."] = "Snij de afbeelding zo uit dat deze optimaal wordt getoond."; +App::$strings["Done Editing"] = "Klaar met bewerken"; +App::$strings["Away"] = "Afwezig"; +App::$strings["Online"] = "Online"; +App::$strings["Unable to locate original post."] = "Niet in staat om de originele locatie van het bericht te vinden. "; +App::$strings["Empty post discarded."] = "Leeg bericht geannuleerd"; +App::$strings["Duplicate post suppressed."] = "Dubbel bericht tegengehouden."; +App::$strings["System error. Post not saved."] = "Systeemfout. Bericht niet opgeslagen."; +App::$strings["Your comment is awaiting approval."] = "Jouw reactie moet nog worden goedgekeurd"; +App::$strings["Unable to obtain post information from database."] = "Niet in staat om informatie over dit bericht uit de database te verkrijgen."; +App::$strings["You have reached your limit of %1$.0f top level posts."] = "Je hebt jouw limiet van %1$.0f berichten bereikt."; +App::$strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw limiet van %1$.0f webpagina's bereikt."; +App::$strings["sent you a private message"] = "stuurde jou een privébericht"; +App::$strings["added your channel"] = "voegde jouw kanaal toe"; +App::$strings["requires approval"] = "vereist goedkeuring"; +App::$strings["g A l F d"] = "G:i, l d F"; +App::$strings["[today]"] = "[vandaag]"; +App::$strings["posted an event"] = "plaatste een gebeurtenis"; +App::$strings["shared a file with you"] = "deelde een bestand met jou"; +App::$strings["Invalid item."] = "Ongeldig item."; +App::$strings["Page not found."] = "Pagina niet gevonden."; +App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; +App::$strings["Could not access contact record."] = "Kon geen toegang krijgen tot de connectie-gegevens."; +App::$strings["Could not locate selected profile."] = "Kon het gekozen profiel niet vinden."; +App::$strings["Connection updated."] = "Connectie bijgewerkt."; +App::$strings["Failed to update connection record."] = "Bijwerken van connectie-gegevens mislukt."; +App::$strings["is now connected to"] = "is nu verbonden met"; +App::$strings["Could not access address book record."] = "Kon geen toegang krijgen tot de record van de connectie."; +App::$strings["Refresh failed - channel is currently unavailable."] = "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"; +App::$strings["Unable to set address book parameters."] = "Niet in staat om de parameters van connecties in te stellen."; +App::$strings["Connection has been removed."] = "Connectie is verwijderd"; +App::$strings["View Profile"] = "Profiel tonen"; +App::$strings["View %s's profile"] = "Profiel van %s tonen"; +App::$strings["Refresh Permissions"] = "Permissies vernieuwen"; +App::$strings["Fetch updated permissions"] = "Aangepaste permissies ophalen"; +App::$strings["Refresh Photo"] = "Foto vernieuwen"; +App::$strings["Fetch updated photo"] = "Aangepaste foto ophalen"; +App::$strings["Recent Activity"] = "Recente activiteit/berichten"; +App::$strings["View recent posts and comments"] = "Recente berichten en reacties tonen"; +App::$strings["Block (or Unblock) all communications with this connection"] = "Blokkeer (of deblokkeer) alle communicatie met deze connectie"; +App::$strings["This connection is blocked!"] = "Deze connectie is geblokkeerd!"; +App::$strings["Unignore"] = "Niet meer negeren"; +App::$strings["Ignore (or Unignore) all inbound communications from this connection"] = "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"; +App::$strings["This connection is ignored!"] = "Deze connectie wordt genegeerd!"; +App::$strings["Unarchive"] = "Niet meer archiveren"; +App::$strings["Archive"] = "Archiveren"; +App::$strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud"; +App::$strings["This connection is archived!"] = "Deze connectie is gearchiveerd!"; +App::$strings["Unhide"] = "Niet meer verbergen"; +App::$strings["Hide"] = "Verbergen"; +App::$strings["Hide or Unhide this connection from your other connections"] = "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"; +App::$strings["This connection is hidden!"] = "Deze connectie is verborgen!"; +App::$strings["Delete this connection"] = "Deze connectie verwijderen"; +App::$strings["Fetch Vcard"] = "Vcard ophalen"; +App::$strings["Fetch electronic calling card for this connection"] = "Visitekaartje van deze connectie ophalen"; +App::$strings["Open Individual Permissions section by default"] = "Sectie met individuele permissies standaard openen"; +App::$strings["Affinity"] = "Affiniteit"; +App::$strings["Open Set Affinity section by default"] = "Sectie met de affiniteitsinstelling standaard openen"; +App::$strings["Me"] = "Ik"; +App::$strings["Family"] = "Familie"; +App::$strings["Acquaintances"] = "Kennissen"; +App::$strings["Filter"] = "Filter"; +App::$strings["Open Custom Filter section by default"] = "Sectie met de berichtenfilter standaard openen"; +App::$strings["Approve this connection"] = "Deze connectie accepteren"; +App::$strings["Accept connection to allow communication"] = "Keur deze connectie goed om communicatie toe te staan"; +App::$strings["Set Affinity"] = "Affiniteit instellen"; +App::$strings["Set Profile"] = "Profiel instellen"; +App::$strings["Set Affinity & Profile"] = "Affiniteit en profiel instellen"; +App::$strings["This connection is unreachable from this location."] = "Deze connectie is onbereikbaar vanaf deze locatie"; +App::$strings["This connection may be unreachable from other channel locations."] = "Deze connectie is mogelijk onbereikbaar vanaf andere kanaallocaties."; +App::$strings["Location independence is not supported by their network."] = "Het netwerk van deze connectie ondersteund geen locatieonafhankelijkheid."; +App::$strings["This connection is unreachable from this location. Location independence is not supported by their network."] = "Deze connectie is onbereikbaar vanaf deze locatie. Het netwerk van deze connectie ondersteunt geen locatieonafhankelijkheid."; +App::$strings["Connection Default Permissions"] = "Standaard permissies voor connecties"; +App::$strings["Connection: %s"] = "Connectie: %s"; +App::$strings["Apply these permissions automatically"] = "Deze permissies automatisch toepassen"; +App::$strings["Connection requests will be approved without your interaction"] = "Connectieverzoeken zullen automatisch worden geaccepteerd"; +App::$strings["Permission role"] = "Permissietype"; +App::$strings["Loading"] = "Aan het laden"; +App::$strings["Add permission role"] = "Permissietype toevoegen"; +App::$strings["This connection's primary address is"] = "Het primaire kanaaladres van deze connectie is"; +App::$strings["Available locations:"] = "Beschikbare locaties:"; +App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast."; +App::$strings["Connection Tools"] = "Hulpmiddelen"; +App::$strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag"; +App::$strings["Rating"] = "Beoordeling"; +App::$strings["Slide to adjust your rating"] = "Gebruik de schuif om je beoordeling te geven"; +App::$strings["Optionally explain your rating"] = "Verklaar jouw beoordeling (niet verplicht)"; +App::$strings["Custom Filter"] = "Berichtenfilter"; +App::$strings["Only import posts with this text"] = "Importeer alleen berichten met deze tekst"; +App::$strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1) - laat leeg om alle berichten te importeren"; +App::$strings["Do not import posts with this text"] = "Importeer geen berichten met deze tekst"; +App::$strings["This information is public!"] = "Deze informatie is openbaar!"; +App::$strings["Connection Pending Approval"] = "Connectie moet nog geaccepteerd worden"; +App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."; +App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Sommige permissies worden mogelijk overgeërfd van de privacyinstellingen van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. "; +App::$strings["Last update:"] = "Laatste wijziging:"; +App::$strings["Details"] = "Details"; +App::$strings["Room not found"] = "Chatkanaal niet gevonden"; +App::$strings["Leave Room"] = "Chatkanaal verlaten"; +App::$strings["Delete Room"] = "Chatkanaal verwijderen"; +App::$strings["I am away right now"] = "Ik ben momenteel afwezig"; +App::$strings["I am online"] = "Ik ben online"; +App::$strings["Bookmark this room"] = "Chatkanaal aan bladwijzers toevoegen"; +App::$strings["Please enter a link URL:"] = "Vul een URL in:"; +App::$strings["Encrypt text"] = "Tekst versleutelen"; +App::$strings["New Chatroom"] = "Nieuw chatkanaal"; +App::$strings["Chatroom name"] = "Naam chatkanaal"; +App::$strings["Expiration of chats (minutes)"] = "Aantal minuten voordat chatberichten worden verwijderd"; +App::$strings["%1\$s's Chatrooms"] = "Chatkanalen van %1\$s"; +App::$strings["No chatrooms available"] = "Geen chatkanalen beschikbaar"; +App::$strings["Expiration"] = "Verloopt na"; +App::$strings["min"] = "min"; +App::$strings["Photos"] = "Foto's"; +App::$strings["Files"] = "Bestanden"; +App::$strings["Unable to update menu."] = "Niet in staat om menu aan te passen"; +App::$strings["Unable to create menu."] = "Niet in staat om menu aan te maken."; +App::$strings["Menu Name"] = "Menunaam"; +App::$strings["Unique name (not visible on webpage) - required"] = "Unieke naam vereist (niet zichtbaar op webpagina)"; +App::$strings["Menu Title"] = "Menutitel"; +App::$strings["Visible on webpage - leave empty for no title"] = "Zichtbaar op webpagina (leeg laten voor geen titel)"; +App::$strings["Allow Bookmarks"] = "Bladwijzers toestaan"; +App::$strings["Menu may be used to store saved bookmarks"] = "Menu kan gebruikt worden om bladwijzers in op te slaan"; +App::$strings["Submit and proceed"] = "Opslaan en doorgaan"; +App::$strings["Menus"] = "Menu's"; +App::$strings["Bookmarks allowed"] = "Bladwijzers toegestaan"; +App::$strings["Delete this menu"] = "Menu verwijderen"; +App::$strings["Edit menu contents"] = "Bewerk de inhoud van het menu"; +App::$strings["Edit this menu"] = "Dit menu bewerken"; +App::$strings["Menu could not be deleted."] = "Menu kon niet verwijderd worden."; +App::$strings["Edit Menu"] = "Menu bewerken"; +App::$strings["Add or remove entries to this menu"] = "Items aan dit menu toevoegen of verwijder"; +App::$strings["Menu name"] = "Naam van menu"; +App::$strings["Must be unique, only seen by you"] = "Moet uniek zijn en is alleen zichtbaar voor jou."; +App::$strings["Menu title"] = "Titel van menu"; +App::$strings["Menu title as seen by others"] = "Titel van menu zoals anderen dat zien."; +App::$strings["Allow bookmarks"] = "Bladwijzers toestaan"; +App::$strings["Layouts"] = "Lay-outs"; +App::$strings["Help"] = "Hulp"; +App::$strings["Comanche page description language help"] = "Hulp met de paginabeschrijvingstaal Comanche"; +App::$strings["Layout Description"] = "Lay-out-omschrijving"; +App::$strings["Download PDL file"] = "Download PDL-bestand"; +App::$strings["Please refresh page"] = "Vernieuw de pagina"; +App::$strings["Unknown error"] = "Onbekende fout"; +App::$strings["Token verification failed."] = "Tokenverificatie mislukt"; +App::$strings["Email Verification Required"] = "E-mailverificatie vereist"; +App::$strings["A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message."] = "Er is een verificatietoken naar jouw e-mailadres verstuurd [%s]. Vul deze token hier in om de accountverificatie te voltooien. Wanneer het e-mailbericht niet is aangekomen, wacht dan nog een paar minuten en controleer jouw spamfolder."; +App::$strings["Resend Email"] = "E-mail opnieuw versturen"; +App::$strings["Validation token"] = "Verificatie-token"; +App::$strings["Post not found."] = "Bericht niet gevonden."; +App::$strings["post"] = "bericht"; +App::$strings["comment"] = "reactie"; +App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s van %2\$s getagd met %4\$s"; +App::$strings["This setting requires special processing and editing has been blocked."] = "Deze instelling vereist een speciaal proces en bewerken is geblokkeerd."; +App::$strings["Configuration Editor"] = "Configuratiebewerker"; +App::$strings["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."] = "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. "; +App::$strings["If enabled, connection requests will be approved without your interaction"] = "Wanneer ingeschakeld worden connectieverzoeken automatisch geaccepteerd"; +App::$strings["Automatic approval settings"] = "Instellingen automatisch accepteren"; +App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "Sommige individuele permissies kunnen een standaardinstelling hebben of zijn vergrendeld, afhankelijk van je kanaaltype of privacyinstellingen."; +App::$strings["Unknown App"] = "Onbekende applicatie"; +App::$strings["Authorize"] = "Autoriseren"; +App::$strings["Do you authorize the app %s to access your channel data?"] = "Geef je toestemming aan de app %s om toegang te krijgen tot jouw kanaalgegevens?"; +App::$strings["Allow"] = "Toestaan"; +App::$strings["Privacy group created."] = "Privacygroep aangemaakt"; +App::$strings["Could not create privacy group."] = "Kon privacygroep niet aanmaken"; +App::$strings["Privacy group not found."] = "Privacygroep niet gevonden"; +App::$strings["Privacy group updated."] = "Privacygroep bijgewerkt"; +App::$strings["Create a group of channels."] = "Privacygroep met kanalen aanmaken"; +App::$strings["Privacy group name: "] = "Naam privacygroep: "; +App::$strings["Members are visible to other channels"] = "Kanalen in deze privacygroep zijn zichtbaar voor andere kanalen"; +App::$strings["Privacy group removed."] = "Privacygroep verwijderd."; +App::$strings["Unable to remove privacy group."] = "Verwijderen privacygroep mislukt"; +App::$strings["Privacy group editor"] = "Privacygroep bewerken"; +App::$strings["Members"] = "Kanalen"; +App::$strings["All Connected Channels"] = "Alle kanaalconnecties"; +App::$strings["Click on a channel to add or remove."] = "Klik op een kanaal om deze toe te voegen of te verwijderen."; +App::$strings["Profile not found."] = "Profiel niet gevonden."; +App::$strings["Profile deleted."] = "Profiel verwijderd."; +App::$strings["Profile-"] = "Profiel-"; +App::$strings["New profile created."] = "Nieuw profiel aangemaakt."; +App::$strings["Profile unavailable to clone."] = "Profiel niet beschikbaar om te klonen"; +App::$strings["Profile unavailable to export."] = "Geen profiel beschikbaar om te exporteren"; +App::$strings["Profile Name is required."] = "Profielnaam is vereist"; +App::$strings["Marital Status"] = "Huwelijke status"; +App::$strings["Romantic Partner"] = "Romantische partner"; +App::$strings["Likes"] = "Houdt van"; +App::$strings["Dislikes"] = "Houdt niet van"; +App::$strings["Work/Employment"] = "Werk/arbeid"; +App::$strings["Religion"] = "Religie"; +App::$strings["Political Views"] = "Politieke overtuigingen"; +App::$strings["Gender"] = "Geslacht"; +App::$strings["Sexual Preference"] = "Seksuele voorkeur"; +App::$strings["Homepage"] = "Homepage"; +App::$strings["Interests"] = "Interesses"; +App::$strings["Profile updated."] = "Profiel bijgewerkt"; +App::$strings["Hide your connections list from viewers of this profile"] = "Laat de lijst met connecties niet aan bezoekers van dit profiel zien."; +App::$strings["Edit Profile Details"] = "Profiel bewerken"; +App::$strings["View this profile"] = "Profiel tonen"; +App::$strings["Edit visibility"] = "Zichtbaarheid bewerken"; +App::$strings["Profile Tools"] = "Hulpmiddelen"; +App::$strings["Change cover photo"] = "Omslagfoto wijzigen"; +App::$strings["Change profile photo"] = "Profielfoto veranderen"; +App::$strings["Create a new profile using these settings"] = "Een nieuw profiel aanmaken met dit profiel als basis"; +App::$strings["Clone this profile"] = "Dit profiel klonen"; +App::$strings["Delete this profile"] = "Dit profiel verwijderen"; +App::$strings["Add profile things"] = "Dingen aan je profiel toevoegen"; +App::$strings["Personal"] = "Persoonlijk"; +App::$strings["Relationship"] = "Relatie"; +App::$strings["Miscellaneous"] = "Diversen"; +App::$strings["Import profile from file"] = "Profiel vanuit bestand importeren"; +App::$strings["Export profile to file"] = "Profiel naar bestand exporteren"; +App::$strings["Your gender"] = "Jouw geslacht"; +App::$strings["Marital status"] = "Burgerlijke staat"; +App::$strings["Sexual preference"] = "Seksuele voorkeur"; +App::$strings["Profile name"] = "Profielnaam"; +App::$strings["This is your default profile."] = "Dit is jouw standaardprofiel"; +App::$strings["Your full name"] = "Jouw volledige naam"; +App::$strings["Title/Description"] = "Titel/omschrijving"; +App::$strings["Street address"] = "Straat en huisnummer"; +App::$strings["Locality/City"] = "Woonplaats"; +App::$strings["Region/State"] = "Provincie/gewest/deelstaat"; +App::$strings["Postal/Zip code"] = "Postcode"; +App::$strings["Who (if applicable)"] = "Wie (wanneer van toepassing)"; +App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Voorbeelden: petra123, Petra Jansen, petra@voorbeeld.nl"; +App::$strings["Since (date)"] = "Sinds (datum)"; +App::$strings["Tell us about yourself"] = "Vertel ons iets over jezelf"; +App::$strings["Homepage URL"] = "URL homepagina"; +App::$strings["Hometown"] = "Oorspronkelijk uit"; +App::$strings["Political views"] = "Politieke overtuigingen"; +App::$strings["Religious views"] = "Religieuze overtuigingen"; +App::$strings["Keywords used in directory listings"] = "Trefwoorden voor in de kanalengids"; +App::$strings["Example: fishing photography software"] = "Voorbeeld: muziek, fotografie, software"; +App::$strings["Musical interests"] = "Muzikale interesses"; +App::$strings["Books, literature"] = "Boeken/literatuur"; +App::$strings["Television"] = "Televisie"; +App::$strings["Film/Dance/Culture/Entertainment"] = "Film/dans/cultuur/entertainment"; +App::$strings["Hobbies/Interests"] = "Hobby's/interesses"; +App::$strings["Love/Romance"] = "Liefde/romantiek"; +App::$strings["School/Education"] = "School/opleiding"; +App::$strings["Contact information and social networks"] = "Contactinformatie en sociale netwerken"; +App::$strings["My other channels"] = "Mijn andere kanalen"; +App::$strings["Communications"] = "Communicatie"; +App::$strings["Profile Image"] = "Profielfoto"; +App::$strings["Edit Profiles"] = "Bewerk profielen"; +App::$strings["This page is available only to site members"] = "Deze pagina is alleen toegankelijk voor hubleden"; +App::$strings["Welcome"] = "Welkom"; +App::$strings["What would you like to do?"] = "Wat wil je graag doen?"; +App::$strings["Please bookmark this page if you would like to return to it in the future"] = "Maak een bladwijzer voor deze pagina aan, wanneer je in de toekomst hier weer naar wil terugkeren"; +App::$strings["Upload a profile photo"] = "Profielfoto uploaden"; +App::$strings["Upload a cover photo"] = "Omslagfoto uploaden"; +App::$strings["Edit your default profile"] = "Jouw standaardprofiel bewerken"; +App::$strings["View friend suggestions"] = "Kanaalvoorstellen tonen"; +App::$strings["View the channel directory"] = "Kanalengids tonen"; +App::$strings["View/edit your channel settings"] = "Jouw profielinstellingen bekijken/bewerken"; +App::$strings["View the site or project documentation"] = "Documentatie van deze hub en het Hubzillaproject tonen"; +App::$strings["Visit your channel homepage"] = "Jouw kanaalpagina tonen"; +App::$strings["View your connections and/or add somebody whose address you already know"] = "Jouw connecties tonen en/of iemand toevoegen waarvan je het adres al weet"; +App::$strings["View your personal stream (this may be empty until you add some connections)"] = "Jouw persoonlijke tijdlijn tonen (deze is waarschijnlijk leeg totdat je enkele connecties toevoegt)"; +App::$strings["View the public stream. Warning: this content is not moderated"] = "De openbare tijdlijn tonen. Waarschuwing: de inhoud van deze berichten wordt niet gemodereerd."; +App::$strings["Page link"] = "Paginalink"; +App::$strings["Edit Webpage"] = "Webpagina bewerken"; +App::$strings["Create a new channel"] = "Nieuw kanaal aanmaken"; +App::$strings["Channel Manager"] = "Kanaalbeheer"; +App::$strings["Current Channel"] = "Huidig kanaal"; +App::$strings["Switch to one of your channels by selecting it."] = "Activeer een van jouw andere kanalen door er op te klikken."; +App::$strings["Default Channel"] = "Standaardkanaal"; +App::$strings["Make Default"] = "Als standaard instellen"; +App::$strings["%d new messages"] = "%d nieuwe berichten"; +App::$strings["%d new introductions"] = "%d nieuwe connectieverzoeken"; +App::$strings["Delegated Channel"] = "Uitbesteed kanaal"; +App::$strings["Cards"] = "Kaarten"; +App::$strings["Add Card"] = "Kaart toevoegen"; +App::$strings["This directory server requires an access token"] = "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig"; +App::$strings["About this site"] = "Over deze hub"; +App::$strings["Site Name"] = "Hubnaam"; +App::$strings["Administrator"] = "Beheerder"; +App::$strings["Terms of Service"] = "Gebruiksvoorwaarden"; +App::$strings["Software and Project information"] = "Software- en projectinformatie"; +App::$strings["This site is powered by \$Projectname"] = "Dit is een \$Projectname-hub"; +App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "Federatieve en gedecentraliseerde netwerk- en identiteitsdiensten, mogelijk gemaakt door Zot"; +App::$strings["Version %s"] = "Versie %s"; +App::$strings["Project homepage"] = "Projectwebsite"; +App::$strings["Developer homepage"] = "Ontwikkelaarswebsite"; +App::$strings["No ratings"] = "Geen beoordelingen"; +App::$strings["Ratings"] = "Beoordelingen"; +App::$strings["Rating: "] = "Beoordeling: "; +App::$strings["Website: "] = "Website: "; +App::$strings["Description: "] = "Omschrijving: "; +App::$strings["Import Webpage Elements"] = "Webpagina-elementen importeren"; +App::$strings["Import selected"] = "Importbestand geselecteerd"; +App::$strings["Export Webpage Elements"] = "Webpagina-elementen exporteren"; +App::$strings["Export selected"] = "Selectie exporteren"; +App::$strings["Webpages"] = "Webpagina's"; +App::$strings["Actions"] = "Acties"; +App::$strings["Page Link"] = "Paginalink"; +App::$strings["Page Title"] = "Paginatitel"; +App::$strings["Invalid file type."] = "Ongeldig bestandsformaat"; +App::$strings["Error opening zip file"] = "Fout tijdens openen zipbestand"; +App::$strings["Invalid folder path."] = "Ongeldige maplocatie"; +App::$strings["No webpage elements detected."] = "Geen webpagina-elementen gedecteerd"; +App::$strings["Import complete."] = "Importeren voltooid."; +App::$strings["Channel name changes are not allowed within 48 hours of changing the account password."] = "Veranderen van kanaaladres is niet toegestaan binnen 48 uur na het veranderen van het accountwachtwoord."; +App::$strings["Reserved nickname. Please choose another."] = "Deze naam is gereserveerd. Kies een andere."; +App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik."; +App::$strings["Change channel nickname/address"] = "Kanaaladres veranderen"; +App::$strings["Any/all connections on other networks will be lost!"] = "Alle connecties op andere netwerken gaan verloren!"; +App::$strings["New channel address"] = "Nieuw kanaaladres"; +App::$strings["Rename Channel"] = "Kanaal hernoemen"; +App::$strings["Item is not editable"] = "Item is niet te bewerken"; +App::$strings["Edit post"] = "Bericht bewerken"; +App::$strings["Invalid message"] = "Ongeldig bericht"; +App::$strings["no results"] = "geen resultaten"; +App::$strings["channel sync processed"] = "kanaalsync verwerkt"; +App::$strings["queued"] = "in wachtrij"; +App::$strings["posted"] = "verstuurd"; +App::$strings["accepted for delivery"] = "geaccepteerd om afgeleverd te worden"; +App::$strings["updated"] = "geüpdatet"; +App::$strings["update ignored"] = "update genegeerd"; +App::$strings["permission denied"] = "toegang geweigerd"; +App::$strings["recipient not found"] = "ontvanger niet gevonden"; +App::$strings["mail recalled"] = "Privébericht ingetrokken"; +App::$strings["duplicate mail received"] = "dubbel privébericht ontvangen"; +App::$strings["mail delivered"] = "privébericht afgeleverd"; +App::$strings["Delivery report for %1\$s"] = "Afleveringsrapport voor %1\$s"; +App::$strings["Options"] = "Opties"; +App::$strings["Redeliver"] = "Opnieuw afleveren"; +App::$strings["Failed to create source. No channel selected."] = "Aanmaken bron mislukt. Geen kanaal geselecteerd."; +App::$strings["Source created."] = "Bron aangemaakt."; +App::$strings["Source updated."] = "Bron aangemaakt."; +App::$strings["*"] = "*"; +App::$strings["Channel Sources"] = "Kanaalbronnen"; +App::$strings["Manage remote sources of content for your channel."] = "Beheer externe bronnen met inhoud voor jouw kanaal"; +App::$strings["New Source"] = "Nieuwe bron"; +App::$strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importeer complete of gedeelde inhoud vanuit het volgende kanaal naar dit kanaal, en verdeel het vervolgens volgens jouw kanaalinstellingen."; +App::$strings["Only import content with these words (one per line)"] = "Importeer alleen inhoud met deze woorden (één per regel)"; +App::$strings["Leave blank to import all public content"] = "Laat leeg om alle openbare inhoud te importeren"; +App::$strings["Channel Name"] = "Kanaalnaam"; +App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "De volgende categorieën aan berichten toevoegen die uit deze bron zijn geïmporteerd (door komma's gescheiden)"; +App::$strings["Source not found."] = "Bron niet gevonden"; +App::$strings["Edit Source"] = "Bron bewerken"; +App::$strings["Delete Source"] = "Bron verwijderen"; +App::$strings["Source removed"] = "Bron verwijderd"; +App::$strings["Unable to remove source."] = "Verwijderen bron mislukt."; +App::$strings["Like/Dislike"] = "Leuk/niet leuk"; +App::$strings["This action is restricted to members."] = "Deze actie kan alleen door \$Projectname-leden worden uitgevoerd."; +App::$strings["Please login with your \$Projectname ID or register as a new \$Projectname member to continue."] = "Je dient in te loggen met je \$Projectname-account of een nieuw \$Projectname-account aan te maken om verder te kunnen gaan."; +App::$strings["Invalid request."] = "Ongeldig verzoek"; +App::$strings["channel"] = "kanaal"; +App::$strings["thing"] = "ding"; +App::$strings["Channel unavailable."] = "Kanaal niet beschikbaar."; +App::$strings["Previous action reversed."] = "Vorige actie omgedraaid"; +App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk"; +App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s niet leuk"; +App::$strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s is het eens met %2\$s's %3\$s"; +App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s is het niet eens met %2\$s's %3\$s"; +App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s onthoudt zich van een besluit over %2\$s's %3\$s"; +App::$strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s is aanwezig op %2\$s's %3\$s"; +App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s is niet aanwezig op %2\$s's %3\$s"; +App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s is mogelijk aanwezig op %2\$s's %3\$s"; +App::$strings["Action completed."] = "Actie voltooid"; +App::$strings["Thank you."] = "Bedankt"; +App::$strings["No default suggestions were found."] = "Er zijn geen standaard kanaalvoorstellen gevonden."; +App::$strings["%d rating"] = array( + 0 => "%d beoordeling", + 1 => "%d beoordelingen", +); +App::$strings["Gender: "] = "Geslacht:"; +App::$strings["Status: "] = "Status: "; +App::$strings["Homepage: "] = "Homepage: "; +App::$strings["Age:"] = "Leeftijd:"; +App::$strings["Location:"] = "Plaats:"; +App::$strings["Description:"] = "Omschrijving:"; +App::$strings["Hometown:"] = "Oorspronkelijk uit:"; +App::$strings["About:"] = "Over:"; +App::$strings["Connect"] = "Verbinden"; +App::$strings["Public Forum:"] = "Openbaar forum:"; +App::$strings["Keywords: "] = "Trefwoorden: "; +App::$strings["Don't suggest"] = "Niet voorstellen"; +App::$strings["Common connections (estimated):"] = "Gemeenschappelijke connecties (schatting):"; +App::$strings["Global Directory"] = "Volledige kanalengids"; +App::$strings["Local Directory"] = "Lokale kanalengids"; +App::$strings["Finding:"] = "Gezocht naar:"; +App::$strings["Channel Suggestions"] = "Voorgestelde kanalen"; +App::$strings["next page"] = "volgende pagina"; +App::$strings["previous page"] = "vorige pagina"; +App::$strings["Sort options"] = "Sorteeropties"; +App::$strings["Alphabetic"] = "Alfabetisch"; +App::$strings["Reverse Alphabetic"] = "Omgekeerd alfabetisch"; +App::$strings["Newest to Oldest"] = "Nieuw naar oud"; +App::$strings["Oldest to Newest"] = "Oud naar nieuw"; +App::$strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn)."; +App::$strings["Xchan Lookup"] = "Xchan opzoeken"; +App::$strings["Lookup xchan beginning with (or webbie): "] = "Zoek een xchan (of webbie) die begint met:"; +App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer."; +App::$strings["Ignore/Hide"] = "Negeren/Verbergen"; +App::$strings["Unable to find your hub."] = "Niet in staat om je hub te vinden"; +App::$strings["Post successful."] = "Verzenden bericht geslaagd."; +App::$strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken."; +App::$strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren."; +App::$strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren"; +App::$strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."; +App::$strings["Messages"] = "Berichten"; +App::$strings["message"] = "bericht"; +App::$strings["Message recalled."] = "Bericht ingetrokken."; +App::$strings["Conversation removed."] = "Conversatie verwijderd"; +App::$strings["Expires YYYY-MM-DD HH:MM"] = "Verloopt op DD-MM-YYYY om HH:MM"; +App::$strings["Requested channel is not in this network"] = "Opgevraagd kanaal is niet in dit netwerk beschikbaar"; +App::$strings["Send Private Message"] = "Privébericht versturen"; +App::$strings["To:"] = "Aan:"; +App::$strings["Subject:"] = "Onderwerp:"; +App::$strings["Attach file"] = "Bestand toevoegen"; +App::$strings["Send"] = "Verzenden"; +App::$strings["Set expiration date"] = "Verloopdatum instellen"; +App::$strings["Delete message"] = "Bericht verwijderen"; +App::$strings["Delivery report"] = "Afleveringsrapport"; +App::$strings["Recall message"] = "Bericht intrekken"; +App::$strings["Message has been recalled."] = "Bericht is ingetrokken."; +App::$strings["Delete Conversation"] = "Verwijder conversatie"; +App::$strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. Mogelijk kan je reageren op de kanaalpagina van de afzender."; +App::$strings["Send Reply"] = "Antwoord versturen"; +App::$strings["Your message for %s (%s):"] = "Jouw privébericht aan %s (%s):"; +App::$strings["Public Hubs"] = "Openbare hubs"; +App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself may provide additional details."] = "Op de hier getoonde hubs kan iedereen zich voor het \$Projectname-netwerk aanmelden. Alle hubs in het netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen een financiële tegemoetkoming voor bepaalde uitbreidingen. Mogelijk wordt hierover op de hub zelf meer informatie gegeven."; +App::$strings["Hub URL"] = "Hub-URL"; +App::$strings["Access Type"] = "Toegangs-
     type"; +App::$strings["Registration Policy"] = "Registratie-
     beleid"; +App::$strings["Stats"] = "Stats"; +App::$strings["Software"] = "Software"; +App::$strings["Rate"] = "Beoordeel"; +App::$strings["webpage"] = "Webpagina"; +App::$strings["block"] = "blok"; +App::$strings["layout"] = "lay-out"; +App::$strings["menu"] = "menu"; +App::$strings["%s element installed"] = "%s onderdeel geïnstalleerd"; +App::$strings["%s element installation failed"] = "Installatie %s-element mislukt"; +App::$strings["Select a bookmark folder"] = "Kies een bladwijzermap"; +App::$strings["Save Bookmark"] = "Bladwijzer opslaan"; +App::$strings["URL of bookmark"] = "URL van bladwijzer"; +App::$strings["Or enter new bookmark folder name"] = "Of geef de naam op van een nieuwe bladwijzermap"; +App::$strings["Enter a folder name"] = "Vul een mapnaam in"; +App::$strings["or select an existing folder (doubleclick)"] = "of kies een bestaande map (dubbelklikken)"; +App::$strings["Save to Folder"] = "In map opslaan"; +App::$strings["Fetching URL returns error: %1\$s"] = "Ophalen URL gaf een foutmelding terug: %1\$s"; +App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximum toegestane dagelijkse registraties op deze \$Projectname-hub bereikt. Probeer het morgen (UTC) nogmaals."; +App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden."; +App::$strings["Passwords do not match."] = "Wachtwoorden komen niet met elkaar overeen."; +App::$strings["Registration successful. Continue to create your first channel..."] = "Registratie geslaagd. Ga verder met het aanmaken van jouw eerste kanaal..."; +App::$strings["Registration successful. Please check your email for validation instructions."] = "Registratie geslaagd. Controleer je e-mail voor instructies."; +App::$strings["Your registration is pending approval by the site owner."] = "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze \$Projectname-hub."; +App::$strings["Your registration can not be processed."] = "Jouw registratie kan niet verwerkt worden."; +App::$strings["Registration on this hub is disabled."] = "Registreren van nieuwe accounts is op deze hub uitgeschakeld."; +App::$strings["Registration on this hub is by approval only."] = "Registraties op deze hub moeten eerst worden goedgekeurd."; +App::$strings["Register at another affiliated hub."] = "Registreer op een andere hub."; +App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Deze \$Projectname-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals."; +App::$strings["I accept the %s for this website"] = "Ik accepteer de %s van deze \$Projectname-hub"; +App::$strings["I am over %s years of age and accept the %s for this website"] = "Ik ben %s jaar of ouder en accepteer de %s van deze hub"; +App::$strings["Your email address"] = "Jouw e-mailadres"; +App::$strings["Choose a password"] = "Geef een wachtwoord op"; +App::$strings["Please re-enter your password"] = "Geef het wachtwoord opnieuw op"; +App::$strings["Please enter your invitation code"] = "Vul jouw uitnodigingscode in"; +App::$strings["no"] = "Nee"; +App::$strings["yes"] = "Ja"; +App::$strings["Membership on this site is by invitation only."] = "Registreren op deze \$Projectname-hub kan alleen op uitnodiging."; +App::$strings["Register"] = "Registreren"; +App::$strings["This site requires email verification. After completing this form, please check your email for further instructions."] = "Deze hub vereist e-mailverificatie. Controleer na het indienen van dit formulier jouw e-mail voor verdere instructies."; +App::$strings["Cover Photos"] = "Omslagfoto's"; +App::$strings["female"] = "vrouw"; +App::$strings["%1\$s updated her %2\$s"] = "%1\$s heeft haar %2\$s bijgewerkt"; +App::$strings["male"] = "man"; +App::$strings["%1\$s updated his %2\$s"] = "%1\$s heeft zijn %2\$s bijgewerkt"; +App::$strings["%1\$s updated their %2\$s"] = "De %2\$s van %1\$s is bijgewerkt"; +App::$strings["cover photo"] = "omslagfoto"; +App::$strings["Change Cover Photo"] = "Omslagfoto wijzigen"; +App::$strings["Documentation Search"] = "Zoek documentatie"; +App::$strings["About"] = "Over"; +App::$strings["Administrators"] = "Beheerders"; +App::$strings["Developers"] = "Ontwikkelaars"; +App::$strings["Tutorials"] = "Zelfstudie"; +App::$strings["\$Projectname Documentation"] = "\$Projectname-documentatie"; +App::$strings["Contents"] = "Inhoud"; +App::$strings["Article"] = "Artikel"; +App::$strings["Item has been removed."] = "Item is verwijderd"; +App::$strings["Tag removed"] = "Tag verwijderd"; +App::$strings["Remove Item Tag"] = "Verwijder item-tag"; +App::$strings["Select a tag to remove: "] = "Kies een tag om te verwijderen"; +App::$strings["No such group"] = "Collectie niet gevonden"; +App::$strings["No such channel"] = "Niet zo'n kanaal"; +App::$strings["forum"] = "forum"; +App::$strings["Search Results For:"] = "Zoekresultaten voor:"; +App::$strings["Privacy group is empty"] = "Privacygroep is leeg"; +App::$strings["Privacy group: "] = "Privacygroep: "; +App::$strings["Invalid connection."] = "Ongeldige connectie."; +App::$strings["Invalid channel."] = "Onbekend kanaal."; +App::$strings["network"] = "netwerk"; +App::$strings["\$Projectname"] = "\$Projectname"; +App::$strings["Welcome to %s"] = "Welkom op %s"; +App::$strings["Permission Denied."] = "Toegang geweigerd"; +App::$strings["File not found."] = "Bestand niet gevonden."; +App::$strings["Edit file permissions"] = "Bestandsrechten bewerken"; +App::$strings["Set/edit permissions"] = "Rechten instellen/bewerken"; +App::$strings["Include all files and sub folders"] = "Toepassen op alle bestanden en submappen"; +App::$strings["Return to file list"] = "Terugkeren naar bestandlijst "; +App::$strings["Copy/paste this code to attach file to a post"] = "Kopieer/plak deze code om het bestand aan een bericht te koppelen"; +App::$strings["Copy/paste this URL to link file from a web page"] = "Kopieer/plak deze URL om het bestand aan een externe webpagina te koppelen"; +App::$strings["Share this file"] = "Dit bestand delen"; +App::$strings["Show URL to this file"] = "Toon URL van dit bestand"; +App::$strings["Show in your contacts shared folder"] = "In de met jouw connecties gedeelde map tonen "; +App::$strings["No channel."] = "Geen kanaal."; +App::$strings["No connections in common."] = "Geen gemeenschappelijke connecties."; +App::$strings["View Common Connections"] = "Gemeenschappelijke connecties tonen"; +App::$strings["Email verification resent"] = "E-mailverificatie opnieuw verzonden"; +App::$strings["Unable to resend email verification message."] = "Opnieuw verzenden e-mailverificatie mislukt"; +App::$strings["No connections."] = "Geen connecties."; +App::$strings["Visit %s's profile [%s]"] = "Bezoek het profiel van %s [%s]"; +App::$strings["View Connections"] = "Connecties tonen"; +App::$strings["Blocked accounts"] = "Geblokkeerde accounts"; +App::$strings["Expired accounts"] = "Verlopen accounts"; +App::$strings["Expiring accounts"] = "Accounts die nog moeten verlopen"; +App::$strings["Clones"] = "Klonen"; +App::$strings["Message queues"] = "Berichtenwachtrij"; +App::$strings["Your software should be updated"] = "Jouw software moet worden bijgewerkt "; +App::$strings["Summary"] = "Samenvatting"; +App::$strings["Registered accounts"] = "Geregistreerde accounts"; +App::$strings["Pending registrations"] = "Accounts die op goedkeuring wachten"; +App::$strings["Registered channels"] = "Geregistreerde kanalen"; +App::$strings["Active plugins"] = "Ingeschakelde plug-ins"; +App::$strings["Version"] = "Versie"; +App::$strings["Repository version (master)"] = "Versie repository (master)"; +App::$strings["Repository version (dev)"] = "Versie repository (dev)"; +App::$strings["No service class restrictions found."] = "Geen abonnementsbeperkingen gevonden."; +App::$strings["Website:"] = "Website:"; +App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Kanaal op afstand [%s] (nog niet op deze hub bekend)"; +App::$strings["Rating (this information is public)"] = "Beoordeling (deze informatie is openbaar)"; +App::$strings["Optionally explain your rating (this information is public)"] = "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"; +App::$strings["Edit Card"] = "Kaart bewerken"; +App::$strings["No valid account found."] = "Geen geldige account gevonden."; +App::$strings["Password reset request issued. Check your email."] = "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail."; +App::$strings["Site Member (%s)"] = "Lid van hub (%s)"; +App::$strings["Password reset requested at %s"] = "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend"; +App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."; +App::$strings["Password Reset"] = "Wachtwoord vergeten?"; +App::$strings["Your password has been reset as requested."] = "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht."; +App::$strings["Your new password is"] = "Jouw nieuwe wachtwoord is"; +App::$strings["Save or copy your new password - and then"] = "Kopieer of sla je nieuwe wachtwoord op - en"; +App::$strings["click here to login"] = "klik dan hier om in te loggen"; +App::$strings["Your password may be changed from the Settings page after successful login."] = "Jouw wachtwoord kan worden veranderd onder instellingen, nadat je succesvol bent ingelogd."; +App::$strings["Your password has changed at %s"] = "Jouw wachtwoord op %s is veranderd"; +App::$strings["Forgot your Password?"] = "Wachtwoord vergeten?"; +App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies."; +App::$strings["Email Address"] = "E-mailadres"; +App::$strings["Mark all seen"] = "Markeer alles als bekeken"; +App::$strings["0. Beginner/Basic"] = "0. Beginner/basic"; +App::$strings["1. Novice - not skilled but willing to learn"] = "1. Onervaren - niet bekwaam, maar wil graag leren"; +App::$strings["2. Intermediate - somewhat comfortable"] = "2. Ervaren - voelt zich enigszins comfortabel"; +App::$strings["3. Advanced - very comfortable"] = "3. Gevorderd - voelt zich comfortabel"; +App::$strings["4. Expert - I can write computer code"] = "4. Expert - kan programmeren"; +App::$strings["5. Wizard - I probably know more than you do"] = "5. Wizard - ik weet waarschijnlijk meer dan jij"; +App::$strings["Site Admin"] = "Hubbeheerder"; +App::$strings["Report Bug"] = "Bugrapport indienen"; +App::$strings["View Bookmarks"] = "Bladwijzers bekijken"; +App::$strings["My Chatrooms"] = "Mijn chatkanalen"; +App::$strings["Firefox Share"] = "Firefox Share"; +App::$strings["Remote Diagnostics"] = "Diagnose op afstand"; +App::$strings["Suggest Channels"] = "Kanalen voorstellen"; +App::$strings["Login"] = "Inloggen"; +App::$strings["Activity"] = "Jouw tijdlijn"; +App::$strings["Wiki"] = "Wiki"; +App::$strings["Channel Home"] = "Jouw kanaal"; +App::$strings["Events"] = "Agenda"; +App::$strings["Directory"] = "Kanalengids"; +App::$strings["Mail"] = "Privéberichten"; +App::$strings["Chat"] = "Chatten"; +App::$strings["Probe"] = "Onderzoeken"; +App::$strings["Suggest"] = "Voorstellen"; +App::$strings["Random Channel"] = "Willekeurig kanaal"; +App::$strings["Invite"] = "Uitnodigen "; +App::$strings["Features"] = "Extra functies"; +App::$strings["Language"] = "Taal"; +App::$strings["Post"] = "Bericht"; +App::$strings["Profile Photo"] = "Profielfoto"; +App::$strings["Purchase"] = "Aanschaffen"; +App::$strings["Undelete"] = "Verwijdering ongedaan maken"; +App::$strings["Add to app-tray"] = "Aan appmenu toevoegen"; +App::$strings["Remove from app-tray"] = "Uit appmenu verwijderen"; +App::$strings["Pin to navbar"] = "Op navigatiebalk vastzetten"; +App::$strings["Unpin from navbar"] = "Van navigatiebalk losmaken"; +App::$strings["__ctx:permcat__ default"] = "standaard"; +App::$strings["__ctx:permcat__ follower"] = "volger"; +App::$strings["__ctx:permcat__ contributor"] = "bijdrager"; +App::$strings["__ctx:permcat__ publisher"] = "publichist "; +App::$strings["(No Title)"] = "(Geen titel)"; +App::$strings["Wiki page create failed."] = "Aanmaken wiki-pagina mislukt."; +App::$strings["Wiki not found."] = "Wiki niet gevonden"; +App::$strings["Destination name already exists"] = "Naam van doel bestaat al"; +App::$strings["Page not found"] = "Pagina niet gevonden"; +App::$strings["Error reading page content"] = "Fout tijdens lezen pagina-inhoud"; +App::$strings["Error reading wiki"] = "Fout tijdens lezen wiki"; +App::$strings["Page update failed."] = "Bijwerken van pagina mislukt."; +App::$strings["Nothing deleted"] = "Niets verwijderd"; +App::$strings["Compare: object not found."] = "Vergelijken: object niet gevonden."; +App::$strings["Page updated"] = "Pagina bijgewerkt"; +App::$strings["Untitled"] = "Naamloos"; +App::$strings["Wiki resource_id required for git commit"] = "Resource_id wiki voor git commit vereist"; +App::$strings["__ctx:wiki_history__ Message"] = "Bericht"; +App::$strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders getoond."; +App::$strings["Visible to your default audience"] = "Voor iedereen zichtbaar, mits niet anders ingesteld"; +App::$strings["Only me"] = "Alleen ik"; +App::$strings["Public"] = "Openbaar"; +App::$strings["Anybody in the \$Projectname network"] = "Iedereen in het \$Projectname-netwerk"; +App::$strings["Any account on %s"] = "Iedereen op %s"; +App::$strings["Any of my connections"] = "Al mijn geaccepteerde connecties"; +App::$strings["Only connections I specifically allow"] = "Alleen connecties die uitdrukkelijk door jou zijn toegestaan"; +App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Geauthenticeerde leden (kan bezoekers van andere netwerken bevatten)"; +App::$strings["Any connections including those who haven't yet been approved"] = "Al mijn geaccepteerde en nog niet geaccepteerde connecties"; +App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Dit is de standaard privacyinstelling voor wie jouw berichten kan bekijken"; +App::$strings["This is your default setting for who can view your default channel profile"] = "Dit is de standaard privacyinstelling voor wie jouw standaardprofiel kan bekijken"; +App::$strings["This is your default setting for who can view your connections"] = "Dit is de standaard privacyinstelling voor wie een lijst met jouw connecties kan bekijken"; +App::$strings["This is your default setting for who can view your file storage and photos"] = "Dit is de standaard privacyinstelling voor wie jouw bestanden en foto's kan bekijken"; +App::$strings["This is your default setting for the audience of your webpages"] = "Dit is de standaard privacyinstelling voor wie jouw webpagina's kan bekijken"; +App::$strings["Missing room name"] = "Naam chatkanaal ontbreekt"; +App::$strings["Duplicate room name"] = "Naam chatkanaal bestaat al"; +App::$strings["Invalid room specifier."] = "Ongeldige omschrijving chatkanaal"; +App::$strings["Room not found."] = "Chatkanaal niet gevonden"; +App::$strings["Room is full"] = "Chatkanaal is vol"; +App::$strings["\$Projectname Notification"] = "\$Projectname-melding"; +App::$strings["\$projectname"] = "\$projectname"; +App::$strings["Thank You,"] = "Bedankt,"; +App::$strings["%s Administrator"] = "Beheerder %s"; +App::$strings["This email was sent by %1\$s at %2\$s."] = "Deze e-mail was verzonden door %1\$s op %2\$s."; +App::$strings["To stop receiving these messages, please adjust your Notification Settings at %s"] = "Wanneer je deze berichten niet meer wilt ontvangen, wijzig dan de instellingen voor jouw Meldingen op %s"; +App::$strings["To stop receiving these messages, please adjust your %s."] = "Wanneer je deze berichten niet meer wilt ontvangen, wijzig dan de instellingen voor jouw %s."; +App::$strings["%s "] = "%s "; +App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname-melding] Nieuw privébericht ontvangen op %s"; +App::$strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s heeft je een nieuw privébericht gestuurd op %2\$s."; +App::$strings["%1\$s sent you %2\$s."] = "%1\$s zond jou %2\$s."; +App::$strings["a private message"] = "een privébericht"; +App::$strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privéberichten te bekijken en/of er op te reageren."; +App::$strings["commented on"] = "gaf een reactie op"; +App::$strings["liked"] = "vindt dit leuk:"; +App::$strings["disliked"] = "vindt dit niet leuk:"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]een %4\$s[/zrl]"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]jouw %4\$s[/zrl]"; +App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname-melding] %2\$s gaf een te modereren reactie in conversatie #%1\$d"; +App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname-melding] %2\$s gaf een reactie in conversatie #%1\$d"; +App::$strings["%1\$s commented on an item/conversation you have been following."] = "%1\$s gaf een reactie op/in een item/conversatie die je volgt."; +App::$strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om de conversatie te bekijken en/of er op te reageren."; +App::$strings["Please visit %s to approve or reject this comment."] = "Bezoek %s om de reactie goed of af te keuren."; +App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = "%1\$s vindt [zrl=%2\$s]jouw %3\$s[/zrl] leuk"; +App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname-melding] %2\$s vindt iets leuk in conversatie #%1\$d"; +App::$strings["%1\$s liked an item/conversation you created."] = "%1\$s vindt iets leuk in een conversatie die jij bent gestart."; +App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = "[\$Projectname-melding] %s heeft een bericht op jouw kanaal geplaatst"; +App::$strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s heeft om %2\$s een bericht op jouw kanaalpagina geplaatst"; +App::$strings["%1\$s posted to [zrl=%2\$s]your wall[/zrl]"] = "%1\$s heeft een bericht op jouw [zrl=%2\$s]kanaalpagina[/zrl] geplaatst"; +App::$strings["[\$Projectname:Notify] %s tagged you"] = "[\$Projectname-melding] %s heeft jou genoemd"; +App::$strings["%1\$s tagged you at %2\$s"] = "%1\$s vermeldde jou om %2\$s"; +App::$strings["%1\$s [zrl=%2\$s]tagged you[/zrl]."] = "%1\$s [zrl=%2\$s]vermeldde jou[/zrl]."; +App::$strings["[\$Projectname:Notify] %1\$s poked you"] = "[\$Projectname-melding] %1\$s heeft jou aangestoten"; +App::$strings["%1\$s poked you at %2\$s"] = "%1\$s porde jou om %2\$s"; +App::$strings["%1\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s [zrl=%2\$s]porde jou[/zrl]."; +App::$strings["[\$Projectname:Notify] %s tagged your post"] = "[\$Projectname-melding] %s heeft jouw bericht getagd"; +App::$strings["%1\$s tagged your post at %2\$s"] = "%1\$s tagde jouw bericht om %2\$s"; +App::$strings["%1\$s tagged [zrl=%2\$s]your post[/zrl]"] = "%1\$s tagde [zrl=%2\$s]jouw bericht[/zrl]"; +App::$strings["[\$Projectname:Notify] Introduction received"] = "[\$Projectname-melding] Connectieverzoek ontvangen"; +App::$strings["You've received an new connection request from '%1\$s' at %2\$s"] = "Je hebt een nieuw connectieverzoek ontvangen van '%1\$s' op %2\$s"; +App::$strings["You've received [zrl=%1\$s]a new connection request[/zrl] from %2\$s."] = "Je hebt een [zrl=%1\$s]nieuw connectieverzoek[/zrl] ontvangen van %2\$s."; +App::$strings["You may visit their profile at %s"] = "Je kan het profiel bekijken op %s"; +App::$strings["Please visit %s to approve or reject the connection request."] = "Bezoek %s om het connectieverzoek te accepteren of af te wijzen."; +App::$strings["[\$Projectname:Notify] Friend suggestion received"] = "[\$Projectname-melding] Kanaalvoorstel ontvangen"; +App::$strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Je hebt een kanaalvoorstel ontvangen van '%1\$s' om %2\$s"; +App::$strings["You've received [zrl=%1\$s]a friend suggestion[/zrl] for %2\$s from %3\$s."] = "Je hebt [zrl=%1\$s]een kanaalvoorstel ontvangen[/zrl] voor %2\$s van %3\$s."; +App::$strings["Name:"] = "Naam:"; +App::$strings["Photo:"] = "Foto:"; +App::$strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen."; +App::$strings["[\$Projectname:Notify]"] = "[\$Projectname-melding]"; +App::$strings["created a new post"] = "maakte een nieuw bericht aan"; +App::$strings["commented on %s's post"] = "gaf een reactie op een bericht van %s"; +App::$strings["edited a post dated %s"] = "bewerkte een bericht op %s"; +App::$strings["edited a comment dated %s"] = "bewerkte een reactie op %s"; +App::$strings["Wiki updated successfully"] = "Bijwerken wiki geslaagd"; +App::$strings["Wiki files deleted successfully"] = "Verwijderen wiki-bestanden geslaagd"; +App::$strings["Update Error at %s"] = "Update-fout op %s"; +App::$strings["Update %s failed. See error logs."] = "Update %s mislukt. Zie foutenlogboek."; +App::$strings["Private Message"] = "Niet voor iedereen zichtbaar"; +App::$strings["Select"] = "Kies"; +App::$strings["I will attend"] = "Aanwezig"; +App::$strings["I will not attend"] = "Niet aanwezig"; +App::$strings["I might attend"] = "Mogelijk aanwezig"; +App::$strings["I agree"] = "Eens"; +App::$strings["I disagree"] = "Oneens"; +App::$strings["I abstain"] = "Onthouding"; +App::$strings["Add Star"] = "Ster toevoegen"; +App::$strings["Remove Star"] = "Ster verwijderen"; +App::$strings["Toggle Star Status"] = "Ster toevoegen of verwijderen"; +App::$strings["starred"] = "met ster"; +App::$strings["Message signature validated"] = "Berichtkenmerk gevalideerd"; +App::$strings["Message signature incorrect"] = "Berichtkenmerk onjuist"; +App::$strings["Add Tag"] = "Tag toevoegen"; +App::$strings["like"] = "vind dit leuk"; +App::$strings["dislike"] = "vind dit niet leuk"; +App::$strings["Share This"] = "Delen"; +App::$strings["share"] = "delen"; +App::$strings["Delivery Report"] = "Afleveringsrapport"; +App::$strings["%d comment"] = array( + 0 => "%d reactie", + 1 => "%d reacties getoond", +); +App::$strings["View %s's profile - %s"] = "Profiel van %s bekijken - %s"; +App::$strings["to"] = "aan"; +App::$strings["via"] = "via"; +App::$strings["Wall-to-Wall"] = "Kanaal-naar-kanaal"; +App::$strings["via Wall-To-Wall:"] = "via kanaal-naar-kanaal"; +App::$strings["from %s"] = "van %s"; +App::$strings["last edited: %s"] = "laatst bewerkt: %s"; +App::$strings["Expires: %s"] = "Verloopt: %s"; +App::$strings["Attend"] = "Aanwezig"; +App::$strings["Attendance Options"] = "Aanwezigheidsopties"; +App::$strings["Vote"] = "Stem"; +App::$strings["Voting Options"] = "Stemopties"; +App::$strings["Save Bookmarks"] = "Bladwijzers opslaan"; +App::$strings["Add to Calendar"] = "Aan agenda toevoegen"; +App::$strings["This is an unsaved preview"] = "Dit is een niet opgeslagen voorvertoning"; +App::$strings["%s show all"] = "%s alle"; +App::$strings["Bold"] = "Vet"; +App::$strings["Italic"] = "Cursief"; +App::$strings["Underline"] = "Onderstrepen"; +App::$strings["Quote"] = "Citeren"; +App::$strings["Code"] = "Broncode"; +App::$strings["Image"] = "Afbeelding"; +App::$strings["Attach File"] = "Bestand toevoegen"; +App::$strings["Insert Link"] = "Link invoegen"; +App::$strings["Video"] = "Video"; +App::$strings["Your full name (required)"] = "Jouw volledige naam (verplicht)"; +App::$strings["Your email address (required)"] = "Jouw e-mailadres (verplicht)"; +App::$strings["Your website URL (optional)"] = "URL van jouw website (niet verplicht)"; +App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen."; +App::$strings["Welcome %s. Remote authentication successful."] = "Welkom %s. Authenticatie op afstand geslaagd."; +App::$strings["parent"] = "omhoog"; +App::$strings["Collection"] = "map"; +App::$strings["Principal"] = "principal"; +App::$strings["Addressbook"] = "Adresboek"; +App::$strings["Calendar"] = "Agenda"; +App::$strings["Schedule Inbox"] = "Planning-postvak IN"; +App::$strings["Schedule Outbox"] = "Planning-postvak UIT"; +App::$strings["Total"] = "Totaal"; +App::$strings["Shared"] = "Gedeeld"; +App::$strings["Add Files"] = "Bestanden toevoegen"; +App::$strings["You are using %1\$s of your available file storage."] = "Je gebruikt %1\$s van de beschikbare bestandsopslag."; +App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s%)"] = "Je gebruikt %1\$s van totaal %2\$s beschikbare bestandsopslag. (%3\$s%)"; +App::$strings["WARNING:"] = "WAARSCHUWING:"; +App::$strings["Create new folder"] = "Nieuwe map aanmaken"; +App::$strings["Upload file"] = "Bestand uploaden"; +App::$strings["Drop files here to immediately upload"] = "Sleep bestanden hierheen om ze onmiddellijk te uploaden"; +App::$strings["Forums"] = "Forums"; App::$strings["Select Channel"] = "Kies een kanaal"; App::$strings["Read-write"] = "Lees- en schrijfrechten"; App::$strings["Read-only"] = "Alleen leesrechten"; @@ -2257,432 +1884,795 @@ App::$strings["Addressbook Name"] = "Naam adresboek"; App::$strings["Addressbook Tools"] = "Adresboek-hulpmiddelen"; App::$strings["Import addressbook"] = "Importeren"; App::$strings["Select an addressbook to import to"] = "Kies een adresboek om te importeren"; -App::$strings["INVALID EVENT DISMISSED!"] = "ONGELDIGE GEBEURTENIS VERWIJDERD!"; -App::$strings["Summary: "] = "Samenvatting: "; -App::$strings["Date: "] = "Datum: "; -App::$strings["Reason: "] = "Reden: "; -App::$strings["INVALID CARD DISMISSED!"] = "ONGELDIGE CONTACTKAART VERWIJDERD!"; -App::$strings["Name: "] = "Naam: "; -App::$strings["You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV Settings before you can use it."] = "Voordat je dit kunt gebruiken dien je eerst deze plugin onder 'Plugin-instellingen > CalDAV/CardDAV' in te schakelen."; -App::$strings["Example: YYYY-MM-DD HH:mm"] = "Bijvoorbeeld: JJJJ-MM-DD UU:mm"; -App::$strings["End date and time"] = "Einddatum en -tijd"; -App::$strings["List month"] = "Maand tonen"; -App::$strings["List week"] = "Week tonen"; -App::$strings["List day"] = "Dag tonen"; -App::$strings["More"] = "Meer"; -App::$strings["Less"] = "Minder"; -App::$strings["Select calendar"] = "Kies agenda"; -App::$strings["Delete all"] = "Alles verwijderen"; -App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "Excuses! Bewerken van herhalende gebeurtenissen is nog niet geïmplementeerd."; -App::$strings["Errors encountered creating database table: "] = "Fouten opgetreden tijdens aanmaken databasetabel: "; -App::$strings["Default Calendar"] = "Standaard agenda"; -App::$strings["Default Addressbook"] = "Standaard adresboek"; -App::$strings["CalDAV/CardDAV Settings saved."] = "CalDAV/CardDAV-instellingen opgeslagen."; -App::$strings["Enable CalDAV/CardDAV Server for this channel"] = "CalDAV/CardDAV-server voor dit kanaal inschakelen"; -App::$strings["Your CalDAV resources are located at %s "] = "Jouw CalDAV-URL is %s "; -App::$strings["Your CardDAV resources are located at %s "] = "Jouw CardDAV-URL is %s "; -App::$strings["CalDAV/CardDAV Settings"] = "CalDAV/CardDAV"; -App::$strings["Home, Voice"] = "Thuis, spraak"; -App::$strings["Home, Fax"] = "Thuis, fax"; -App::$strings["Work, Voice"] = "Werk, spraak"; -App::$strings["Work, Fax"] = "Werk, fax"; -App::$strings["Invalid game."] = "Ongeldig spel."; -App::$strings["You are not a player in this game."] = "Jij doet niet aan dit speel mee."; -App::$strings["You must be a local channel to create a game."] = "Je moet een lokaal kanaal zijn om een spel aan te maken."; -App::$strings["You must select one opponent that is not yourself."] = "Je moet één tegenstander uitkiezen, maar niet jezelf."; -App::$strings["Creating new game..."] = "Nieuw spel wordt aangemaakt..."; -App::$strings["You must select white or black."] = "Je moet wit of zwart kiezen."; -App::$strings["Error creating new game."] = "Fout tijdens aanmaken nieuw spel."; -App::$strings["Requested channel is not available."] = "Opgevraagd kanaal is niet beschikbaar."; -App::$strings["You must select a local channel /chess/channelname"] = "Je moet een lokaal kanaal kiezen: .../chess/kanaalnaam"; -App::$strings["Enable notifications"] = "Notificaties inschakelen"; -App::$strings["Your Webbie:"] = "Jouw kanaaladres:"; -App::$strings["Fontsize (px):"] = "Tekengrootte (px):"; -App::$strings["Link:"] = "Link:"; -App::$strings["Like us on Hubzilla"] = "Like ons op Hubzilla"; -App::$strings["Embed:"] = "Insluiten (embed):"; -App::$strings["Male"] = "Man"; -App::$strings["Female"] = "Vrouw"; -App::$strings["First Name"] = "Voornaam"; -App::$strings["Last Name"] = "Achternaam"; -App::$strings["Full Name"] = "Volledige naam"; -App::$strings["Profile Photo 16px"] = "Profielfoto 16px"; -App::$strings["Profile Photo 32px"] = "Profielfoto 32px"; -App::$strings["Profile Photo 48px"] = "Profielfoto 48px"; -App::$strings["Profile Photo 64px"] = "Profielfoto 64px"; -App::$strings["Profile Photo 80px"] = "Profielfoto 80px"; -App::$strings["Profile Photo 128px"] = "Profielfoto 128px"; -App::$strings["Timezone"] = "Tijdzone"; -App::$strings["Birth Year"] = "Geboortejaar"; -App::$strings["Birth Month"] = "Geboortemaand"; -App::$strings["Birth Day"] = "Geboortedag"; -App::$strings["Birthdate"] = "Geboortedatum"; -App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten."; -App::$strings["The error message was:"] = "Foutmelding was:"; -App::$strings["OpenID protocol error. No ID returned."] = "OpenID-protocolfout. Geen ID terugontvangen."; -App::$strings["Login failed."] = "Inloggen mislukt."; -App::$strings["Reconnecting %d connections"] = "%d connecties opnieuw aan het verbinden"; -App::$strings["Diaspora Reconnect"] = "Diaspora opnieuw verbinden"; -App::$strings["Use this form to re-establish Diaspora connections which were initially made from a different hub."] = "Gebruik dit formulier om opnieuw met Diaspora-connecties te verbinden, die oorspronkelijk op een andere hub waren verbonden."; -App::$strings["Reconnect"] = "Opnieuw verbinden"; -App::$strings["Send test email"] = "Test-e-mail versturen"; -App::$strings["Mail sent."] = "E-mail verzonden."; -App::$strings["Sending of mail failed."] = "Verzenden van e-mail mislukt."; -App::$strings["Mail Test"] = "E-mailtest"; -App::$strings["Errors encountered deleting database table "] = "Fouten opgetreden tijdens verwijderen databasetabel "; -App::$strings["Drop tables when uninstalling?"] = "Verwijder tabellen tijdens uitschakelen plugin?"; -App::$strings["If checked, the Rendezvous database tables will be deleted when the plugin is uninstalled."] = "Wanneer dit is aangevinkt worden de tabellen in de Rendezvous-database verwijderd wanneer de plugin wordt uitgeschakeld."; -App::$strings["Mapbox Access Token"] = "Toegangstoken "; -App::$strings["If you enter a Mapbox access token, it will be used to retrieve map tiles from Mapbox instead of the default OpenStreetMap tile server."] = "De Mapbox-toegangstoken wordt gebruikt om kaarttegels (tiles) van Mapbox op te halen in plaats van de standaard tile-server van OpenStreetMap."; -App::$strings["Rendezvous"] = "Rendezvous"; -App::$strings["This identity has been deleted by another member due to inactivity. Please press the \"New identity\" button or refresh the page to register a new identity. You may use the same name."] = "Deze identiteit is door een ander lid verwijderd als gevolg van inactiviteit. Klik op de knop \"Nieuwe identiteit\" of herlaad de pagina om een nieuwe identiteit aan te maken. Je kan eventueel dezelfde naam gebruiken."; -App::$strings["Welcome to Rendezvous!"] = "Welkom bij Rendezvous!"; -App::$strings["Enter your name to join this rendezvous. To begin sharing your location with the other members, tap the GPS control. When your location is discovered, a red dot will appear and others will be able to see you on the map."] = "Vul je naam in om deel te nemen aan deze rendezvous. Om met het delen van je locatie met de andere leden te beginnen, klik je op de locatieknop van je webbrowser. Nadat jouw locatie is gevonden verschijnt er een rode stip en kunnen andere leden jou zien op de kaart."; -App::$strings["Let's meet here"] = "Laten we elkaar hier ontmoeten"; -App::$strings["New marker"] = "Nieuwe markering"; -App::$strings["Edit marker"] = "Markering bewerken"; -App::$strings["New identity"] = "Nieuwe identiteit"; -App::$strings["Delete marker"] = "Markering verwijderen"; -App::$strings["Delete member"] = "Lid verwijderen"; -App::$strings["Edit proximity alert"] = "Nabijheidswaarschuwing bewerken"; -App::$strings["A proximity alert will be issued when this member is within a certain radius of you.

    Enter a radius in meters (0 to disable):"] = "Een nabijheidswaarschuwing wordt actief wanneer dit lid zich binnen een bepaalde straal rond jouw locatie bevindt.

    Voer het aantal meters van de straal in (0 om uit te schakelen):"; -App::$strings["distance"] = "afstand"; -App::$strings["Proximity alert distance (meters)"] = "Afstand nabijheidswaarschuwing (meter)"; -App::$strings["A proximity alert will be issued when you are within a certain radius of the marker location.

    Enter a radius in meters (0 to disable):"] = "Een nabijheidswaarschuwing wordt actief wanneer je je binnen een bepaalde straal rond een specifieke locatie bevindt.

    Voer het aantal meters van de straal in (0 om uit te schakelen):"; -App::$strings["Marker proximity alert"] = "Locatiemarkering nabijheidswaarschuwing"; -App::$strings["Reminder note"] = "Herinnering"; -App::$strings["Enter a note to be displayed when you are within the specified proximity..."] = "Vul de tekst in die getoond moet worden wanneer je je op de aangegeven afstand bevindt..."; -App::$strings["Add new rendezvous"] = "Nieuwe rendezvous toevoegen"; -App::$strings["Create a new rendezvous and share the access link with those you wish to invite to the group. Those who open the link become members of the rendezvous. They can view other member locations, add markers to the map, or share their own locations with the group."] = "Maak een nieuwe rendezvous aan en deel de toegangslink met wie je wil uitnodigen voor de groep. Wie op de link klikt wordt lid van rendezvous. Zij kunnen dan de locaties zien van andere leden, markeringen aan de kaart toevoegen of hun eigen locaties met de groep delen."; -App::$strings["Install Firefox Sharing Tools"] = "Firefox Share"; -App::$strings["Share content from Firefox to \$Projectname"] = "Deel webpagina's vanuit Firefox met "; -App::$strings["Install Firefox Sharing Tools to this web browser"] = "Activeer de \$Projectname-service in Firefox"; -App::$strings["Error retrieving wiki"] = "Fout tijdens ophalen wiki"; -App::$strings["Error creating zip file export folder"] = "Fout tijdens aanmaken exportmap zipbestand"; -App::$strings["Error downloading wiki: "] = "Fout tijdens downloaden wiki: "; -App::$strings["Wiki Pages"] = "Wikipagina's"; -App::$strings["Add new page"] = "Nieuwe pagina toevoegen"; -App::$strings["Page name"] = "Paginanaam"; -App::$strings["Wiki List"] = "Wiki's"; -App::$strings["Enable the GNU-Social protocol for this channel"] = "GNU social-protocol voor dit kanaal inschakelen"; -App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Zoek %1\$s (%2\$s)"; -App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname"; -App::$strings["Search \$Projectname"] = "Zoek in "; -App::$strings["Cannot locate DNS info for database server '%s'"] = "Kan DNS-informatie voor databaseserver '%s' niet vinden"; -App::$strings["default"] = "standaard"; -App::$strings["Select an alternate language"] = "Kies een andere taal"; -App::$strings["Not a valid email address"] = "Geen geldig e-mailadres"; -App::$strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze hub niet toegestaan"; -App::$strings["Your email address is already registered at this site."] = "Jouw e-mailadres is al op deze hub geregistreerd."; -App::$strings["An invitation is required."] = "Een uitnodiging is vereist"; -App::$strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden"; -App::$strings["Please enter the required information."] = "Vul de vereiste informatie in."; -App::$strings["Failed to store account information."] = "Account-informatie kon niet opgeslagen worden."; -App::$strings["Registration confirmation for %s"] = "Registratiebevestiging voor %s"; -App::$strings["Registration request at %s"] = "Registratiebevestiging voor %s"; -App::$strings["your registration password"] = "jouw registratiewachtwoord"; -App::$strings["Registration details for %s"] = "Registratiegegevens voor %s"; -App::$strings["Account approved."] = "Account goedgekeurd"; -App::$strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s"; -App::$strings["Click here to upgrade."] = "Klik hier om te upgraden."; -App::$strings["This action exceeds the limits set by your subscription plan."] = "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden."; -App::$strings["This action is not available under your subscription plan."] = "Deze handeling is niet mogelijk met jouw abonnement."; App::$strings["Categories"] = "Categorieën"; -App::$strings["Suggestions"] = "Voorgestelde kanalen"; -App::$strings["See more..."] = "Meer..."; -App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Je hebt %1$.0f van de %2$.0f toegestane connecties."; -App::$strings["Add New Connection"] = "Nieuwe connectie toevoegen"; -App::$strings["Enter channel address"] = "Vul kanaaladres in"; -App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Voorbeelden: bob@example.com, http://example.com/barbara"; -App::$strings["Notes"] = "Aantekeningen"; -App::$strings["Remove term"] = "Verwijder zoekterm"; -App::$strings["Saved Searches"] = "Opgeslagen zoekopdrachten"; -App::$strings["add"] = "toevoegen"; -App::$strings["Saved Folders"] = "Bewaarde mappen"; App::$strings["Everything"] = "Alles"; -App::$strings["Archives"] = "Archieven"; -App::$strings["Refresh"] = "Vernieuwen"; -App::$strings["Account settings"] = "Account"; -App::$strings["Channel settings"] = "Kanaal"; -App::$strings["Additional features"] = "Extra functies"; -App::$strings["Feature/Addon settings"] = "Plugin-instellingen"; -App::$strings["Display settings"] = "Weergave"; -App::$strings["Manage locations"] = "Locaties beheren"; -App::$strings["Export channel"] = "Kanaal exporteren"; -App::$strings["Connected apps"] = "Verbonden applicaties"; -App::$strings["Permission Groups"] = "Permissiegroepen"; -App::$strings["Premium Channel Settings"] = "Instellingen premiumkanaal"; +App::$strings["Events Tools"] = "Agenda-hulpmiddelen"; +App::$strings["Export Calendar"] = "Exporteren"; +App::$strings["Import Calendar"] = "Importeren"; +App::$strings["Suggested Chatrooms"] = "Voorgestelde chatkanalen"; +App::$strings["HQ Control Panel"] = "HQ-controlepaneel"; +App::$strings["Create a new post"] = "Nieuw bericht aanmaken"; App::$strings["Private Mail Menu"] = "Privéberichten"; App::$strings["Combined View"] = "Gecombineerd postvak"; App::$strings["Inbox"] = "Postvak IN"; App::$strings["Outbox"] = "Postvak UIT"; App::$strings["New Message"] = "Nieuw bericht"; -App::$strings["Conversations"] = "Conversaties"; -App::$strings["Received Messages"] = "Ontvangen berichten"; -App::$strings["Sent Messages"] = "Verzonden berichten"; -App::$strings["No messages."] = "Geen berichten"; -App::$strings["Delete conversation"] = "Verwijder conversatie"; -App::$strings["Events Tools"] = "Agenda-hulpmiddelen"; -App::$strings["Export Calendar"] = "Exporteren"; -App::$strings["Import Calendar"] = "Importeren"; App::$strings["Chatrooms"] = "Chatkanalen"; App::$strings["Overview"] = "Overzicht"; -App::$strings["Chat Members"] = "Chatleden"; -App::$strings["__ctx:wiki_history__ Message"] = "Bericht"; -App::$strings["Bookmarked Chatrooms"] = "Bladwijzers van chatkanalen"; -App::$strings["Suggested Chatrooms"] = "Voorgestelde chatkanalen"; -App::$strings["photo/image"] = "foto/afbeelding"; -App::$strings["Click to show more"] = "Klik voor meer"; App::$strings["Rating Tools"] = "Beoordelingen"; App::$strings["Rate Me"] = "Beoordeel mij"; App::$strings["View Ratings"] = "Bekijk beoordelingen"; -App::$strings["Forums"] = "Forums"; App::$strings["__ctx:widget__ Activity"] = "Activiteit"; +App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Je hebt %1$.0f van de %2$.0f toegestane connecties."; +App::$strings["Add New Connection"] = "Nieuwe connectie toevoegen"; +App::$strings["Enter channel address"] = "Vul kanaaladres in"; +App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Voorbeelden: bob@example.com, http://example.com/barbara"; +App::$strings["Wiki List"] = "Wiki's"; +App::$strings["Archives"] = "Archieven"; +App::$strings["Received Messages"] = "Ontvangen berichten"; +App::$strings["Sent Messages"] = "Verzonden berichten"; +App::$strings["Conversations"] = "Conversaties"; +App::$strings["No messages."] = "Geen berichten"; +App::$strings["Delete conversation"] = "Verwijder conversatie"; +App::$strings["Chat Members"] = "Chatleden"; +App::$strings["photo/image"] = "foto/afbeelding"; +App::$strings["Remove term"] = "Verwijder zoekterm"; +App::$strings["Saved Searches"] = "Opgeslagen zoekopdrachten"; +App::$strings["add"] = "toevoegen"; +App::$strings["Notes"] = "Aantekeningen"; +App::$strings["Add new page"] = "Nieuwe pagina toevoegen"; +App::$strings["Wiki Pages"] = "Wikipagina's"; +App::$strings["Page name"] = "Paginanaam"; +App::$strings["Refresh"] = "Vernieuwen"; App::$strings["Tasks"] = "Taken"; +App::$strings["Suggestions"] = "Voorgestelde kanalen"; +App::$strings["See more..."] = "Meer..."; +App::$strings["Saved Folders"] = "Bewaarde mappen"; +App::$strings["Click to show more"] = "Klik voor meer"; +App::$strings["Tags"] = "Tags"; +App::$strings["Profile Creation"] = "Profiel aanmaken"; +App::$strings["Upload profile photo"] = "Profielfoto uploaden"; +App::$strings["Upload cover photo"] = "Omslagfoto uploaden"; +App::$strings["Edit your profile"] = "Jouw profiel bewerken"; +App::$strings["Find and Connect with others"] = "Vind en verbind met anderen"; +App::$strings["View the directory"] = "Kanalengids tonen"; +App::$strings["Manage your connections"] = "Jouw connecties beheren"; +App::$strings["Communicate"] = "Communiceren"; +App::$strings["View your channel homepage"] = "Jouw kanaalpagina tonen"; +App::$strings["View your network stream"] = "Jouw tijdlijn tonen"; +App::$strings["Documentation"] = "Documentatie"; +App::$strings["View public stream"] = "Openbare tijdlijn tonen"; +App::$strings["New Member Links"] = "Links voor nieuwe leden"; App::$strings["Member registrations waiting for confirmation"] = "Accounts die op goedkeuring wachten"; App::$strings["Inspect queue"] = "Inspecteer berichtenwachtrij"; App::$strings["DB updates"] = "Database-updates"; App::$strings["Admin"] = "Beheer"; -App::$strings["Plugin Features"] = "Plugin-opties"; -App::$strings["Tags"] = "Tags"; -App::$strings["Keywords"] = "Trefwoorden"; -App::$strings["have"] = "heb"; -App::$strings["has"] = "heeft"; -App::$strings["want"] = "wil"; -App::$strings["wants"] = "wil"; -App::$strings["likes"] = "vindt dit leuk"; -App::$strings["dislikes"] = "vindt dit niet leuk"; -App::$strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i"; -App::$strings["Starts:"] = "Start:"; -App::$strings["Finishes:"] = "Einde:"; -App::$strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd."; -App::$strings["Not specified"] = "Niet aangegeven"; -App::$strings["Needs Action"] = "Actie vereist"; -App::$strings["Completed"] = "Voltooid"; -App::$strings["In Process"] = "In behandeling"; -App::$strings["Cancelled"] = "Geannuleerd"; -App::$strings["Birthday"] = "Verjaardag of geboortedatum"; -App::$strings["Age: "] = "Leeftijd:"; -App::$strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-DD of MM-DD"; -App::$strings["never"] = "nooit"; -App::$strings["less than a second ago"] = "minder dan een seconde geleden"; -App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s geleden"; -App::$strings["__ctx:relative_date__ year"] = array( - 0 => "jaar", - 1 => "jaren", -); -App::$strings["__ctx:relative_date__ month"] = array( - 0 => "maand", - 1 => "maanden", -); -App::$strings["__ctx:relative_date__ week"] = array( - 0 => "week", - 1 => "weken", -); -App::$strings["__ctx:relative_date__ day"] = array( - 0 => "dag", - 1 => "dagen", -); -App::$strings["__ctx:relative_date__ hour"] = array( - 0 => "uur", - 1 => "uren", -); -App::$strings["__ctx:relative_date__ minute"] = array( - 0 => "minuut", - 1 => "minuten", -); -App::$strings["__ctx:relative_date__ second"] = array( - 0 => "seconde", - 1 => "seconden", -); -App::$strings["%1\$s's birthday"] = "Verjaardag van %1\$s"; -App::$strings["Happy Birthday %1\$s"] = "Gefeliciteerd met je verjaardag %1\$s"; -App::$strings["Frequently"] = "Regelmatig"; -App::$strings["Hourly"] = "Elk uur"; -App::$strings["Twice daily"] = "Twee keer per dag"; -App::$strings["Daily"] = "Dagelijks"; -App::$strings["Weekly"] = "Wekelijks"; -App::$strings["Monthly"] = "Maandelijks"; -App::$strings["Currently Male"] = "Momenteel man"; -App::$strings["Currently Female"] = "Momenteel vrouw"; -App::$strings["Mostly Male"] = "Voornamelijk man"; -App::$strings["Mostly Female"] = "Voornamelijk vrouw"; -App::$strings["Transgender"] = "Transgender"; -App::$strings["Intersex"] = "Interseksueel"; -App::$strings["Transsexual"] = "Transseksueel"; -App::$strings["Hermaphrodite"] = "Hermafrodiet"; -App::$strings["Neuter"] = "Genderneutraal"; -App::$strings["Non-specific"] = "Niet gespecificeerd"; -App::$strings["Undecided"] = "Nog niet beslist"; -App::$strings["Males"] = "Mannen"; -App::$strings["Females"] = "Vrouwen"; -App::$strings["Gay"] = "Homoseksueel"; -App::$strings["Lesbian"] = "Lesbisch"; -App::$strings["No Preference"] = "Geen voorkeur"; -App::$strings["Bisexual"] = "Biseksueel"; -App::$strings["Autosexual"] = "Autoseksueel"; -App::$strings["Abstinent"] = "Seksuele onthouding"; -App::$strings["Virgin"] = "Maagd"; -App::$strings["Deviant"] = "Afwijkend"; -App::$strings["Fetish"] = "Fetisj"; -App::$strings["Oodles"] = "Veel"; -App::$strings["Nonsexual"] = "Aseksueel"; -App::$strings["Single"] = "Alleen"; -App::$strings["Lonely"] = "Eenzaam"; -App::$strings["Available"] = "Beschikbaar"; -App::$strings["Unavailable"] = "Niet beschikbaar"; -App::$strings["Has crush"] = "Heeft een oogje op iemand"; -App::$strings["Infatuated"] = "Smoorverliefd"; -App::$strings["Dating"] = "Aan het daten"; -App::$strings["Unfaithful"] = "Ontrouw"; -App::$strings["Sex Addict"] = "Seksverslaafd"; -App::$strings["Friends/Benefits"] = "Vriendschap plus"; -App::$strings["Casual"] = "Ongebonden/vluchtig"; -App::$strings["Engaged"] = "Verloofd"; -App::$strings["Married"] = "Getrouwd"; -App::$strings["Imaginarily married"] = "Denkbeeldig getrouwd"; -App::$strings["Partners"] = "Partners"; -App::$strings["Cohabiting"] = "Samenwonend"; -App::$strings["Common law"] = "Common-law-huwelijk"; -App::$strings["Happy"] = "Gelukkig"; -App::$strings["Not looking"] = "Niet op zoek"; -App::$strings["Swinger"] = "Swinger"; -App::$strings["Betrayed"] = "Verraden"; -App::$strings["Separated"] = "Uit elkaar"; -App::$strings["Unstable"] = "Onstabiel"; -App::$strings["Divorced"] = "Gescheiden"; -App::$strings["Imaginarily divorced"] = "Denkbeeldig gescheiden"; -App::$strings["Widowed"] = "Weduwnaar/weduwe"; -App::$strings["Uncertain"] = "Onzeker"; -App::$strings["It's complicated"] = "Het is ingewikkeld"; -App::$strings["Don't care"] = "Maakt mij niks uit"; -App::$strings["Ask me"] = "Vraag het me"; -App::$strings["Who can see this?"] = "Wie kan dit zien?"; -App::$strings["Custom selection"] = "Handmatige selectie"; -App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Kies \"Tonen\" om weergave toe te staan. Met \"Niet tonen\" kan je uitzonderingen maken op \"Tonen\"."; -App::$strings["Show"] = "Tonen"; -App::$strings["Don't show"] = "Niet tonen"; -App::$strings["Post permissions %s cannot be changed %s after a post is shared.
    These permissions set who is allowed to view the post."] = "Permissies van berichten %s zijn niet meer te veranderen %s nadat een bericht is gedeeld.
    Met deze permissies bepaal je wie het bericht kan zien."; -App::$strings["Image/photo"] = "Afbeelding/foto"; -App::$strings["Encrypted content"] = "Versleutelde inhoud"; -App::$strings["Install %s element: "] = "Installeer %s-element: "; -App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren."; -App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s"; -App::$strings["Click to open/close"] = "Klik om te openen of te sluiten"; -App::$strings["spoiler"] = "spoiler"; -App::$strings["$1 wrote:"] = "$1 schreef:"; -App::$strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s"; -App::$strings["New window"] = "Nieuw venster"; -App::$strings["Open the selected location in a different window or browser tab"] = "Open de geselecteerde locatie in een ander venster of tab"; -App::$strings["Help:"] = "Hulp:"; -App::$strings["Not Found"] = "Niet gevonden"; -App::$strings["New Page"] = "Nieuwe pagina"; -App::$strings["%d invitation available"] = array( - 0 => "%d uitnodiging beschikbaar", - 1 => "%d uitnodigingen beschikbaar", -); -App::$strings["Find Channels"] = "Kanalen vinden"; -App::$strings["Enter name or interest"] = "Vul naam of interesse in"; -App::$strings["Connect/Follow"] = "Verbinden/volgen"; -App::$strings["Examples: Robert Morgenstein, Fishing"] = "Voorbeeld: Robert Morgenstein, vissen"; -App::$strings["Random Profile"] = "Willekeurig profiel"; -App::$strings["Invite Friends"] = "Vrienden uitnodigen"; -App::$strings["Advanced example: name=fred and country=iceland"] = "Geavanceerd voorbeeld (Engels): name=jan en country=nederland"; -App::$strings["%d connection in common"] = array( - 0 => "%d gemeenschappelijke connectie", - 1 => "%d gemeenschappelijke connecties", -); -App::$strings["show more"] = "meer connecties weergeven"; -App::$strings["Delete this item?"] = "Dit item verwijderen?"; -App::$strings["%s show less"] = "%s minder reacties weergeven"; -App::$strings["%s expand"] = "%s uitklappen"; -App::$strings["%s collapse"] = "%s inklappen"; -App::$strings["Password too short"] = "Wachtwoord te kort"; -App::$strings["Passwords do not match"] = "Wachtwoorden komen niet overeen"; -App::$strings["everybody"] = "iedereen"; -App::$strings["Secret Passphrase"] = "Geheim wachtwoord"; -App::$strings["Passphrase hint"] = "Wachtwoordhint"; -App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Mededeling: de permissies zijn veranderd, maar zijn nog niet opgeslagen."; -App::$strings["close all"] = "Alles sluiten"; -App::$strings["Nothing new here"] = "Niets nieuw hier"; -App::$strings["Rate This Channel (this is public)"] = "Beoordeel dit kanaal (dit is openbaar)"; -App::$strings["Describe (optional)"] = "Omschrijving (niet verplicht)"; -App::$strings["Please enter a link URL"] = "Vul een URL in:"; -App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Niet opgeslagen wijzigingen. Ben je er zeker van dat je deze pagina wil verlaten?"; -App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo"; -App::$strings["timeago.prefixFromNow"] = "timeago.prefixFromNow"; -App::$strings["ago"] = "geleden"; -App::$strings["from now"] = "vanaf nu"; -App::$strings["less than a minute"] = "minder dan een minuut"; -App::$strings["about a minute"] = "ongeveer een minuut"; -App::$strings["%d minutes"] = "%d minuten"; -App::$strings["about an hour"] = "ongeveer een uur"; -App::$strings["about %d hours"] = "ongeveer %d uren"; -App::$strings["a day"] = "een dag"; -App::$strings["%d days"] = "%d dagen"; -App::$strings["about a month"] = "ongeveer een maand"; -App::$strings["%d months"] = "%d maanden"; -App::$strings["about a year"] = "ongeveer een jaar"; -App::$strings["%d years"] = "%d jaren"; -App::$strings[" "] = " "; -App::$strings["timeago.numbers"] = "timeago.numbers"; -App::$strings["January"] = "januari"; -App::$strings["February"] = "februari"; -App::$strings["March"] = "maart"; -App::$strings["April"] = "april"; -App::$strings["__ctx:long__ May"] = "mei"; -App::$strings["June"] = "juni"; -App::$strings["July"] = "juli"; -App::$strings["August"] = "augustus"; -App::$strings["September"] = "september"; -App::$strings["October"] = "oktober"; -App::$strings["November"] = "november"; -App::$strings["December"] = "december"; -App::$strings["Jan"] = "jan"; -App::$strings["Feb"] = "feb"; -App::$strings["Mar"] = "mrt"; -App::$strings["Apr"] = "apr"; -App::$strings["__ctx:short__ May"] = "mei"; -App::$strings["Jun"] = "jun"; -App::$strings["Jul"] = "jul"; -App::$strings["Aug"] = "aug"; -App::$strings["Sep"] = "sep"; -App::$strings["Oct"] = "okt"; -App::$strings["Nov"] = "nov"; -App::$strings["Dec"] = "dec"; -App::$strings["Sunday"] = "zondag"; -App::$strings["Monday"] = "maandag"; -App::$strings["Tuesday"] = "dinsdag"; -App::$strings["Wednesday"] = "woensdag"; -App::$strings["Thursday"] = "donderdag"; -App::$strings["Friday"] = "vrijdag"; -App::$strings["Saturday"] = "zaterdag"; -App::$strings["Sun"] = "zo"; -App::$strings["Mon"] = "ma"; -App::$strings["Tue"] = "di"; -App::$strings["Wed"] = "wo"; -App::$strings["Thu"] = "do"; -App::$strings["Fri"] = "vr"; -App::$strings["Sat"] = "za"; -App::$strings["__ctx:calendar__ today"] = "vandaag"; -App::$strings["__ctx:calendar__ month"] = "maand"; -App::$strings["__ctx:calendar__ week"] = "week"; -App::$strings["__ctx:calendar__ day"] = "dag"; -App::$strings["__ctx:calendar__ All day"] = "hele dag"; -App::$strings["Directory Options"] = "Opties kanalengids"; -App::$strings["Safe Mode"] = "Veilig zoeken"; -App::$strings["Public Forums Only"] = "Alleen openbare forums"; -App::$strings["This Website Only"] = "Alleen deze hub"; -App::$strings["view full size"] = "volledige grootte tonen"; -App::$strings["No Subject"] = "Geen onderwerp"; -App::$strings["OStatus"] = "OStatus"; -App::$strings["GNU-Social"] = "GNU social"; -App::$strings["RSS/Atom"] = "RSS/Atom"; -App::$strings["Facebook"] = "Facebook"; -App::$strings["Zot"] = "Zot"; -App::$strings["LinkedIn"] = "LinkedIn"; -App::$strings["XMPP/IM"] = "XMPP/IM"; -App::$strings["MySpace"] = "MySpace"; +App::$strings["Plugin Features"] = "Plug-in-opties"; +App::$strings["Account settings"] = "Account"; +App::$strings["Channel settings"] = "Kanaal"; +App::$strings["Additional features"] = "Extra functies"; +App::$strings["Addon settings"] = "Plug-ins"; +App::$strings["Display settings"] = "Weergave"; +App::$strings["Manage locations"] = "Locaties beheren"; +App::$strings["Export channel"] = "Kanaal exporteren"; +App::$strings["OAuth1 apps"] = "OAuth1-applicaties"; +App::$strings["OAuth2 apps"] = "OAuth2-applicaties"; +App::$strings["Permission Groups"] = "Permissiegroepen"; +App::$strings["Premium Channel Settings"] = "Instellingen premiumkanaal"; +App::$strings["Bookmarked Chatrooms"] = "Bladwijzers van chatkanalen"; +App::$strings["New Network Activity"] = "Nieuwe tijdlijnactiviteit"; +App::$strings["New Network Activity Notifications"] = "Nieuwe tijdlijnactiviteitmeldingen"; +App::$strings["View your network activity"] = "Jouw tijdlijnactiviteit tonen"; +App::$strings["Mark all notifications read"] = "Markeer alle meldingen als gelezen"; +App::$strings["Show new posts only"] = "Alleen nieuwe berichten tonen"; +App::$strings["Filter by name"] = "Op naam filteren"; +App::$strings["New Home Activity"] = "Nieuwe kanaalactiviteit"; +App::$strings["New Home Activity Notifications"] = "Nieuwe kanaalactiviteitmeldingen"; +App::$strings["View your home activity"] = "Jouw kanaalactiviteit tonen"; +App::$strings["Mark all notifications seen"] = "Markeer alle meldingen als bekeken"; +App::$strings["New Mails"] = "Nieuwe privéberichten"; +App::$strings["New Mails Notifications"] = "Nieuw privéberichtmeldingen"; +App::$strings["View your private mails"] = "Jouw privéberichten tonen"; +App::$strings["Mark all messages seen"] = "Markeer alle berichten als bekeken"; +App::$strings["New Events"] = "Nieuwe gebeurtenissen"; +App::$strings["New Events Notifications"] = "Nieuwe gebeurtenismeldingen"; +App::$strings["View events"] = "Agenda tonen"; +App::$strings["Mark all events seen"] = "Markeer alle gebeurtenissen als bekeken"; +App::$strings["New Connections Notifications"] = "Nieuwe connectiemeldingen"; +App::$strings["View all connections"] = "Toon alle connecties"; +App::$strings["New Files"] = "Nieuwe bestanden"; +App::$strings["New Files Notifications"] = "Nieuw bestandmeldingen"; +App::$strings["Notices"] = "Meldingen"; +App::$strings["View all notices"] = "Alle meldingen tonen"; +App::$strings["Mark all notices seen"] = "Markeer alle meldingen als bekeken"; +App::$strings["New Registrations"] = "Nieuwe registraties"; +App::$strings["New Registrations Notifications"] = "Nieuwe registratiemeldingen"; +App::$strings["Public Stream Notifications"] = "Openbare tijdlijnmeldingen"; +App::$strings["View the public stream"] = "De openbare tijdlijn tonen"; +App::$strings["Sorry, you have got no notifications at the moment"] = "Sorry, maar je hebt op dit moment geen meldingen"; +App::$strings["Source channel not found."] = "Bron van kanaal niet gevonden"; +App::$strings["Create an account to access services and applications"] = "Maak een account aan om toegang te krijgen tot diensten en toepassingen"; +App::$strings["Logout"] = "Uitloggen"; +App::$strings["Login/Email"] = "E-mailadres of inlognaam"; +App::$strings["Password"] = "Wachtwoord"; +App::$strings["Remember me"] = "Aangemeld blijven"; +App::$strings["Forgot your password?"] = "Wachtwoord vergeten?"; +App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] Probleem met SSL-certificaat van %s"; +App::$strings["Website SSL certificate is not valid. Please correct."] = "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b."; +App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Crontaken zijn niet actief op %s"; +App::$strings["Cron/Scheduled tasks not running."] = "Cron is niet actief"; +App::$strings["never"] = "nooit"; +App::$strings["Cover Photo"] = "Omslagfoto"; +App::$strings["Focus (Hubzilla default)"] = "Focus (Hubzilla-standaard)"; +App::$strings["Theme settings"] = "Thema-instellingen"; +App::$strings["Narrow navbar"] = "Smalle navigatiebalk"; +App::$strings["Navigation bar background color"] = "Achtergrondkleur navigatiebalk"; +App::$strings["Navigation bar icon color "] = "Pictogramkleur navigatiebalk"; +App::$strings["Navigation bar active icon color "] = "Actieve pictogramkleur navigatiebalk"; +App::$strings["Link color"] = "Linkkleur"; +App::$strings["Set font-color for banner"] = "Tekstkleur van banner instellen"; +App::$strings["Set the background color"] = "Achtergrondkleur instellen"; +App::$strings["Set the background image"] = "Achtergrondafbeelding instellen"; +App::$strings["Set the background color of items"] = "Achtergrondkleur items instellen"; +App::$strings["Set the background color of comments"] = "Achtergrondkleur reacties instellen"; +App::$strings["Set font-size for the entire application"] = "Tekstgrootte van de volledige applicatie instellen"; +App::$strings["Examples: 1rem, 100%, 16px"] = "Voorbeelden: 1rem, 100%, 16px"; +App::$strings["Set font-color for posts and comments"] = "Tekstkleur van berichten en reacties"; +App::$strings["Set radius of corners"] = "Radius van hoeken instellen"; +App::$strings["Example: 4px"] = "Voorbeeld: 4px"; +App::$strings["Set shadow depth of photos"] = "Schaduwdiepte van foto's instellen"; +App::$strings["Set maximum width of content region in pixel"] = "Maximumbreedte conversatieruimte instellen (in pixels)"; +App::$strings["Leave empty for default width"] = "Laat leeg voor standaardbreedte"; +App::$strings["Left align page content"] = "Inhoud links uitlijnen"; +App::$strings["Set size of conversation author photo"] = "Grootte profielfoto's van berichten instellen"; +App::$strings["Set size of followup author photos"] = "Grootte profielfoto's van reacties instellen"; +App::$strings["Errors encountered deleting database table "] = "Fouten opgetreden tijdens verwijderen databasetabel "; +App::$strings["Submit Settings"] = "Instellingen toepassen"; +App::$strings["Drop tables when uninstalling?"] = "Verwijder tabellen tijdens uitschakelen plug-in?"; +App::$strings["If checked, the Rendezvous database tables will be deleted when the plugin is uninstalled."] = "Wanneer dit is aangevinkt worden de tabellen in de Rendezvous-database verwijderd wanneer de plug-in wordt uitgeschakeld."; +App::$strings["Mapbox Access Token"] = "Toegangstoken "; +App::$strings["If you enter a Mapbox access token, it will be used to retrieve map tiles from Mapbox instead of the default OpenStreetMap tile server."] = "De Mapbox-toegangstoken wordt gebruikt om kaarttegels (tiles) van Mapbox op te halen in plaats van de standaard tile-server van OpenStreetMap."; +App::$strings["Rendezvous"] = "Rendezvous"; +App::$strings["This identity has been deleted by another member due to inactivity. Please press the \"New identity\" button or refresh the page to register a new identity. You may use the same name."] = "Deze identiteit is door een ander lid verwijderd als gevolg van inactiviteit. Klik op de knop \"Nieuwe identiteit\" of herlaad de pagina om een nieuwe identiteit aan te maken. Je kan eventueel dezelfde naam gebruiken."; +App::$strings["Welcome to Rendezvous!"] = "Welkom bij Rendezvous!"; +App::$strings["Enter your name to join this rendezvous. To begin sharing your location with the other members, tap the GPS control. When your location is discovered, a red dot will appear and others will be able to see you on the map."] = "Vul je naam in om deel te nemen aan deze rendezvous. Om met het delen van je locatie met de andere leden te beginnen, klik je op de locatieknop van je webbrowser. Nadat jouw locatie is gevonden verschijnt er een rode stip en kunnen andere leden jou zien op de kaart."; +App::$strings["Let's meet here"] = "Laten we elkaar hier ontmoeten"; +App::$strings["New marker"] = "Nieuwe markering"; +App::$strings["Edit marker"] = "Markering bewerken"; +App::$strings["New identity"] = "Nieuwe identiteit"; +App::$strings["Delete marker"] = "Markering verwijderen"; +App::$strings["Delete member"] = "Lid verwijderen"; +App::$strings["Edit proximity alert"] = "Nabijheidswaarschuwing bewerken"; +App::$strings["A proximity alert will be issued when this member is within a certain radius of you.

    Enter a radius in meters (0 to disable):"] = "Een nabijheidswaarschuwing wordt actief wanneer dit lid zich binnen een bepaalde straal rond jouw locatie bevindt.

    Voer het aantal meters van de straal in (0 om uit te schakelen):"; +App::$strings["distance"] = "afstand"; +App::$strings["Proximity alert distance (meters)"] = "Afstand nabijheidswaarschuwing (meter)"; +App::$strings["A proximity alert will be issued when you are within a certain radius of the marker location.

    Enter a radius in meters (0 to disable):"] = "Een nabijheidswaarschuwing wordt actief wanneer je je binnen een bepaalde straal rond een specifieke locatie bevindt.

    Voer het aantal meters van de straal in (0 om uit te schakelen):"; +App::$strings["Marker proximity alert"] = "Locatiemarkering nabijheidswaarschuwing"; +App::$strings["Reminder note"] = "Herinnering"; +App::$strings["Enter a note to be displayed when you are within the specified proximity..."] = "Vul de tekst in die getoond moet worden wanneer je je op de aangegeven afstand bevindt..."; +App::$strings["Add new rendezvous"] = "Nieuwe rendezvous toevoegen"; +App::$strings["Create a new rendezvous and share the access link with those you wish to invite to the group. Those who open the link become members of the rendezvous. They can view other member locations, add markers to the map, or share their own locations with the group."] = "Maak een nieuwe rendezvous aan en deel de toegangslink met wie je wil uitnodigen voor de groep. Wie op de link klikt wordt lid van rendezvous. Zij kunnen dan de locaties zien van andere leden, markeringen aan de kaart toevoegen of hun eigen locaties met de groep delen."; +App::$strings["You have no rendezvous. Press the button above to create a rendezvous!"] = "Je hebt geen rendezvous. Klik de knop hierboven om een rendezvous aan te maken!"; +App::$strings["Some setting"] = "Een of andere instelling"; +App::$strings["A setting"] = "Een instelling"; +App::$strings["Skeleton Settings"] = "Plug-in-skeleton"; +App::$strings["GNU-Social Protocol Settings updated."] = "GNU social-protocol-instellingen bijgewerkt."; +App::$strings["The GNU-Social protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Het GNU social-protocol ondersteunt geen locatieonafhankelijkheid. Connecties die je met dit netwerk maakt zijn mogelijk onbereikbaar vanaf andere kanaallocaties."; +App::$strings["Enable the GNU-Social protocol for this channel"] = "GNU social-protocol voor dit kanaal inschakelen"; +App::$strings["GNU-Social Protocol Settings"] = "GNU social-protocol"; +App::$strings["Follow"] = "Volgen"; +App::$strings["%1\$s is now following %2\$s"] = "%1\$s volgt nu %2\$s"; +App::$strings["Planets Settings updated."] = "Planets-instellingen opgeslagen."; +App::$strings["Enable Planets Plugin"] = "Planets inschakelen"; +App::$strings["Planets Settings"] = "Planets"; +App::$strings["System defaults:"] = "Systeemstandaarden:"; +App::$strings["Preferred Clipart IDs"] = "Voorkeursclipart"; +App::$strings["List of preferred clipart ids. These will be shown first."] = "Lijst met clipartnummers die als eerste moeten worden getoond."; +App::$strings["Default Search Term"] = "Standaard zoekterm"; +App::$strings["The default search term. These will be shown second."] = "Standaard zoekterm. Deze worden als tweede getoond."; +App::$strings["Return After"] = "Ga na afloop naar"; +App::$strings["Page to load after image selection."] = "Pagina die na het kiezen van een afbeelding moet laden."; +App::$strings["Edit Profile"] = "Profiel bewerken"; +App::$strings["Profile List"] = "Profiellijst"; +App::$strings["Order of Preferred"] = "Voorkeursclipart sorteren op"; +App::$strings["Sort order of preferred clipart ids."] = "Als eerste getoonde clipart hierop sorteren."; +App::$strings["Newest first"] = "Nieuwste eerst"; +App::$strings["As entered"] = "Zoals ingevoerd"; +App::$strings["Order of other"] = "Overige clipart sorteren op"; +App::$strings["Sort order of other clipart ids."] = "Overige clipart hierop sorteren."; +App::$strings["Most downloaded first"] = "Meest gedownload eerst"; +App::$strings["Most liked first"] = "Meest geliked eerst"; +App::$strings["Preferred IDs Message"] = "Tekst voorkeursclipart"; +App::$strings["Message to display above preferred results."] = "Tekst die bovenaan de resultaten met voorkeursclipart moet worden getoond."; +App::$strings["Uploaded by: "] = "Geüpload door: "; +App::$strings["Drawn by: "] = "Getekend door: "; +App::$strings["Use this image"] = "Deze afbeelding gebruiken"; +App::$strings["Or select from a free OpenClipart.org image:"] = "Of kies uit een vrije OpenClipart.org-afbeelding:"; +App::$strings["Search Term"] = "Zoekterm"; +App::$strings["Unknown error. Please try again later."] = "Onbekende fout. Probeer later nog eens."; +App::$strings["Profile photo updated successfully."] = "Bijwerken profielfoto geslaagd."; +App::$strings["Flag Adult Photos"] = "Markeer foto's als voor volwassenen"; +App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Zorgt voor een optie om foto's met inhoud voor volwassenen in de standaard albumweergave te verbergen"; +App::$strings["Post to WordPress"] = "WordPress"; +App::$strings["Enable WordPress Post Plugin"] = "Doorplaatsen naar WordPress inschakelen"; +App::$strings["WordPress username"] = "Gebruikersnaam WordPress"; +App::$strings["WordPress password"] = "Wachtwoord WordPress"; +App::$strings["WordPress API URL"] = "API-URL WordPress"; +App::$strings["Typically https://your-blog.tld/xmlrpc.php"] = "Meestal https://jouw-blog.tld/xmlrpc.php"; +App::$strings["WordPress blogid"] = "Blog ID WordPress"; +App::$strings["For multi-user sites such as wordpress.com, otherwise leave blank"] = "Voor websites met meerdere gebruikers, zoals wordpress.com. Anders leeg laten."; +App::$strings["Post to WordPress by default"] = "Standaard naar WordPress doorplaatsen"; +App::$strings["Forward comments (requires hubzilla_wp plugin)"] = "Reacties doorplaatsen (Hubzilla_WP-plug-in vereist)"; +App::$strings["WordPress Post Settings"] = "WordPress (berichten doorplaatsen)"; +App::$strings["Wordpress Settings saved."] = "WordPress-instellingen opgeslagen."; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Deze plug-in controleert berichten op woorden die je hieronder kunt opgeven en klapt berichten in die deze woorden bevatten, zodat die berichten niet op ongeschikte momenten worden getoond. Denk hierbij bijvoorbeeld aan berichten met erotische afbeeldingen, die waarschijnlijk niet geschikt zijn binnen een werkomgeving. Het is beleefd en het wordt aangeraden om zulke berichten met #NSFW te taggen. Dit filter kan ook gebruikt worden met andere woorden en is dus voor alles inzetbaar."; +App::$strings["Enable Content filter"] = "Inhoudsfilter inschakelen"; +App::$strings["Comma separated list of keywords to hide"] = "Door komma's gescheiden lijst met woorden die gefilterd moeten worden."; +App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "Woord, /reguliere expressie/, lang=xx, lang!=xx"; +App::$strings["Not Safe For Work Settings"] = "Not Safe For Work (inhoudsfilter)"; +App::$strings["General Purpose Content Filter"] = "Voor alles te gebruiken inhoudsfilter"; +App::$strings["NSFW Settings saved."] = "NSFW-instellingen opgeslagen."; +App::$strings["Possible adult content"] = "Mogelijk inhoud voor volwassenen"; +App::$strings["%s - view"] = "%s - tonen"; +App::$strings["Post to Insanejournal"] = "InsaneJournal"; +App::$strings["Enable InsaneJournal Post Plugin"] = "Doorplaatsen naar InsaneJournal inschakelen"; +App::$strings["InsaneJournal username"] = "Gebruikersnaam InsaneJournal"; +App::$strings["InsaneJournal password"] = "Wachtwoord InsaneJournal"; +App::$strings["Post to InsaneJournal by default"] = "Standaard doorplaatsen naar InsaneJournal"; +App::$strings["InsaneJournal Post Settings"] = "InsaneJournal (berichten doorplaatsen)"; +App::$strings["Insane Journal Settings saved."] = "InsaneJournal-instellingen opgeslagen."; +App::$strings["Post to Dreamwidth"] = "Dreamwidth"; +App::$strings["Enable Dreamwidth Post Plugin"] = "Doorplaatsen naar Dreamwidth inschakelen"; +App::$strings["Dreamwidth username"] = "Gebruikersnaam Dreamwidth"; +App::$strings["Dreamwidth password"] = "Wachtwoord Dreamwidth"; +App::$strings["Post to Dreamwidth by default"] = "Standaard doorplaatsen naar Dreamwidth"; +App::$strings["Dreamwidth Post Settings"] = "Dreamwidth (berichten doorplaatsen)"; +App::$strings["New registration"] = "Nieuwe registratie"; +App::$strings["Message sent to %s. New account registration: %s"] = "Bericht naar %s verzonden. Nieuwe accountregistratie: %s "; +App::$strings["Hubzilla Directory Stats"] = "Kanalengidsstatistieken Hubzilla"; +App::$strings["Total Hubs"] = "Totaal aantal hubs"; +App::$strings["Hubzilla Hubs"] = "Hubzilla-hubs"; +App::$strings["Friendica Hubs"] = "Friendica-hubs"; +App::$strings["Diaspora Pods"] = "Diaspora-pods"; +App::$strings["Hubzilla Channels"] = "Hubzilla-kanalen"; +App::$strings["Friendica Channels"] = "Friendica-kanalen"; +App::$strings["Diaspora Channels"] = "Diaspora-kanalen"; +App::$strings["Aged 35 and above"] = "Leeftijd is ouder dan 35 jaar"; +App::$strings["Aged 34 and under"] = "Leeftijd is jonger dan 34"; +App::$strings["Average Age"] = "Gemiddelde leeftijd"; +App::$strings["Known Chatrooms"] = "Bekend aantal chatkanalen"; +App::$strings["Known Tags"] = "Bekend aantal tags"; +App::$strings["Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network. This also applies to chatrooms,"] = "Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network. This also applies to chatrooms,"; +App::$strings["Your Webbie:"] = "Jouw kanaaladres:"; +App::$strings["Fontsize (px):"] = "Tekengrootte (px):"; +App::$strings["Link:"] = "Link:"; +App::$strings["Like us on Hubzilla"] = "Like ons op Hubzilla"; +App::$strings["Embed:"] = "Insluiten (embed):"; +App::$strings["Photos imported"] = "Foto's geïmporteerd"; +App::$strings["Redmatrix Photo Album Import"] = "Fotoalbums importeren vanuit Redmatrix"; +App::$strings["This will import all your Redmatrix photo albums to this channel."] = "Hiermee importeer je al jouw Redmatrix-fotoalbums in dit Hubzilla-kanaal."; +App::$strings["Redmatrix Server base URL"] = "Basis-URL van Redmatrix-hub"; +App::$strings["Redmatrix Login Username"] = "Gebruikersnaam Redmatrix"; +App::$strings["Redmatrix Login Password"] = "Wachtwoord Redmatrix"; +App::$strings["Import just this album"] = "Alleen dit album importeren"; +App::$strings["Leave blank to import all albums"] = "Laat leeg om alle albums te importeren"; +App::$strings["Maximum count to import"] = "Maximaal aantal om te importeren"; +App::$strings["0 or blank to import all available"] = "0 of leeg om alles te importeren"; +App::$strings["Channels to auto connect"] = "Kanalen om automatisch mee te verbinden"; +App::$strings["Comma separated list"] = "Door komma's gescheiden lijst"; +App::$strings["Popular Channels"] = "Populaire chatkanalen"; +App::$strings["IRC Settings"] = "IRC"; +App::$strings["IRC settings saved."] = "IRC-instellingen opgeslagen."; +App::$strings["IRC Chatroom"] = "IRC-chatkanaal"; +App::$strings["Post to LiveJournal"] = "LiveJournal"; +App::$strings["Enable LiveJournal Post Plugin"] = "Doorplaatsen naar LiveJournal inschakelen"; +App::$strings["LiveJournal username"] = "Gebruikersnaam LiveJournal"; +App::$strings["LiveJournal password"] = "Wachtwoord LiveJournal"; +App::$strings["Post to LiveJournal by default"] = "Standaard doorplaatsen naar LiveJournal"; +App::$strings["LiveJournal Post Settings"] = "LiveJournal (berichten doorplaatsen)"; +App::$strings["LiveJournal Settings saved."] = "LiveJournal-instellingen opgeslagen."; +App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten."; +App::$strings["The error message was:"] = "Foutmelding was:"; +App::$strings["First Name"] = "Voornaam"; +App::$strings["Last Name"] = "Achternaam"; +App::$strings["Nickname"] = "Bijnaam"; +App::$strings["Full Name"] = "Volledige naam"; +App::$strings["Profile Photo 16px"] = "Profielfoto 16px"; +App::$strings["Profile Photo 32px"] = "Profielfoto 32px"; +App::$strings["Profile Photo 48px"] = "Profielfoto 48px"; +App::$strings["Profile Photo 64px"] = "Profielfoto 64px"; +App::$strings["Profile Photo 80px"] = "Profielfoto 80px"; +App::$strings["Profile Photo 128px"] = "Profielfoto 128px"; +App::$strings["Timezone"] = "Tijdzone"; +App::$strings["Birth Year"] = "Geboortejaar"; +App::$strings["Birth Month"] = "Geboortemaand"; +App::$strings["Birth Day"] = "Geboortedag"; +App::$strings["Birthdate"] = "Geboortedatum"; +App::$strings["OpenID protocol error. No ID returned."] = "OpenID-protocolfout. Geen ID terugontvangen."; +App::$strings["Login failed."] = "Inloggen mislukt."; +App::$strings["Male"] = "Man"; +App::$strings["Female"] = "Vrouw"; +App::$strings["You're welcome."] = "Je bent van harte welkom."; +App::$strings["Ah shucks..."] = "Hé verdorie..."; +App::$strings["Don't mention it."] = "Graag gedaan."; +App::$strings["<blush>"] = ""; +App::$strings["Page to load after login"] = "Pagina die na het inloggen getoond moet worden"; +App::$strings["Examples: "apps", "network?f=&gid=37" (privacy collection), "channel" or "notifications/system" (leave blank for default network page (grid)."] = "Voorbeelden: "apps", "network?f=&gid=37" (privacygroep), "channel" of "notifications/system" (laat leeg voor de standaard netwerkpagina (activiteiten)."; +App::$strings["Startpage Settings"] = "Startpagina"; +App::$strings["bitchslap"] = "bitchslappen"; +App::$strings["bitchslapped"] = "bitchslapped"; +App::$strings["shag"] = "wippen"; +App::$strings["shagged"] = "wipte met"; +App::$strings["patent"] = "patent"; +App::$strings["patented"] = "patented"; +App::$strings["hug"] = "knuffelen"; +App::$strings["hugged"] = "knuffelde"; +App::$strings["murder"] = "vermoorden"; +App::$strings["murdered"] = "vermoorde"; +App::$strings["worship"] = "aanbidden"; +App::$strings["worshipped"] = "aanbad"; +App::$strings["kiss"] = "kussen"; +App::$strings["kissed"] = "kuste"; +App::$strings["tempt"] = "verleiden"; +App::$strings["tempted"] = "verleidde"; +App::$strings["raise eyebrows at"] = "wenkbrauwen optrekken"; +App::$strings["raised their eyebrows at"] = "trok zijn/haar wenkbrauwen op naar"; +App::$strings["insult"] = "beledigen"; +App::$strings["insulted"] = "beledigde"; +App::$strings["praise"] = "prijzen"; +App::$strings["praised"] = "prees"; +App::$strings["be dubious of"] = "twijfels hebben"; +App::$strings["was dubious of"] = "had twijfels over"; +App::$strings["eat"] = "opeten"; +App::$strings["ate"] = "at"; +App::$strings["giggle and fawn at"] = "giechelen en vleien"; +App::$strings["giggled and fawned at"] = "giechelde naar en vleide met"; +App::$strings["doubt"] = "betwijfelen"; +App::$strings["doubted"] = "betwijfelde"; +App::$strings["glare"] = "boos kijken"; +App::$strings["glared at"] = "keek boos naar"; +App::$strings["fuck"] = "neuken"; +App::$strings["fucked"] = "neukte"; +App::$strings["bonk"] = "naaien"; +App::$strings["bonked"] = "naaide"; +App::$strings["declare undying love for"] = "eeuwige liefde verklaren"; +App::$strings["declared undying love for"] = "verklaarde de eeuwige liefde aan"; +App::$strings["Diaspora Protocol Settings updated."] = "Diaspora-protocol-instellingen bijgewerkt."; +App::$strings["The Diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Het Diaspora-protocol ondersteunt geen locatieonafhankelijkheid. Connecties die je met dit netwerk maakt zijn mogelijk onbereikbaar vanaf andere kanaallocaties."; +App::$strings["Enable the Diaspora protocol for this channel"] = "Diaspora-protocol voor dit kanaal inschakelen"; +App::$strings["Allow any Diaspora member to comment on your public posts"] = "Sta toe dat elk Diaspora-lid op jouw openbare berichten kan reageren."; +App::$strings["Prevent your hashtags from being redirected to other sites"] = "Voorkom dat jouw hashtags naar andere websites worden doorverwezen"; +App::$strings["Sign and forward posts and comments with no existing Diaspora signature"] = "Berichten en reacties met geen bestaande Diaspora-handtekening ondertekenen en doorsturen"; +App::$strings["Followed hashtags (comma separated, do not include the #)"] = "Gevolgde hashtags (door komma's gescheiden lijst, zonder de #)"; +App::$strings["Diaspora Protocol Settings"] = "Diaspora-protocol (incl. Friendica)"; +App::$strings["No username found in import file."] = "Geen gebruikersnaam in het importbestand gevonden."; +App::$strings["Unable to create a unique channel address. Import failed."] = "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt."; +App::$strings["Your account on %s will expire in a few days."] = "Jouw account op %s verloopt over een paar dagen. "; +App::$strings["Your $Productname test account is about to expire."] = "Jouw $Productname-testaccount staat op het punt om te verlopen."; +App::$strings["Enable Rainbowtag"] = "Rainbowtag inschakelen"; +App::$strings["Rainbowtag Settings"] = "Rainbowtag"; +App::$strings["Rainbowtag Settings saved."] = "Rainbowtag-instellingen opgeslagen."; +App::$strings["Show Upload Limits"] = "Uploadlimieten tonen"; +App::$strings["Hubzilla configured maximum size: "] = "Op Hubzilla configureerde maximale grootte: "; +App::$strings["PHP upload_max_filesize: "] = "PHP upload_max_filesize: "; +App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = "PHP post_max_size (moet hoger zijn dan upload_max_filesize): "; +App::$strings["generic profile image"] = "Algemene profielfoto"; +App::$strings["random geometric pattern"] = "Willekeurig geometrisch patroon"; +App::$strings["monster face"] = "monstergezicht"; +App::$strings["computer generated face"] = "computergegenereerd gezicht"; +App::$strings["retro arcade style face"] = "retro-arcadestijlgezicht"; +App::$strings["Hub default profile photo"] = "Standaard profielfoto hub"; +App::$strings["Information"] = "Informatie"; +App::$strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
    The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "De Libravatar-plug-in is ook geïnstalleerd. Schakel de Libravatar of deze Gravatar-plug-in uit.
    De Libravatar-plug-in valt terug op Gravatar wanneer er niks op Libravatar wordt gevonden."; +App::$strings["Save Settings"] = "Instellingen opslaan"; +App::$strings["Default avatar image"] = "Standaard avatar"; +App::$strings["Select default avatar image if none was found at Gravatar. See README"] = "Kies een standaard avatar wanneer niets op Gravatar wordt gevonden. Zie README"; +App::$strings["Rating of images"] = "Beoordeling van afbeeldingen"; +App::$strings["Select the appropriate avatar rating for your site. See README"] = "Kies een toepasselijke avatarrating voor jouw hub. Zie README"; +App::$strings["Gravatar settings updated."] = "Gravatar-instellingen bijgewerkt."; +App::$strings["Hubzilla File Storage Import"] = "Importeer bestanden vanuit Hubzilla"; +App::$strings["This will import all your cloud files from another server."] = "Hiermee importeer je al jouw bestanden vanaf een andere hub."; +App::$strings["Hubzilla Server base URL"] = "Basis-URL van Hubzilla-server"; +App::$strings["Since modified date yyyy-mm-dd"] = "Sinds de aangepaste datum jjjj-mm-dd"; +App::$strings["Until modified date yyyy-mm-dd"] = "Tot de aangepaste datum jjjj-mm-dd"; +App::$strings["Recent Channel/Profile Viewers"] = "Recente bezoekers van jouw kanaal/profiel"; +App::$strings["This plugin/addon has not been configured."] = "Deze plug-in is niet geconfigureerd. "; +App::$strings["Please visit the Visage settings on %s"] = "Bezoek de Visage-instellingen op %s"; +App::$strings["your feature settings page"] = "Jouw plug-in-instellingen"; +App::$strings["No entries."] = "Niets aanwezig."; +App::$strings["Enable Visage Visitor Logging"] = "Visage inschakelen "; +App::$strings["Visage Settings"] = "Visage"; +App::$strings["Nsabait Settings updated."] = "NSAbait-instellingen bijgewerkt."; +App::$strings["Enable NSAbait Plugin"] = "NSAbait inschakelen"; +App::$strings["NSAbait Settings"] = "NSAbait"; +App::$strings["Send test email"] = "Test-e-mail versturen"; +App::$strings["No recipients found."] = "Geen ontvangers gevonden"; +App::$strings["Mail sent."] = "E-mail verzonden."; +App::$strings["Sending of mail failed."] = "Verzenden van e-mail mislukt."; +App::$strings["Mail Test"] = "E-mailtest"; +App::$strings["Message subject"] = "Onderwerp e-mailbericht"; +App::$strings["Use markdown for editing posts"] = "Sta het gebruik van markdown toe om berichten te bewerken"; +App::$strings["View Larger"] = "Groter tonen"; +App::$strings["Tile Server URL"] = "URL tile-server"; +App::$strings["A list of public tile servers"] = "Een lijst met openbare tile-servers"; +App::$strings["Nominatim (reverse geocoding) Server URL"] = "Server-URL Nominatim (reverse geocoding)"; +App::$strings["A list of Nominatim servers"] = "Een lijst met Nominatim-servers"; +App::$strings["Default zoom"] = "Standaard zoomniveau"; +App::$strings["The default zoom level. (1:world, 18:highest, also depends on tile server)"] = "Standaard zoomniveau. Van 1 (wereld) t/m 18 (maximaal). Is ook afhankelijk van tile-server."; +App::$strings["Include marker on map"] = "Markering op kaart plaatsen"; +App::$strings["Include a marker on the map."] = "Plaatst een markering op de kaart."; +App::$strings["text to include in all outgoing posts from this site"] = "tekst om onderaan elk uitgaand bericht van deze hub te plaatsen"; +App::$strings["Fuzzloc Settings updated."] = "Fuzzloc-instellingen bijgewerkt."; +App::$strings["Fuzzloc allows you to blur your precise location if your channel uses browser location mapping."] = "Fuzzloc stelt je in staat om jouw exacte locatie te verhullen, wanneer jouw kanaal browserlocatie-mapping gebruikt."; +App::$strings["Enable Fuzzloc Plugin"] = "Fuzzloc inschakelen"; +App::$strings["Minimum offset in meters"] = "Minimum offset in meters"; +App::$strings["Maximum offset in meters"] = "Maximum offset in meters"; +App::$strings["Fuzzloc Settings"] = "Fuzzloc"; +App::$strings["Post to Friendica"] = "Friendica"; +App::$strings["rtof Settings saved."] = "RTOF-instellingen opgeslagen."; +App::$strings["Allow posting to Friendica"] = "Doorplaatsen naar Friendica toestaan"; +App::$strings["Send public postings to Friendica by default"] = "Standaard doorplaatsen naar Friendica"; +App::$strings["Friendica API Path"] = "API-pad Friendica"; +App::$strings["https://{sitename}/api"] = "https://{hubnaam}/api"; +App::$strings["Friendica login name"] = "Gebruikersnaam Friendica"; +App::$strings["Friendica password"] = "Wachtwoord Friendica"; +App::$strings["Hubzilla to Friendica Post Settings"] = "Friendica (berichten doorplaatsen)"; +App::$strings["Status:"] = "Status:"; +App::$strings["Activate addon"] = "Plug-in inschakelen"; +App::$strings["Hide Jappixmini Chat-Widget from the webinterface"] = "Hide Jappixmini Chat-Widget from the webinterface"; +App::$strings["Jabber username"] = "Gebruikersnaam Jabber"; +App::$strings["Jabber server"] = "Jabberserver"; +App::$strings["Jabber BOSH host URL"] = "Jabber BOSH host URL"; +App::$strings["Jabber password"] = "Wachtwoord Jabber"; +App::$strings["Encrypt Jabber password with Hubzilla password"] = "Versleutel Jabber-wachtwoord met Hubzilla-wachtwoord"; +App::$strings["Hubzilla password"] = "Wachtwoord Hubzilla"; +App::$strings["Approve subscription requests from Hubzilla contacts automatically"] = "Approve subscription requests from Hubzilla contacts automatically"; +App::$strings["Purge internal list of jabber addresses of contacts"] = "Purge internal list of jabber addresses of contacts"; +App::$strings["Configuration Help"] = "Configuratiehulp"; +App::$strings["Jappix Mini Settings"] = "Jappix Mini"; +App::$strings["Currently blocked"] = "Momenteel geblokkeerd"; +App::$strings["No channels currently blocked"] = "Momenteel geen kanalen geblokkeerd"; +App::$strings["Superblock Settings"] = "Superblock"; +App::$strings["Block Completely"] = "Volledig blokkeren"; +App::$strings["superblock settings updated"] = "Superblock-instellingen bijgewerkt"; +App::$strings["Federate"] = "Federeren"; +App::$strings["nofed Settings saved."] = "Geen federatie-instellingen opgeslagen."; +App::$strings["Allow Federation Toggle"] = "Federatie toestaan?"; +App::$strings["Federate posts by default"] = "Standaard berichten federeren"; +App::$strings["NoFed Settings"] = "Geen federatie"; +App::$strings["Post to Red"] = "Hubzilla"; +App::$strings["Channel is required."] = "Een kanaal is vereist."; +App::$strings["redred Settings saved."] = "RedRed-instellingen opgeslagen."; +App::$strings["Allow posting to another Hubzilla Channel"] = "Doorplaatsen naar een ander Hubzilla-kanaal toestaan"; +App::$strings["Send public postings to Hubzilla channel by default"] = "Standaard doorplaatsen naar een ander Hubzilla-kanaal toestaan"; +App::$strings["Hubzilla API Path"] = "API-pad Hubzilla"; +App::$strings["Hubzilla login name"] = "Gebruikersnaam Hubzilla"; +App::$strings["Hubzilla channel name"] = "Kanaalnaam Hubzilla"; +App::$strings["Hubzilla Crosspost Settings"] = "Hubzilla (berichten doorplaatsen)"; +App::$strings["Logfile archive directory"] = "Logbestand archiefmap"; +App::$strings["Directory to store rotated logs"] = "Map om geroteerde logbestanden in op te slaan"; +App::$strings["Logfile size in bytes before rotating"] = "Grootte van logbestand in bytes, voordat het wordt geroteerd"; +App::$strings["Number of logfiles to retain"] = "Aantal te behouden logbestanden"; +App::$strings["Friendica Photo Album Import"] = "Fotoalbums importeren vanuit Friendica"; +App::$strings["This will import all your Friendica photo albums to this Red channel."] = "Hiermee importeer je al jouw Friendica-fotoalbums in dit Hubzilla-kanaal."; +App::$strings["Friendica Server base URL"] = "Basis-URL van Friendica-server"; +App::$strings["Friendica Login Username"] = "Gebruikersnaam Friendica"; +App::$strings["Friendica Login Password"] = "Wachtwoord Friendica"; +App::$strings["ActivityPub"] = "ActivityPub"; +App::$strings["ActivityPub Protocol Settings updated."] = "ActivityPub-protocol-instellingen bijgewerkt. "; +App::$strings["The ActivityPub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Het ActivityPub-protocol ondersteunt geen locatieonafhankelijkheid. Connecties die je met dit netwerk maakt zijn mogelijk onbereikbaar vanaf andere kanaallocaties."; +App::$strings["Enable the ActivityPub protocol for this channel"] = "ActivityPub-protocol voor dit kanaal inschakelen"; +App::$strings["Send multi-media HTML articles"] = "Verzend multimedia-HTML-artikelen"; +App::$strings["Not supported by some microblog services such as Mastodon"] = "Wordt door sommige microblogdiensten, zoals Mastodon, niet ondersteund"; +App::$strings["ActivityPub Protocol Settings"] = "ActivityPub-protocol"; +App::$strings["Project Servers and Resources"] = "Projectservers en -middelen"; +App::$strings["Project Creator and Tech Lead"] = "Projectgrondlegger en hoofdontwikkelaar"; +App::$strings["Admin, developer, directorymin, support bloke"] = "Beheerder, ontwikkelaar, kanalengidsbeheerder en supportgozer"; +App::$strings["And the hundreds of other people and organisations who helped make the Hubzilla possible."] = "En de honderden andere mensen en organisaties die Hubzilla mogelijk hebben gemaakt. "; +App::$strings["The Redmatrix/Hubzilla projects are provided primarily by volunteers giving their time and expertise - and often paying out of pocket for services they share with others."] = "De Hubzillaprojecten worden hoofdzakelijk aangeboden door vrijwilligers die er hun tijd en expertise insteken - en meestal zelf de diensten betalen die ze met anderen delen."; +App::$strings["There is no corporate funding and no ads, and we do not collect and sell your personal information. (We don't control your personal information - you do.)"] = "Wij worden niet gefinancierd door bedrijven en reclame, en wij verzamelen en verkopen niet jouw persoonlijke gegevens. We hebben geen controle over jouw persoonlijke gegevens - dat heb jezelf."; +App::$strings["Help support our ground-breaking work in decentralisation, web identity, and privacy."] = "Steun ons baanbrekende werk in decentralisatie, webidentiteit en privacy. "; +App::$strings["Your donations keep servers and services running and also helps us to provide innovative new features and continued development."] = "Jouw donaties laten onze servers en diensten draaien, en helpt ons om nieuwe innovatieve mogelijkheden te blijven ontwikkelen."; +App::$strings["Donate"] = "Doneer"; +App::$strings["Choose a project, developer, or public hub to support with a one-time donation"] = "Kies een project, ontwikkelaar of openbaar toegankelijke hub, die je met een eenmalige donatie wil steunen"; +App::$strings["Donate Now"] = "Doneer nu"; +App::$strings["Or become a project sponsor (Hubzilla Project only)"] = "Of wordt een projectsponsor (alleen het Hubzilla-project)"; +App::$strings["Please indicate if you would like your first name or full name (or nothing) to appear in our sponsor listing"] = "Geef aan of jouw voornaam of volledige naam (of niets) op onze sponsorlijst moet verschijnen"; +App::$strings["Sponsor"] = "Sponsor"; +App::$strings["Special thanks to: "] = "Speciale dank gaat naar: "; +App::$strings["This is a fairly comprehensive and complete guitar chord dictionary which will list most of the available ways to play a certain chord, starting from the base of the fingerboard up to a few frets beyond the twelfth fret (beyond which everything repeats). A couple of non-standard tunings are provided for the benefit of slide players, etc."] = "This is a fairly comprehensive and complete guitar chord dictionary which will list most of the available ways to play a certain chord, starting from the base of the fingerboard up to a few frets beyond the twelfth fret (beyond which everything repeats). A couple of non-standard tunings are provided for the benefit of slide players, etc."; +App::$strings["Chord names start with a root note (A-G) and may include sharps (#) and flats (b). This software will parse most of the standard naming conventions such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."] = "Chord names start with a root note (A-G) and may include sharps (#) and flats (b). This software will parse most of the standard naming conventions such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."; +App::$strings["Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."] = "Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."; +App::$strings["Guitar Chords"] = "Gitaarakkoorden"; +App::$strings["The complete online chord dictionary"] = "Het complete online akkoordenboek"; +App::$strings["Tuning"] = "Stemmen"; +App::$strings["Chord name: example: Em7"] = "Akkoordnaam: bijvoorbeeld: Em7"; +App::$strings["Show for left handed stringing"] = "Toon voor linkshandige gitaar"; +App::$strings["Quick Reference"] = "Beknopt overzicht"; +App::$strings["Post to Libertree"] = "Libertree"; +App::$strings["Enable Libertree Post Plugin"] = "Doorplaatsen naar Libertree inschakelen"; +App::$strings["Libertree API token"] = "API-token Libertree"; +App::$strings["Libertree site URL"] = "Website-URL Libertree"; +App::$strings["Post to Libertree by default"] = "Standaard doorplaatsen naar Libertree"; +App::$strings["Libertree Post Settings"] = "Libertree (berichten doorplaatsen)"; +App::$strings["Libertree Settings saved."] = "Libertree-instellingen opgeslagen."; +App::$strings["Flattr this!"] = "Flattr this!"; +App::$strings["Flattr widget settings updated."] = "Instellingen Flattrwidget bijgewerkt."; +App::$strings["Flattr user"] = "Gebruikersnaam Flattr"; +App::$strings["URL of the Thing to flattr"] = "URL van het Flattr-item"; +App::$strings["If empty channel URL is used"] = "Wanneer een lege kanaal-URL wordt gebruikt"; +App::$strings["Title of the Thing to flattr"] = "Naam van het Flattr-item"; +App::$strings["If empty \"channel name on The Hubzilla\" will be used"] = "Wanneer een lege \"kanaalnaam op Hubzilla\" wordt gebruikt"; +App::$strings["Static or dynamic flattr button"] = "Statische of dynamische Flattr-knop"; +App::$strings["static"] = "statisch"; +App::$strings["dynamic"] = "dynamisch"; +App::$strings["Alignment of the widget"] = "Uitlijning van de widget"; +App::$strings["left"] = "links"; +App::$strings["right"] = "rechts"; +App::$strings["Enable Flattr widget"] = "Flattrwidget inschakelen"; +App::$strings["Flattr Widget Settings"] = "Flattrwidget"; +App::$strings["Post to GNU social"] = "GNU social"; +App::$strings["Please contact your site administrator.
    The provided API URL is not valid."] = "De verstrekte API-URL is ongeldig.
    Neem contact op met jouw hubbeheerder."; +App::$strings["We could not contact the GNU social API with the Path you entered."] = "Wij konden de GNU social-API niet bereiken door middel van het ingevulde pad."; +App::$strings["GNU social settings updated."] = "GNU social-instellingen bijgewerkt."; +App::$strings["Globally Available GNU social OAuthKeys"] = "Op de gehele hub te gebruiken GNU social OAuthkeys."; +App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
    If not feel free to connect to any other GNU social instance (see below)."] = "Er zijn op deze hub enkele voorgeconfigureerde OAuthkey-paren voor GNU social servers beschikbaar. Wanneer je een van deze servers gebruikt, gebruik dan deze voorgeconfigureerde gegevens.
    Wanneer dit niet het geval is, maak dan gerust met een andere GNU social-server verbinding (zie hieronder)."; +App::$strings["Provide your own OAuth Credentials"] = "Verstrek jouw eigen OAuth-gegevens"; +App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
    Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Geen consumerkey voor GNU social gevonden. Registreer jouw Hubzilla-account als een desktopclient in jouw GNU-social-account, kopieer en plak hier de consumerkey en de consumersecret, en vul de API-base-root in.
    Voordat je jouw eigen OAuthkey-paar registreert, vraag dan eerst aan jouw hubbeheerder of er al een key-paar voor deze hub op jouw favoriete GNU social-server bestaat."; +App::$strings["OAuth Consumer Key"] = "OAuth-consumerkey"; +App::$strings["OAuth Consumer Secret"] = "Oauth-consumersecret"; +App::$strings["Base API Path"] = "Basispad API"; +App::$strings["Remember the trailing /"] = "Vergeet niet de afsluitende /"; +App::$strings["GNU social application name"] = "Naam GNU social-applicatie"; +App::$strings["To connect to your GNU social account click the button below to get a security code from GNU social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU social."] = "Om jouw GNU social-account te koppelen klik je op de knop hieronder. Je krijgt dan een veiligheidscode van GNU social die je kan kopiëren en dan hieronder in het invulveld kan plakken. Vervolgens klik je op Opslaan. Alleen jouw openbare berichten kunnen worden doorgeplaatst naar GNU social."; +App::$strings["Log in with GNU social"] = "Inloggen op "; +App::$strings["Copy the security code from GNU social here"] = "Plak de veiligheidscode van GNU social hier"; +App::$strings["Cancel Connection Process"] = "Annuleer het verbindingsproces"; +App::$strings["Current GNU social API is"] = "Huidige GNU social-API is"; +App::$strings["Cancel GNU social Connection"] = "Annuleer de GNU social-verbinding"; +App::$strings["Currently connected to: "] = "Momenteel gekoppeld aan: "; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Opmerking: In verband met jouw privacyinstellingen (wanneer jouw kanaalprofiel voor onbekenden is verborgen) leidt de profiellink die mogelijk in jouw naar GNU social doorgestuurde openbare berichten staat, naar een lege pagina met de melding dat toegang tot jouw kanaalprofiel is beperkt."; +App::$strings["Allow posting to GNU social"] = "Doorplaatsen naar GNU social toestaan"; +App::$strings["If enabled your public postings can be posted to the associated GNU-social account"] = "Wanneer dit is ingeschakeld kunnen jouw openbare berichten naar het gekoppelde Twitter-account worden doorgeplaatst"; +App::$strings["Post to GNU social by default"] = "Standaard doorplaatsen naar GNU social"; +App::$strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Wanneer dit is ingeschakeld worden al jouw openbare berichten standaard naar het gekoppelde GNU social-account doorgeplaatst"; +App::$strings["Clear OAuth configuration"] = "OAuth-configuratie wissen"; +App::$strings["GNU social Post Settings"] = "GNU social (berichten doorplaatsen)"; +App::$strings["API URL"] = "API-URL"; +App::$strings["Application name"] = "Naam applicatie"; +App::$strings["QR code"] = "QR-code"; +App::$strings["QR Generator"] = "QR-code-generator"; +App::$strings["Enter some text"] = "Vul wat tekst in"; +App::$strings["Invalid game."] = "Ongeldig spel."; +App::$strings["You are not a player in this game."] = "Jij doet niet aan dit speel mee."; +App::$strings["You must be a local channel to create a game."] = "Je moet een lokaal kanaal zijn om een spel aan te maken."; +App::$strings["You must select one opponent that is not yourself."] = "Je moet één tegenstander uitkiezen, maar niet jezelf."; +App::$strings["Random color chosen."] = "Willekeurige kleur gekozen."; +App::$strings["Error creating new game."] = "Fout tijdens aanmaken nieuw spel."; +App::$strings["Requested channel is not available."] = "Opgevraagd kanaal is niet beschikbaar."; +App::$strings["You must select a local channel /chess/channelname"] = "Je moet een lokaal kanaal kiezen: .../chess/kanaalnaam"; +App::$strings["Enable notifications"] = "Meldingen inschakelen"; +App::$strings["Post to Twitter"] = "Twitter"; +App::$strings["Twitter settings updated."] = "Twitter-instellingen bijgewerkt."; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Geen consumerkeys voor Twitter gevonden. Neem contact op met jouw hubbeheerder."; +App::$strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "De Twitter-plug-in is op deze Hubzilla-hub ingeschakeld, maar je hebt nog niet jouw Hubzilla-kanaal met jouw Twitter-account gekoppeld. Om dit te doen klik je op de knop hieronder om een PIN-code van Twitter te krijgen. Deze dien je te kopiëren en in het invoegveld beneden te plakken. Vervolgens klik je op Opslaan. Alleen jouw openbare berichten kunnen op Twitter worden geplaatst."; +App::$strings["Log in with Twitter"] = "Op Twitter inloggen"; +App::$strings["Copy the PIN from Twitter here"] = "Plak of type de PIN-code hier"; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Opmerking: In verband met jouw privacyinstellingen (wanneer jouw kanaalprofiel voor onbekenden is verborgen) leidt de profiellink die mogelijk in jouw naar Twitter doorgestuurde openbare berichten staat, naar een lege pagina met de melding dat toegang tot jouw kanaalprofiel is beperkt."; +App::$strings["Allow posting to Twitter"] = "Doorplaatsen naar Twitter toestaan"; +App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Wanneer dit is ingeschakeld kunnen jouw openbare berichten naar het gekoppelde Twitter-account worden doorgeplaatst"; +App::$strings["Twitter post length"] = "Lengte Twitterbericht"; +App::$strings["Maximum tweet length"] = "Maximale tweetlengte"; +App::$strings["Send public postings to Twitter by default"] = "Standaard doorplaatsen naar Twitter"; +App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Wanneer dit is ingeschakeld worden al jouw openbare berichten standaard naar het gekoppelde Twitter-account doorgeplaatst"; +App::$strings["Twitter Post Settings"] = "Twitter (berichten doorplaatsen)"; +App::$strings["Deactivate the feature"] = "Deze functie uitschakelen"; +App::$strings["Hide the button and show the smilies directly."] = "Verberg de knop en toon de smilies direct."; +App::$strings["Smileybutton Settings"] = "Smileyknop"; +App::$strings["Order Not Found"] = "Bestelling niet gevonden"; +App::$strings["Order cannot be checked out."] = "De bestelling kan niet worden uitgecheckt."; +App::$strings["Enable Shopping Cart"] = "Winkelwagen inschakelen"; +App::$strings["Enable Test Catalog"] = "Testcatalogus inschakelen"; +App::$strings["Enable Manual Payments"] = "Handmatige betalingen inschakelen"; +App::$strings["Base Cart Settings"] = "Algemene kaartinstellingen"; +App::$strings["Add Item"] = "Item toevoegen"; +App::$strings["Call cart_post_"] = "Call cart_post_"; +App::$strings["Cart Not Enabled (profile: "] = "Winkelwagen niet ingeschakeld (profiel:"; +App::$strings["Order not found."] = "Bestelling niet gevonden."; +App::$strings["No Order Found"] = "Geen bestelling gevonden"; +App::$strings["call: "] = "call: "; +App::$strings["An unknown error has occurred Please start again."] = "Er heeft zich een onbekende fout voorgedaan. Start opnieuw."; +App::$strings["Invalid Payment Type. Please start again."] = "Ongeldige betalingssoort. Start opnieuw."; +App::$strings["Order not found"] = "Bestelling niet gevonden"; +App::$strings["Error: order mismatch. Please try again."] = "Fout: mismatch bestelling. Probeer opnieuw."; +App::$strings["Manual payments are not enabled."] = "Handmatige betalingen zijn niet ingeschakeld."; +App::$strings["Finished"] = "Afgerond"; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Het bezoek aan deze website wordt gemeten door Piwik."; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Wanneer je niet wil dat jouw bezoek aan deze website wordt bijgehouden, kan je een cookie achterlaten om te verhinderen dat Piwik jou op deze website blijft volgen (opt-out)."; +App::$strings["Piwik Base URL"] = "Basis-URL Piwik"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluut pad naar jouw Piwik-installatie (zonder protocol (http/s), met een slash op het einde)"; +App::$strings["Site ID"] = "Site ID"; +App::$strings["Show opt-out cookie link?"] = "Toon opt-out cookie-link?"; +App::$strings["Asynchronous tracking"] = "Asynchroon volgen"; +App::$strings["Enable frontend JavaScript error tracking"] = "Volgen van front-end JavaScript-fouten inschakelen"; +App::$strings["This feature requires Piwik >= 2.2.0"] = "Deze functie vereist Piwik >= 2.2.0"; +App::$strings["Edit your profile and change settings."] = "Jouw profiel bewerken en instellingen veranderen."; +App::$strings["Click here to see activity from your connections."] = "Klik hier voor een tijdlijn met berichten en overige activiteiten van jouw connecties."; +App::$strings["Click here to see your channel home."] = "Klik hier voor de tijdlijn van jouw eigen kanaal."; +App::$strings["You can access your private messages from here."] = "Hiermee krijg je toegang tot jouw privéberichten."; +App::$strings["Create new events here."] = "Nieuwe gebeurtenissen kan je hier aanmaken."; +App::$strings["You can accept new connections and change permissions for existing ones here. You can also e.g. create groups of contacts."] = "Hier kan je nieuwe connecties accepteren en instellingen van bestaande connecties wijzigen. Je kan hier bijv. ook privacygroepen aanmaken."; +App::$strings["System notifications will arrive here"] = "Systeemmeldingen komen hier tevoorschijn"; +App::$strings["Search for content and users"] = "Zoek hier naar tekst in berichten of naar andere kanalen."; +App::$strings["Browse for new contacts"] = "Blader hier in een gids met kanalen, die je toe kan voegen als connectie."; +App::$strings["Launch installed apps"] = "Open (op deze hub) geïnstalleerde apps."; +App::$strings["Looking for help? Click here."] = "Zoek je hulp? Klik dan hier."; +App::$strings["New events have occurred in your network. Click here to see what has happened!"] = "Er is een nieuwe gebeurtenis in jouw netwerk. Klik hier om te zien wat precies."; +App::$strings["You have received a new private message. Click here to see from who!"] = "Je hebt een nieuw privébericht ontvangen. Klik hier om te zien van wie."; +App::$strings["There are events this week. Click here too see which!"] = "Er vinden deze week gebeurtenissen plaats. Klik hier om te zien welke dit zijn."; +App::$strings["You have received a new introduction. Click here to see who!"] = "Je hebt een nieuw connectieverzoek ontvangen. Klik hier om te kijken van wie."; +App::$strings["There is a new system notification. Click here to see what has happened!"] = "Er is een nieuwe systeemmelding. Klik hier om te zien wat er aan de hand is."; +App::$strings["Click here to share text, images, videos and sound."] = "Klik hier om tekst, afbeeldingen, video en audio te delen."; +App::$strings["You can write an optional title for your update (good for long posts)."] = "Je kan een titel voor je nieuwe bericht verzinnen, maar dit is niet verplicht. Vooral goed voor langere berichten."; +App::$strings["Entering some categories here makes it easier to find your post later."] = "Het invullen van enkele categorieën, maakt het later terugvinden van je berichten gemakkelijker. Dit is niet verplicht."; +App::$strings["Share photos, links, location, etc."] = "Deel foto's, links, locaties, enz."; +App::$strings["Only want to share content for a while? Make it expire at a certain date."] = "Wil je alleen iets tot een bepaald moment delen? Dan kan je het hiermee op een bepaalde datum en tijd laten verlopen."; +App::$strings["You can password protect content."] = "Je kan met een wachtwoord gegevens beveiligen."; +App::$strings["Choose who you share with."] = "Kies met wie je dit wil delen. "; +App::$strings["Click here when you are done."] = "Klik hier wanneer je klaar bent."; +App::$strings["Adjust from which channels posts should be displayed."] = "Aanpassen van welke kanalen berichten moeten worden getoond. "; +App::$strings["Only show posts from channels in the specified privacy group."] = "Toon alleen berichten van kanalen in de hier gekozen privacygroep."; +App::$strings["Easily find posts containing tags (keywords preceded by the \"#\" symbol)."] = "Vind gemakkelijk berichten met tags (trefwoorden die beginnen met een \"#\")."; +App::$strings["Easily find posts in given category."] = "Vind gemakkelijk berichten in een bepaalde categorie."; +App::$strings["Easily find posts by date."] = "Vind gemakkelijk berichten op datum."; +App::$strings["Suggested users who have volounteered to be shown as suggestions, and who we think you might find interesting."] = "Voorstellen voor kanalen die wellicht interessant voor jou zijn en hier ook vrijwillig voor hebben gekozen."; +App::$strings["Here you see channels you have connected to."] = "Hier kan je zien met welke kanalen je bent verbonden (connecties)."; +App::$strings["Save your search so you can repeat it at a later date."] = "Sla jouw zoekopdracht op, zodat je het later opnieuw kan gebruiken."; +App::$strings["If you see this icon you can be sure that the sender is who it say it is. It is normal that it is not always possible to verify the sender, so the icon will be missing sometimes. There is usually no need to worry about that."] = "Wanneer je dit pictogram ziet, kan je er van uitgaan dat de afzender is wie hij/zij beweert te zijn. Het is niet altijd mogelijk om de afzender te verifiëren, waardoor het pictogram soms ontbreekt. Dit is meestal geen reden voor ongerustheid."; +App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "Gevaar! Het lijkt er op dat iemand een bericht heeft proberen te vervalsen! Dit bericht is mogelijk niet afkomstig van de vermelde afzender!"; +App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?

    You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.

    You can also advance by pressing the return key"] = "Welkom op Hubzilla! Wil jij een rondleiding hebben langs de gebruikersinterface?

    Je kan dit op elk moment pauzeren en weer hervatten door de pagina te herladen of naar een andere pagina te gaan.

    Je kan ook vooruitgaan met behulp van de entertoets."; +App::$strings["Extended Identity Sharing"] = "Uitgebreid identiteit delen"; +App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with \$Projectname sites."] = "Deel jouw Hubzilla-identiteit met alle websites op het internet. Wanneer dit is uitgeschakeld wordt je identiteit alleen binnen het Hubzilla-netwerk gedeeld."; +App::$strings["Three Dimensional Tic-Tac-Toe"] = "Driedimensionaal Boter-kaas-en-eieren"; +App::$strings["3D Tic-Tac-Toe"] = "Boter-kaas-en-eieren in 3D"; +App::$strings["New game"] = "Nieuw spel"; +App::$strings["New game with handicap"] = "Nieuw spel met handicap"; +App::$strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Driedimensionaal Boter-kaas-en-eieren is hetzelfde als het klassieke spel, behalve dat het gelijktijdig op meerdere hoogtes wordt gespeeld."; +App::$strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "In dit geval zijn er drie hoogtes. Je wint wanneer je drie op een rij hebt op een van de drie hoogtes, van boven naar beneden of diagonaal."; +App::$strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Het spel met een handicap schakelt de middelste positie op de middelste hoogte uit, omdat de speler die deze positie krijgt vaak een oneerlijk voordeel geniet."; +App::$strings["You go first..."] = "Jij bent eerst..."; +App::$strings["I'm going first this time..."] = "Ik ga deze keer eerst..."; +App::$strings["You won!"] = "Jij wint!"; +App::$strings["\"Cat\" game!"] = "Gelijkspel!"; +App::$strings["I won!"] = "Ik win!"; +App::$strings["Message to display on every page on this server"] = "Bericht om op elke pagina van deze hub te tonen"; +App::$strings["Pageheader Settings"] = "Pageheader"; +App::$strings["pageheader Settings saved."] = "Pageheader-instellingen opgeslagen."; +App::$strings["Only authenticate automatically to sites of your friends"] = "Alleen automatisch authentiseren op hubs van jouw connecties"; +App::$strings["By default you are automatically authenticated anywhere in the network"] = "Standaard wordt je overal in het netwerk automatisch geauthentiseerd"; +App::$strings["Authchoose Settings"] = "Authchoose (authenticatiekeuze)"; +App::$strings["Atuhchoose Settings updated."] = "Authchoose-instellingen bijgewerkt."; +App::$strings["lonely"] = "Eenzaam"; +App::$strings["drunk"] = "dronken"; +App::$strings["horny"] = "geil"; +App::$strings["stoned"] = "stoned"; +App::$strings["fucked up"] = "opgefokt"; +App::$strings["clusterfucked"] = "clusterfucked"; +App::$strings["crazy"] = "gek"; +App::$strings["hurt"] = "gekwetst"; +App::$strings["sleepy"] = "slaperig"; +App::$strings["grumpy"] = "chagrijnig"; +App::$strings["high"] = "high"; +App::$strings["semi-conscious"] = "half bij kennis"; +App::$strings["in love"] = "verliefd"; +App::$strings["in lust"] = "wellustig"; +App::$strings["naked"] = "naakt"; +App::$strings["stinky"] = "stinkend"; +App::$strings["sweaty"] = "zweterig"; +App::$strings["bleeding out"] = "aan het doodbloeden"; +App::$strings["victorious"] = "zegevierend"; +App::$strings["defeated"] = "verslagen"; +App::$strings["envious"] = "jaloers"; +App::$strings["jealous"] = "jaloers"; +App::$strings["XMPP settings updated."] = "XMPP-instellingen bijgewerkt."; +App::$strings["Enable Chat"] = "Chatten inschakelen"; +App::$strings["Individual credentials"] = "Individuele credentials"; +App::$strings["Jabber BOSH server"] = "BOSH-server van Jabber"; +App::$strings["XMPP Settings"] = "XMPP"; +App::$strings["Jabber BOSH host"] = "BOSH-host van Jabber"; +App::$strings["Use central userbase"] = "Gebruik een centrale gebruikersgroep"; +App::$strings["If enabled, members will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Wanneer ingeschakeld worden leden automatisch op een Ejabberd-server ingelogd. Deze dient wel op deze machine te zijn geïnstalleerd met zgn. 'synchronized credentials' via het 'auth_ejabberd.php'-script."; +App::$strings["Who likes me?"] = "Wie vindt mij leuk?"; +App::$strings["You are now authenticated to pumpio."] = "De verbinding met pump.io is geverifieerd"; +App::$strings["return to the featured settings page"] = "Ga terug naar pagina met plug-in-instellingen"; +App::$strings["Post to Pump.io"] = "Pump.io"; +App::$strings["Pump.io servername"] = "Pump.io-servernaam"; +App::$strings["Without \"http://\" or \"https://\""] = "Zonder \"http://\" of \"https://\""; +App::$strings["Pump.io username"] = "Gebruikersnaam Pump.io"; +App::$strings["Without the servername"] = "Zonder servernaam"; +App::$strings["You are not authenticated to pumpio"] = "De verbinding met pump.io is niet geverifieerd"; +App::$strings["(Re-)Authenticate your pump.io connection"] = "Verifieer (opnieuw) jouw pump.io-verbinding"; +App::$strings["Enable pump.io Post Plugin"] = "Doorplaatsen naar Pump.io inschakelen"; +App::$strings["Post to pump.io by default"] = "Standaard doorplaatsen naar Pump.io"; +App::$strings["Should posts be public"] = "Moeten berichten openbaar zijn"; +App::$strings["Mirror all public posts"] = "Alle openbare berichten doorplaatsen"; +App::$strings["Pump.io Post Settings"] = "Pump.io (berichten doorplaatsen)"; +App::$strings["PumpIO Settings saved."] = "Pump.io-instellingen opgeslagen."; +App::$strings["An account has been created for you."] = "Er is voor jou een account aangemaakt."; +App::$strings["Authentication successful but rejected: account creation is disabled."] = "Authenticatie geslaagd, maar afgekeurd: aanmaken accounts uitgeschakeld."; +App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Zoek %1\$s (%2\$s)"; +App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname"; +App::$strings["Search \$Projectname"] = "Zoek in "; +App::$strings["Redmatrix File Storage Import"] = "Importeer bestanden vanuit Redmatrix"; +App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Hiermee importeer je al jouw Redmatrix-bestanden in dit kanaal."; +App::$strings["file"] = "bestand"; +App::$strings["Send email to all members"] = "Naar alle leden e-mail versturen"; +App::$strings["%1\$d of %2\$d messages sent."] = "%1\$d van %2\$d berichten verzonden."; +App::$strings["Send email to all hub members."] = "Naar alle leden van deze hub e-mail versturen."; +App::$strings["Sender Email address"] = "E-mailadres afzender"; +App::$strings["Test mode (only send to hub administrator)"] = "Testmodus (alleen naar hubbeheerder sturen)"; +App::$strings["Frequently"] = "Regelmatig"; +App::$strings["Hourly"] = "Elk uur"; +App::$strings["Twice daily"] = "Twee keer per dag"; +App::$strings["Daily"] = "Dagelijks"; +App::$strings["Weekly"] = "Wekelijks"; +App::$strings["Monthly"] = "Maandelijks"; +App::$strings["Currently Male"] = "Momenteel man"; +App::$strings["Currently Female"] = "Momenteel vrouw"; +App::$strings["Mostly Male"] = "Voornamelijk man"; +App::$strings["Mostly Female"] = "Voornamelijk vrouw"; +App::$strings["Transgender"] = "Transgender"; +App::$strings["Intersex"] = "Interseksueel"; +App::$strings["Transsexual"] = "Transseksueel"; +App::$strings["Hermaphrodite"] = "Hermafrodiet"; +App::$strings["Neuter"] = "Genderneutraal"; +App::$strings["Non-specific"] = "Niet gespecificeerd"; +App::$strings["Undecided"] = "Nog niet beslist"; +App::$strings["Males"] = "Mannen"; +App::$strings["Females"] = "Vrouwen"; +App::$strings["Gay"] = "Homoseksueel"; +App::$strings["Lesbian"] = "Lesbisch"; +App::$strings["No Preference"] = "Geen voorkeur"; +App::$strings["Bisexual"] = "Biseksueel"; +App::$strings["Autosexual"] = "Autoseksueel"; +App::$strings["Abstinent"] = "Seksuele onthouding"; +App::$strings["Virgin"] = "Maagd"; +App::$strings["Deviant"] = "Afwijkend"; +App::$strings["Fetish"] = "Fetisj"; +App::$strings["Oodles"] = "Veel"; +App::$strings["Nonsexual"] = "Aseksueel"; +App::$strings["Single"] = "Alleen"; +App::$strings["Lonely"] = "Eenzaam"; +App::$strings["Available"] = "Beschikbaar"; +App::$strings["Unavailable"] = "Niet beschikbaar"; +App::$strings["Has crush"] = "Heeft een oogje op iemand"; +App::$strings["Infatuated"] = "Smoorverliefd"; +App::$strings["Dating"] = "Aan het daten"; +App::$strings["Unfaithful"] = "Ontrouw"; +App::$strings["Sex Addict"] = "Seksverslaafd"; +App::$strings["Friends/Benefits"] = "Vriendschap plus"; +App::$strings["Casual"] = "Ongebonden/vluchtig"; +App::$strings["Engaged"] = "Verloofd"; +App::$strings["Married"] = "Getrouwd"; +App::$strings["Imaginarily married"] = "Denkbeeldig getrouwd"; +App::$strings["Partners"] = "Partners"; +App::$strings["Cohabiting"] = "Samenwonend"; +App::$strings["Common law"] = "Common-law-huwelijk"; +App::$strings["Happy"] = "Gelukkig"; +App::$strings["Not looking"] = "Niet op zoek"; +App::$strings["Swinger"] = "Swinger"; +App::$strings["Betrayed"] = "Verraden"; +App::$strings["Separated"] = "Uit elkaar"; +App::$strings["Unstable"] = "Onstabiel"; +App::$strings["Divorced"] = "Gescheiden"; +App::$strings["Imaginarily divorced"] = "Denkbeeldig gescheiden"; +App::$strings["Widowed"] = "Weduwnaar/weduwe"; +App::$strings["Uncertain"] = "Onzeker"; +App::$strings["It's complicated"] = "Het is ingewikkeld"; +App::$strings["Don't care"] = "Maakt mij niks uit"; +App::$strings["Ask me"] = "Vraag het me"; +App::$strings["likes %1\$s's %2\$s"] = "vindt het %2\$s van %1\$s leuk"; +App::$strings["doesn't like %1\$s's %2\$s"] = "vindt het %2\$s van %1\$s niet leuk"; App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s is nu met %2\$s verbonden"; App::$strings["%1\$s poked %2\$s"] = "%1\$s heeft %2\$s aangestoten"; App::$strings["poked"] = "aangestoten"; @@ -2693,10 +2683,9 @@ App::$strings["View in context"] = "In context bekijken"; App::$strings["remove"] = "verwijderen"; App::$strings["Loading..."] = "Aan het laden..."; App::$strings["Delete Selected Items"] = "Verwijder de geselecteerde items"; -App::$strings["View Source"] = "Bron weergeven"; +App::$strings["View Source"] = "Bron tonen"; App::$strings["Follow Thread"] = "Conversatie volgen"; App::$strings["Unfollow Thread"] = "Conversatie niet meer volgen"; -App::$strings["Activity/Posts"] = "Activiteit/berichten connectie"; App::$strings["Edit Connection"] = "Connectie bewerken"; App::$strings["Message"] = "Bericht"; App::$strings["%s likes this."] = "%s vindt dit leuk."; @@ -2731,14 +2720,12 @@ App::$strings["Toggle comments"] = "Reacties in- of uitschakelen"; App::$strings["Categories (optional, comma-separated list)"] = "Categorieën (niet verplicht, door komma's gescheiden lijst)"; App::$strings["Other networks and post services"] = "Andere netwerken en diensten"; App::$strings["Set publish date"] = "Publicatiedatum instellen"; -App::$strings["Discover"] = "Ontdekken"; -App::$strings["Imported public streams"] = "Openbare streams importeren"; App::$strings["Commented Order"] = "Nieuwe reacties bovenaan"; App::$strings["Sort by Comment Date"] = "Berichten met nieuwe reacties bovenaan"; App::$strings["Posted Order"] = "Nieuwe berichten bovenaan"; App::$strings["Sort by Post Date"] = "Nieuwe berichten bovenaan"; App::$strings["Posts that mention or involve you"] = "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent"; -App::$strings["Activity Stream - by date"] = "Activiteitenstroom - volgens datum"; +App::$strings["Activity Stream - by date"] = "Tijdlijn - op datum"; App::$strings["Starred"] = "Met ster"; App::$strings["Favourite Posts"] = "Favoriete berichten"; App::$strings["Spam"] = "Spam"; @@ -2749,7 +2736,10 @@ App::$strings["Photo Albums"] = "Fotoalbums"; App::$strings["Files and Storage"] = "Bestanden en opslagruimte"; App::$strings["Bookmarks"] = "Bladwijzers"; App::$strings["Saved Bookmarks"] = "Opgeslagen bladwijzers"; -App::$strings["View Webpages"] = "Webpagina's weergeven"; +App::$strings["View Cards"] = "Kaarten tonen"; +App::$strings["articles"] = "artikelen"; +App::$strings["View Articles"] = "Artikelen tonen"; +App::$strings["View Webpages"] = "Webpagina's tonen"; App::$strings["__ctx:noun__ Attending"] = array( 0 => "aanwezig", 1 => "aanwezig", @@ -2774,84 +2764,14 @@ App::$strings["__ctx:noun__ Abstain"] = array( 0 => "onthouding", 1 => "onthoudingen", ); -App::$strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten kunnen van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken."; -App::$strings["Add new connections to this privacy group"] = "Voeg nieuwe connecties aan deze privacygroep toe"; -App::$strings["edit"] = "bewerken"; -App::$strings["Privacy Groups"] = "Privacygroepen"; -App::$strings["Edit group"] = "Privacygroep bewerken"; -App::$strings["Add privacy group"] = "Privacygroep toevoegen"; -App::$strings["Channels not in any privacy group"] = "Kanalen die zich in geen enkele privacygroep bevinden"; -App::$strings["(Unknown)"] = "(Onbekend)"; -App::$strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar."; -App::$strings["Visible to you only."] = "Alleen voor jou zichtbaar."; -App::$strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar."; -App::$strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar."; -App::$strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar."; -App::$strings["Visible to all connections."] = "Voor alle connecties zichtbaar."; -App::$strings["Visible to approved connections."] = "Voor alle geaccepteerde connecties zichtbaar."; -App::$strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar."; -App::$strings["Privacy group is empty."] = "Privacygroep is leeg"; -App::$strings["Privacy group: %s"] = "Privacygroep: %s"; -App::$strings["Connection not found."] = "Connectie niet gevonden."; -App::$strings["profile photo"] = "profielfoto"; -App::$strings["[Edited %s]"] = "[%s bewerkt]"; -App::$strings["__ctx:edit_activity__ Post"] = "Bericht"; -App::$strings["__ctx:edit_activity__ Comment"] = "Reactie"; -App::$strings["Attachments:"] = "Bijlagen:"; -App::$strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:"; -App::$strings["guest:"] = "gast:"; -App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. "; -App::$strings["Remote authentication"] = "Authenticatie op afstand"; -App::$strings["Click to authenticate to your home hub"] = "Authenticeer jezelf via (bijvoorbeeld) jouw hub"; -App::$strings["Logout"] = "Uitloggen"; -App::$strings["End this session"] = "Beëindig deze sessie"; -App::$strings["Your profile page"] = "Jouw profielpagina"; -App::$strings["Manage/Edit profiles"] = "Beheer/wijzig profielen"; -App::$strings["Edit your profile"] = "Jouw profiel bewerken"; -App::$strings["Sign in"] = "Inloggen"; -App::$strings["Get me home"] = "Terug naar mijn hub"; -App::$strings["Log me out of this site"] = "Uitloggen op deze hub"; -App::$strings["Create an account"] = "Maak een account aan"; -App::$strings["Help and documentation"] = "Hulp en documentatie"; -App::$strings["Applications, utilities, links, games"] = "Apps"; -App::$strings["Search site @name, #tag, ?docs, content"] = "Zoek een @kanaal, doorzoek inhoud hub met tekst en #tags, of doorzoek ?documentatie "; -App::$strings["Channel Directory"] = "Kanalengids"; -App::$strings["Your grid"] = "Jouw grid"; -App::$strings["View your network/grid"] = "Jouw grid/netwerk weergeven"; -App::$strings["Mark all grid notifications seen"] = "Markeer alle gridnotificaties als bekeken"; -App::$strings["Channel home"] = "Jouw kanaal"; -App::$strings["View your channel home"] = "Jouw kanaal weergeven"; -App::$strings["Mark all channel notifications seen"] = "Alle kanaalnotificaties als gelezen markeren"; -App::$strings["Notices"] = "Notificaties"; -App::$strings["Notifications"] = "Notificaties"; -App::$strings["View all notifications"] = "Alle notificaties weergeven"; -App::$strings["Private mail"] = "Privéberichten"; -App::$strings["View your private messages"] = "Privéberichten weergeven"; -App::$strings["Mark all private messages seen"] = "Markeer alle privéberichten als bekeken"; -App::$strings["Event Calendar"] = "Agenda"; -App::$strings["View events"] = "Agenda weergeven"; -App::$strings["Mark all events seen"] = "Markeer alle gebeurtenissen als bekeken"; -App::$strings["Manage Your Channels"] = "Beheer je kanalen"; -App::$strings["Account/Channel Settings"] = "Account-/kanaal-instellingen"; -App::$strings["Site Setup and Configuration"] = "Hub instellen en beheren"; -App::$strings["@name, #tag, ?doc, content"] = "@kanaal, #tag, inhoud, ?hulp"; -App::$strings["Please wait..."] = "Wachten aub..."; -App::$strings["Add Apps"] = "Apps toevoegen"; -App::$strings["Item was not found."] = "Item niet gevonden"; -App::$strings["No source file."] = "Geen bronbestand."; -App::$strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden"; -App::$strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden"; -App::$strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d"; -App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."; -App::$strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."; -App::$strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."; -App::$strings["Path not available."] = "Locatie niet beschikbaar."; -App::$strings["Empty pathname"] = "Ontbrekende locatienaam"; -App::$strings["duplicate filename or path"] = "dubbele bestandsnaam of locatie"; -App::$strings["Path not found."] = "Locatie niet gevonden"; -App::$strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt."; -App::$strings["database storage failed."] = "opslag in database mislukt."; -App::$strings["Empty path"] = "Ontbrekende locatie"; +App::$strings["Directory Options"] = "Opties kanalengids"; +App::$strings["Safe Mode"] = "Veilig zoeken"; +App::$strings["Public Forums Only"] = "Alleen openbare forums"; +App::$strings["This Website Only"] = "Alleen deze hub"; +App::$strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s"; +App::$strings["Unable to import a removed channel."] = "Niet in staat om een verwijderd kanaal te importeren."; +App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."; +App::$strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt."; App::$strings["prev"] = "vorige"; App::$strings["first"] = "eerste"; App::$strings["last"] = "laatste"; @@ -2892,15 +2812,39 @@ App::$strings["depressed"] = "gedeprimeerd"; App::$strings["motivated"] = "gemotiveerd"; App::$strings["relaxed"] = "ontspannen"; App::$strings["surprised"] = "verrast"; +App::$strings["Monday"] = "maandag"; +App::$strings["Tuesday"] = "dinsdag"; +App::$strings["Wednesday"] = "woensdag"; +App::$strings["Thursday"] = "donderdag"; +App::$strings["Friday"] = "vrijdag"; +App::$strings["Saturday"] = "zaterdag"; +App::$strings["Sunday"] = "zondag"; +App::$strings["January"] = "januari"; +App::$strings["February"] = "februari"; +App::$strings["March"] = "maart"; +App::$strings["April"] = "april"; App::$strings["May"] = "mei"; +App::$strings["June"] = "juni"; +App::$strings["July"] = "juli"; +App::$strings["August"] = "augustus"; +App::$strings["September"] = "september"; +App::$strings["October"] = "oktober"; +App::$strings["November"] = "november"; +App::$strings["December"] = "december"; App::$strings["Unknown Attachment"] = "Onbekende bijlage"; App::$strings["unknown"] = "onbekend"; App::$strings["remove category"] = "categorie verwijderen"; App::$strings["remove from file"] = "uit map verwijderen"; +App::$strings["Download binary/encrypted content"] = "Binaire/versleutelende inhoud downloaden"; +App::$strings["default"] = "standaard"; App::$strings["Page layout"] = "Pagina-lay-out"; App::$strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs"; +App::$strings["HTML"] = "HTML"; +App::$strings["Comanche Layout"] = "Comanche-layout"; +App::$strings["PHP"] = "PHP"; App::$strings["Page content type"] = "Opmaaktype"; App::$strings["activity"] = "activiteit"; +App::$strings["a-z, 0-9, -, and _ only"] = "alleen a-z, 0-9, - en _"; App::$strings["Design Tools"] = "Ontwerp-hulpmiddelen"; App::$strings["Pages"] = "Pagina's"; App::$strings["Import website..."] = "Website importeren..."; @@ -2918,52 +2862,215 @@ App::$strings["Export to cloud files"] = "Naar de cloud exporteren"; App::$strings["/path/to/export/folder"] = "/locatie/van/export/map"; App::$strings["Enter a path to a cloud files destination."] = "Voer de locatie in van de cloudbestemming"; App::$strings["Specify folder"] = "Selecteer een map"; -App::$strings["Logged out."] = "Uitgelogd."; -App::$strings["Failed authentication"] = "Mislukte authenticatie"; +App::$strings["%d invitation available"] = array( + 0 => "%d uitnodiging beschikbaar", + 1 => "%d uitnodigingen beschikbaar", +); +App::$strings["Find Channels"] = "Kanalen vinden"; +App::$strings["Enter name or interest"] = "Vul naam of interesse in"; +App::$strings["Connect/Follow"] = "Verbinden/volgen"; +App::$strings["Examples: Robert Morgenstein, Fishing"] = "Voorbeeld: Robert Morgenstein, vissen"; +App::$strings["Random Profile"] = "Willekeurig profiel"; +App::$strings["Invite Friends"] = "Vrienden uitnodigen"; +App::$strings["Advanced example: name=fred and country=iceland"] = "Geavanceerd voorbeeld (Engels): name=jan en country=nederland"; +App::$strings["Common Connections"] = "Gemeenschappelijke connecties"; +App::$strings["View all %d common connections"] = "Toon alle %d gemeenschappelijke connecties"; +App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s"; App::$strings["Channel is blocked on this site."] = "Kanaal is op deze hub geblokkeerd."; App::$strings["Channel location missing."] = "Ontbrekende kanaallocatie."; App::$strings["Response from remote channel was incomplete."] = "Antwoord van het kanaal op afstand was niet volledig."; +App::$strings["Premium channel - please visit:"] = "Premiumkanaal - bezoek:"; App::$strings["Channel was deleted and no longer exists."] = "Kanaal is verwijderd en bestaat niet meer."; -App::$strings["Protocol disabled."] = "Protocol uitgeschakeld."; +App::$strings["Remote channel or protocol unavailable."] = "Kanaal op afstand of protocol niet beschikbaar."; App::$strings["Channel discovery failed."] = "Kanaal ontdekken mislukt."; +App::$strings["Protocol disabled."] = "Protocol uitgeschakeld."; App::$strings["Cannot connect to yourself."] = "Kan niet met jezelf verbinden"; -App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."; -App::$strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt."; -App::$strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt."; -App::$strings["Unable to import element \""] = "Niet in staat om dit element te importeren: \""; +App::$strings["Delete this item?"] = "Dit item verwijderen?"; +App::$strings["%s show less"] = "%s minder reacties tonen"; +App::$strings["%s expand"] = "%s uitklappen"; +App::$strings["%s collapse"] = "%s inklappen"; +App::$strings["Password too short"] = "Wachtwoord te kort"; +App::$strings["Passwords do not match"] = "Wachtwoorden komen niet overeen"; +App::$strings["everybody"] = "iedereen"; +App::$strings["Secret Passphrase"] = "Geheim wachtwoord"; +App::$strings["Passphrase hint"] = "Wachtwoordhint"; +App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Mededeling: de permissies zijn veranderd, maar zijn nog niet opgeslagen."; +App::$strings["close all"] = "Alles sluiten"; +App::$strings["Nothing new here"] = "Niets nieuw hier"; +App::$strings["Rate This Channel (this is public)"] = "Beoordeel dit kanaal (dit is openbaar)"; +App::$strings["Describe (optional)"] = "Omschrijving (niet verplicht)"; +App::$strings["Please enter a link URL"] = "Vul een URL in:"; +App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Niet opgeslagen wijzigingen. Ben je er zeker van dat je deze pagina wil verlaten?"; +App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo"; +App::$strings["timeago.prefixFromNow"] = "timeago.prefixFromNow"; +App::$strings["timeago.suffixAgo"] = "geleden"; +App::$strings["timeago.suffixFromNow"] = "vanaf nu"; +App::$strings["less than a minute"] = "minder dan een minuut"; +App::$strings["about a minute"] = "ongeveer een minuut"; +App::$strings["%d minutes"] = "%d minuten"; +App::$strings["about an hour"] = "ongeveer een uur"; +App::$strings["about %d hours"] = "ongeveer %d uren"; +App::$strings["a day"] = "een dag"; +App::$strings["%d days"] = "%d dagen"; +App::$strings["about a month"] = "ongeveer een maand"; +App::$strings["%d months"] = "%d maanden"; +App::$strings["about a year"] = "ongeveer een jaar"; +App::$strings["%d years"] = "%d jaren"; +App::$strings[" "] = " "; +App::$strings["timeago.numbers"] = "timeago.numbers"; +App::$strings["__ctx:long__ May"] = "mei"; +App::$strings["Jan"] = "jan"; +App::$strings["Feb"] = "feb"; +App::$strings["Mar"] = "mrt"; +App::$strings["Apr"] = "apr"; +App::$strings["__ctx:short__ May"] = "mei"; +App::$strings["Jun"] = "jun"; +App::$strings["Jul"] = "jul"; +App::$strings["Aug"] = "aug"; +App::$strings["Sep"] = "sep"; +App::$strings["Oct"] = "okt"; +App::$strings["Nov"] = "nov"; +App::$strings["Dec"] = "dec"; +App::$strings["Sun"] = "zo"; +App::$strings["Mon"] = "ma"; +App::$strings["Tue"] = "di"; +App::$strings["Wed"] = "wo"; +App::$strings["Thu"] = "do"; +App::$strings["Fri"] = "vr"; +App::$strings["Sat"] = "za"; +App::$strings["__ctx:calendar__ today"] = "vandaag"; +App::$strings["__ctx:calendar__ month"] = "maand"; +App::$strings["__ctx:calendar__ week"] = "week"; +App::$strings["__ctx:calendar__ day"] = "dag"; +App::$strings["__ctx:calendar__ All day"] = "hele dag"; App::$strings["Unable to determine sender."] = "Afzender kan niet bepaald worden."; App::$strings["No recipient provided."] = "Geen ontvanger opgegeven."; App::$strings["[no subject]"] = "[geen onderwerp]"; App::$strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd."; +App::$strings[" and "] = " en "; +App::$strings["public profile"] = "openbaar profiel"; +App::$strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s veranderde %2\$s naar “%3\$s”"; +App::$strings["Visit %1\$s's %2\$s"] = "Bezoek het %2\$s van %1\$s"; +App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s heeft een aangepaste %2\$s, %3\$s veranderd."; +App::$strings["Item was not found."] = "Item niet gevonden"; +App::$strings["No source file."] = "Geen bronbestand."; +App::$strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden"; +App::$strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden"; +App::$strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d"; +App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."; +App::$strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."; +App::$strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."; +App::$strings["Path not available."] = "Locatie niet beschikbaar."; +App::$strings["Empty pathname"] = "Ontbrekende locatienaam"; +App::$strings["duplicate filename or path"] = "dubbele bestandsnaam of locatie"; +App::$strings["Path not found."] = "Locatie niet gevonden"; +App::$strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt."; +App::$strings["database storage failed."] = "opslag in database mislukt."; +App::$strings["Empty path"] = "Ontbrekende locatie"; +App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. "; +App::$strings["(Unknown)"] = "(Onbekend)"; +App::$strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar."; +App::$strings["Visible to you only."] = "Alleen voor jou zichtbaar."; +App::$strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar."; +App::$strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar."; +App::$strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar."; +App::$strings["Visible to all connections."] = "Voor alle connecties zichtbaar."; +App::$strings["Visible to approved connections."] = "Voor alle geaccepteerde connecties zichtbaar."; +App::$strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar."; +App::$strings["Privacy group is empty."] = "Privacygroep is leeg"; +App::$strings["Privacy group: %s"] = "Privacygroep: %s"; +App::$strings["Connection not found."] = "Connectie niet gevonden."; +App::$strings["profile photo"] = "profielfoto"; +App::$strings["[Edited %s]"] = "[%s bewerkt]"; +App::$strings["__ctx:edit_activity__ Post"] = "Bericht"; +App::$strings["__ctx:edit_activity__ Comment"] = "Reactie"; +App::$strings["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen"; +App::$strings["Empty name"] = "Ontbrekende naam"; +App::$strings["Name too long"] = "Naam te lang"; +App::$strings["No account identifier"] = "Geen account-identificator"; +App::$strings["Nickname is required."] = "Bijnaam is verplicht"; +App::$strings["Unable to retrieve created identity"] = "Niet in staat om aangemaakte identiteit te ontvangen"; +App::$strings["Default Profile"] = "Standaardprofiel"; +App::$strings["Unable to retrieve modified identity"] = "Niet in staat om aangepaste identiteit te ontvangen"; +App::$strings["Create New Profile"] = "Nieuw profiel aanmaken"; +App::$strings["Visible to everybody"] = "Voor iedereen zichtbaar"; +App::$strings["Gender:"] = "Geslacht:"; +App::$strings["Homepage:"] = "Homepagina:"; +App::$strings["Online Now"] = "Nu online"; +App::$strings["Change your profile photo"] = "Jouw profielfoto veranderen"; +App::$strings["Trans"] = "Transgender"; +App::$strings["Like this channel"] = "Vind dit kanaal leuk"; +App::$strings["j F, Y"] = "F j Y"; +App::$strings["j F"] = "F j"; +App::$strings["Birthday:"] = "Geboortedatum:"; +App::$strings["for %1\$d %2\$s"] = "voor %1\$d %2\$s"; +App::$strings["Tags:"] = "Tags:"; +App::$strings["Sexual Preference:"] = "Seksuele voorkeur:"; +App::$strings["Political Views:"] = "Politieke overtuigingen:"; +App::$strings["Religion:"] = "Religie:"; +App::$strings["Hobbies/Interests:"] = "Hobby's/interesses:"; +App::$strings["Likes:"] = "Houdt van:"; +App::$strings["Dislikes:"] = "Houdt niet van:"; +App::$strings["Contact information and Social Networks:"] = "Contactinformatie en sociale netwerken:"; +App::$strings["My other channels:"] = "Mijn andere kanalen"; +App::$strings["Musical interests:"] = "Muzikale interesses:"; +App::$strings["Books, literature:"] = "Boeken, literatuur:"; +App::$strings["Television:"] = "Televisie:"; +App::$strings["Film/dance/culture/entertainment:"] = "Films/dansen/cultuur/vermaak:"; +App::$strings["Love/Romance:"] = "Liefde/romantiek:"; +App::$strings["Work/employment:"] = "Werk/beroep:"; +App::$strings["School/education:"] = "School/opleiding:"; +App::$strings["Like this thing"] = "Vind dit ding leuk"; +App::$strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i"; +App::$strings["Starts:"] = "Start:"; +App::$strings["Finishes:"] = "Einde:"; +App::$strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd."; +App::$strings["Not specified"] = "Niet aangegeven"; +App::$strings["Needs Action"] = "Actie vereist"; +App::$strings["Completed"] = "Voltooid"; +App::$strings["In Process"] = "In behandeling"; +App::$strings["Cancelled"] = "Geannuleerd"; +App::$strings["Home, Voice"] = "Thuis, spraak"; +App::$strings["Home, Fax"] = "Thuis, fax"; +App::$strings["Work, Voice"] = "Werk, spraak"; +App::$strings["Work, Fax"] = "Werk, fax"; +App::$strings["view full size"] = "volledige grootte tonen"; +App::$strings["Friendica"] = "Friendica"; +App::$strings["OStatus"] = "OStatus"; +App::$strings["GNU-Social"] = "GNU social"; +App::$strings["RSS/Atom"] = "RSS/Atom"; +App::$strings["Diaspora"] = "Diaspora"; +App::$strings["Facebook"] = "Facebook"; +App::$strings["Zot"] = "Zot"; +App::$strings["LinkedIn"] = "LinkedIn"; +App::$strings["XMPP/IM"] = "XMPP/IM"; +App::$strings["MySpace"] = "MySpace"; +App::$strings["Select an alternate language"] = "Kies een andere taal"; +App::$strings["Who can see this?"] = "Wie kan dit zien?"; +App::$strings["Custom selection"] = "Handmatige selectie"; +App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Kies \"Tonen\" om weergave toe te staan. Met \"Niet tonen\" kun je uitzonderingen maken op \"Tonen\"."; +App::$strings["Show"] = "Tonen"; +App::$strings["Don't show"] = "Niet tonen"; +App::$strings["Post permissions %s cannot be changed %s after a post is shared.
    These permissions set who is allowed to view the post."] = "Permissies van berichten %s zijn niet meer te veranderen %s nadat een bericht is gedeeld.
    Met deze permissies bepaal je wie het bericht kan zien."; +App::$strings["Cannot locate DNS info for database server '%s'"] = "Kan DNS-informatie voor databaseserver '%s' niet vinden"; +App::$strings["Image/photo"] = "Afbeelding/foto"; +App::$strings["Encrypted content"] = "Versleutelde inhoud"; +App::$strings["Install %1\$s element %2\$s"] = "Installeer %1\$s element %2\$s"; +App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren."; +App::$strings["card"] = "kaart"; +App::$strings["article"] = "artikel"; +App::$strings["Click to open/close"] = "Klik om te openen of te sluiten"; +App::$strings["spoiler"] = "spoiler"; +App::$strings["View article"] = "Artikel tonen"; +App::$strings["View summary"] = "Samenvatting tonen"; +App::$strings["$1 wrote:"] = "$1 schreef:"; App::$strings[" by "] = " door "; App::$strings[" on "] = " op "; App::$strings["Embedded content"] = "Ingesloten (embedded) inhoud"; App::$strings["Embedding disabled"] = "Insluiten (embedding) uitgeschakeld"; -App::$strings["Invalid data packet"] = "Datapakket ongeldig"; -App::$strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd. "; -App::$strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd"; -App::$strings["invalid target signature"] = "ongeldig doelkenmerk"; -App::$strings["Can view my normal stream and posts"] = "Kan mijn normale kanaalstream en berichten bekijken"; -App::$strings["Can view my webpages"] = "Kan mijn pagina's bekijken"; -App::$strings["Can post on my channel page (\"wall\")"] = "Kan een bericht in mijn kanaal plaatsen"; -App::$strings["Can like/dislike stuff"] = "Kan dingen leuk of niet leuk vinden"; -App::$strings["Profiles and things other than posts/comments"] = "Profielen en dingen, buiten berichten en reacties"; -App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+"; -App::$strings["Advanced - useful for creating group forum channels"] = "Geavanceerd - nuttig voor groepforums"; -App::$strings["Can chat with me (when available)"] = "Kan met mij chatten (wanneer beschikbaar)"; -App::$strings["Can write to my file storage and photos"] = "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen"; -App::$strings["Can edit my webpages"] = "Kan mijn pagina's bewerken"; -App::$strings["Somewhat advanced - very useful in open communities"] = "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)"; -App::$strings["Can administer my channel resources"] = "Kan mijn kanaal beheren"; -App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet."; -App::$strings[" and "] = " en "; -App::$strings["public profile"] = "openbaar profiel"; -App::$strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s veranderde %2\$s naar “%3\$s”"; -App::$strings["Visit %1\$s's %2\$s"] = "Bezoek het %2\$s van %1\$s"; -App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s heeft een aangepaste %2\$s, %3\$s veranderd."; +App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s verwelkomt %2\$s"; App::$strings["General Features"] = "Algemene functies"; -App::$strings["Multiple Profiles"] = "Meerdere profielen"; -App::$strings["Ability to create multiple profiles"] = "Mogelijkheid om meerdere profielen aan te maken"; +App::$strings["Display new member quick links menu"] = "Menu met links voor nieuwe leden tonen"; App::$strings["Advanced Profiles"] = "Geavanceerde profielen"; App::$strings["Additional profile sections and selections"] = "Extra onderdelen en keuzes voor je profiel"; App::$strings["Profile Import/Export"] = "Profiel importen/exporteren"; @@ -2973,21 +3080,36 @@ App::$strings["Provide managed web pages on your channel"] = "Sta beheerde webpa App::$strings["Provide a wiki for your channel"] = "Voeg een wiki aan jouw kanaal toe"; App::$strings["Private Notes"] = "Privé-aantekeningen"; App::$strings["Enables a tool to store notes and reminders (note: not encrypted)"] = "Een eenvoudige toepassing om aantekeningen en herinneringen in te bewaren (let op: niet versleuteld)"; +App::$strings["Create personal planning cards"] = "Persoonlijke planningskaarten maken"; +App::$strings["Create interactive articles"] = "Interactieve artikelen maken"; App::$strings["Navigation Channel Select"] = "Kanaal kiezen in navigatiemenu"; App::$strings["Change channels directly from within the navigation dropdown menu"] = "Kies een ander kanaal direct vanuit het dropdown-menu op de navigatiebalk"; App::$strings["Photo Location"] = "Fotolocatie"; App::$strings["If location data is available on uploaded photos, link this to a map."] = "Wanneer in de geüploade foto's locatiegegevens aanwezig zijn, link dit dan aan een kaart."; App::$strings["Access Controlled Chatrooms"] = "Chatkanalen met toegangscontrole "; App::$strings["Provide chatrooms and chat services with access control."] = "Chatkanalen en chatdiensten met toegangscontrole aanbieden."; -App::$strings["Provide alternate connection permission roles."] = "Extra permissietypes voor connecties aanmaken"; App::$strings["Smart Birthdays"] = "Slimme verjaardagen"; App::$strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "Maak verjaardagen bewust van tijdzones. Voor het geval dat jouw vrienden over de hele wereld verspreid zijn."; App::$strings["Event Timezone Selection"] = "Tijdzone gebeurtenis"; App::$strings["Allow event creation in timezones other than your own."] = "Sta het aanmaken van gebeurtenissen in andere tijdzones toe."; +App::$strings["Premium Channel"] = "Premiumkanaal"; +App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal"; App::$strings["Advanced Directory Search"] = "Geavanceerd in de kanalengids zoeken"; App::$strings["Allows creation of complex directory search queries"] = "Gebruik complexe zoekopdrachten in de kanalengids"; App::$strings["Advanced Theme and Layout Settings"] = "Geavanceerde thema- en lay-out-instellingen"; App::$strings["Allows fine tuning of themes and page layouts"] = "Maakt het mogelijk dat thema's en pagina-lay-outs preciezer ingesteld kunnen worden "; +App::$strings["Access Control and Permissions"] = "Toegangscontrole en permissies"; +App::$strings["Privacy Groups"] = "Privacygroepen"; +App::$strings["Enable management and selection of privacy groups"] = "Beheer en selectie van privacygroepen inschakelen"; +App::$strings["Multiple Profiles"] = "Meerdere profielen"; +App::$strings["Ability to create multiple profiles"] = "Mogelijkheid om meerdere profielen aan te maken"; +App::$strings["Provide alternate connection permission roles."] = "Extra permissietypes voor connecties aanmaken"; +App::$strings["OAuth1 Clients"] = "OAuth1-clients"; +App::$strings["Manage OAuth1 authenticatication tokens for mobile and remote apps."] = "OAuth1-authenticatietokens beheren voor mobiele en remote apps."; +App::$strings["OAuth2 Clients"] = "OAuth2-clients"; +App::$strings["Manage OAuth2 authenticatication tokens for mobile and remote apps."] = "OAuth2-authenticatietokens beheren voor mobiele en remote apps."; +App::$strings["Access Tokens"] = "Gasttoegang"; +App::$strings["Create access tokens so that non-members can access private content."] = "Maak toegangstokens aan zodat niet-leden toegang kunnen krijgen tot afgeschermde inhoud."; App::$strings["Post Composition Features"] = "Functies voor het opstellen van berichten"; App::$strings["Large Photos"] = "Grote foto's"; App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Gebruik grotere foto's (1024px) in berichten. Wanneer dit is uitgeschakeld worden er kleinere foto's (640px) gebruikt."; @@ -3004,17 +3126,18 @@ App::$strings["Content Expiration"] = "Inhoud laten verlopen"; App::$strings["Remove posts/comments and/or private messages at a future time"] = "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen"; App::$strings["Suppress Duplicate Posts/Comments"] = "Dubbele berichten/reacties tegenhouden"; App::$strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Voorkomt dat berichten en reacties met identieke inhoud en die binnen twee minuten zijn verstuurd, worden gepubliceerd. "; -App::$strings["Network and Stream Filtering"] = "Netwerk- en streamfilter"; +App::$strings["Auto-save drafts of posts and comments"] = "Automatisch concepten van berichten en reacties opslaan"; +App::$strings["Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions"] = "Slaat automatisch concepten van berichten en reacties op in de lokale browseropslag, om zo onopzettelijke gegevensverlies te voorkomen"; +App::$strings["Network and Stream Filtering"] = "Netwerk- en tijdlijnfilter"; App::$strings["Search by Date"] = "Zoek op datum"; App::$strings["Ability to select posts by date ranges"] = "Mogelijkheid om berichten op datum te filteren "; -App::$strings["Enable management and selection of privacy groups"] = "Beheer en selectie van privacygroepen inschakelen"; App::$strings["Save search terms for re-use"] = "Sla zoekopdrachten op voor hergebruik"; -App::$strings["Network Personal Tab"] = "Persoonlijke netwerktab"; -App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had"; -App::$strings["Network New Tab"] = "Nieuwe netwerktab"; -App::$strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen"; +App::$strings["Network Personal Tab"] = "Persoonlijke tijdlijntab"; +App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Tab inschakelen die alleen tijdlijnberichten toont waarmee jij interactie had"; +App::$strings["Network New Tab"] = "Nieuwe tijdlijnactiviteittab"; +App::$strings["Enable tab to display all new Network activity"] = "Tab inschakelen om alle nieuwe tijdlijnactiviteit te tonen"; App::$strings["Affinity Tool"] = "Affiniteitsfilter"; -App::$strings["Filter stream activity by depth of relationships"] = "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag"; +App::$strings["Filter stream activity by depth of relationships"] = "Filter wat je op jouw tijdlijn ziet aan de hand van hoe goed je iemand kent of mag"; App::$strings["Show friend and connection suggestions"] = "Toon kanaalvoorstellen"; App::$strings["Connection Filtering"] = "Berichtenfilters"; App::$strings["Filter incoming posts from connections based on keywords/content"] = "Filter binnenkomende berichten van connecties aan de hand van trefwoorden en taal"; @@ -3032,94 +3155,105 @@ App::$strings["Star Posts"] = "Geef berichten een ster"; App::$strings["Ability to mark special posts with a star indicator"] = "Mogelijkheid om speciale berichten met een ster te markeren"; App::$strings["Tag Cloud"] = "Tagwolk"; App::$strings["Provide a personal tag cloud on your channel page"] = "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina"; -App::$strings["Premium Channel"] = "Premiumkanaal"; -App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal"; +App::$strings["Trending"] = "Trending"; +App::$strings["Keywords"] = "Trefwoorden"; +App::$strings["have"] = "heb"; +App::$strings["has"] = "heeft"; +App::$strings["want"] = "wil"; +App::$strings["wants"] = "wil"; +App::$strings["likes"] = "vindt dit leuk"; +App::$strings["dislikes"] = "vindt dit niet leuk"; +App::$strings["Not a valid email address"] = "Geen geldig e-mailadres"; +App::$strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze hub niet toegestaan"; +App::$strings["Your email address is already registered at this site."] = "Jouw e-mailadres is al op deze hub geregistreerd."; +App::$strings["An invitation is required."] = "Een uitnodiging is vereist"; +App::$strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden"; +App::$strings["Please enter the required information."] = "Vul de vereiste informatie in."; +App::$strings["Failed to store account information."] = "Account-informatie kon niet opgeslagen worden."; +App::$strings["Registration confirmation for %s"] = "Registratiebevestiging voor %s"; +App::$strings["Registration request at %s"] = "Registratiebevestiging voor %s"; +App::$strings["your registration password"] = "jouw registratiewachtwoord"; +App::$strings["Registration details for %s"] = "Registratiegegevens voor %s"; +App::$strings["Account approved."] = "Account goedgekeurd"; +App::$strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s"; +App::$strings["Click here to upgrade."] = "Klik hier om te upgraden."; +App::$strings["This action exceeds the limits set by your subscription plan."] = "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden."; +App::$strings["This action is not available under your subscription plan."] = "Deze handeling is niet mogelijk met jouw abonnement."; +App::$strings["Birthday"] = "Verjaardag of geboortedatum"; +App::$strings["Age: "] = "Leeftijd:"; +App::$strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-DD of MM-DD"; +App::$strings["less than a second ago"] = "minder dan een seconde geleden"; +App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s geleden"; +App::$strings["__ctx:relative_date__ year"] = array( + 0 => "jaar", + 1 => "jaren", +); +App::$strings["__ctx:relative_date__ month"] = array( + 0 => "maand", + 1 => "maanden", +); +App::$strings["__ctx:relative_date__ week"] = array( + 0 => "week", + 1 => "weken", +); +App::$strings["__ctx:relative_date__ day"] = array( + 0 => "dag", + 1 => "dagen", +); +App::$strings["__ctx:relative_date__ hour"] = array( + 0 => "uur", + 1 => "uren", +); +App::$strings["__ctx:relative_date__ minute"] = array( + 0 => "minuut", + 1 => "minuten", +); +App::$strings["__ctx:relative_date__ second"] = array( + 0 => "seconde", + 1 => "seconden", +); +App::$strings["%1\$s's birthday"] = "Verjaardag van %1\$s"; +App::$strings["Happy Birthday %1\$s"] = "Gefeliciteerd met je verjaardag %1\$s"; +App::$strings["Remote authentication"] = "Authenticatie op afstand"; +App::$strings["Click to authenticate to your home hub"] = "Authenticeer jezelf via (bijvoorbeeld) jouw hub"; +App::$strings["Manage Your Channels"] = "Beheer je kanalen"; +App::$strings["Account/Channel Settings"] = "Account-/kanaalinstellingen"; +App::$strings["End this session"] = "Beëindig deze sessie"; +App::$strings["Your profile page"] = "Jouw profielpagina"; +App::$strings["Manage/Edit profiles"] = "Beheer/wijzig profielen"; +App::$strings["Sign in"] = "Inloggen"; +App::$strings["Take me home"] = "Terug naar mijn hub"; +App::$strings["Log me out of this site"] = "Uitloggen op deze hub"; +App::$strings["Create an account"] = "Maak een account aan"; +App::$strings["Help and documentation"] = "Hulp en documentatie"; +App::$strings["Search site @name, !forum, #tag, ?docs, content"] = "Zoek in deze hub naar @naam, !forum, #tag, ?hulp"; +App::$strings["Site Setup and Configuration"] = "Hub instellen en beheren"; +App::$strings["@name, !forum, #tag, ?doc, content"] = "@naam, !forum, #tag, ?hulp, inhoud"; +App::$strings["Please wait..."] = "Wachten aub..."; +App::$strings["Add Apps"] = "Apps toevoegen"; +App::$strings["Arrange Apps"] = "Volgorde apps"; +App::$strings["Toggle System Apps"] = "Systeem-apps toevoegen of verwijderen"; App::$strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"; App::$strings["Image file is empty."] = "Afbeeldingsbestand is leeg"; App::$strings["Photo storage failed."] = "Foto kan niet worden opgeslagen"; App::$strings["a new photo"] = "een nieuwe foto"; App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s plaatste %2\$s op %3\$s"; App::$strings["Upload New Photos"] = "Nieuwe foto's uploaden"; -App::$strings["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen"; -App::$strings["Empty name"] = "Ontbrekende naam"; -App::$strings["Name too long"] = "Naam te lang"; -App::$strings["No account identifier"] = "Geen account-identificator"; -App::$strings["Nickname is required."] = "Bijnaam is verplicht"; -App::$strings["Reserved nickname. Please choose another."] = "Deze naam is gereserveerd. Kies een andere."; -App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik."; -App::$strings["Unable to retrieve created identity"] = "Niet in staat om aangemaakte identiteit te vinden"; -App::$strings["Default Profile"] = "Standaardprofiel"; -App::$strings["Create New Profile"] = "Nieuw profiel aanmaken"; -App::$strings["Visible to everybody"] = "Voor iedereen zichtbaar"; -App::$strings["Gender:"] = "Geslacht:"; -App::$strings["Homepage:"] = "Homepagina:"; -App::$strings["Online Now"] = "Nu online"; -App::$strings["Like this channel"] = "Vind dit kanaal leuk"; -App::$strings["j F, Y"] = "F j Y"; -App::$strings["j F"] = "F j"; -App::$strings["Birthday:"] = "Geboortedatum:"; -App::$strings["for %1\$d %2\$s"] = "voor %1\$d %2\$s"; -App::$strings["Sexual Preference:"] = "Seksuele voorkeur:"; -App::$strings["Tags:"] = "Tags:"; -App::$strings["Political Views:"] = "Politieke overtuigingen:"; -App::$strings["Religion:"] = "Religie:"; -App::$strings["Hobbies/Interests:"] = "Hobby's/interesses:"; -App::$strings["Likes:"] = "Houdt van:"; -App::$strings["Dislikes:"] = "Houdt niet van:"; -App::$strings["Contact information and Social Networks:"] = "Contactinformatie en sociale netwerken:"; -App::$strings["My other channels:"] = "Mijn andere kanalen"; -App::$strings["Musical interests:"] = "Muzikale interesses:"; -App::$strings["Books, literature:"] = "Boeken, literatuur:"; -App::$strings["Television:"] = "Televisie:"; -App::$strings["Film/dance/culture/entertainment:"] = "Films/dansen/cultuur/vermaak:"; -App::$strings["Love/Romance:"] = "Liefde/romantiek:"; -App::$strings["Work/employment:"] = "Werk/beroep:"; -App::$strings["School/education:"] = "School/opleiding:"; -App::$strings["Like this thing"] = "Vind dit ding leuk"; -App::$strings["User '%s' deleted"] = "Account '%s' verwijderd"; -App::$strings["Source channel not found."] = "Bron van kanaal niet gevonden"; -App::$strings["Focus (Hubzilla default)"] = "Focus (Hubzilla-standaard)"; -App::$strings["Theme settings"] = "Thema-instellingen"; -App::$strings["Narrow navbar"] = "Smalle navigatiebalk"; -App::$strings["Navigation bar background color"] = "Achtergrondkleur navigatiebalk"; -App::$strings["Navigation bar gradient top color"] = "Bovenste gradiëntkleur navigatiebalk"; -App::$strings["Navigation bar gradient bottom color"] = "Onderste gradiëntkleur navigatiebalk"; -App::$strings["Navigation active button gradient top color"] = "Bovenste gradiëntkleur actieve knop navigatiebalk"; -App::$strings["Navigation active button gradient bottom color"] = "Onderste gradiëntkleur actieve knop op navigatiebalk"; -App::$strings["Navigation bar border color "] = "Randkleur navigatiebalk "; -App::$strings["Navigation bar icon color "] = "Pictogramkleur navigatiebalk"; -App::$strings["Navigation bar active icon color "] = "Actieve pictogramkleur navigatiebalk"; -App::$strings["link color"] = "Linkkleur instellen"; -App::$strings["Set font-color for banner"] = "Tekstkleur van banner instellen"; -App::$strings["Set the background color"] = "Achtergrondkleur instellen"; -App::$strings["Set the background image"] = "Achtergrondafbeelding instellen"; -App::$strings["Set the background color of items"] = "Achtergrondkleur items instellen"; -App::$strings["Set the background color of comments"] = "Achtergrondkleur reacties instellen"; -App::$strings["Set the border color of comments"] = "Randkleur reacties instellen"; -App::$strings["Set the indent for comments"] = "Inspringen reacties instellen"; -App::$strings["Set the basic color for item icons"] = "Basiskleur itempictogrammen instellen"; -App::$strings["Set the hover color for item icons"] = "Hoverkleur itempictogrammen instellen"; -App::$strings["Set font-size for the entire application"] = "Tekstgrootte van de volledige applicatie instellen"; -App::$strings["Example: 14px"] = "Voorbeeld: 14px"; -App::$strings["Set font-size for posts and comments"] = "Lettergrootte voor berichten en reacties instellen"; -App::$strings["Set font-color for posts and comments"] = "Tekstkleur van berichten en reacties"; -App::$strings["Set radius of corners"] = "Radius van hoeken instellen"; -App::$strings["Set shadow depth of photos"] = "Schaduwdiepte van foto's instellen"; -App::$strings["Set maximum width of content region in pixel"] = "Maximumbreedte conversatieruimte instellen (in pixels)"; -App::$strings["Leave empty for default width"] = "Laat leeg voor standaardbreedte"; -App::$strings["Left align page content"] = "Inhoud links uitlijnen"; -App::$strings["Set minimum opacity of nav bar - to hide it"] = "Minimale ondoorzichtigheid navigatiebalk (- om te verbergen)"; -App::$strings["Set size of conversation author photo"] = "Grootte profielfoto's van berichten instellen"; -App::$strings["Set size of followup author photos"] = "Grootte profielfoto's van reacties instellen"; -App::$strings["Update %s failed. See error logs."] = "Update %s mislukt. Zie foutenlogboek."; -App::$strings["Update Error at %s"] = "Update-fout op %s"; -App::$strings["Create an account to access services and applications"] = "Maak een account aan om toegang te krijgen tot diensten en toepassingen"; -App::$strings["Login/Email"] = "E-mailadres of inlognaam"; -App::$strings["Password"] = "Wachtwoord"; -App::$strings["Remember me"] = "Aangemeld blijven"; -App::$strings["Forgot your password?"] = "Wachtwoord vergeten?"; -App::$strings["toggle mobile"] = "mobiele weergave omschakelen"; -App::$strings["Website SSL certificate is not valid. Please correct."] = "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b."; -App::$strings["[hubzilla] Website SSL error for %s"] = "[hubzilla] Probleem met SSL-certificaat voor %s"; -App::$strings["Cron/Scheduled tasks not running."] = "Cron is niet actief"; -App::$strings["[hubzilla] Cron tasks not running on %s"] = "[hubzilla] Cron-taken zijn niet actief op %s"; +App::$strings["Invalid data packet"] = "Datapakket ongeldig"; +App::$strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd. "; +App::$strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd"; +App::$strings["invalid target signature"] = "ongeldig doelkenmerk"; +App::$strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten kunnen van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken."; +App::$strings["Add new connections to this privacy group"] = "Voeg nieuwe connecties aan deze privacygroep toe"; +App::$strings["edit"] = "bewerken"; +App::$strings["Edit group"] = "Privacygroep bewerken"; +App::$strings["Add privacy group"] = "Privacygroep toevoegen"; +App::$strings["Channels not in any privacy group"] = "Kanalen die zich in geen enkele privacygroep bevinden"; +App::$strings["New window"] = "Nieuw venster"; +App::$strings["Open the selected location in a different window or browser tab"] = "Open de geselecteerde locatie in een ander venster of tab"; +App::$strings["Delegation session ended."] = "Delegatiesessie beëindigd."; +App::$strings["Logged out."] = "Uitgelogd."; +App::$strings["Email validation is incomplete. Please check your email."] = "E-mailverificatie is nog niet voltooid. Controleer jouw e-mail."; +App::$strings["Failed authentication"] = "Mislukte authenticatie"; +App::$strings["Help:"] = "Hulp:"; +App::$strings["Not Found"] = "Niet gevonden"; -- cgit v1.2.3 From cd4454100b41f384148d0c1ebdaf6e64d629b0e1 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 24 May 2018 16:32:21 -0700 Subject: alternate fix for z_check_dns --- include/network.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/include/network.php b/include/network.php index 7e8f823a3..4b2d2f93f 100644 --- a/include/network.php +++ b/include/network.php @@ -468,13 +468,21 @@ function z_dns_check($h,$check_mx = 0) { && \App::$config['system']['do_not_check_dns']) return true; + // This will match either Windows or Mac ('Darwin') + if(stripos(PHP_OS,'win') !== false) + return true; + + // BSD variants have dns_get_record() but it only works reliably without any options + if(stripos(PHP_OS,'bsd') !== false) + return((@dns_get_record($h) || filter_var($h, FILTER_VALIDATE_IP)) ? true : false); + + // Otherwise we will assume dns_get_record() works as documented + + $opts = DNS_A + DNS_CNAME + DNS_PTR; + if($check_mx) + $opts += DNS_MX; - //$opts = DNS_A + DNS_CNAME + DNS_PTR; - //if($check_mx) - // $opts += DNS_MX; - // Specific record type flags are unreliable on FreeBSD and Mac, - // so now we'll ignore these and just check for the existence of any DNS record. - return((@dns_get_record($h) || filter_var($h, FILTER_VALIDATE_IP)) ? true : false); + return((@dns_get_record($h,$opts) || filter_var($h, FILTER_VALIDATE_IP)) ? true : false); } /** -- cgit v1.2.3 From 33700e9cf47e2b5f0b4597772d9cea81e811bae3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 25 May 2018 15:29:59 +0200 Subject: differentiate between direct messages and followers-only messages --- Zotlabs/Lib/ThreadItem.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 0fed78158..a3c7f99b9 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -103,8 +103,12 @@ class ThreadItem { $shareable = true; $privacy_warning = false; - if($item['owner']['xchan_network'] === 'activitypub') - $privacy_warning = true; + if(($item['item_private'] == 1) && ($item['owner']['xchan_network'] === 'activitypub')) { + $recips = get_iconfig($item['parent'], 'activitypub', 'recips'); + + if(! in_array($observer['xchan_url'], $recips['to'])) + $privacy_warning = true; + } $mode = $conv->get_mode(); -- cgit v1.2.3 From 4ff2b8ed1bf565fbc1c011698781e282bcdd31e5 Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Sat, 26 May 2018 09:17:04 +0200 Subject: Update hmessages.po --- view/fr/hmessages.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/fr/hmessages.po b/view/fr/hmessages.po index a830d06ef..c5263c2df 100644 --- a/view/fr/hmessages.po +++ b/view/fr/hmessages.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-23 11:34+0200\n" -"PO-Revision-Date: 2018-05-06 07:46+0000\n" +"PO-Revision-Date: 2018-05-26 07:06+0000\n" "Last-Translator: Philip Wittamore \n" "Language-Team: French (http://www.transifex.com/Friendica/red-matrix/language/fr/)\n" "MIME-Version: 1.0\n" @@ -6943,7 +6943,7 @@ msgstr "À propos :" #: ../../include/conversation.php:1052 ../../include/channel.php:1376 #: ../../include/connections.php:110 msgid "Connect" -msgstr "Ajouter/Suivre" +msgstr "Lier" #: ../../Zotlabs/Module/Directory.php:339 msgid "Public Forum:" @@ -12750,7 +12750,7 @@ msgstr "Saisir nom ou centre d'intérêt" #: ../../include/contact_widgets.php:21 msgid "Connect/Follow" -msgstr "Ajouter/Suivre" +msgstr "Lier et suivre" #: ../../include/contact_widgets.php:22 msgid "Examples: Robert Morgenstein, Fishing" -- cgit v1.2.3 From 89d97c556a9bcb9b5f08032c6835d08ecb8e693e Mon Sep 17 00:00:00 2001 From: Galette Saucisse Date: Sat, 26 May 2018 09:18:41 +0200 Subject: Update hstrings.php --- view/fr/hstrings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/fr/hstrings.php b/view/fr/hstrings.php index f7fd25224..cdf233584 100644 --- a/view/fr/hstrings.php +++ b/view/fr/hstrings.php @@ -1485,7 +1485,7 @@ App::$strings["Location:"] = "Emplacement :"; App::$strings["Description:"] = "Description :"; App::$strings["Hometown:"] = "Ville natale :"; App::$strings["About:"] = "À propos :"; -App::$strings["Connect"] = "Ajouter/Suivre"; +App::$strings["Connect"] = "Lier"; App::$strings["Public Forum:"] = "Forum public :"; App::$strings["Keywords: "] = "Mots-clefs :"; App::$strings["Don't suggest"] = "Ne pas suggérer"; @@ -2868,7 +2868,7 @@ App::$strings["%d invitation available"] = array( ); App::$strings["Find Channels"] = "Trouver des canaux"; App::$strings["Enter name or interest"] = "Saisir nom ou centre d'intérêt"; -App::$strings["Connect/Follow"] = "Ajouter/Suivre"; +App::$strings["Connect/Follow"] = "Lier et suivre"; App::$strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Guillaume Martin, Course à pieds"; App::$strings["Random Profile"] = "Un profil au hasard"; App::$strings["Invite Friends"] = "Inviter des amis"; -- cgit v1.2.3 From 2bf76928ccc60a7dace548ec7d326e15b78d47b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= Date: Sat, 26 May 2018 18:09:22 +0200 Subject: Some stuff of the Spanish Hubzilla --- doc/context/es-es/articles/help.html | 20 ++++++++++++++++++++ doc/es | 1 + 2 files changed, 21 insertions(+) create mode 100644 doc/context/es-es/articles/help.html create mode 120000 doc/es diff --git a/doc/context/es-es/articles/help.html b/doc/context/es-es/articles/help.html new file mode 100644 index 000000000..0bf176fdd --- /dev/null +++ b/doc/context/es-es/articles/help.html @@ -0,0 +1,20 @@ +

    +
    General
    +
    El artículo es un tipo de documento de una naturaleza un poco especial, a mitad de camino entre las fichas de organización de trabajo ("cards") y las entradas normales, pero que está separado del stream social. Son muy adecuados para ayudar a escribir y organizar textos, con un formateo básico, pero completo, sobre cualquier tema, especialmente sobre documentación seriada, de forma más amplia que un wiki pero menos que un página web. Al no formar parte del stream social, para acceder a él hace falta conocer su dirección: [URL del sitio]/articles/[nombre del usuario, sin dominio]. Ahí estarán disponibles los distintas artículos que escriba, por orden de publicación.
    +
    Crear un artículo
    +
    + Crear un artículo nuevo es muy parecido a componer un nuevo post.

    +
      +
    • + Nombre del enlace de la página: Este nombre es el del nombre del artículo para una URL estática +
      • +
    • + Título: El título se muestra en la parte de arriba del artículo +
      • +
    • + Temas o Categorías: Si tiene activada la opción Temas de las entradas en su canal, entonces puede añadirlos al artículo. Estas categorías o temas se despliegan en la lista Temas en el panel de la izquierda y permiten filtrar su colección de artículos. +
      • +
    • Sumario: Es el espacio, entre las etiquetas predefinidas [summary][/summary], reservado para redactar un resumen del artículo, que aparecerá en su encabezado. El espacio disponible a continuación del sumario, en la ventana de composición, es el adecuado para la redacción del artículo en sí. +
    +
    +
    \ No newline at end of file diff --git a/doc/es b/doc/es new file mode 120000 index 000000000..c8ba7666b --- /dev/null +++ b/doc/es @@ -0,0 +1 @@ +es-es \ No newline at end of file -- cgit v1.2.3 From eb04dbc5ce2321ca5da4274005bd3e4352cf83fa Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 26 May 2018 21:15:22 +0200 Subject: DB update to fix wrong hubloc_url for activitypub hublocs --- Zotlabs/Update/_1215.php | 26 ++++++++++++++++++++++++++ boot.php | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 Zotlabs/Update/_1215.php diff --git a/Zotlabs/Update/_1215.php b/Zotlabs/Update/_1215.php new file mode 100644 index 000000000..3acaab587 --- /dev/null +++ b/Zotlabs/Update/_1215.php @@ -0,0 +1,26 @@ +0"); + + // this will fix peertube hubloc_url + $r2 = q("UPDATE hubloc SET hubloc_url = LEFT(hubloc_url, POSITION('/account' IN hubloc_url)-1) WHERE POSITION('/account' IN hubloc_url)>0"); + + if($r1 && $r2) { + q("COMMIT"); + return UPDATE_SUCCESS; + } + else { + q("ROLLBACK"); + return UPDATE_FAILED; + } + } + +} diff --git a/boot.php b/boot.php index 9b3b86381..c0d749c2e 100755 --- a/boot.php +++ b/boot.php @@ -54,7 +54,7 @@ define ( 'STD_VERSION', '3.5.6' ); define ( 'ZOT_REVISION', '6.0a' ); -define ( 'DB_UPDATE_VERSION', 1214 ); +define ( 'DB_UPDATE_VERSION', 1215 ); define ( 'PROJECT_BASE', __DIR__ ); -- cgit v1.2.3 From 5a475453ab2939836ab8a541de6ca9608781a0c8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 27 May 2018 12:20:07 +0200 Subject: fix js error with catalan language (unescaped strings) --- view/tpl/jot-header.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 22413f350..365a922f9 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -365,12 +365,12 @@ var activeCommentText = ''; if($('#jot-nocomment').val() > 0) { $('#jot-nocomment').val(0); $('#profile-nocomment, #profile-nocomment-sub').removeClass('fa-comments-o').addClass('fa-comments'); - $('#profile-nocomment-wrapper').attr('title', '{{$nocomment_enabled}}'); + $('#profile-nocomment-wrapper').attr('title', '{{$nocomment_enabled|escape:'javascript'}}'); } else { $('#jot-nocomment').val(1); $('#profile-nocomment, #profile-nocomment-sub').removeClass('fa-comments').addClass('fa-comments-o'); - $('#profile-nocomment-wrapper').attr('title', '{{$nocomment_disabled}}'); + $('#profile-nocomment-wrapper').attr('title', '{{$nocomment_disabled|escape:'javascript'}}'); } } -- cgit v1.2.3 From 4f3be92a0d8b9b8555647d3086e13dd3530c6463 Mon Sep 17 00:00:00 2001 From: Herbert Thielen Date: Sun, 27 May 2018 17:57:35 +0200 Subject: include photos.php required for photo_calculate_scale() --- Zotlabs/Module/Cover_photo.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index 9adfa2209..88fd4485d 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -9,6 +9,7 @@ namespace Zotlabs\Module; require_once('include/photo/photo_driver.php'); require_once('include/channel.php'); +require_once('include/photos.php'); -- cgit v1.2.3 From ddebbcc0a08aae9cd33bb3105ce1f2c8863b544c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 27 May 2018 17:46:25 -0700 Subject: hubzilla issue #1200 --- Zotlabs/Module/Network.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 82c88e565..942b48109 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -131,7 +131,7 @@ class Network extends \Zotlabs\Web\Controller { if(x($_GET,'search') || x($_GET,'file')) $nouveau = true; if($cid) { - $r = q("SELECT abook_xchan FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1", + $r = q("SELECT abook_xchan, xchan_addr, xchan_url FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_id = %d AND abook_channel = %d LIMIT 1", intval($cid), intval(local_channel()) ); @@ -144,7 +144,7 @@ class Network extends \Zotlabs\Web\Controller { // NOTREACHED } if($_GET['pf'] === '1') - $deftag = '!' . t('forum') . '+' . intval($cid); + $deftag = '!{' . (($r[0]['xchan_addr']) ? $r[0]['xchan_addr'] : $r[0]['xchan_url']) . '}'; else $def_acl = [ 'allow_cid' => '<' . $r[0]['abook_xchan'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; } -- cgit v1.2.3 From 139c39c2ce270ca1e95d86b517ebe0ad4182ecfa Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 28 May 2018 22:23:40 -0700 Subject: we probably don't need to delivery local items more than once --- Zotlabs/Daemon/Deliver.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Zotlabs/Daemon/Deliver.php b/Zotlabs/Daemon/Deliver.php index 394a7bf3e..b809cba91 100644 --- a/Zotlabs/Daemon/Deliver.php +++ b/Zotlabs/Daemon/Deliver.php @@ -75,6 +75,8 @@ class Deliver { q("delete from dreport where dreport_queue = '%s'", dbesc($argv[$x]) ); + + continue; } } -- cgit v1.2.3 From ed3d3b6f27452969164f35fee3cf7955733b503e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 29 May 2018 17:35:44 -0700 Subject: provide possibility of using different orderings (post, commented) on channel page --- Zotlabs/Module/Channel.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 327ca53db..9108f6841 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -82,6 +82,7 @@ class Channel extends \Zotlabs\Web\Controller { $category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : ''); $hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : ''); + $order = ((x($_GET,'order')) ? notags($_GET['order']) : 'post'); $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); $groups = array(); @@ -244,6 +245,7 @@ class Channel extends \Zotlabs\Web\Controller { if($datequery) { $sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery)))); + $order = 'post'; } if($datequery2) { $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); @@ -253,6 +255,12 @@ class Channel extends \Zotlabs\Web\Controller { $sql_extra2 .= " and item.item_thread_top != 0 "; } + if($order === 'post') + $ordering = "created"; + else + $ordering = "commented"; + + $itemspage = get_pconfig(local_channel(),'system','itemspage'); \App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start'])); @@ -275,7 +283,7 @@ class Channel extends \Zotlabs\Web\Controller { AND (abook.abook_blocked = 0 or abook.abook_flags is null) AND item.item_wall = 1 $sql_extra $sql_extra2 - ORDER BY created DESC, id $pager_sql ", + ORDER BY $ordering DESC, id $pager_sql ", intval(\App::$profile['profile_uid']) ); } @@ -284,7 +292,6 @@ class Channel extends \Zotlabs\Web\Controller { $r = array(); } } - if($r) { $parents_str = ids_to_querystr($r,'item_id'); @@ -300,7 +307,7 @@ class Channel extends \Zotlabs\Web\Controller { xchan_query($items); $items = fetch_post_tags($items, true); - $items = conv_sort($items,'created'); + $items = conv_sort($items,$ordering); if($load && $mid && (! count($items))) { // This will happen if we don't have sufficient permissions @@ -345,7 +352,7 @@ class Channel extends \Zotlabs\Web\Controller { '$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1), '$search' => $search, '$xchan' => '', - '$order' => '', + '$order' => $order, '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$file' => '', '$cats' => (($category) ? urlencode($category) : ''), -- cgit v1.2.3 From 9fcb3bf2e8fab84f9144eecceaf984b2026e6d08 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 30 May 2018 14:02:58 +0200 Subject: first cut on restructuring the previously called network tabs --- Zotlabs/Module/Network.php | 21 +++++++++++++++++---- include/features.php | 20 ++++++++++---------- include/group.php | 2 +- include/text.php | 22 +++++++++++++++++++++- view/pdl/mod_network.pdl | 2 ++ 5 files changed, 51 insertions(+), 16 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 942b48109..060179217 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -57,13 +57,26 @@ class Network extends \Zotlabs\Web\Controller { $datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : ''); $datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : ''); - $nouveau = ((x($_GET,'new')) ? intval($_GET['new']) : 0); $static = ((x($_GET,'static')) ? intval($_GET['static']) : 0); $gid = ((x($_GET,'gid')) ? intval($_GET['gid']) : 0); $category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : ''); $hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : ''); $verb = ((x($_REQUEST,'verb')) ? $_REQUEST['verb'] : ''); - + + + $order = get_pconfig(local_channel(), 'mod_network', 'order', 0); + switch($order) { + case 0: + $order = 'comment'; + break; + case 1: + $order = 'post'; + break; + case 2: + $nouveau = true; + break; + } + $search = (($_GET['search']) ? $_GET['search'] : ''); if($search) { $_GET['netsearch'] = escape_tags($search); @@ -84,7 +97,7 @@ class Network extends \Zotlabs\Web\Controller { } if($datequery) - $_GET['order'] = 'post'; + $order = 'post'; // filter by collection (e.g. group) @@ -150,7 +163,7 @@ class Network extends \Zotlabs\Web\Controller { } if(! $update) { - $tabs = network_tabs(); + $tabs = ''; //network_tabs(); $o .= $tabs; // search terms header diff --git a/include/features.php b/include/features.php index 616e3f6c5..3d3e41a05 100644 --- a/include/features.php +++ b/include/features.php @@ -386,21 +386,21 @@ function get_features($filtered = true, $level = (-1)) { ], [ - 'personal_tab', - t('Network Personal Tab'), - t('Enable tab to display only Network posts that you\'ve interacted on'), + 'order_tab', + t('Alternate Stream Order'), + t('Ability to order the stream by last post date, last comment date or unthreaded activities'), false, - get_config('feature_lock','personal_tab'), - feature_level('personal_tab',1), + get_config('feature_lock','order_tab'), + feature_level('order_tab',2), ], [ - 'new_tab', - t('Network New Tab'), - t('Enable tab to display all new Network activity'), + 'personal_tab', + t('Network Personal Tab'), + t('Enable tab to display only Network posts that you\'ve interacted on'), false, - get_config('feature_lock','new_tab'), - feature_level('new_tab',2), + get_config('feature_lock','personal_tab'), + feature_level('personal_tab',1), ], [ diff --git a/include/group.php b/include/group.php index 8c95f6224..03ebf7ee5 100644 --- a/include/group.php +++ b/include/group.php @@ -284,7 +284,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id 'text' => t('All Channels'), 'id' => 0, 'selected' => (($group_id == 0) ? 'group-selected' : ''), - 'href' => $every . (($every === 'network') ? '?f=&gid=0' : '') . ((x($_GET,'order')) ? '&order=' . $_GET['order'] : ''), + 'href' => $every . (($every === 'network') ? '?f=&gid=0' : ''), ); diff --git a/include/text.php b/include/text.php index 34063cdd7..319de67a8 100644 --- a/include/text.php +++ b/include/text.php @@ -3333,4 +3333,24 @@ function unique_multidim_array($array, $key) { $i++; } return $temp_array; -} +} + +function network_qstring($req) { + + $ret = '?f='; + + if(x($req, 'cid')) + $ret .= '&cid=' . $req['cid']; + + if(x($req, 'gid')) + $ret .= '&gid=' . $req['gid']; + + if(x($req, 'star')) + $ret .= '&star=' . $req['star']; + + if(x($req, 'conv')) + $ret .= '&conv=' . $req['conv']; + + return $ret; + +} diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl index 09fdba573..f93a6c66d 100644 --- a/view/pdl/mod_network.pdl +++ b/view/pdl/mod_network.pdl @@ -1,5 +1,7 @@ [region=aside] +[widget=activity_order][/widget] [widget=collections][/widget] +[widget=activity_filter][/widget] [widget=forums][/widget] [widget=suggestions][/widget] [widget=savedsearch][/widget] -- cgit v1.2.3 From 8d6441704bdc8d0628149dbb32321b6921f097ba Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 30 May 2018 14:06:18 +0200 Subject: add widget files and templates --- Zotlabs/Widget/Activity_filter.php | 66 ++++++++++++++++++++++ Zotlabs/Widget/Activity_order.php | 111 +++++++++++++++++++++++++++++++++++++ view/tpl/common_pills.tpl | 8 +++ 3 files changed, 185 insertions(+) create mode 100644 Zotlabs/Widget/Activity_filter.php create mode 100644 Zotlabs/Widget/Activity_order.php create mode 100755 view/tpl/common_pills.tpl diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php new file mode 100644 index 000000000..a60144239 --- /dev/null +++ b/Zotlabs/Widget/Activity_filter.php @@ -0,0 +1,66 @@ + t('Personal Posts'), + 'icon' => 'user-circle', + 'url' => z_root() . '/' . $cmd . '?f=' . ((x($_GET,'order')) ? '&order=' . $_GET['order'] : '') . '&conv=1', + 'sel' => $conv_active, + 'title' => t('Posts that mention or involve you'), + ); + } + + if(feature_enabled(local_channel(),'star_posts')) { + $tabs[] = array( + 'label' => t('Starred Posts'), + 'icon' => 'star', + 'url'=>z_root() . '/' . $cmd . '/?f=' . ((x($_GET,'order')) ? '&order=' . $_GET['order'] : '') . '&star=1', + 'sel'=>$starred_active, + 'title' => t('Favourite Posts'), + ); + } + + + $arr = ['tabs' => $tabs]; + + call_hooks('network_tabs', $arr); + + $tpl = get_markup_template('common_pills.tpl'); + + if($arr['tabs']) { + return replace_macros($tpl, [ + '$title' => t('Additional Filters'), + '$tabs' => $arr['tabs'], + ]); + } + else { + return ''; + } + } + +} diff --git a/Zotlabs/Widget/Activity_order.php b/Zotlabs/Widget/Activity_order.php new file mode 100644 index 000000000..ba288965f --- /dev/null +++ b/Zotlabs/Widget/Activity_order.php @@ -0,0 +1,111 @@ + t('Commented Date'), + 'url'=>z_root() . '/' . $cmd . '?f=&order=comment' . $filter, + 'sel'=> $commentord_active, + 'title' => t('Sort by Comment Date'), + ]; + $tabs[] = [ + 'label' => t('Posted Date'), + 'url'=>z_root() . '/' . $cmd . '?f=&order=post' . $filter, + 'sel'=> $postord_active, + 'title' => t('Sort by Post Date'), + ]; + $tabs[] = array( + 'label' => t('Date Unthreaded'), + 'url' => z_root() . '/' . $cmd . '?f=&order=unthreaded' . $filter, + 'sel' => $unthreaded_active, + 'title' => t('Activity Stream - by date'), + ); + + $arr = ['tabs' => $tabs]; + + call_hooks('network_tabs', $arr); + + $tpl = get_markup_template('common_pills.tpl'); + + if($arr['tabs']) { + return replace_macros($tpl, [ + '$title' => t('Order Activity by'), + '$tabs' => $arr['tabs'], + ]); + } + else { + return ''; + } + } + +} diff --git a/view/tpl/common_pills.tpl b/view/tpl/common_pills.tpl new file mode 100755 index 000000000..d10aa365b --- /dev/null +++ b/view/tpl/common_pills.tpl @@ -0,0 +1,8 @@ +
    +

    {{$title}}

    + +
    -- cgit v1.2.3 From 293e405f5b9761ade0c621c3696b93439b2440bf Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 30 May 2018 14:09:24 +0200 Subject: just query for data we actually need --- Zotlabs/Daemon/Poller.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php index e4bc9c143..49151437c 100644 --- a/Zotlabs/Daemon/Poller.php +++ b/Zotlabs/Daemon/Poller.php @@ -71,14 +71,18 @@ class Poller { $randfunc = db_getfunc('RAND'); - $contacts = q("SELECT * FROM abook LEFT JOIN xchan on abook_xchan = xchan_hash + $contacts = q("SELECT abook.abook_updated, abook.abook_connected, abook.abook_feed, + abook.abook_channel, abook.abook_id, abook.abook_archived, abook.abook_pending, + abook.abook_ignored, abook.abook_blocked, + xchan.xchan_network, + account.account_lastlog, account.account_flags + FROM abook LEFT JOIN xchan on abook_xchan = xchan_hash LEFT JOIN account on abook_account = account_id where abook_self = 0 $sql_extra AND (( account_flags = %d ) OR ( account_flags = %d )) $abandon_sql ORDER BY $randfunc", intval(ACCOUNT_OK), intval(ACCOUNT_UNVERIFIED) // FIXME - ); if($contacts) { -- cgit v1.2.3 From 881406f82b455cbd78eb64570a0a41937814a444 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 30 May 2018 14:54:39 +0200 Subject: remove redundant reference for order --- Zotlabs/Module/Network.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 060179217..5e7492fd4 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -120,16 +120,11 @@ class Network extends \Zotlabs\Web\Controller { $def_acl = array('allow_gid' => '<' . $r[0]['hash'] . '>'); } - $default_cmin = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmin',0) : 0); $default_cmax = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmax',99) : 99); - - // if no tabs are selected, defaults to comments - $cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0); $star = ((x($_GET,'star')) ? intval($_GET['star']) : 0); - $order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment'); $liked = ((x($_GET,'liked')) ? intval($_GET['liked']) : 0); $conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0); $spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0); -- cgit v1.2.3 From e1a55ba471a2de5dd31e51c2471f8c3122ad2919 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 30 May 2018 20:18:13 +0200 Subject: remove redundant css from default.css --- view/css/default.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/view/css/default.css b/view/css/default.css index fc6da54f9..765a197d9 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -1,11 +1,3 @@ -header #banner { - position: fixed; - top: 0px; - width: 33%; - margin-left: 33%; - margin-right: 33%; -} - main { display: table; table-layout: fixed; -- cgit v1.2.3 From 6349a7417f41cd697ba2dea82653911a1abaaf94 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 30 May 2018 22:40:22 +0200 Subject: make navbar search use the module search function in /network and /channel --- Zotlabs/Module/Channel.php | 29 ++++++++++++++++------------- Zotlabs/Module/Network.php | 4 ++++ Zotlabs/Widget/Activity_order.php | 7 +++++++ include/nav.php | 14 +++++++++++++- view/tpl/navbar_default.tpl | 2 +- 5 files changed, 41 insertions(+), 15 deletions(-) diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 9108f6841..dac177c9e 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -84,6 +84,7 @@ class Channel extends \Zotlabs\Web\Controller { $hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : ''); $order = ((x($_GET,'order')) ? notags($_GET['order']) : 'post'); $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); + $search = ((x($_GET,'search')) ? $_GET['search'] : EMPTY_STR); $groups = array(); @@ -119,9 +120,12 @@ class Channel extends \Zotlabs\Web\Controller { $static = channel_manual_conv_update(\App::$profile['profile_uid']); - //$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']); - - // $o .= common_friends_visitor_widget(\App::$profile['profile_uid']); + // search terms header + if($search) { + $o .= replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8') + )); + } if($channel && $is_owner) { $channel_acl = array( @@ -180,15 +184,13 @@ class Channel extends \Zotlabs\Web\Controller { $simple_update = (($update) ? " AND item_unseen = 1 " : ''); - - $search = EMPTY_STR; - if(x($_GET,'search')) { - $search = escape_tags($_GET['search']); + if($search) { + $search = escape_tags($search); if(strpos($search,'#') === 0) { - $sql_extra2 .= term_query('item',substr($search,1),TERM_HASHTAG,TERM_COMMUNITYTAG); + $sql_extra .= term_query('item',substr($search,1),TERM_HASHTAG,TERM_COMMUNITYTAG); } else { - $sql_extra2 .= sprintf(" AND item.body like '%s' ", + $sql_extra .= sprintf(" AND item.body like '%s' ", dbesc(protect_sprintf('%' . $search . '%')) ); } @@ -255,7 +257,7 @@ class Channel extends \Zotlabs\Web\Controller { $sql_extra2 .= " and item.item_thread_top != 0 "; } - if($order === 'post') + if($order === 'post') $ordering = "created"; else $ordering = "commented"; @@ -282,7 +284,7 @@ class Channel extends \Zotlabs\Web\Controller { WHERE true and item.uid = %d $item_normal AND (abook.abook_blocked = 0 or abook.abook_flags is null) AND item.item_wall = 1 - $sql_extra $sql_extra2 + $sql_extra $sql_extra2 ORDER BY $ordering DESC, id $pager_sql ", intval(\App::$profile['profile_uid']) ); @@ -398,12 +400,13 @@ class Channel extends \Zotlabs\Web\Controller { } } + $mode = (($search) ? 'search' : 'channel'); if($checkjs->disabled()) { - $o .= conversation($items,'channel',$update,'traditional'); + $o .= conversation($items,$mode,$update,'traditional'); } else { - $o .= conversation($items,'channel',$update,$page_mode); + $o .= conversation($items,$mode,$update,$page_mode); } if((! $update) || ($checkjs->disabled())) { diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 5e7492fd4..acd12158c 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -138,6 +138,7 @@ class Network extends \Zotlabs\Web\Controller { if(x($_GET,'search') || x($_GET,'file')) $nouveau = true; + if($cid) { $r = q("SELECT abook_xchan, xchan_addr, xchan_url FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_id = %d AND abook_channel = %d LIMIT 1", intval($cid), @@ -567,6 +568,9 @@ class Network extends \Zotlabs\Web\Controller { } $mode = (($nouveau) ? 'network-new' : 'network'); + + if($search) + $mode = 'search'; $o .= conversation($items,$mode,$update,$page_mode); diff --git a/Zotlabs/Widget/Activity_order.php b/Zotlabs/Widget/Activity_order.php index ba288965f..edeef2c20 100644 --- a/Zotlabs/Widget/Activity_order.php +++ b/Zotlabs/Widget/Activity_order.php @@ -53,6 +53,12 @@ class Activity_order { } } + // override order for search results and filer results + if(x($_GET,'search') || x($_GET,'file')) { + $unthreaded_active = 'active'; + $commentord_active = $postord_active = ''; + } + $cmd = \App::$cmd; $filter = ''; @@ -69,6 +75,7 @@ class Activity_order { if(x($_GET,'conv')) $filter .= '&conv=' . $_GET['conv']; + // tabs $tabs = []; diff --git a/include/nav.php b/include/nav.php index c5ceb97c5..994819ed4 100644 --- a/include/nav.php +++ b/include/nav.php @@ -168,7 +168,19 @@ function nav($template = 'default') { $nav['help'] = [$help_url, t('Help'), "", t('Help and documentation'), 'help_nav_btn', $context_help, $enable_context_help]; } - $nav['search'] = ['search', t('Search'), "", t('Search site @name, !forum, #tag, ?docs, content')]; + switch(App::$module) { + case 'network': + $search_form_action = 'network'; + break; + case 'channel': + $search_form_action = 'channel'; + break; + default: + $search_form_action = 'search'; + } + + + $nav['search'] = ['search', t('Search'), "", t('Search site @name, !forum, #tag, ?docs, content'), $search_form_action]; /** diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 7bc8df8d5..ebcadf365 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -119,7 +119,7 @@
    {{if $item.conv}} -- cgit v1.2.3 From de20d8f73a705deecf7c81c29e6361c838305fc7 Mon Sep 17 00:00:00 2001 From: gia vec Date: Thu, 7 Jun 2018 22:10:32 +0200 Subject: Update Developers.md (cherry picked from commit 68ffddafb1ce27bf408735f08f2a69ad094655b3) --- doc/Developers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Developers.md b/doc/Developers.md index b1f185c2e..624c058d2 100644 --- a/doc/Developers.md +++ b/doc/Developers.md @@ -13,7 +13,7 @@ You may fork/clone the $Projectname repository from [https://framagit.org/hubzil Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) to create and use your own tracking fork on framagit -Then go to your gramagit page and create a "Pull request" when you are ready +Then go to your framagit page and create a "Pull request" when you are ready to notify us to merge your work. **Translations** -- cgit v1.2.3 From c69c7db4f7daaa91b338340a3bd2e74cf7b17abb Mon Sep 17 00:00:00 2001 From: gia vec Date: Thu, 7 Jun 2018 22:13:18 +0200 Subject: Update developers.bb (cherry picked from commit 009ecb0ff4a7118e9713d79dbb3cc7faa1d22034) --- doc/developers.bb | 142 +++++++++++++++++++++++++++--------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/doc/developers.bb b/doc/developers.bb index c8eec04ca..4bda7fdff 100644 --- a/doc/developers.bb +++ b/doc/developers.bb @@ -1,71 +1,71 @@ -[b]$Projectname Developer Guide[/b] - -We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. All developers are expected to abide by our [zrl=[baseurl]/help/contributor/covenant]code of conduct[/zrl]. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine. - -[b]Here is how you can join us.[/b] - -First, get yourself a working git package on the system where you will be -doing development. - -Create your own github account. - -You may fork/clone the project repository from [url=https://framagit.org/hubzilla.core.git]https://framgit.org/hubzilla/core.git[/url] - -Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url] -to create and use your own tracking fork on framagit - -Then go to your framagit page and create a "Pull request" when you are ready -to notify us to merge your work. - -[b]Translations[/b] - -Our translations are managed through Transifex. If you wish to help out translating $Projectname to another language, sign up on transifex.com, visit [url=https://www.transifex.com/projects/p/hubzilla/]https://www.transifex.com/projects/p/hubzilla/[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'hmessages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. - -[zrl=[baseurl]/help/Translations]Translations - More Info[/zrl] - -[b]Important[/b] - -Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. - -Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. - - -[b]Licensing[/b] - -All code contributed to the project falls under the MIT license, unless otherwise specified. We will accept third-party code which falls under MIT, BSD and LGPL, but copyleft licensing (GPL, and AGPL) is only permitted in addons. It must be possible to completely remove the GPL (copyleft) code from the main project without breaking anything. - -[b]Concensus Building[/b] - -Code changes which fix an obvious bug are pretty straight-forward. For instance if you click "Save" and the thing you're trying to save isn't saved, it's fairly obvious what the intended behaviour should be. Often when developing feature requests, it may affect large numbers of community members and it's possible that other members of the community won't agree with the need for the feature, or with your proposed implementation. They may not see something as a bug or a desirable feature. - -We encourage consensus building within the community when it comes to any feature which might be considered controversial or where there isn't unanimous decision that the proposed feature is the correct way to accomplish the task. The first place to pitch your ideas is to the [url=https://project.hubzilla.org/channel/hubzilla]Hubzilla Development[/url] forum. Others may have some input or be able to point out facets of your concept which might be problematic in our environment. But also, you may encounter opposition to your plan. This doesn't mean you should stop and/or ignore the feature. Listen to the concerns of others and try and work through any implementation issues. - -There are places where opposition cannot be resolved. In these cases, please consider making your feature [b]optional[/b] or non-default behaviour that must be specifically enabled. This technique can often be used when a feature has significant but less than unanimous support. Those who desire the feature can turn it on and those who don't want it - will leave it turned off. - -If a feature uses other networks or websites and or is only seen as desirable by a small minority of the community, consider making the functionality available via an addon or plugin. Once again, those who don't desire the feature won't need to install it. Plugins are relatively easy to create and "hooks" can be easily added or modified if the current hooks do not do what is needed to allow your plugin to work. - - -[b]Coding Style[/b] - -In the interests of consistency we adopt the following code styling. We may accept patches using other styles, but where possible please try to provide a consistent code style. We aren't going to argue or debate the merits of this style, and it is irrelevant what project 'xyz' uses. This is not project 'xyz'. This is a baseline to try and keep the code readable now and in the future. - -[li] All comments should be in English.[/li] - -[li] We use doxygen to generate documentation. This hasn't been consistently applied, but learning it and using it are highly encouraged.[/li] - -[li] Indentation is accomplished primarily with tabs using a tab-width of 4.[/li] - -[li] String concatenation and operators should be separated by whitespace. e.g. "$foo = $bar . 'abc';" instead of "$foo=$bar.'abc';"[/li] - -[li] Generally speaking, we use single quotes for string variables and double quotes for SQL statements. "Here documents" should be avoided. Sometimes using double quoted strings with variable replacement is the most efficient means of creating the string. In most cases, you should be using single quotes.[/li] - -[li] Use whitespace liberally to enhance readability. When creating arrays with many elements, we will often set one key/value pair per line, indented from the parent line appropriately. Lining up the assignment operators takes a bit more work, but also increases readability.[/li] - -[li] Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. [/li] - -[li] Some functions take arguments in argc/argv style like main() in C or function args in bash or Perl. Urls are broken up within a module. e.g, given "http://example.com/module/arg1/arg2", then $this->argc will be 3 (integer) and $this->argv will contain: [0] => 'module', [1] => 'arg1', [2] => 'arg2'. There will always be one argument. If provided a naked domain URL, $this->argv[0] is set to "home".[/li] - -[b]See Also[/b] -[zrl=[baseurl]/help/sql_conventions]SQL Conventions[/zrl] - -#include doc/macros/main_footer.bb; +[b]$Projectname Developer Guide[/b] + +We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. All developers are expected to abide by our [zrl=[baseurl]/help/contributor/covenant]code of conduct[/zrl]. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine. + +[b]Here is how you can join us.[/b] + +First, get yourself a working git package on the system where you will be +doing development. + +Create your own github account. + +You may fork/clone the project repository from [url=https://framagit.org/hubzilla.core.git]https://framagit.org/hubzilla/core.git[/url] + +Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url] +to create and use your own tracking fork on framagit + +Then go to your framagit page and create a "Pull request" when you are ready +to notify us to merge your work. + +[b]Translations[/b] + +Our translations are managed through Transifex. If you wish to help out translating $Projectname to another language, sign up on transifex.com, visit [url=https://www.transifex.com/projects/p/hubzilla/]https://www.transifex.com/projects/p/hubzilla/[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'hmessages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. + +[zrl=[baseurl]/help/Translations]Translations - More Info[/zrl] + +[b]Important[/b] + +Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. + +Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. + + +[b]Licensing[/b] + +All code contributed to the project falls under the MIT license, unless otherwise specified. We will accept third-party code which falls under MIT, BSD and LGPL, but copyleft licensing (GPL, and AGPL) is only permitted in addons. It must be possible to completely remove the GPL (copyleft) code from the main project without breaking anything. + +[b]Concensus Building[/b] + +Code changes which fix an obvious bug are pretty straight-forward. For instance if you click "Save" and the thing you're trying to save isn't saved, it's fairly obvious what the intended behaviour should be. Often when developing feature requests, it may affect large numbers of community members and it's possible that other members of the community won't agree with the need for the feature, or with your proposed implementation. They may not see something as a bug or a desirable feature. + +We encourage consensus building within the community when it comes to any feature which might be considered controversial or where there isn't unanimous decision that the proposed feature is the correct way to accomplish the task. The first place to pitch your ideas is to the [url=https://project.hubzilla.org/channel/hubzilla]Hubzilla Development[/url] forum. Others may have some input or be able to point out facets of your concept which might be problematic in our environment. But also, you may encounter opposition to your plan. This doesn't mean you should stop and/or ignore the feature. Listen to the concerns of others and try and work through any implementation issues. + +There are places where opposition cannot be resolved. In these cases, please consider making your feature [b]optional[/b] or non-default behaviour that must be specifically enabled. This technique can often be used when a feature has significant but less than unanimous support. Those who desire the feature can turn it on and those who don't want it - will leave it turned off. + +If a feature uses other networks or websites and or is only seen as desirable by a small minority of the community, consider making the functionality available via an addon or plugin. Once again, those who don't desire the feature won't need to install it. Plugins are relatively easy to create and "hooks" can be easily added or modified if the current hooks do not do what is needed to allow your plugin to work. + + +[b]Coding Style[/b] + +In the interests of consistency we adopt the following code styling. We may accept patches using other styles, but where possible please try to provide a consistent code style. We aren't going to argue or debate the merits of this style, and it is irrelevant what project 'xyz' uses. This is not project 'xyz'. This is a baseline to try and keep the code readable now and in the future. + +[li] All comments should be in English.[/li] + +[li] We use doxygen to generate documentation. This hasn't been consistently applied, but learning it and using it are highly encouraged.[/li] + +[li] Indentation is accomplished primarily with tabs using a tab-width of 4.[/li] + +[li] String concatenation and operators should be separated by whitespace. e.g. "$foo = $bar . 'abc';" instead of "$foo=$bar.'abc';"[/li] + +[li] Generally speaking, we use single quotes for string variables and double quotes for SQL statements. "Here documents" should be avoided. Sometimes using double quoted strings with variable replacement is the most efficient means of creating the string. In most cases, you should be using single quotes.[/li] + +[li] Use whitespace liberally to enhance readability. When creating arrays with many elements, we will often set one key/value pair per line, indented from the parent line appropriately. Lining up the assignment operators takes a bit more work, but also increases readability.[/li] + +[li] Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. [/li] + +[li] Some functions take arguments in argc/argv style like main() in C or function args in bash or Perl. Urls are broken up within a module. e.g, given "http://example.com/module/arg1/arg2", then $this->argc will be 3 (integer) and $this->argv will contain: [0] => 'module', [1] => 'arg1', [2] => 'arg2'. There will always be one argument. If provided a naked domain URL, $this->argv[0] is set to "home".[/li] + +[b]See Also[/b] +[zrl=[baseurl]/help/sql_conventions]SQL Conventions[/zrl] + +#include doc/macros/main_footer.bb; -- cgit v1.2.3 From b47fdd748f4f7e8112ae5cd9d2d5c84985f43c7f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 8 Jun 2018 08:30:22 +0200 Subject: typo --- doc/developers.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developers.bb b/doc/developers.bb index 4bda7fdff..22dc82d7e 100644 --- a/doc/developers.bb +++ b/doc/developers.bb @@ -9,7 +9,7 @@ doing development. Create your own github account. -You may fork/clone the project repository from [url=https://framagit.org/hubzilla.core.git]https://framagit.org/hubzilla/core.git[/url] +You may fork/clone the project repository from [url=https://framagit.org/hubzilla/core.git]https://framagit.org/hubzilla/core.git[/url] Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url] to create and use your own tracking fork on framagit -- cgit v1.2.3 From 7bf1c5f27b8b8f0eea226e81a5db99585c5a56b3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 8 Jun 2018 09:04:19 +0200 Subject: github to framagit transition --- app/bugreport.apd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/bugreport.apd b/app/bugreport.apd index 99cc48bf9..f1f328013 100644 --- a/app/bugreport.apd +++ b/app/bugreport.apd @@ -1,5 +1,5 @@ -version: 1 -url: https://github.com/redmatrix/hubzilla/issues +version: 2 +url: https://framagit.org/hubzilla/core/issues name: Report Bug photo: icon:bug categories: System -- cgit v1.2.3 From 4feff1cf897918892e6555b431f0d069031a8597 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Fri, 8 Jun 2018 05:37:23 -0400 Subject: Update github.com git repo URLs with framagit.org URLs --- README.md | 2 +- Zotlabs/Storage/Browser.php | 2 +- composer.json | 6 +++--- doc/Hubzilla_on_OpenShift.bb | 4 ++-- doc/README.md | 2 +- doc/about/about.bb | 2 +- doc/addons.bb | 2 +- doc/addons_gnusocial.bb | 2 +- doc/admin/administrator_guide.md | 12 ++++++------ doc/bugs.bb | 2 +- doc/ca/general.bb | 4 ++-- doc/ca/what_is_zot.bb | 2 +- doc/campaign.bb | 2 +- doc/context/en/admin/plugins/help.html | 2 +- doc/context/es-es/admin/plugins/help.html | 2 +- doc/de/general.bb | 4 ++-- doc/dev_beginner.bb | 6 +++--- doc/developer/unorganized.md | 4 ++-- doc/es-es/about/about.bb | 2 +- doc/es-es/git_for_non_developers.bb | 2 +- doc/fr/about/about.bb | 2 +- doc/general.bb | 4 ++-- doc/git_for_non_developers.bb | 2 +- doc/member/bbcode.html | 8 ++++---- doc/red2pi.bb | 4 ++-- util/generate-hooks-index/project.clj | 2 +- 26 files changed, 44 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 240d976f3..69266f6ef 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Hubzilla - Community Server

    -Installing Hubzilla +Installing Hubzilla

    **What is Hubzilla?** diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index f4f906ad1..153016da6 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -12,7 +12,7 @@ use Sabre\DAV; * * @extends \\Sabre\\DAV\\Browser\\Plugin * - * @link http://github.com/redmatrix/hubzilla + * @link http://framagit.org/hubzilla/core/ * @license http://opensource.org/licenses/mit-license.php The MIT License (MIT) */ class Browser extends DAV\Browser\Plugin { diff --git a/composer.json b/composer.json index 79b60771b..792c08810 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "SSO", "ZOT" ], - "homepage" : "http://github.com/redmatrix/hubzilla", + "homepage" : "http://framagit.org/hubzilla/core/", "license" : "MIT", "authors" : [{ "name" : "Mike Macgirvin", @@ -18,8 +18,8 @@ } ], "support" : { - "issues" : "https://github.com/redmatrix/hubzilla/issues", - "source" : "https://github.com/redmatrix/hubzilla" + "issues" : "https://framagit.org/hubzilla/core/issues", + "source" : "https://framagit.org/hubzilla/core/" }, "require" : { "php" : ">=5.5", diff --git a/doc/Hubzilla_on_OpenShift.bb b/doc/Hubzilla_on_OpenShift.bb index bdc8bf9bf..7bdd70955 100644 --- a/doc/Hubzilla_on_OpenShift.bb +++ b/doc/Hubzilla_on_OpenShift.bb @@ -1,11 +1,11 @@ [b]$Projectname on OpenShift[/b] -You will notice a new .openshift folder when you fetch from upstream, i.e. from [url=https://github.com/redmatrix/hubzilla.git]https://github.com/redmatrix/hubzilla.git[/url] , which contains a deploy script to set up Hubzilla on OpenShift with plugins and extra themes. +You will notice a new .openshift folder when you fetch from upstream, i.e. from [url=https://framagit.org/hubzilla/core.git]https://framagit.org/hubzilla/core.git[/url] , which contains a deploy script to set up Hubzilla on OpenShift with plugins and extra themes. As of this writing, 2015-10-28, you do not have to pay for OpenShift on the Free plan, which gives you three gears at no cost. The Bronze plan gives you three gears at no cost too, but you can expand to 16 gears by paying, and this requires you to register your payment card. The three gears can give three instances of Hubzilla with one gear each, or you can combine two gears into one high-availability Hubzilla instance and one extra gear. The main difference to be aware of is this: gears on the Free plan will go into hibernation if left idle for too long, this does not happen on the Bronze plan. Create an account on OpenShift, then use the registration e-mail and password to create your first Hubzilla instance. Install git and RedHat's command line tools - rhc - if you have not already done so. See for example https://developers.openshift.com/en/getting-started-debian-ubuntu.html on how to do this on Debian GNU/Linux, or in the menu on that page for other GNU/Linux distributions or other operating systems. -[code]rhc app-create your_app_name php-5.4 mysql-5.5 cron phpmyadmin --namespace your_domain --from-code https://github.com/redmatrix/hubzilla.git -l your@email.address -p your_account_password +[code]rhc app-create your_app_name php-5.4 mysql-5.5 cron phpmyadmin --namespace your_domain --from-code https://framagit.org/hubzilla/core.git -l your@email.address -p your_account_password [/code] Make a note of the database username and password OpenShift creates for your instance, and use these at [url=https://your_app_name-your_domain.rhcloud.com/]https://your_app_name-your_domain.rhcloud.com/[/url] to complete the setup. You MUST change server address from 127.0.0.1 to localhost. diff --git a/doc/README.md b/doc/README.md index 54f80bebe..8de107877 100644 --- a/doc/README.md +++ b/doc/README.md @@ -4,7 +4,7 @@ Hubzilla - Community Server ===========================

    -Installing Hubzilla +Installing Hubzilla

    diff --git a/doc/about/about.bb b/doc/about/about.bb index b927e80c0..e909f54cd 100644 --- a/doc/about/about.bb +++ b/doc/about/about.bb @@ -13,7 +13,7 @@ From the practical perspective of hub members who use the software, $Projectname While all of these apps and services can be found in other software packages, only $Projectname allows you to set permissions for groups and individuals who may not even have accounts on your hub! In typical web apps, if you want to share things privately on the internet, the people you share with must have accounts on the server hosting your data; otherwise, there is no robust way for your server to [i]authenticate[/i] visitors to the site to know whether to grant them access. $Projectname solves this problem with an advanced system of [i]remote authentication[/i] that validates the identity of visitors by employing techniques that include public key cryptography. [h3]Software Stack[/h3] -The $Projectname software stack is a relatively standard webserver application written primarily in PHP/MySQL and [url=https://github.com/redmatrix/hubzilla/blob/master/install/INSTALL.txt]requiring little more than a web server, a MySQL-compatible database, and the PHP scripting language[/url]. It is designed to be easily installable by those with basic website administration skills on typical shared hosting platforms with a broad range of computing hardware. It is also easily extended via plugins and themes and other third-party tools. +The $Projectname software stack is a relatively standard webserver application written primarily in PHP/MySQL and [url=https://framagit.org/hubzilla/core/blob/master/install/INSTALL.txt]requiring little more than a web server, a MySQL-compatible database, and the PHP scripting language[/url]. It is designed to be easily installable by those with basic website administration skills on typical shared hosting platforms with a broad range of computing hardware. It is also easily extended via plugins and themes and other third-party tools. [h3]Glossary[/h3] [dl terms="b"] diff --git a/doc/addons.bb b/doc/addons.bb index e6841d3d0..a37ecee99 100644 --- a/doc/addons.bb +++ b/doc/addons.bb @@ -106,7 +106,7 @@ For these reasons we [b]strongly recommend[/b] that you do NOT install addons fr We also recognise that some developers prefer working on their own and do not wish their code to be mingled with the project repository for a variety of reasons. These developers can ease troubleshooting and debugging by providing a README file in their respective code repository outlining the process for submitting patches and bug fixes. It is also recommended that these projects provide both a 'dev' (development) and 'master' (production) branch which tracks the current project branches of those names. This is because dev and master are often not compatible from the viewpoint of library interfaces. It is also highly recommended that your repository versions are tagged and moved forward within 24 hours of project releases. This is a major inconvenience for everybdy involved, and can present downtime for production sites while this process is being carried out; which is one more reason why we [b]strongly recommend[/b] that addons be submitted to the project addon repository and that you do NOT install such third-party addons. -[url=https://github.com/redmatrix/hubzilla-addons]https://github.com/redmatrix/hubzilla-addons[/url] Main project addon repository +[url=https://framagit.org/hubzilla/core/-addons]https://framagit.org/hubzilla/core/-addons[/url] Main project addon repository [url=https://github.com/23n/red-addons]https://github.com/23n/red-addons[/url] Oliver's repository (mayan_places and flip) diff --git a/doc/addons_gnusocial.bb b/doc/addons_gnusocial.bb index d9aed9ac5..fbb387476 100644 --- a/doc/addons_gnusocial.bb +++ b/doc/addons_gnusocial.bb @@ -10,7 +10,7 @@ Next, click the link to Register a new application. That brings up the new appli Icon. I uploaded $Projectname icon located at this link, after saving it to my computer: -https://github.com/redmatrix/hubzilla/blob/master/images/rm-32.png +https://framagit.org/hubzilla/core/blob/master/images/rm-32.png Name. Give the application an appropriate name. I called mine hubzilla. You might prefer r2g. diff --git a/doc/admin/administrator_guide.md b/doc/admin/administrator_guide.md index 939dc18a7..e966115d0 100644 --- a/doc/admin/administrator_guide.md +++ b/doc/admin/administrator_guide.md @@ -19,7 +19,7 @@ we welcome patches if you manage to get it working. ### Where to find more help If you encounter problems or have issues not addressed in this documentation, please let us know via the [Github issue -tracker](https://github.com/redmatrix/hubzilla/issues). Please be as clear as you +tracker](https://framagit.org/hubzilla/core/issues). Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future. Due to the large variety of operating systems and PHP platforms @@ -120,7 +120,7 @@ repository rather than to use a packaged tar or zip file. This makes the software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be: - git clone https://github.com/redmatrix/hubzilla.git mywebsite + git clone https://framagit.org/hubzilla/core.git mywebsite and then you can pick up the latest changes at any time with: @@ -153,7 +153,7 @@ web-based administrative tools to function: Navigate to your website. Then you should clone the addon repository (separately). We'll give this repository a nickname of 'hzaddons'. You can pull in other hubzilla addon repositories by giving them different nicknames:: cd mywebsite - util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git hzaddons + util/add_addon_repo https://framagit.org/hubzilla/addons.git hzaddons ##### Updating For keeping the addon tree updated, you should be on your top level website directory and issue an update command for that repository:: @@ -185,7 +185,7 @@ The installation script was originally designed for a small hardware server behi 1. `apt-get install git` 1. `mkdir -p /var/www/html` 1. `cd /var/www/html` -1. `git clone https://github.com/redmatrix/hubzilla.git .` +1. `git clone https://framagit.org/hubzilla/core.git .` 1. `nano .homeinstall/hubzilla-config.txt` 1. `cd .homeinstall/` 1. `./hubzilla-setup.sh` @@ -396,7 +396,7 @@ To immediately clear out all the extra logging stuff you added. Use the informa ##### Rotating log files -1. Enable the **logrot** addon in the official [hubzilla-addons](https://github.com/redmatrix/hubzilla-addons) repo +1. Enable the **logrot** addon in the official [hubzilla-addons](https://framagit.org/hubzilla/core/-addons) repo 1. Create a directory in your web root called `log` with webserver write permissions 1. Go to the **logrot** admin settings and enter this folder name as well as the max size and number of retained log files. @@ -407,6 +407,6 @@ When reporting issues, please try to provide as much detail as may be necessary We encourage you to try to the best of your abilities to use these logs combined with the source code in your possession to troubleshoot issues and find their cause. The community is often able to help, but only you have access to your site logfiles and it is considered a security risk to share them. -If a code issue has been uncovered, please report it on the project bugtracker (https://github.com/redmatrix/hubzilla/issues). Again provide as much detail as possible to avoid us going back and forth asking questions about your configuration or how to duplicate the problem, so that we can get right to the problem and figure out what to do about it. You are also welcome to offer your own solutions and submit patches. In fact we encourage this as we are all volunteers and have little spare time available. The more people that help, the easier the workload for everybody. It's OK if your solution isn't perfect. Every little bit helps and perhaps we can improve on it. +If a code issue has been uncovered, please report it on the project bugtracker (https://framagit.org/hubzilla/core/issues). Again provide as much detail as possible to avoid us going back and forth asking questions about your configuration or how to duplicate the problem, so that we can get right to the problem and figure out what to do about it. You are also welcome to offer your own solutions and submit patches. In fact we encourage this as we are all volunteers and have little spare time available. The more people that help, the easier the workload for everybody. It's OK if your solution isn't perfect. Every little bit helps and perhaps we can improve on it. diff --git a/doc/bugs.bb b/doc/bugs.bb index cc1ea3a20..f6e14b659 100644 --- a/doc/bugs.bb +++ b/doc/bugs.bb @@ -23,7 +23,7 @@ If you get a blank white screen when doing something, this is almost always a co At this point it might be worthwhile discussing the issue on one of the online forums. There may be several of these and some may be more suited to your spoken language. At this time, the 'Hubzilla Support' channel (support@gravizot.de) is the recommended forum for discussing bugs. -If community members with software engineering training/expertise can't help you right away, understand that they are volunteers and may have a lot of other work and demands on their time. At this point you need to file a bug report. You will need an account on github.com to do this. So register, and then visit https://github.com/redmatrix/hubzilla/issues . Create an issue here and provide all the same information that you provided online. Don't leave out anything. +If community members with software engineering training/expertise can't help you right away, understand that they are volunteers and may have a lot of other work and demands on their time. At this point you need to file a bug report. You will need an account on github.com to do this. So register, and then visit https://framagit.org/hubzilla/core/issues . Create an issue here and provide all the same information that you provided online. Don't leave out anything. Then you wait. If it's a high profile issue, it may get fixed quickly. But nobody is in charge of fixing bugs. If it lingers without resolution, please spend some more time investigating the problem. Ask about anything you don't understand related to the behaviour. You will learn more about how the software works and quite possibly figure out why it isn't working now. Ultimately it is somebody in the community who is going to fix this and you are a member of the community; and this is how the open source process works. diff --git a/doc/ca/general.bb b/doc/ca/general.bb index 682b1ff52..3e46b6136 100644 --- a/doc/ca/general.bb +++ b/doc/ca/general.bb @@ -5,9 +5,9 @@ [h3]Recursos Externs[/h3] [zrl=[baseurl]/help/external-resource-links]Enllaços a Recursos Externs[/zrl] -[url=https://github.com/redmatrix/hubzilla]Lloc Web Principal[/url] +[url=https://framagit.org/hubzilla/core/]Lloc Web Principal[/url] -[url=https://github.com/redmatrix/hubzilla-addons]Complements del Lloc Web[/url] +[url=https://framagit.org/hubzilla/core/-addons]Complements del Lloc Web[/url] [url=[baseurl]/help/credits]Credits en $Projectname[/url] diff --git a/doc/ca/what_is_zot.bb b/doc/ca/what_is_zot.bb index df1f15921..83d9614a3 100644 --- a/doc/ca/what_is_zot.bb +++ b/doc/ca/what_is_zot.bb @@ -55,7 +55,7 @@ Per més detalla, informació tècnica sobre Zot, clica sobre algún dels següe - [url=https://github.com/friendica/red/wiki/zot]Especificació pel desenvolupament de Zot (en anglès)[/url] - - [url=https://github.com/redmatrix/hubzilla/blob/master/include/zot.php]Referència per la implementació de Zot en PHP (en anglès)[/url] + - [url=https://framagit.org/hubzilla/core/blob/master/include/zot.php]Referència per la implementació de Zot en PHP (en anglès)[/url] #include doc/macros/main_footer.bb; diff --git a/doc/campaign.bb b/doc/campaign.bb index 750412ba3..677abf8c0 100644 --- a/doc/campaign.bb +++ b/doc/campaign.bb @@ -153,7 +153,7 @@ Each contributor at this level gets their own $Projectname virtual private serve We're a handful of volunteers, and we understand that not everyone can contribute by donating money. There are many other ways you can in getting the Matrix to version 1.0! -First, you can checkout our source code on github: https://github.com/redmatrix/hubzilla +First, you can checkout our source code on github: https://framagit.org/hubzilla/core/ Maybe you can dive in and help us out with some development. diff --git a/doc/context/en/admin/plugins/help.html b/doc/context/en/admin/plugins/help.html index d57f4967f..320d93040 100644 --- a/doc/context/en/admin/plugins/help.html +++ b/doc/context/en/admin/plugins/help.html @@ -6,7 +6,7 @@ which opens a control panel for managing what plugin repositories are installed. These repos are stored in extend/addon/[repo name]/. The official Hubzilla plugin repo can be added by entering the repo URL - https://github.com/redmatrix/hubzilla-addons.git + https://framagit.org/hubzilla/addons.git and choosing a name for the repo such as official. You should see this repo in the list similar to the following:
    diff --git a/doc/context/es-es/admin/plugins/help.html b/doc/context/es-es/admin/plugins/help.html index 0096937fe..520425b17 100644 --- a/doc/context/es-es/admin/plugins/help.html +++ b/doc/context/es-es/admin/plugins/help.html @@ -6,7 +6,7 @@ que abre un panel de control para administrar qué repositorios de plugins están instalados. Estos repositorios están almacenados en extend/addon/[nombre del repositorio]/. El repositorio de plugins oficial de Hubzilla se puede añadir escribiendo la URL del repositorio - https://github.com/redmatrix/hubzilla-addons.git + https://framagit.org/hubzilla/addons.git y eligiendo un nombre para el repositorio como oficial. Debería ver este repositorio en una lista parecida a esta:
    diff --git a/doc/de/general.bb b/doc/de/general.bb index b9b75f161..3168c4d9b 100644 --- a/doc/de/general.bb +++ b/doc/de/general.bb @@ -5,8 +5,8 @@ [h3]Externe Ressourcen[/h3] [zrl=[baseurl]/help/external-resource-links]Links zu externen Ressourcen[/zrl] -[url=https://github.com/redmatrix/hubzilla]Haupt-Website[/url] -[url=https://github.com/redmatrix/hubzilla-addons]Addons-Website[/url] +[url=https://framagit.org/hubzilla/core/]Haupt-Website[/url] +[url=https://framagit.org/hubzilla/core/-addons]Addons-Website[/url] [url=[baseurl]/help/credits]$Projectname Credits[/url] diff --git a/doc/dev_beginner.bb b/doc/dev_beginner.bb index 4cf1ca591..d07b20574 100644 --- a/doc/dev_beginner.bb +++ b/doc/dev_beginner.bb @@ -174,8 +174,8 @@ It is a good idea to read the whole manual! Git is different to other version co Now you should [list] [*] create an account at github.com -[*] fork https://github.com/redmatrix/hubzilla -[*] fork https://github.com/redmatrix/hubzilla-addons +[*] fork https://framagit.org/hubzilla/core/ +[*] fork https://framagit.org/hubzilla/core/-addons [/list] If you not want to use GIT from the command line - there is a usefull Eclipse plugin named ""Eclipse Mylyn to GitHub connector". @@ -362,7 +362,7 @@ surfer@debian:/var/www$ git checkout -b dev_beginning Make sure your local repository is up-to-date with the main project. Add the original repository as a remote named “upstream” if not done yet [code] -surfer@debian:/var/www$ git remote add upstream https://github.com/redmatrix/hubzilla +surfer@debian:/var/www$ git remote add upstream https://framagit.org/hubzilla/core/ [/code] Fetch the newest work from that remote diff --git a/doc/developer/unorganized.md b/doc/developer/unorganized.md index 74d914aaf..5ba719226 100644 --- a/doc/developer/unorganized.md +++ b/doc/developer/unorganized.md @@ -7,7 +7,7 @@ doing development. Create your own github account. -You may fork/clone the Red repository from [https://github.com/redmatrix/hubzilla.git](https://github.com/redmatrix/hubzilla.git). +You may fork/clone the Red repository from [https://framagit.org/hubzilla/core.git](https://framagit.org/hubzilla/core.git). Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) to create and use your own tracking fork on github @@ -44,7 +44,7 @@ doing development. Create your own github account. -You may fork/clone the Red repository from [url=https://github.com/redmatrix/hubzilla.git]https://github.com/redmatrix/hubzilla.git[/url] +You may fork/clone the Red repository from [url=https://framagit.org/hubzilla/core.git]https://framagit.org/hubzilla/core.git[/url] Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url] to create and use your own tracking fork on github diff --git a/doc/es-es/about/about.bb b/doc/es-es/about/about.bb index 731bdef85..8f5e46f3c 100644 --- a/doc/es-es/about/about.bb +++ b/doc/es-es/about/about.bb @@ -15,7 +15,7 @@ Aunque todas estas aplicaciones y servicios se pueden encontrar en otros paquete [h3]El software[/h3] -$Projectname es, básicamente, una aplicación de servidor web relativamente estándar escrita principalmente en PHP/MySQL [url=https://github.com/redmatrix/hubzilla/blob/master/install/INSTALL.txt][/url], que requiere poco más que un servidor web, una base de datos compatible con MySQL y el lenguaje de scripting PHP. Está diseñado para ser fácilmente instalable por aquellos con habilidades básicas de administración de sitios web en plataformas típicas de alojamiento compartido con una amplia gama de hardware informático. También se puede extender fácilmente a través de plugins y temas y otras herramientas de terceros. +$Projectname es, básicamente, una aplicación de servidor web relativamente estándar escrita principalmente en PHP/MySQL [url=https://framagit.org/hubzilla/core/blob/master/install/INSTALL.txt][/url], que requiere poco más que un servidor web, una base de datos compatible con MySQL y el lenguaje de scripting PHP. Está diseñado para ser fácilmente instalable por aquellos con habilidades básicas de administración de sitios web en plataformas típicas de alojamiento compartido con una amplia gama de hardware informático. También se puede extender fácilmente a través de plugins y temas y otras herramientas de terceros. [h3]Glosario[/h3] diff --git a/doc/es-es/git_for_non_developers.bb b/doc/es-es/git_for_non_developers.bb index 7a3ab980b..2599c2f7c 100644 --- a/doc/es-es/git_for_non_developers.bb +++ b/doc/es-es/git_for_non_developers.bb @@ -22,7 +22,7 @@ Una vez que lo haya hecho, cd en el directorio, y añadir un upstream. [code] cd red -git remote add upstream https://github.com/redmatrix/hubzilla +git remote add upstream https://framagit.org/hubzilla/core/ [/code] A partir de ahora, puede realizar cambios en el upstream con el comando diff --git a/doc/fr/about/about.bb b/doc/fr/about/about.bb index de736bff2..0c0463d7c 100644 --- a/doc/fr/about/about.bb +++ b/doc/fr/about/about.bb @@ -14,7 +14,7 @@ Du point de vue pratique des membres du hub qui utilisent le logiciel, $Projectn Alors que toutes ces applications et services peuvent être trouvés dans d'autres progiciels, seul $Projectname vous permet de définir des permissions pour des groupes et des individus qui n'ont peut-être même pas de comptes sur votre hub ! Dans les applications web typiques, si vous voulez partager des choses en privé sur Internet, les personnes avec qui vous partagez doivent avoir des comptes sur le serveur hébergeant vos données ; autrement, il n'y a pas de moyen robuste pour votre serveur [i]d'authentifier[/i] les visiteurs du site pour savoir s'ils doivent leur accorder l'accès. $Projectname résout ce problème avec un système avancé [i]d'authentification à distance[/i] qui valide l'identité des visiteurs en employant des techniques qui incluent la cryptographie à clé publique. [h3]Pile logicielle[/h3]. -La pile logicielle $Projectname est une application serveur web relativement standard écrite principalement en PHP/MySQL et [url=https://github.com/redmatrix/hubzilla/blob/master/install/INSTALL.txt] nécessitant un peu plus qu'un serveur web, une base de données compatible MySQL, et le langage de script PHP[/url]. Il est conçu pour être facilement installable par ceux qui ont des compétences de base en administration de sites Web sur des plates-formes d'hébergement mutualisé typiques avec une large gamme de matériel informatique. Il est aussi facilement extensible via des plugins et des thèmes et d'autres outils tiers. +La pile logicielle $Projectname est une application serveur web relativement standard écrite principalement en PHP/MySQL et [url=https://framagit.org/hubzilla/core/blob/master/install/INSTALL.txt] nécessitant un peu plus qu'un serveur web, une base de données compatible MySQL, et le langage de script PHP[/url]. Il est conçu pour être facilement installable par ceux qui ont des compétences de base en administration de sites Web sur des plates-formes d'hébergement mutualisé typiques avec une large gamme de matériel informatique. Il est aussi facilement extensible via des plugins et des thèmes et d'autres outils tiers. [h3]Glossaire[/h3]. [dl terms="b"] diff --git a/doc/general.bb b/doc/general.bb index 8390aceb3..ecdaf1dfd 100644 --- a/doc/general.bb +++ b/doc/general.bb @@ -6,8 +6,8 @@ [h3]External resources[/h3] [zrl=[baseurl]/help/external-resource-links]List of external resources[/zrl] -[url=https://github.com/redmatrix/hubzilla]Main Website[/url] -[url=https://github.com/redmatrix/hubzilla-addons]Addon Website[/url] +[url=https://framagit.org/hubzilla/core/]Main Website[/url] +[url=https://framagit.org/hubzilla/core/-addons]Addon Website[/url] [url=[baseurl]/help/credits]$Projectname Credits[/url] [h3]About this $Projectname hub[/h3] [zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl] diff --git a/doc/git_for_non_developers.bb b/doc/git_for_non_developers.bb index 80c11024b..54d34fdf5 100644 --- a/doc/git_for_non_developers.bb +++ b/doc/git_for_non_developers.bb @@ -14,7 +14,7 @@ Once you've done that, cd into the directory, and add an upstream. [code] cd red -git remote add upstream https://github.com/redmatrix/hubzilla +git remote add upstream https://framagit.org/hubzilla/core/ [/code] From now on, you can pull upstream changes with the command diff --git a/doc/member/bbcode.html b/doc/member/bbcode.html index 9b7080a32..a61289364 100644 --- a/doc/member/bbcode.html +++ b/doc/member/bbcode.html @@ -315,17 +315,17 @@ Create a table of content in a webpage or wiki page. Please refer to the [baseurl]/rpost?f=&title=title&body=Text+to+post - This requires the qrator plugin.
    [qr]text to post[/qr] + This requires the qrator plugin.
    [qr]text to post[/qr] - This requires a suitable map plugin such as openstreetmap. + This requires a suitable map plugin such as openstreetmap. [map]Generate an inline map using the current browser coordinates of the poster, if browser location is enabled - This requires a suitable map plugin such as openstreetmap. + This requires a suitable map plugin such as openstreetmap. [map=latitude,longitude]Generate a map using global coordinates. - This requires a suitable map plugin such as openstreetmap. + This requires a suitable map plugin such as openstreetmap. [map]Place Name[/map] Generate a map for a given named location. The first matching location is returned. For instance "Sydney" will usually return Sydney, Australia and not Sydney, Nova Scotia, Canada unless the more precise location is specified. It is highly recommended to use the post preview utility to ensure you have the correct location before submitting the post. diff --git a/doc/red2pi.bb b/doc/red2pi.bb index 28db7dc70..8a056b81b 100644 --- a/doc/red2pi.bb +++ b/doc/red2pi.bb @@ -239,10 +239,10 @@ Cleanup: Remove the directory www/ (Git will not create files and folders in dir Remove directory[code]pi@pi /var $ sudo rm -rf www/[/code] Download the sources of $Projectname from GIT -[code]pi@pi /var $ sudo git clone https://github.com/redmatrix/hubzilla.git www[/code] +[code]pi@pi /var $ sudo git clone https://framagit.org/hubzilla/core.git www[/code] Download the sources of the addons from GIT -[code]pi@pi /var/www $ sudo git clone https://github.com/redmatrix/hubzilla-addons.git addon[/code] +[code]pi@pi /var/www $ sudo git clone https://framagit.org/hubzilla/addons.git addon[/code] Make user www-data the owner of the whole web directory (including subdirectories and files) (TODO: This step has to be proofed by the next installation.) diff --git a/util/generate-hooks-index/project.clj b/util/generate-hooks-index/project.clj index 730fe76d8..dc0b92f51 100644 --- a/util/generate-hooks-index/project.clj +++ b/util/generate-hooks-index/project.clj @@ -1,6 +1,6 @@ (defproject generate-hooks-index "0.1.0-SNAPSHOT" :description "Generates Hooks docs for Hubzilla" - :url "https://github.com/redmatrix/hubzilla" + :url "https://framagit.org/hubzilla/core/" :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} :dependencies [[org.clojure/clojure "1.7.0"] -- cgit v1.2.3 From 7c98aea52497ebbdd1880d98b0dbc26c32eaca39 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 8 Jun 2018 12:16:47 +0200 Subject: update changelog --- CHANGELOG | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 62645b2b1..b2b1fc81f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,27 @@ +Hubzilla 3.4.1 (2018-06-08) + - Say bye, bye to GitHub and move sourcecode repositories to #^https://framagit.org/hubzilla + - When removing a connection, don't remove items that are starred, filed or replied to + - Do not show archived forums in forum widget + - Fix potential XSS vulnerabilities + - Translation updates + - Fix postresql issue with oauth2 + - Improve abconfig queries + - Fix postgresql issue if register mode was set to yes - with approval + + Addons + - Diaspora: fix likes of non-contacts not allowed to like allthough diaspora_public_comments is set + - Pubcrawl: fix wrong hubloc url + - Pubcrawl: fix issues with attachments + - Pubcrawl: fetch required item metadata in asfetch_item() + - Cavatar: use cavatar for all default profile photos if enabled + - Pubcrawl: fix peertube video display + - Pubcrawl: fix incoming activitypub comments not getting propagated downstream + - Statistics: fix .well-known/nodeinfo + - Pubsubhubbub: fix postgresql related issues + - Pubcrawl: send the original LD-signature signed activity when distributing comments downstream if we have it + - Cavatar: improve the image creation process + + Hubzilla 3.4 (2018-05-04) - Provide warnings about profile photo and cover photo permissions - Don't duplicate addressbook entries on repeated channel imports -- cgit v1.2.3 From 950006a4dea6223d4c4059c13bffa0131785d97d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= Date: Fri, 8 Jun 2018 12:49:21 +0200 Subject: Update doc/es-es --- doc/es-es/about/about.bb | 63 ++++++++++++++++++++++++++++------------------ doc/es-es/about/project.bb | 25 +++++++++--------- doc/es-es/main.bb | 1 - 3 files changed, 52 insertions(+), 37 deletions(-) diff --git a/doc/es-es/about/about.bb b/doc/es-es/about/about.bb index 731bdef85..74cef9bfc 100644 --- a/doc/es-es/about/about.bb +++ b/doc/es-es/about/about.bb @@ -12,7 +12,6 @@ Desde la perspectiva práctica de los miembros del hub que utilizan el software, [li]y más...[/li][/ul] Aunque todas estas aplicaciones y servicios se pueden encontrar en otros paquetes de software, sólo $Projectname le permite establecer permisos para grupos e individuos que pueden no tener cuentas en tu hub. En las aplicaciones web típicas, si desea compartir cosas en privado en Internet, las personas con las que comparte deben tener cuentas en el servidor que aloja sus datos; de lo contrario, no hay una forma sólida para que su servidor[i]autentifique[/i] a los visitantes del sitio para saber si les concede acceso. $Projectname resuelve este problema con un sistema avanzado de[i]autenticación remota[/i] que valida la identidad de los visitantes empleando técnicas que incluyen criptografía de clave pública. - [h3]El software[/h3] $Projectname es, básicamente, una aplicación de servidor web relativamente estándar escrita principalmente en PHP/MySQL [url=https://github.com/redmatrix/hubzilla/blob/master/install/INSTALL.txt][/url], que requiere poco más que un servidor web, una base de datos compatible con MySQL y el lenguaje de scripting PHP. Está diseñado para ser fácilmente instalable por aquellos con habilidades básicas de administración de sitios web en plataformas típicas de alojamiento compartido con una amplia gama de hardware informático. También se puede extender fácilmente a través de plugins y temas y otras herramientas de terceros. @@ -20,23 +19,25 @@ $Projectname es, básicamente, una aplicación de servidor web relativamente est [h3]Glosario[/h3] [dl terms="b"] -Una instancia de este software ejecutándose en un servidor web estándar +[*= Hub] Una instancia de este software ejecutándose en un servidor web estándar -[grid] Red global de hubs que intercambian información entre sí utilizando el protocolo Zot. +[*= Grid] Red global de hubs que intercambian información entre sí utilizando el protocolo Zot. -La identidad fundamental en la cuadrícula. Un canal puede representar a una persona, un blog o un foro, por nombrar algunos. Los canales pueden hacer conexiones con otros canales para compartir información con permisos muy detallados. +[*= Canal] La identidad fundamental en la cuadrícula. Un canal puede representar a una persona, un blog o un foro, por nombrar algunos. Los canales pueden hacer conexiones con otros canales para compartir información con permisos muy detallados. -Los canales pueden tener clones asociados con cuentas separadas y otras cuentas no relacionadas en hubs independientes. Las comunicaciones compartidas con un canal se sincronizan entre los clones del canal, permitiendo que un canal envíe y reciba mensajes y acceda a contenido compartido desde múltiples hubs. Esto proporciona resistencia contra fallas en la red y en el hardware, lo que puede ser un problema significativo para los servidores web autohospedados o de recursos limitados. La clonación le permite mover completamente un canal de un hub a otro, llevando sus datos y conexiones con usted. Ver identidad nómada. +[*= Clones] Los canales pueden tener clones asociados con cuentas separadas y otras cuentas no relacionadas en hubs independientes. Las comunicaciones compartidas con un canal se sincronizan entre los clones del canal, permitiendo que un canal envíe y reciba mensajes y acceda a contenido compartido desde múltiples hubs. Esto proporciona resistencia contra fallas en la red y en el hardware, lo que puede ser un problema significativo para los servidores web autohospedados o de recursos limitados. La clonación le permite mover completamente un canal de un hub a otro, llevando sus datos y conexiones con usted. Ver identidad nómada. -Identidad nómada] La capacidad de autenticar y migrar fácilmente una identidad a través de concentradores y dominios web independientes. La identidad nómada proporciona una verdadera propiedad de una identidad en línea, porque las identidades de los canales controlados por una cuenta en un hub no están vinculadas al propio hub. Un hub es más como un "host" para canales. Con Hubzilla, no tienes una "cuenta" en un servidor como lo haces en sitios web típicos; tienes una identidad que puedes llevarte a través de la rejilla usando clones. +[*= Identidad nómada] La capacidad de autenticar y migrar fácilmente una identidad a través de hubs y dominios web independientes. La identidad nómada proporciona una verdadera propiedad de una identidad en línea, porque las identidades de los canales controlados por una cuenta en un hub no están vinculadas al propio hub. Un hub es más como un "host" para canales. Con Hubzilla, no tienes una "cuenta" en un servidor como lo haces en sitios web típicos; tienes una identidad que puedes llevarte a través de la rejilla usando clones. -Traducción y sincronización: El novedoso protocolo basado en JSON para la implementación de comunicaciones y servicios descentralizados seguros. Se diferencia de muchos otros protocolos de comunicación en que construye las comunicaciones sobre un marco de identidad y autenticación descentralizado. El componente de autenticación es similar a OpenID conceptualmente pero está aislado de las identidades basadas en DNS. Cuando es posible, la autenticación remota es silenciosa e invisible. Esto proporciona un mecanismo para el control de acceso distribuido a escala de Internet que es discreto. +[*= Zot] El novedoso protocolo basado en JSON para la implementación de comunicaciones y servicios descentralizados seguros. Se diferencia de muchos otros protocolos de comunicación en que construye las comunicaciones sobre un marco de identidad y autenticación descentralizado. El componente de autenticación es similar a OpenID conceptualmente pero está aislado de las identidades basadas en DNS. Cuando es posible, la autenticación remota es silenciosa e invisible. Esto proporciona un mecanismo para el control de acceso distribuido a escala de Internet que es discreto. [/dl] + [h3]Características[/h3] Esta página enumera algunas de las características principales de $Projectname que se incluyen en la versión oficial. $Projectname es una plataforma altamente extensible, por lo que se pueden añadir más características y capacidades a través de temas y plugins adicionales. + [h4]Control deslizante de afinidad[/h4] Cuando se añaden conexiones en $Projectname, los miembros tienen la opción de asignar niveles de "afinidad" (cuán cerca está su amigo). @@ -46,6 +47,7 @@ En este punto, la herramienta $Projectname [i]Control deslizante de afinidad[/i] El control deslizante de afinidad permite el filtrado instantáneo de grandes cantidades de contenido, agrupado por niveles de cercanía. + [h4]Filtrado de conexiones[/h4] Usted tiene la capacidad de controlar con precisión lo que aparece en su flujo usando el "Filtro de conexión" opcional. Cuando está habilitado, el Editor de conexión proporciona entradas para seleccionar los criterios que deben coincidir para incluir o excluir un mensaje específico de un canal específico. Una vez que un mensaje ha sido permitido, todos los comentarios a ese mensaje son permitidos sin importar si coinciden o no con los criterios de selección. Puede seleccionar las palabras que, si están presentes, bloquean el mensaje o se aseguran de que esté incluido en su stream. Se pueden utilizar expresiones regulares para un control aún más preciso, así como hashtags o incluso el idioma detectado del mensaje. @@ -81,19 +83,23 @@ Puede crear cualquier número de salas de chat personales y permitir el acceso a [h4]Construcción de Páginas Web[/h4] -El nombre del proyecto tiene muchas herramientas de creación de "Gestión de contenidos" para construir páginas web, incluyendo edición de diseño, menús, bloques, widgets y regiones de página/contenido. Todo esto puede ser controladospara que las páginas resultantes sean privadas para la audiencia a la que están destinadas. +$Projectname tiene muchas herramientas de creación de "Gestión de contenidos" para construir páginas web, incluyendo edición de diseño, menús, bloques, widgets y regiones de página/contenido. Todo esto puede ser controladospara que las páginas resultantes sean privadas para la audiencia a la que están destinadas. + [h4]Aplicaciones[/h4] Las aplicaciones pueden ser construidas y distribuidas por los miembros. Éstas se diferencian de las aplicaciones tradicionales de "bloqueo de proveedores" porque están completamente controladas por el autor, que puede proporcionar control de acceso en las páginas de aplicaciones de destino y cobrar en consecuencia por este acceso. La mayoría de las aplicaciones en $Projectname son gratuitas y pueden ser creadas fácilmente por aquellos sin conocimientos de programación. -[h4]Diseño[/h4 -El diseño de la página se basa en un lenguaje de descripción llamado comanche. El propio nombre del proyecto está escrito en diseños comanches que se pueden cambiar. Esto permite un nivel de personalización que no se encuentra normalmente en los llamados "entornos multiusuario". +[h4]Diseño[/h4] + +El diseño de la página se basa en un lenguaje de descripción llamado comanche. La propia $Projectname está escrito en diseños comanches que se pueden cambiar. Esto permite un nivel de personalización que no se encuentra normalmente en los llamados "entornos multiusuario". + [h4]Marcadores[/h4] -Comparta y guarde/maneje los marcadores de los enlaces proporcionados en las conversaciones. +Comparta y guarde/maneje los marcadores de los enlaces proporcionados en las conversaciones. + [h4]Cifrado privado de mensajes y cuestiones de privacidad[/h4] @@ -101,7 +107,7 @@ El correo privado se almacena en un formato "oscuro". Aunque este no es a prueba Cada canal $Projectname tiene su propio conjunto único de claves RSA 4096-bit privadas y públicas asociadas, generadas cuando se crean los canales por primera vez. Se utiliza para proteger mensajes privados y mensajes en tránsito. -Además, los mensajes pueden crearse utilizando "encriptación de extremo a extremo" que no puede ser leída por los operadores de nombres de proyecto o ISPs o cualquier persona que no conozca el código de acceso. +Además, los mensajes pueden crearse utilizando "encriptación de extremo a extremo" que no puede ser leída por los operadores de $Projectname o ISPs o cualquier persona que no conozca el código de acceso. Por lo general, los mensajes públicos no se cifran durante el transporte ni durante el almacenamiento. @@ -130,7 +136,8 @@ Proporcionamos un acceso fácil a un directorio de miembros y proporcionamos her [h4]TLS/SSL[/h4] -En el caso de los concentradores de nombres de proyecto que utilizan TLS/SSL, las comunicaciones de cliente a servidor se cifran mediante TLS/SSL. Dadas las recientes revelaciones en los medios de comunicación con respecto a la vigilancia global generalizada y la elusión del cifrado por parte de NSA y GCHQ, es razonable asumir que las comunicaciones protegidas por HTTPS pueden verse comprometidas de varias maneras. Por consiguiente, las comunicaciones privadas se cifran a un nivel superior antes de enviarlas fuera del sitio. +En el caso de los hubs de $Projectname que utilizan TLS/SSL, las comunicaciones de cliente a servidor se cifran mediante TLS/SSL. Dadas las recientes revelaciones en los medios de comunicación con respecto a la vigilancia global generalizada y la elusión del cifrado por parte de NSA y GCHQ, es razonable asumir que las comunicaciones protegidas por HTTPS pueden verse comprometidas de varias maneras. Por consiguiente, las comunicaciones privadas se cifran a un nivel superior antes de enviarlas fuera del sitio. + [h4]Ajustes de canal[/h4] @@ -140,13 +147,13 @@ Si elige una función de privacidad "personalizada", cada canal permite establec Las opciones son: - Nadie excepto usted mismo. - Sólo aquellos que usted permita específicamente. - Cualquiera en sus conexiones aprobadas. - Cualquiera en este sitio web. - Cualquiera en esta red. - Cualquiera autentificado. - Cualquiera en Internet. + - Nadie excepto usted mismo. + - Sólo aquellos que usted permita específicamente. + - Cualquiera en sus conexiones aprobadas. + - Cualquiera en este sitio web. + - Cualquiera en esta red. + - Cualquiera autentificado. + - Cualquiera en Internet. [h4]Foros Públicos y Privados[/h4] @@ -173,37 +180,45 @@ $Projectname ofrece nuevas e interesantes posibilidades de privacidad. Puede lee Se aplican algunas advertencias. Para una explicación completa de la clonación de identidad, lea el documento . + [h4]Perfiles Múltiples[/h4] Se puede crear cualquier número de perfiles que contengan información diferente y éstos pueden hacerse visibles para algunas de sus conexiones/amigos. Un perfil "predeterminado" puede ser visto por cualquiera y puede contener información limitada, con más información disponible para seleccionar grupos o personas. Esto significa que el perfil (y el contenido del sitio) que ven sus compañeros de trabajo puede ser diferente de lo que ven sus compañeros de trabajo, y también completamente diferente de lo que es visible para el público en general. + [h4]Copia de seguridad de la cuenta[/h4] $Projectname ofrece una sencilla copia de seguridad de la cuenta con un solo clic, en la que puede descargar una copia de seguridad completa de su(s) perfil(es). Las copias de seguridad se pueden utilizar para clonar o restaurar un perfil. + [h4]Borrado de cuenta[/h4] Las cuentas se pueden eliminar inmediatamente haciendo clic en un enlace. Eso es todo. Todo el contenido asociado se elimina de la rejilla (esto incluye los mensajes y cualquier otro contenido producido por el perfil eliminado). Dependiendo del número de conexiones que tenga, el proceso de eliminación de contenido remoto podría llevar algún tiempo, pero está previsto que ocurra tan rápido como sea posible. [h4]Supresión de contenido[/h4] -Cualquier contenido creado en $Projectname permanece bajo el control del miembro (o canal) que lo creó originalmente. En cualquier momento, un miembro puede borrar un mensaje o un rango de mensajes. El proceso de eliminación garantiza que el contenido se elimine, independientemente de si se publicó en el concentrador principal (doméstico) de un canal o en otro concentrador, donde el canal se autenticó de forma remota a través de Zot (protocolo de autenticación y comunicación de $Projectname). +Cualquier contenido creado en $Projectname permanece bajo el control del miembro (o canal) que lo creó originalmente. En cualquier momento, un miembro puede borrar un mensaje o un rango de mensajes. El proceso de eliminación garantiza que el contenido se elimine, independientemente de si se publicó en el hub principal de un canal o en otro hub, donde el canal se autenticó de forma remota a través de Zot (protocolo de autenticación y comunicación de $Projectname). + [h4]Medios[/h4] Al igual que cualquier otro sistema moderno de blogging, red social, o un servicio de micro-blogging, $Projectname soporta la carga de archivos, incrustación de video y vinculación de páginas web. + [h4]Previsualización/Edición[/h4] + Los mensajes y comentarios se pueden previsualizar antes de enviarlos y editarlos después de enviarlos. + [h4]Votación/Consenso[/h4] Los mensajes pueden convertirse en elementos de "consenso" que permiten a los lectores ofrecer retroalimentación, que se recopila en contadores de "acuerdo", "desacuerdo" y "abstención". Esto le permite medir el interés por las ideas y crear encuestas informales. -[h4]Extendiendo $Nombre del proyecto[/h4] +[h4]Extendiendo $Projectname[/h4] -El nombre del proyecto se puede ampliar de varias maneras, a través de la personalización del sitio, personalización, configuración de opciones, temas y complementos/plugins. -[h4]API[/h4] +$Projectname se puede ampliar de varias maneras, a través de la personalización del sitio, personalización, configuración de opciones, temas y complementos/plugins. +[h4]API[/h4] + Una API está disponible para su uso por parte de servicios de terceros. Un plugin también proporciona una implementación básica de Twitter (para los que existen cientos de herramientas de terceros). El acceso puede ser proporcionado por login/contraseña o OAuth, y el registro del cliente de las aplicaciones de OAuth es proporcionado. \ No newline at end of file diff --git a/doc/es-es/about/project.bb b/doc/es-es/about/project.bb index 6871869d5..5f493af1d 100644 --- a/doc/es-es/about/project.bb +++ b/doc/es-es/about/project.bb @@ -1,4 +1,4 @@ -[h3]$Nombre del proyecto Gobernanza[/h3] +[h3]Gobernanza de $Projectname[/h3] La gobernanza se relaciona con la gestión de un proyecto y, en particular, con su relación con la resolución de conflictos. @@ -7,7 +7,7 @@ La gobernanza se relaciona con la gestión de un proyecto y, en particular, con El proyecto es mantenido y las decisiones tomadas por la "comunidad". La estructura de gobernanza sigue evolucionando. Hasta que se finalice la estructura, las decisiones se toman en el siguiente orden: [ol] -Consenso perezoso +[*] Consenso perezoso Si se presenta una propuesta de proyecto a uno de los foros de gobierno de la comunidad y no hay objeciones serias en un plazo "razonable" desde la fecha de la propuesta (por lo general, disponemos de 2 a 3 días para que todas las partes interesadas puedan opinar), no es necesario votar y la propuesta se considerará aprobada. En este momento se pueden plantear algunas preocupaciones, pero si éstas se abordan durante la discusión y se proporcionan soluciones provisionales, se considerarán aprobadas. @@ -17,12 +17,12 @@ Si se presenta una propuesta de proyecto a uno de los foros de gobierno de la co Los desarrolladores senior con un historial significativo de proyectos se comprometen a vetar cualquier decisión. La decisión no podrá adoptarse hasta que se retire el veto o se presente una propuesta alternativa. -Voto Comunitario +[*] Voto Comunitario Una decisión que no tiene un mandato claro o un consenso claro, pero que no es vetada, puede ser llevada a votación comunitaria. En la actualidad se trata de un simple voto popular en uno de los foros comunitarios aplicables. En este momento, el voto popular decide el resultado. Esto puede cambiar en el futuro si la comunidad adopta un modelo de gobierno de "consejo". Este documento se actualizará en ese momento con las reglas de gobierno actualizadas. [/ol] -El Voto Comunitario no siempre proporciona un resultado agradable y puede generar facciones polarizadas en la comunidad (de ahí la razón por la que se están considerando otros modelos). Si la propuesta es "rechazada" todavía hay varias cosas que se pueden hacer y la propuesta se vuelve a presentar con parámetros ligeramente diferentes (convertir a un complemento, convertir a una característica opcional que está desactivada por defecto, etc.). Si el interés en la película es alto y la votación es "cercana", puede generar muchos malos sentimientos entre los votantes perdedores. En estas votaciones tan reñidas, se[b]recomienda encarecidamente[/b] que el proponente tome medidas para abordar cualquier inquietud que se haya planteado y vuelva a presentar. +El Voto Comunitario no siempre proporciona un resultado agradable y puede generar facciones polarizadas en la comunidad (de ahí la razón por la que se están considerando otros modelos). Si la propuesta es "rechazada" todavía hay varias cosas que se pueden hacer y la propuesta se vuelve a presentar con parámetros ligeramente diferentes (convertir a un complemento, convertir a una característica opcional que está desactivada por defecto, etc.). Si el interés en la película es alto y la votación es "cercana", puede generar muchos malos sentimientos entre los votantes perdedores. En estas votaciones tan reñidas, se [b]recomienda encarecidamente[/b] que el proponente tome medidas para abordar cualquier inquietud que se haya planteado y vuelva a presentar. @@ -30,24 +30,24 @@ El Voto Comunitario no siempre proporciona un resultado agradable y puede genera P: ¿Quién puede ver mi contenido? -R: Por defecto CUALQUIER PERSONA en Internet, A MENOS que usted lo restrinja. El nombre del proyecto le permite elegir el nivel de privacidad que desea. El contenido restringido NO será visible para las "redes de espionaje" y los anunciantes. Estará protegido contra las escuchas de personas ajenas a la empresa, en la medida de nuestras posibilidades. Los administradores de los hubs con suficientes habilidades y paciencia PUEDEN ser capaces de escuchar a escondidas algunas comunicaciones privadas, pero deben hacer un esfuerzo para hacerlo. Los modos de privacidad existen dentro de $Projectname que son incluso resistentes a las escuchas por parte de administradores de hubs cualificados y decididos. +R: Por defecto CUALQUIER PERSONA en Internet, A MENOS que usted lo restrinja. $Projectname le permite elegir el nivel de privacidad que desea. El contenido restringido NO será visible para las "redes de espionaje" y los anunciantes. Estará protegido contra las escuchas de personas ajenas a la empresa, en la medida de nuestras posibilidades. Los administradores de los hubs con suficientes habilidades y paciencia PUEDEN ser capaces de escuchar a escondidas algunas comunicaciones privadas, pero deben hacer un esfuerzo para hacerlo. Los modos de privacidad existen dentro de $Projectname que son incluso resistentes a las escuchas por parte de administradores de hubs cualificados y decididos. P: ¿Se puede censurar mi contenido? -R: $Nombre del proyecto (la red) NO PUEDE censurar su contenido. Los administradores de servidores y hubs están sujetos a las leyes locales y PUEDEN eliminar contenido objetable de su sitio o hub. Cualquiera PUEDE convertirse en administrador del hub, incluyéndote a ti; y por lo tanto publicar contenido que de otra manera podría ser censurado. Usted aún PUEDE estar sujeto a las leyes locales. +R: $Projectname (la red) NO PUEDE censurar su contenido. Los administradores de servidores y hubs están sujetos a las leyes locales y PUEDEN eliminar contenido objetable de su sitio o hub. Cualquiera PUEDE convertirse en administrador del hub, incluyéndote a ti; y por lo tanto publicar contenido que de otra manera podría ser censurado. Usted aún PUEDE estar sujeto a las leyes locales. [h5]Definiciones[/h5] -**$$Nombre del proyecto** +**$Projectname** También conocido como "la red", $Projectname es una colección de ordenadores/servidores individuales (aka **hubs**) que se conectan para formar una red cooperativa más grande. -*Hub* +**Hub** Una computadora individual o servidor conectado a $Projectname. Estos son proporcionados por un administrador de **hub y pueden ser públicos o privados, de pago o gratuitos. -El administrador del hub. +**El administrador del hub** El operador del sistema de un hub individual. @@ -82,11 +82,11 @@ La privacidad para su identidad es otro aspecto. Debido a que tiene una identida Una identidad descentralizada tiene muchas ventajas y le ofrece muchas características interesantes, pero debe tener en cuenta que su identidad es conocida por otros hubs de la red $Projectname. Una de esas ventajas es que otros canales pueden servirte contenido personalizado y permitirte ver cosas privadas (como fotos privadas que otros desean compartir contigo). Por eso esos canales necesitan saber quién eres. Pero entendemos que a veces esos otros canales saben más de ti de lo que deseas. Por ejemplo el plug-in Visage que puede decirle al propietario de un canal la última vez que visites su perfil. Usted puede fácilmente OPT-OUT de este bajo nivel y, pensamos, seguimiento inofensivo. -Puede habilitar [No rastrear (DNT)](http://donottrack.us/) en su navegador web. Respetamos esta nueva propuesta de política de privacidad. Todos los navegadores modernos soportan DNT. Lo encontrarás en la configuración de privacidad de tus navegadores o bien puedes consultar el manual del navegador. Esto no afectará a la funcionalidad de $Projectname. Este ajuste es probablemente suficiente para la mayoría de las personas. +* Puede habilitar [No rastrear (DNT)](http://donottrack.us/)] en su navegador web. Respetamos esta nueva propuesta de política de privacidad. Todos los navegadores modernos soportan DNT. Lo encontrarás en la configuración de privacidad de tus navegadores o bien puedes consultar el manual del navegador. Esto no afectará a la funcionalidad de $Projectname. Este ajuste es probablemente suficiente para la mayoría de las personas. -Puede [desactivar la publicación](configuración) de su canal en nuestro directorio de canales. Si quieres que la gente encuentre tu canal, debes darles la dirección de tu canal directamente a ellos. Creemos que esto es una buena indicación de que prefieres privacidad extra y habilitar automáticamente "No rastrear" si este es el caso. +* Puede [desactivar la publicación](configuración) de su canal en nuestro directorio de canales. Si quieres que la gente encuentre tu canal, debes darles la dirección de tu canal directamente a ellos. Creemos que esto es una buena indicación de que prefieres privacidad extra y habilitar automáticamente "No rastrear" si este es el caso. -Puedes tener un hub bloqueado. Esto significa que todos los canales y contenidos de ese hub no son públicos y no son visibles para el mundo exterior. Esto es algo que sólo el administrador del hub puede hacer. También respetamos esto y activamos automáticamente "No rastrear" si está configurado. +* Puede tener un hub bloqueado. Esto significa que todos los canales y contenidos de ese hub no son públicos y no son visibles para el mundo exterior. Esto es algo que sólo el administrador del hub puede hacer. También respetamos esto y activamos automáticamente "No rastrear" si está configurado. [h5]Censura[/h5] @@ -97,6 +97,7 @@ $Projectname RECOMIENDA que los administradores de hubs proporcionen un período Si usted típica y regularmente publica contenido de naturaleza adulta u ofensiva, se le recomienda encarecidamente que marque su cuenta "NSFW" (No es seguro para el trabajo). Esto evitará que se muestre la foto de tu perfil en el directorio, excepto a los espectadores que hayan optado por desactivar el "modo seguro". Si los administradores del directorio consideran que la foto de tu perfil es adulta u ofensiva, el administrador del directorio PUEDE marcar tu foto de perfil como NSFW. Actualmente no existe ningún mecanismo oficial para impugnar o revertir esta decisión, razón por la cual DEBERÍA usted marcar su propia cuenta NSFW si es probable que sea inapropiada para el público en general. + [h3]Créditos[/h3] Gracias a todos los que han ayudado y contribuido al proyecto y a sus predecesores a lo largo de los años. diff --git a/doc/es-es/main.bb b/doc/es-es/main.bb index 00d2e47bb..dff1717e4 100644 --- a/doc/es-es/main.bb +++ b/doc/es-es/main.bb @@ -2,7 +2,6 @@ [zrl=[baseurl]/help/about][b]¿Qué es $Projectname?[/b][/zrl] $Projectname est un software de publicación y comunicación descentralizadas que le permite tener el control de sus necesidades y datos. Es ustedm y solo usted, quien decide a quién permite ver sus publicaciones. - [zrl=[baseurl]/help/features][b]Funcionaliades de $Projectname[/b][/zrl] $Projectname es una red global distribuida que es flexible, pero puede crecer en potencia desde in pequeño sitio personal hasta albergar una comunidad de numerosas personas. -- cgit v1.2.3 From 468af29e3e4fb5c59f44afe8e870e21b66153992 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 8 Jun 2018 23:03:05 +0200 Subject: new feature filter network by name --- Zotlabs/Widget/Activity_filter.php | 17 ++++++++++++++++- include/features.php | 11 ++++++++++- view/css/widgets.css | 1 + view/js/mod_network.js | 3 +++ view/tpl/activity_filter_widget.tpl | 10 ++++++++++ 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php index 32da20bf6..78e439fdd 100644 --- a/Zotlabs/Widget/Activity_filter.php +++ b/Zotlabs/Widget/Activity_filter.php @@ -154,6 +154,20 @@ class Activity_filter { ]; } + $name = []; + if(feature_enabled(local_channel(),'name_tab')) { + if(x($_GET,'cid') && ! x($_GET,'pf')) { + $filter_active = 'name'; + } + $name = [ + 'label' => x($_GET,'name') ? $_GET['name'] : t('Filter by name'), + 'icon' => 'filter', + 'url'=> z_root() . '/' . $cmd . '/', + 'sel'=> $filter_active == 'name' ? 'is-valid' : '', + 'title' => '' + ]; + } + $reset = []; if($filter_active) { $reset = [ @@ -179,7 +193,8 @@ class Activity_filter { $o .= replace_macros(get_markup_template('activity_filter_widget.tpl'), [ '$title' => t('Activity Filters'), '$reset' => $reset, - '$content' => $content + '$content' => $content, + '$name' => $name ]); } diff --git a/include/features.php b/include/features.php index bcdea73e0..03f50c9a4 100644 --- a/include/features.php +++ b/include/features.php @@ -394,6 +394,15 @@ function get_features($filtered = true, $level = (-1)) { feature_level('order_tab',2), ], + [ + 'name_tab', + t('Contact Filter'), + t('Ability to display only posts of a selected contact'), + false, + get_config('feature_lock','name_tab'), + feature_level('name_tab',1), + ], + [ 'forums_tab', t('Forum Filter'), @@ -406,7 +415,7 @@ function get_features($filtered = true, $level = (-1)) { [ 'personal_tab', t('Personal Posts Filter'), - t('Ability to display only Network posts that you\'ve interacted on'), + t('Ability to display only posts that you\'ve interacted on'), false, get_config('feature_lock','personal_tab'), feature_level('personal_tab',1), diff --git a/view/css/widgets.css b/view/css/widgets.css index 9730d6915..e330c38e1 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -182,6 +182,7 @@ a.wikilist { .notifications-textinput { padding: .75rem 0.85rem; + position: relative; } .notifications-textinput input { diff --git a/view/js/mod_network.js b/view/js/mod_network.js index 2899bbacd..734e572bb 100644 --- a/view/js/mod_network.js +++ b/view/js/mod_network.js @@ -1,4 +1,7 @@ $(document).ready(function() { $("#search-text").contact_autocomplete(baseurl + '/search_ac','',true); + $("#cid-filter").name_autocomplete(baseurl + '/acl', 'a', true, function(data) { + $("#cid").val(data.id); + }); }); diff --git a/view/tpl/activity_filter_widget.tpl b/view/tpl/activity_filter_widget.tpl index 7ff5a4f7e..1b1e2c880 100644 --- a/view/tpl/activity_filter_widget.tpl +++ b/view/tpl/activity_filter_widget.tpl @@ -8,4 +8,14 @@ {{/if}} {{$content}} + {{if $name}} +
    + +
    + + + +
    + {{/if}} +
    -- cgit v1.2.3 From 1fbc1314695feff17ec9d6ecaa009f5e554ad109 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 8 Jun 2018 23:19:30 +0200 Subject: if unthreaded and cid and not pf, query author only --- Zotlabs/Module/Network.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 9837d35a3..132770608 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -262,13 +262,18 @@ class Network extends \Zotlabs\Web\Controller { $item_thread_top = ''; if($load || $update) { - $ttype = (($pf) ? TERM_FORUM : TERM_MENTION); + if(!$pf && $nouveau) { + $sql_extra = " AND author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' "; + } + else { + $ttype = (($pf) ? TERM_FORUM : TERM_MENTION); - $p1 = q("SELECT DISTINCT parent FROM item WHERE uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ) $item_normal "); - $p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'"); + $p1 = q("SELECT DISTINCT parent FROM item WHERE uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ) $item_normal "); + $p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'"); - $p_str = ids_to_querystr(array_merge($p1,$p2),'parent'); - $sql_extra = " AND item.parent IN ( $p_str ) "; + $p_str = ids_to_querystr(array_merge($p1,$p2),'parent'); + $sql_extra = " AND item.parent IN ( $p_str ) "; + } } $title = replace_macros(get_markup_template("section_title.tpl"),array( -- cgit v1.2.3 From c4778e5e2494d262c18dd73815fb495964355fce Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 9 Jun 2018 10:58:01 +0200 Subject: restrict cid filter to unthreaded order (makes much more sense that way imho and the query is a lot faster) and slighty change order of the filters --- Zotlabs/Module/Network.php | 2 +- Zotlabs/Widget/Activity_filter.php | 65 +++++++++++++++++++------------------- Zotlabs/Widget/Activity_order.php | 4 +-- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 132770608..2e9bcd2ce 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -140,7 +140,7 @@ class Network extends \Zotlabs\Web\Controller { $deftag = ''; - if(x($_GET,'search') || x($_GET,'file')) + if(x($_GET,'search') || $file || (!$pf && $cid)) $nouveau = true; if($cid) { diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php index 78e439fdd..fadf39144 100644 --- a/Zotlabs/Widget/Activity_filter.php +++ b/Zotlabs/Widget/Activity_filter.php @@ -76,6 +76,38 @@ class Activity_filter { } } + if(feature_enabled(local_channel(),'forums_tab')) { + $forums = get_forum_channels(local_channel()); + + if($forums) { + foreach($forums as $f) { + if(x($_GET,'pf') && x($_GET,'cid')) { + $forum_active = ((x($_GET,'pf') && $_GET['cid'] == $f['abook_id']) ? 'active' : ''); + $filter_active = 'forums'; + } + $fsub[] = [ + 'label' => $f['xchan_name'], + 'img' => $f['xchan_photo_s'], + 'url' => (($f['private_forum']) ? $f['xchan_url'] : z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id']), + 'sel' => $forum_active, + 'title' => t('Show posts to this forum'), + 'lock' => (($f['private_forum']) ? 'lock' : '') + ]; + } + + $tabs[] = [ + 'id' => 'forums', + 'label' => t('Forums'), + 'icon' => 'comments-o', + 'url' => '#', + 'sel' => (($filter_active == 'forums') ? true : false), + 'title' => t('Show forums'), + 'sub' => $fsub + + ]; + } + } + if(feature_enabled(local_channel(),'filing')) { $terms = q("select distinct term from term where uid = %d and ttype = %d order by term asc", intval(local_channel()), @@ -110,39 +142,6 @@ class Activity_filter { } } - if(feature_enabled(local_channel(),'forums_tab')) { - $forums = get_forum_channels(local_channel()); - - if($forums) { - foreach($forums as $f) { - if(x($_GET,'pf') && x($_GET,'cid')) { - $forum_active = ((x($_GET,'pf') && $_GET['cid'] == $f['abook_id']) ? 'active' : ''); - $filter_active = 'forums'; - } - $fsub[] = [ - 'label' => $f['xchan_name'], - 'img' => $f['xchan_photo_s'], - 'url' => (($f['private_forum']) ? $f['xchan_url'] : z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id']), - 'sel' => $forum_active, - 'title' => t('Show posts to this forum'), - 'lock' => (($f['private_forum']) ? 'lock' : '') - ]; - } - - $tabs[] = [ - 'id' => 'forums', - 'label' => t('Forums'), - 'icon' => 'comments-o', - 'url' => '#', - 'sel' => (($filter_active == 'forums') ? true : false), - 'title' => t('Show forums'), - 'sub' => $fsub - - ]; - } - } - - if(x($_GET,'search')) { $filter_active = 'search'; $tabs[] = [ diff --git a/Zotlabs/Widget/Activity_order.php b/Zotlabs/Widget/Activity_order.php index 534d6caee..0e660afc3 100644 --- a/Zotlabs/Widget/Activity_order.php +++ b/Zotlabs/Widget/Activity_order.php @@ -53,8 +53,8 @@ class Activity_order { } } - // override order for search results and filer results - if(x($_GET,'search') || x($_GET,'file')) { + // override order for search, filer and cid results + if(x($_GET,'search') || x($_GET,'file') || (! x($_GET,'pf') && x($_GET,'cid'))) { $unthreaded_active = 'active'; $commentord_active = $postord_active = 'disabled'; } -- cgit v1.2.3 From afaa8012c8040a431ff0f1a0908f6e51546cfd32 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 9 Jun 2018 11:04:56 +0200 Subject: bump version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 4ad37b274..f3603acc9 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.5.6' ); +define ( 'STD_VERSION', '3.5.7' ); define ( 'ZOT_REVISION', '6.0a' ); -- cgit v1.2.3 From e37ccb7a63ed9c0c67ebe1600109fe82258615df Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 9 Jun 2018 13:08:14 +0200 Subject: move cid filter js to the widget --- view/js/mod_network.js | 3 --- view/tpl/activity_filter_widget.tpl | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/view/js/mod_network.js b/view/js/mod_network.js index 734e572bb..2899bbacd 100644 --- a/view/js/mod_network.js +++ b/view/js/mod_network.js @@ -1,7 +1,4 @@ $(document).ready(function() { $("#search-text").contact_autocomplete(baseurl + '/search_ac','',true); - $("#cid-filter").name_autocomplete(baseurl + '/acl', 'a', true, function(data) { - $("#cid").val(data.id); - }); }); diff --git a/view/tpl/activity_filter_widget.tpl b/view/tpl/activity_filter_widget.tpl index 1b1e2c880..1eb11c10f 100644 --- a/view/tpl/activity_filter_widget.tpl +++ b/view/tpl/activity_filter_widget.tpl @@ -16,6 +16,10 @@
    + {{/if}} -
    -- cgit v1.2.3 From 438ce44af9e66153af2ab1719c2372165143aff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= Date: Sat, 9 Jun 2018 13:41:13 +0200 Subject: Update symbolic link doc/es --- doc/es | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/es b/doc/es index c8ba7666b..a170c77bc 120000 --- a/doc/es +++ b/doc/es @@ -1 +1 @@ -es-es \ No newline at end of file +doc/es-es \ No newline at end of file -- cgit v1.2.3 From 9e29c136788fc14b9264843e11541bb6a2176e19 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 9 Jun 2018 16:38:15 +0200 Subject: fix issue #1219 --- Zotlabs/Module/Viewsrc.php | 9 ++++++--- view/css/conversation.css | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Viewsrc.php b/Zotlabs/Module/Viewsrc.php index 54ab89e81..5900e385a 100644 --- a/Zotlabs/Module/Viewsrc.php +++ b/Zotlabs/Module/Viewsrc.php @@ -28,7 +28,7 @@ class Viewsrc extends \Zotlabs\Web\Controller { $item_normal = item_normal(); if(local_channel() && $item_id) { - $r = q("select id, item_flags, mimetype, item_obscured, body from item where uid in (%d , %d) and id = %d $item_normal limit 1", + $r = q("select id, item_flags, mimetype, item_obscured, body, llink, plink from item where uid in (%d , %d) and id = %d $item_normal limit 1", intval(local_channel()), intval($sys['channel_id']), intval($item_id) @@ -52,8 +52,11 @@ class Viewsrc extends \Zotlabs\Web\Controller { } if(is_ajax()) { - print '
    ' . t('Source of Item') . ' ' . $r[0]['id'] . '
    '; - echo $o; + echo '
    '; + echo '
    id: ' . $r[0]['id'] . ' | plink | llink
    '; + echo '
    '; + echo '
    ' . $o . '
    '; + echo '
    '; killme(); } diff --git a/view/css/conversation.css b/view/css/conversation.css index 81792b48e..0f69ffaba 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -136,7 +136,7 @@ a.wall-item-name-link { .wall-item-ago, .wall-item-ago i { font-size: 0.75rem; - line-height: 1; + line-height: 1.1; } .wall-item-ago .fa-check { -- cgit v1.2.3 From d0f7b1d9b79a5a96314d5c6caa011f7050cec2f9 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 10 Jun 2018 17:04:34 +0200 Subject: fix issue #1221 --- Zotlabs/Lib/Share.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Lib/Share.php b/Zotlabs/Lib/Share.php index e9e4d23c4..d3ecbf7fa 100644 --- a/Zotlabs/Lib/Share.php +++ b/Zotlabs/Lib/Share.php @@ -107,7 +107,7 @@ class Share { } public function bbcode() { - $bb = NULL_STR; + $bb = EMPTY_STR; if(! $this->item) return $bb; @@ -140,4 +140,4 @@ class Share { } -} \ No newline at end of file +} -- cgit v1.2.3 From 6959c9e42350b7d19402bef24bb4fd366af22ed4 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 10 Jun 2018 15:27:55 -0700 Subject: fixes for immediate expire, channel_active not initialised in DB --- include/channel.php | 1 + include/items.php | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/channel.php b/include/channel.php index 1a62dcd3c..d26056171 100644 --- a/include/channel.php +++ b/include/channel.php @@ -2359,6 +2359,7 @@ function channel_store_lowlevel($arr) { 'channel_dirdate' => ((array_key_exists('channel_dirdate',$arr)) ? $arr['channel_dirdate'] : NULL_DATE), 'channel_lastpost' => ((array_key_exists('channel_lastpost',$arr)) ? $arr['channel_lastpost'] : NULL_DATE), 'channel_deleted' => ((array_key_exists('channel_deleted',$arr)) ? $arr['channel_deleted'] : NULL_DATE), + 'channel_active' => ((array_key_exists('channel_active',$arr)) ? $arr['channel_active'] : NULL_DATE), 'channel_max_anon_mail' => ((array_key_exists('channel_max_anon_mail',$arr)) ? $arr['channel_max_anon_mail'] : '10'), 'channel_max_friend_req' => ((array_key_exists('channel_max_friend_req',$arr)) ? $arr['channel_max_friend_req'] : '10'), 'channel_expire_days' => ((array_key_exists('channel_expire_days',$arr)) ? $arr['channel_expire_days'] : '0'), diff --git a/include/items.php b/include/items.php index e75a9659d..54df5d322 100755 --- a/include/items.php +++ b/include/items.php @@ -3697,10 +3697,7 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) { ); } else { - $r = q("UPDATE item SET item_deleted = 1, body = '', title = '', - changed = '%s', edited = '%s' WHERE id = %d", - dbesc(datetime_convert()), - dbesc(datetime_convert()), + $r = q("DELETE FROM item WHERE id = %d", intval($item['id']) ); } -- cgit v1.2.3 From 912ccb31a133c09b28890f0bab5be5ce1f7f95d4 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 10 Jun 2018 19:26:35 -0700 Subject: hubzilla core issue #1218 --- include/menu.php | 5 +++++ view/tpl/usermenu.tpl | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/menu.php b/include/menu.php index 4add78c39..1a2059451 100644 --- a/include/menu.php +++ b/include/menu.php @@ -81,6 +81,10 @@ function menu_render($menu, $class='', $edit = false, $var = array()) { if ((! $channel_id) && (local_channel())) $channel_id = local_channel(); + $chan = channelx_by_n($channel_id); + if(! $chan) + return ''; + $menu_list = menu_list($channel_id); $menu_names = array(); @@ -110,6 +114,7 @@ function menu_render($menu, $class='', $edit = false, $var = array()) { $ret = replace_macros(get_markup_template('usermenu.tpl'),array( '$menu' => $menu['menu'], '$class' => $class, + '$nick' => $chan['channel_address'], '$edit' => (($edit) ? t("Edit") : ''), '$id' => $menu['menu']['menu_id'], '$items' => $menu['items'], diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl index c51728c34..8bbfedd07 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -2,7 +2,7 @@
    {{/if}} {{if $menu.menu_desc}} -

    {{$menu.menu_desc}}{{if $edit}} {{/if}}

    +

    {{$menu.menu_desc}}{{if $edit}} {{/if}}

    {{/if}} {{if $items}}
      -- cgit v1.2.3 From b361fb4f89ff60bbe32c7aa41dca5caf895ab54c Mon Sep 17 00:00:00 2001 From: Herbert Thielen Date: Mon, 11 Jun 2018 15:54:22 +0200 Subject: fix links to addons repository --- doc/addons.bb | 2 +- doc/admin/administrator_guide.md | 2 +- doc/ca/general.bb | 2 +- doc/de/general.bb | 2 +- doc/dev_beginner.bb | 6 +++--- doc/general.bb | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/addons.bb b/doc/addons.bb index a37ecee99..4bfa7a9fd 100644 --- a/doc/addons.bb +++ b/doc/addons.bb @@ -106,7 +106,7 @@ For these reasons we [b]strongly recommend[/b] that you do NOT install addons fr We also recognise that some developers prefer working on their own and do not wish their code to be mingled with the project repository for a variety of reasons. These developers can ease troubleshooting and debugging by providing a README file in their respective code repository outlining the process for submitting patches and bug fixes. It is also recommended that these projects provide both a 'dev' (development) and 'master' (production) branch which tracks the current project branches of those names. This is because dev and master are often not compatible from the viewpoint of library interfaces. It is also highly recommended that your repository versions are tagged and moved forward within 24 hours of project releases. This is a major inconvenience for everybdy involved, and can present downtime for production sites while this process is being carried out; which is one more reason why we [b]strongly recommend[/b] that addons be submitted to the project addon repository and that you do NOT install such third-party addons. -[url=https://framagit.org/hubzilla/core/-addons]https://framagit.org/hubzilla/core/-addons[/url] Main project addon repository +[url=https://framagit.org/hubzilla/addons]https://framagit.org/hubzilla/addons[/url] Main project addon repository [url=https://github.com/23n/red-addons]https://github.com/23n/red-addons[/url] Oliver's repository (mayan_places and flip) diff --git a/doc/admin/administrator_guide.md b/doc/admin/administrator_guide.md index e966115d0..34dfa8cad 100644 --- a/doc/admin/administrator_guide.md +++ b/doc/admin/administrator_guide.md @@ -396,7 +396,7 @@ To immediately clear out all the extra logging stuff you added. Use the informa ##### Rotating log files -1. Enable the **logrot** addon in the official [hubzilla-addons](https://framagit.org/hubzilla/core/-addons) repo +1. Enable the **logrot** addon in the official [hubzilla-addons](https://framagit.org/hubzilla/addons) repo 1. Create a directory in your web root called `log` with webserver write permissions 1. Go to the **logrot** admin settings and enter this folder name as well as the max size and number of retained log files. diff --git a/doc/ca/general.bb b/doc/ca/general.bb index 3e46b6136..fb54f0abc 100644 --- a/doc/ca/general.bb +++ b/doc/ca/general.bb @@ -7,7 +7,7 @@ [url=https://framagit.org/hubzilla/core/]Lloc Web Principal[/url] -[url=https://framagit.org/hubzilla/core/-addons]Complements del Lloc Web[/url] +[url=https://framagit.org/hubzilla/addons]Complements del Lloc Web[/url] [url=[baseurl]/help/credits]Credits en $Projectname[/url] diff --git a/doc/de/general.bb b/doc/de/general.bb index 3168c4d9b..2ce5533f1 100644 --- a/doc/de/general.bb +++ b/doc/de/general.bb @@ -6,7 +6,7 @@ [zrl=[baseurl]/help/external-resource-links]Links zu externen Ressourcen[/zrl] [url=https://framagit.org/hubzilla/core/]Haupt-Website[/url] -[url=https://framagit.org/hubzilla/core/-addons]Addons-Website[/url] +[url=https://framagit.org/hubzilla/addons]Addons-Website[/url] [url=[baseurl]/help/credits]$Projectname Credits[/url] diff --git a/doc/dev_beginner.bb b/doc/dev_beginner.bb index d07b20574..3e98c6ec3 100644 --- a/doc/dev_beginner.bb +++ b/doc/dev_beginner.bb @@ -174,8 +174,8 @@ It is a good idea to read the whole manual! Git is different to other version co Now you should [list] [*] create an account at github.com -[*] fork https://framagit.org/hubzilla/core/ -[*] fork https://framagit.org/hubzilla/core/-addons +[*] fork https://framagit.org/hubzilla/core +[*] fork https://framagit.org/hubzilla/addons [/list] If you not want to use GIT from the command line - there is a usefull Eclipse plugin named ""Eclipse Mylyn to GitHub connector". @@ -416,4 +416,4 @@ surfer@debian:/var/www$ git push [/code] -#include doc/macros/main_footer.bb; \ No newline at end of file +#include doc/macros/main_footer.bb; diff --git a/doc/general.bb b/doc/general.bb index ecdaf1dfd..0b80db756 100644 --- a/doc/general.bb +++ b/doc/general.bb @@ -7,7 +7,7 @@ [h3]External resources[/h3] [zrl=[baseurl]/help/external-resource-links]List of external resources[/zrl] [url=https://framagit.org/hubzilla/core/]Main Website[/url] -[url=https://framagit.org/hubzilla/core/-addons]Addon Website[/url] +[url=https://framagit.org/hubzilla/addons]Addon Website[/url] [url=[baseurl]/help/credits]$Projectname Credits[/url] [h3]About this $Projectname hub[/h3] [zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl] -- cgit v1.2.3 From 254a6be277e8536ae101faa429805fcbd6382d61 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 13 Jun 2018 16:25:50 -0700 Subject: null db fields in mod_invite --- Zotlabs/Module/Invite.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php index 0bcd1c1fa..4722a7ee5 100644 --- a/Zotlabs/Module/Invite.php +++ b/Zotlabs/Module/Invite.php @@ -113,7 +113,7 @@ class Invite extends \Zotlabs\Web\Controller { $invite_code = autoname(8) . rand(1000,9999); $nmessage = str_replace('$invite_code',$invite_code,$message); - $r = q("INSERT INTO register (hash,created) VALUES ('%s', '%s') ", + $r = q("INSERT INTO register (hash,created,uid,password,lang) VALUES ('%s', '%s','','','') ", dbesc($invite_code), dbesc(datetime_convert()) ); -- cgit v1.2.3 From 65cbc7c2bba523a2663a89fae29b5cef162fd0a1 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 13 Jun 2018 16:37:16 -0700 Subject: uid is integer --- Zotlabs/Module/Invite.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php index 4722a7ee5..359f99b3e 100644 --- a/Zotlabs/Module/Invite.php +++ b/Zotlabs/Module/Invite.php @@ -113,7 +113,7 @@ class Invite extends \Zotlabs\Web\Controller { $invite_code = autoname(8) . rand(1000,9999); $nmessage = str_replace('$invite_code',$invite_code,$message); - $r = q("INSERT INTO register (hash,created,uid,password,lang) VALUES ('%s', '%s','','','') ", + $r = q("INSERT INTO register (hash,created,uid,password,lang) VALUES ('%s', '%s',0,'','') ", dbesc($invite_code), dbesc(datetime_convert()) ); -- cgit v1.2.3 From 10491294d8ed78af565aef690d80c99e9adb4d0b Mon Sep 17 00:00:00 2001 From: gia vec Date: Wed, 13 Jun 2018 03:53:55 +0200 Subject: Update hubzilla-setup.sh (cherry picked from commit 95f2eb68ca38976b7ca9d3f5c2d89c923d5ef4b5) --- .homeinstall/hubzilla-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.homeinstall/hubzilla-setup.sh b/.homeinstall/hubzilla-setup.sh index a38e36b73..ff101086c 100755 --- a/.homeinstall/hubzilla-setup.sh +++ b/.homeinstall/hubzilla-setup.sh @@ -572,7 +572,7 @@ function check_https { function install_hubzilla { print_info "installing hubzilla addons..." cd /var/www/html/ - util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git hzaddons + util/add_addon_repo https://framagit.org/hubzilla/addons.git hzaddons mkdir -p "store/[data]/smarty3" chmod -R 777 store touch .htconfig.php -- cgit v1.2.3 From 77ba647778bcface5230110fe72f73fc54527bdd Mon Sep 17 00:00:00 2001 From: gia vec Date: Wed, 13 Jun 2018 03:45:48 +0200 Subject: Update README.md (cherry picked from commit 7d73543b84507b74c8058da7dd062d7949c34d61) --- .homeinstall/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.homeinstall/README.md b/.homeinstall/README.md index 7870e65dd..aeecb9184 100644 --- a/.homeinstall/README.md +++ b/.homeinstall/README.md @@ -164,7 +164,7 @@ Make the directory for apache and change diretory to it Clone hubzilla from git ("git pull" will update it later) - git clone https://github.com/redmatrix/hubzilla html + git clone https://framagit.org/hubzilla/core html Change to the install script -- cgit v1.2.3 From b5e4a5f51c478d646248c5a9eb22907cda32dd3e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 13 Jun 2018 20:27:10 -0700 Subject: SECURITY: provide option to disable the cloud 'root' directory and make the cloud module require a target channel nickname. This is a low impact change as there is currently no disclosure of private information. The presence of a file browser for all the channels on the site could be (and is reported to be) a concern to some people and there is no reason why it shouldn't be optional. --- Zotlabs/Module/Admin/Security.php | 5 +++++ Zotlabs/Module/Cloud.php | 9 +++++++++ view/tpl/admin_security.tpl | 1 + 3 files changed, 15 insertions(+) diff --git a/Zotlabs/Module/Admin/Security.php b/Zotlabs/Module/Admin/Security.php index 49e1ccf42..249fda469 100644 --- a/Zotlabs/Module/Admin/Security.php +++ b/Zotlabs/Module/Admin/Security.php @@ -16,6 +16,10 @@ class Security { $block_public = ((x($_POST,'block_public')) ? True : False); set_config('system','block_public',$block_public); + + $cloud_noroot = ((x($_POST,'cloud_noroot')) ? 1 : 0); + set_config('system','cloud_disable_siteroot',1 - $cloud_noroot); + $ws = $this->trim_array_elems(explode("\n",$_POST['whitelisted_sites'])); set_config('system','whitelisted_sites',$ws); @@ -87,6 +91,7 @@ class Security { '$page' => t('Security'), '$form_security_token' => get_form_security_token('admin_security'), '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.")), + '$cloud_noroot' => [ 'cloud_noroot', t('Provide a cloud root directory'), 1 - intval(get_config('system','cloud_disable_siteroot')), t('The cloud root directory lists all channel names which provide public files') ], '$transport_security' => array('transport_security', t('Set "Transport Security" HTTP header'),intval(get_config('system','transport_security_header')),''), '$content_security' => array('content_security', t('Set "Content Security Policy" HTTP header'),intval(get_config('system','content_security_policy')),''), '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php index 34397d275..1b330ecba 100644 --- a/Zotlabs/Module/Cloud.php +++ b/Zotlabs/Module/Cloud.php @@ -35,11 +35,20 @@ class Cloud extends \Zotlabs\Web\Controller { if (argc() > 1) $which = argv(1); + + if (argc() < 2 && intval(get_config('system','cloud_disable_siteroot'))) { + notice( t('Permission denied.') . EOL); + construct_page(); + killme(); + } + $profile = 0; if ($which) profile_load( $which, $profile); + + $auth = new \Zotlabs\Storage\BasicAuth(); $ob_hash = get_observer_hash(); diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl index 409e9fc7d..121758e63 100755 --- a/view/tpl/admin_security.tpl +++ b/view/tpl/admin_security.tpl @@ -7,6 +7,7 @@ {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$cloud_noroot}} {{include file="field_checkbox.tpl" field=$transport_security}} {{include file="field_checkbox.tpl" field=$content_security}} {{include file="field_checkbox.tpl" field=$embed_sslonly}} -- cgit v1.2.3 From 8da0f9d3569e7c19e5581c4d402931a07dcab317 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 13 Jun 2018 21:06:56 -0700 Subject: optionally report total available space when uploading --- Zotlabs/Module/Admin/Security.php | 5 ++++- Zotlabs/Storage/Browser.php | 4 ++++ view/tpl/admin_security.tpl | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Admin/Security.php b/Zotlabs/Module/Admin/Security.php index 249fda469..80c1d85b7 100644 --- a/Zotlabs/Module/Admin/Security.php +++ b/Zotlabs/Module/Admin/Security.php @@ -20,7 +20,9 @@ class Security { $cloud_noroot = ((x($_POST,'cloud_noroot')) ? 1 : 0); set_config('system','cloud_disable_siteroot',1 - $cloud_noroot); - + $cloud_disksize = ((x($_POST,'cloud_disksize')) ? 1 : 0); + set_config('system','cloud_report_disksize',$cloud_disksize); + $ws = $this->trim_array_elems(explode("\n",$_POST['whitelisted_sites'])); set_config('system','whitelisted_sites',$ws); @@ -92,6 +94,7 @@ class Security { '$form_security_token' => get_form_security_token('admin_security'), '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.")), '$cloud_noroot' => [ 'cloud_noroot', t('Provide a cloud root directory'), 1 - intval(get_config('system','cloud_disable_siteroot')), t('The cloud root directory lists all channel names which provide public files') ], + '$cloud_disksize' => [ 'cloud_disksize', t('Show total disk space available to cloud uploads'), intval(get_config('system','cloud_report_disksize')), '' ], '$transport_security' => array('transport_security', t('Set "Transport Security" HTTP header'),intval(get_config('system','transport_security_header')),''), '$content_security' => array('content_security', t('Set "Content Security Policy" HTTP header'),intval(get_config('system','content_security_policy')),''), '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 153016da6..67d934783 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -347,6 +347,10 @@ class Browser extends DAV\Browser\Plugin { // Storage and quota for the account (all channels of the owner of this directory)! $limit = engr_units_to_bytes(service_class_fetch($owner, 'attach_upload_limit')); + if((! $limit) && get_config('system','cloud_report_disksize')) { + $limit = engr_units_to_bytes(disk_free_space('store')); + } + $r = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d", intval($this->auth->channel_account_id) ); diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl index 121758e63..493707a7a 100755 --- a/view/tpl/admin_security.tpl +++ b/view/tpl/admin_security.tpl @@ -8,6 +8,7 @@ {{include file="field_checkbox.tpl" field=$block_public}} {{include file="field_checkbox.tpl" field=$cloud_noroot}} + {{include file="field_checkbox.tpl" field=$cloud_disksize}} {{include file="field_checkbox.tpl" field=$transport_security}} {{include file="field_checkbox.tpl" field=$content_security}} {{include file="field_checkbox.tpl" field=$embed_sslonly}} -- cgit v1.2.3 From 7a144b90fb9174eb50e5d53d2f62d6d8d2671353 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 14 Jun 2018 20:40:25 -0700 Subject: re-implement/refactor getQuotaInfo() on DAV storage --- Zotlabs/Module/Home.php | 2 +- Zotlabs/Storage/Browser.php | 6 ++-- Zotlabs/Storage/Directory.php | 77 ++++++++++++++++++++++++------------------- include/language.php | 2 +- 4 files changed, 50 insertions(+), 37 deletions(-) diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php index 4b3e596a9..647a6412a 100644 --- a/Zotlabs/Module/Home.php +++ b/Zotlabs/Module/Home.php @@ -9,7 +9,7 @@ require_once('include/conversation.php'); class Home extends \Zotlabs\Web\Controller { function init() { - + $ret = array(); call_hooks('home_init',$ret); diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 67d934783..c2d70b854 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -333,6 +333,7 @@ class Browser extends DAV\Browser\Plugin { $aclselect = null; $lockstate = ''; + $limit = 0; if($this->auth->owner_id) { $channel = channelx_by_n($this->auth->owner_id); @@ -343,10 +344,11 @@ class Browser extends DAV\Browser\Plugin { $aclselect = ((local_channel() == $this->auth->owner_id) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : ''); } + + // Storage and quota for the account (all channels of the owner of this directory)! + $limit = engr_units_to_bytes(service_class_fetch($this->auth->owner_id, 'attach_upload_limit')); } - // Storage and quota for the account (all channels of the owner of this directory)! - $limit = engr_units_to_bytes(service_class_fetch($owner, 'attach_upload_limit')); if((! $limit) && get_config('system','cloud_report_disksize')) { $limit = engr_units_to_bytes(disk_free_space('store')); } diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index f46e2e666..73548fda0 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -571,39 +571,6 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo return datetime_convert('UTC', 'UTC', $r[0]['edited'], 'U'); } - /** - * @brief Return quota usage. - * - * @fixme Should guests relly see the used/free values from filesystem of the - * complete store directory? - * - * @return array with used and free values in bytes. - */ - public function getQuotaInfo() { - // values from the filesystem of the complete store/ directory - $limit = disk_total_space('store'); - $free = disk_free_space('store'); - - if ($this->auth->owner_id) { - $c = q("select * from channel where channel_id = %d and channel_removed = 0 limit 1", - intval($this->auth->owner_id) - ); - - $ulimit = engr_units_to_bytes(service_class_fetch($c[0]['channel_id'], 'attach_upload_limit')); - $limit = (($ulimit) ? $ulimit : $limit); - - $x = q("select sum(filesize) as total from attach where aid = %d", - intval($c[0]['channel_account_id']) - ); - $free = (($x) ? $limit - $x[0]['total'] : 0); - } - - return array( - $limit - $free, - $free - ); - } - /** * @brief Array with all Directory and File DAV\\Node items for the given path. @@ -895,4 +862,48 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo return false; } + public function getQuotaInfo() { + + /** + * Returns the quota information + * + * This method MUST return an array with 2 values, the first being the total used space, + * the second the available space (in bytes) + */ + + $used = 0; + $limit = 0; + $free = 0; + + if ($this->auth->owner_id) { + $channel = channelx_by_n($this->auth->owner_id); + if($channel) { + $r = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d", + intval($channel['channel_account_id']) + ); + $used = (($r) ? (float) $r[0]['total'] : 0); + $limit = (float) service_class_fetch($this->auth->owner_id, 'attach_upload_limit'); + if($limit) { + // Don't let the result go negative + $free = (($limit > $used) ? $limit - $used : 0); + } + } + } + + if(! $limit) { + $free = disk_free_space('store'); + $used = disk_total_space('store') - $free; + } + + // prevent integer overflow on 32-bit systems + + if($used > (float) PHP_INT_MAX) + $used = PHP_INT_MAX; + if($free > (float) PHP_INT_MAX) + $free = PHP_INT_MAX; + + return [ (int) $used, (int) $free ]; + + } + } diff --git a/include/language.php b/include/language.php index d0ecd3a85..69a7e3004 100644 --- a/include/language.php +++ b/include/language.php @@ -242,7 +242,7 @@ function tt($singular, $plural, $count, $ctx = ''){ if (! function_exists($f)) $f = 'string_plural_select_default'; - $k = $f($count); + $k = $f(intval($count)); return is_array($t) ? $t[$k] : $t; } -- cgit v1.2.3 From 967d4da30a4d3d39a2bedddf2ac476a96707bc45 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 14 Jun 2018 22:46:20 -0700 Subject: wiki: word-wrap code on any character --- view/css/mod_wiki.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css index 998b932db..7e47dca21 100644 --- a/view/css/mod_wiki.css +++ b/view/css/mod_wiki.css @@ -55,6 +55,7 @@ pre code { padding: 1em 1.5em; display: block; white-space: pre-wrap; + word-break: break-all; } code { @@ -64,6 +65,7 @@ code { display: inline; padding: 0.2em 0.2em; white-space: pre-wrap; + word-break: break-all; } #wiki-content-container code { -- cgit v1.2.3 From 2f3c3db02062fa867cb9b39ffcf11f646a9b80bb Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 15 Jun 2018 02:02:03 -0700 Subject: hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider saved default changes --- Zotlabs/Module/Network.php | 10 ++++++---- view/tpl/build_query.tpl | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 2e9bcd2ce..a01425188 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -123,8 +123,8 @@ class Network extends \Zotlabs\Web\Controller { $def_acl = array('allow_gid' => '<' . $r[0]['hash'] . '>'); } - $default_cmin = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmin',0) : 0); - $default_cmax = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmax',99) : 99); + $default_cmin = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmin',0) : (-1)); + $default_cmax = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmax',99) : (-1)); $cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0); $star = ((x($_GET,'star')) ? intval($_GET['star']) : 0); @@ -140,6 +140,7 @@ class Network extends \Zotlabs\Web\Controller { $deftag = ''; + if(x($_GET,'search') || $file || (!$pf && $cid)) $nouveau = true; @@ -420,8 +421,9 @@ class Network extends \Zotlabs\Web\Controller { $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start'])); } - - if(($cmin != 0) || ($cmax != 99)) { + // cmin and cmax are both -1 when the affinity tool is disabled + + if(($cmin != (-1)) || ($cmax != (-1))) { // Not everybody who shows up in the network stream will be in your address book. // By default those that aren't are assumed to have closeness = 99; but this isn't diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index 754d5997c..2c55a8140 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -36,8 +36,8 @@ var udargs = ((page_load) ? "/load" : ""); var bCmd = bParam_cmd + udargs + "?f=" ; if(bParam_uid) bCmd = bCmd + "&p=" + bParam_uid; - if(bParam_cmin != 0) bCmd = bCmd + "&cmin=" + bParam_cmin; - if(bParam_cmax != 99) bCmd = bCmd + "&cmax=" + bParam_cmax; + if(bParam_cmin != (-1)) bCmd = bCmd + "&cmin=" + bParam_cmin; + if(bParam_cmax != (-1)) bCmd = bCmd + "&cmax=" + bParam_cmax; if(bParam_gid != 0) { bCmd = bCmd + "&gid=" + bParam_gid; } else if(bParam_cid != 0) { bCmd = bCmd + "&cid=" + bParam_cid; } if(bParam_static != 0) { bCmd = bCmd + "&static=" + bParam_static; } -- cgit v1.2.3 From 7e736c5359732647f5203bf2bb7fcd50c448fad9 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 15 Jun 2018 15:21:19 -0700 Subject: apply changes to slider defaults across all modules that use buildQuery for updates --- Zotlabs/Module/Channel.php | 4 ++-- Zotlabs/Module/Display.php | 4 ++-- Zotlabs/Module/Network.php | 4 ++-- Zotlabs/Module/Pubstream.php | 4 ++-- Zotlabs/Module/Search.php | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 80e81580a..b5e6b3aee 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -344,8 +344,8 @@ class Channel extends \Zotlabs\Web\Controller { '$uid' => ((\App::$profile['profile_uid']) ? \App::$profile['profile_uid'] : '0'), '$gid' => '0', '$cid' => '0', - '$cmin' => '0', - '$cmax' => '0', + '$cmin' => '(-1)', + '$cmax' => '(-1)', '$star' => '0', '$liked' => '0', '$conv' => '0', diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index a127ab196..fe0408c6f 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -213,8 +213,8 @@ class Display extends \Zotlabs\Web\Controller { '$uid' => '0', '$gid' => '0', '$cid' => '0', - '$cmin' => '0', - '$cmax' => '99', + '$cmin' => '(-1)', + '$cmax' => '(-1)', '$star' => '0', '$liked' => '0', '$conv' => '0', diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index a01425188..172157aab 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -335,8 +335,8 @@ class Network extends \Zotlabs\Web\Controller { '$uid' => ((local_channel()) ? local_channel() : '0'), '$gid' => (($gid) ? $gid : '0'), '$cid' => (($cid) ? $cid : '0'), - '$cmin' => (($cmin) ? $cmin : '0'), - '$cmax' => (($cmax) ? $cmax : '0'), + '$cmin' => (($cmin) ? $cmin : '(-1)'), + '$cmax' => (($cmax) ? $cmax : '(-1)'), '$star' => (($star) ? $star : '0'), '$liked' => (($liked) ? $liked : '0'), '$conv' => (($conv) ? $conv : '0'), diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index f0e87f468..7b80a3978 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -118,8 +118,8 @@ class Pubstream extends \Zotlabs\Web\Controller { '$uid' => ((local_channel()) ? local_channel() : '0'), '$gid' => '0', '$cid' => '0', - '$cmin' => '0', - '$cmax' => '99', + '$cmin' => '(-1)', + '$cmax' => '(-1)', '$star' => '0', '$liked' => '0', '$conv' => '0', diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 3a552bb22..e520c671d 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -121,8 +121,8 @@ class Search extends \Zotlabs\Web\Controller { '$uid' => ((\App::$profile['profile_uid']) ? \App::$profile['profile_uid'] : '0'), '$gid' => '0', '$cid' => '0', - '$cmin' => '0', - '$cmax' => '0', + '$cmin' => '(-1)', + '$cmax' => '(-1)', '$star' => '0', '$liked' => '0', '$conv' => '0', -- cgit v1.2.3 From eedfb7de3238f202e539407e7c6eaac1838f7015 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 15 Jun 2018 16:28:36 -0700 Subject: slightly more memory efficient way to drop posts of removed connections --- include/connections.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/connections.php b/include/connections.php index 5a9e31950..20f7c24ff 100644 --- a/include/connections.php +++ b/include/connections.php @@ -373,23 +373,24 @@ function contact_remove($channel_id, $abook_id) { if(intval($abook['abook_self'])) return false; - $r = q("select id from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d and item_retained = 0 and item_starred = 0", dbesc($abook['abook_xchan']), dbesc($abook['abook_xchan']), intval($channel_id) ); if($r) { - $r = fetch_post_tags($r,true); - foreach($r as $rr) { - $terms = get_terms_oftype($item['term'],TERM_FILE); - if(! $terms) { - drop_item($rr['id'],false); + $x = q("select uid from term where otype = %d and oid = %d ttype = %d limit 1", + intval(TERM_OBJ_POST), + intval($rr['id']), + intval(TERM_FILE) + ); + if($x) { + continue; } + drop_item($rr['id'],false); } } - q("delete from abook where abook_id = %d and abook_channel = %d", intval($abook['abook_id']), -- cgit v1.2.3 From 9c5df51141d68e50d3c1f5d3097160408debce48 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 17 Jun 2018 16:58:12 +0200 Subject: some work on mod group --- Zotlabs/Module/Group.php | 107 +++++++++++++++++++++++++------------- Zotlabs/Widget/Collections.php | 3 ++ app/group.apd | 6 +++ include/group.php | 8 --- include/text.php | 13 ++++- view/css/mod_group.css | 75 +++++--------------------- view/theme/redbasic/css/style.css | 32 +++--------- view/tpl/group_edit.tpl | 48 +++++++++-------- view/tpl/groupeditor.tpl | 26 ++++----- view/tpl/micropro_card.tpl | 6 +++ view/tpl/privacy_groups.tpl | 28 ++++++++++ 11 files changed, 181 insertions(+), 171 deletions(-) create mode 100644 app/group.apd create mode 100644 view/tpl/micropro_card.tpl create mode 100644 view/tpl/privacy_groups.tpl diff --git a/Zotlabs/Module/Group.php b/Zotlabs/Module/Group.php index 93a089d02..acebe995d 100644 --- a/Zotlabs/Module/Group.php +++ b/Zotlabs/Module/Group.php @@ -7,6 +7,17 @@ require_once('include/group.php'); class Group extends \Zotlabs\Web\Controller { + function init() { + if(! local_channel()) { + notice( t('Permission denied.') . EOL); + return; + } + + \App::$profile_uid = local_channel(); + + nav_set_selected('Privacy Groups'); + } + function post() { if(! local_channel()) { @@ -22,12 +33,10 @@ class Group extends \Zotlabs\Web\Controller { $r = group_add(local_channel(),$name,$public); if($r) { info( t('Privacy group created.') . EOL ); - $r = group_byname(local_channel(),$name); - if($r) - goaway(z_root() . '/group/' . $r); } - else - notice( t('Could not create privacy group.') . EOL ); + else { + notice( t('Could not create privacy group.') . EOL ); + } goaway(z_root() . '/group'); } @@ -74,30 +83,59 @@ class Group extends \Zotlabs\Web\Controller { notice( t('Permission denied') . EOL); return; } - + // Switch to text mode interface if we have more than 'n' contacts or group members - $switchtotext = get_pconfig(local_channel(),'system','groupedit_image_limit'); if($switchtotext === false) $switchtotext = get_config('system','groupedit_image_limit'); if($switchtotext === false) $switchtotext = 400; - - $tpl = get_markup_template('group_edit.tpl'); - $context = array('$submit' => t('Submit')); - - if((argc() == 2) && (argv(1) === 'new')) { - - return replace_macros($tpl, $context + array( - '$title' => t('Create a group of channels.'), - '$gname' => array('groupname',t('Privacy group name: '), '', ''), - '$gid' => 'new', - '$public' => array('public',t('Members are visible to other channels'), false, ''), + + + if((argc() == 1) || ((argc() == 2) && (argv(1) === 'new'))) { + + $new = (((argc() == 2) && (argv(1) === 'new')) ? true : false); + + $groups = q("SELECT id, gname FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + intval(local_channel()) + ); + + $i = 0; + foreach($groups as $group) { + $entries[$i]['name'] = $group['gname']; + $entries[$i]['id'] = $group['id']; + $entries[$i]['count'] = count(group_get_members($group['id'])); + $i++; + } + + $tpl = get_markup_template('privacy_groups.tpl'); + $o = replace_macros($tpl, [ + '$title' => t('Privacy Groups'), + '$add_new_label' => t('Add Group'), + '$new' => $new, + + // new group form + '$gname' => array('groupname',t('Privacy group name')), + '$public' => array('public',t('Members are visible to other channels'), false), '$form_security_token' => get_form_security_token("group_edit"), - )); - - + '$submit' => t('Submit'), + + // groups list + '$title' => t('Privacy Groups'), + '$name_label' => t('Name'), + '$count_label' => t('Members'), + '$entries' => $entries + ]); + + return $o; + } + + + + + $context = array('$submit' => t('Submit')); + $tpl = get_markup_template('group_edit.tpl'); if((argc() == 3) && (argv(1) === 'drop')) { check_form_security_token_redirectOnErr('/group', 'group_drop', 't'); @@ -172,22 +210,17 @@ class Group extends \Zotlabs\Web\Controller { $preselected[] = $member['xchan_hash']; } } - - $drop_tpl = get_markup_template('group_drop.tpl'); - $drop_txt = replace_macros($drop_tpl, array( - '$id' => $group['id'], - '$delete' => t('Delete'), - '$form_security_token' => get_form_security_token("group_drop"), - )); - - + $context = $context + array( - '$title' => t('Privacy group editor'), + '$title' => sprintf(t('Privacy Group: %s'), $group['gname']), + '$details_label' => t('Edit'), '$gname' => array('groupname',t('Privacy group name: '),$group['gname'], ''), '$gid' => $group['id'], '$drop' => $drop_txt, '$public' => array('public',t('Members are visible to other channels'), $group['visible'], ''), - '$form_security_token' => get_form_security_token('group_edit'), + '$form_security_token_edit' => get_form_security_token('group_edit'), + '$delete' => t('Delete Group'), + '$form_security_token_drop' => get_form_security_token("group_drop"), ); } @@ -196,14 +229,14 @@ class Group extends \Zotlabs\Web\Controller { return; $groupeditor = array( - 'label_members' => t('Members'), + 'label_members' => t('Group members'), 'members' => array(), - 'label_contacts' => t('All Connected Channels'), + 'label_contacts' => t('Not in this group'), 'contacts' => array(), ); $sec_token = addslashes(get_form_security_token('group_member_change')); - $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false); + $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : 'card'); foreach($members as $member) { if($member['xchan_url']) { $member['archived'] = (intval($member['abook_archived']) ? true : false); @@ -219,7 +252,7 @@ class Group extends \Zotlabs\Web\Controller { ); if(count($r)) { - $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); + $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : 'card'); foreach($r as $member) { if(! in_array($member['xchan_hash'],$preselected)) { $member['archived'] = (intval($member['abook_archived']) ? true : false); @@ -230,7 +263,7 @@ class Group extends \Zotlabs\Web\Controller { } $context['$groupeditor'] = $groupeditor; - $context['$desc'] = t('Click on a channel to add or remove.'); + $context['$desc'] = t('Click a channel to toggle membership'); if($change) { $tpl = get_markup_template('groupeditor.tpl'); diff --git a/Zotlabs/Widget/Collections.php b/Zotlabs/Widget/Collections.php index d2b29679a..bc9c812c6 100644 --- a/Zotlabs/Widget/Collections.php +++ b/Zotlabs/Widget/Collections.php @@ -8,6 +8,9 @@ class Collections { function widget($args) { + if(argc() < 2) + return; + $mode = ((array_key_exists('mode',$args)) ? $args['mode'] : 'conversation'); switch($mode) { case 'conversation': diff --git a/app/group.apd b/app/group.apd new file mode 100644 index 000000000..d16b9237c --- /dev/null +++ b/app/group.apd @@ -0,0 +1,6 @@ +version: 1 +url: $baseurl/group +requires: local_channel +name: Privacy Groups +photo: icon:users +categories: Networking diff --git a/include/group.php b/include/group.php index 03ebf7ee5..56bf210ff 100644 --- a/include/group.php +++ b/include/group.php @@ -279,14 +279,6 @@ function group_side($every="connections",$each="group",$edit = false, $group_id } $groups = array(); - - $groups[] = array( - 'text' => t('All Channels'), - 'id' => 0, - 'selected' => (($group_id == 0) ? 'group-selected' : ''), - 'href' => $every . (($every === 'network') ? '?f=&gid=0' : ''), - ); - $r = q("SELECT * FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", intval($_SESSION['uid']) diff --git a/include/text.php b/include/text.php index a8c28d7bd..8bade6e90 100644 --- a/include/text.php +++ b/include/text.php @@ -1018,21 +1018,30 @@ function magiclink_url($observer,$myaddr,$url) { -function micropro($contact, $redirect = false, $class = '', $textmode = false) { +function micropro($contact, $redirect = false, $class = '', $mode = false) { if($contact['click']) $url = '#'; else $url = chanlink_hash($contact['xchan_hash']); - return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array( + + $tpl = 'micropro_img.tpl'; + if($mode === true) + $tpl = 'micropro_txt.tpl'; + if($mode === 'card') + $tpl = 'micropro_card.tpl'; + + return replace_macros(get_markup_template($tpl), array( '$click' => (($contact['click']) ? $contact['click'] : ''), '$class' => $class . (($contact['archived']) ? ' archived' : ''), '$oneway' => (($contact['oneway']) ? true : false), '$url' => $url, '$photo' => $contact['xchan_photo_s'], '$name' => $contact['xchan_name'], + '$addr' => $contact['xchan_addr'], '$title' => $contact['xchan_name'] . ' [' . $contact['xchan_addr'] . ']', + '$network' => sprintf(t('Network: %s'), $contact['xchan_network']) )); } diff --git a/view/css/mod_group.css b/view/css/mod_group.css index b828e551d..215064706 100644 --- a/view/css/mod_group.css +++ b/view/css/mod_group.css @@ -1,66 +1,19 @@ - -#group-new-submit-wrapper { - margin-top: 30px; -} -/* -#group-edit-form > label { - float: left; - width: 300px; -} - -#group-edit-form input { - float: left; - width: 175px; -} - -#group-edit-form .field { - clear: both; -} -*/ -#group-edit-submit-wrapper input { - clear: both; - width: 100px; -} - -#group-edit-select-end { - clear: both; -} -/* -#group-edit-name-label { - float: left; - width: 175px; - margin-top: 20px; - margin-bottom: 20px; +.mpall, +.mpgroup { + line-height: 1.2; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } -#group-edit-name { - float: left; - width: 225px; - margin-top: 20px; - margin-bottom: 20px; +#groups-index th:nth-child(1), +#groups-index td:nth-child(1){ + white-space: nowrap; + padding: 7px 3px 7px 10px; } -#group-edit-name-wrapper { - - -} -*/ - -#group_members_select_label { - display: block; - float: left; - width: 175px; -} - -.group_members_select { - float: left; - width: 230px; - overflow: auto; -} - -#group_members_select_end { - clear: both; -} -#group-edit-name-end { - clear: both; +#groups-index th:nth-child(2), +#groups-index td:nth-child(2){ + text-align: center; + padding: 7px 10px 7px 7px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 87c97f1f5..6ffccb4e9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -693,31 +693,6 @@ nav .acpopup { margin-bottom: 15px; } -#group-members { - margin-top: 20px; - padding: 10px; - height: 250px; - overflow: auto; - border: 1px solid #ddd; -} - -#group-separator { - margin-top: 10px; - margin-bottom: 10px; -} - -#group-all-contacts { - padding: 10px; - height: 450px; - overflow: auto; - border: 1px solid #ddd; -} - -#group-edit-desc { - margin-top: 15px; -} - - #prof-members { margin-top: 20px; padding: 10px; @@ -830,7 +805,7 @@ div.jGrowl div.jGrowl-notification { .dropdown-notification, .notification, .member-item { - line-height: 1.1em; + line-height: 1.2em; font-size: 0.75rem; overflow: hidden; text-overflow: ellipsis; @@ -1177,6 +1152,7 @@ img.mail-conv-sender-photo { .wall-item-ago, .dropdown-sub-text { color: #777; + display: block; } .wall-item-content, @@ -1416,6 +1392,9 @@ main.fullscreen .generic-content-wrapper { main.fullscreen .section-title-wrapper { border-radius: 0px; + position: sticky; + top: 0; + z-index: 1020; } main.fullscreen .section-content-wrapper, @@ -1429,6 +1408,7 @@ main.fullscreen .section-content-wrapper-np { .atoken-index-row:hover td, .chatroom-index-row:hover td, +.group-index-row:hover td, .wikis-index-row:hover td, .locs-index-row:hover td, [id^="cloud-index-"]:hover td, diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl index d9412a6f7..88f037abe 100755 --- a/view/tpl/group_edit.tpl +++ b/view/tpl/group_edit.tpl @@ -1,26 +1,30 @@ -
      -

      {{$title}}

      - - -
      -
      - - - {{include file="field_input.tpl" field=$gname}} - {{include file="field_checkbox.tpl" field=$public}} - {{if $drop}}{{$drop}}{{/if}} -
      - +
      +
      +
      + + +
      -
      - -
      - +

      {{$title}}

      +
      -{{if $groupeditor}} -
      - {{include file="groupeditor.tpl"}} + +
      + {{$desc}} +
      +
      +
      + {{include file="groupeditor.tpl"}} +
      -{{/if}} -{{if $desc}}
      {{$desc}}
      {{/if}}
      diff --git a/view/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl index c79bb0a2a..94c275c7e 100755 --- a/view/tpl/groupeditor.tpl +++ b/view/tpl/groupeditor.tpl @@ -1,16 +1,12 @@ -
      -

      {{$groupeditor.label_members}}

      -
      -{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}} -
      -
      -
      -
      - -
      -

      {{$groupeditor.label_contacts}}

      -
      -{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}} -
      -
      +
      +

      {{$groupeditor.label_contacts}}

      +
      + {{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}} +
      +
      +
      +

      {{$groupeditor.label_members}}

      +
      + {{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}} +
      diff --git a/view/tpl/micropro_card.tpl b/view/tpl/micropro_card.tpl new file mode 100644 index 000000000..c1b621349 --- /dev/null +++ b/view/tpl/micropro_card.tpl @@ -0,0 +1,6 @@ + + {{if $oneway}}{{/if}} + {{$name}} + {{$addr}} + {{$network}} + diff --git a/view/tpl/privacy_groups.tpl b/view/tpl/privacy_groups.tpl new file mode 100644 index 000000000..b4e27ef2c --- /dev/null +++ b/view/tpl/privacy_groups.tpl @@ -0,0 +1,28 @@ +
      +
      + +

      {{$title}}

      +
      + + + + + + + + + {{foreach $entries as $group}} + + + + + {{/foreach}} +
      {{$name_label}}{{$count_label}}
      {{$group.name}}{{$group.count}}
      +
      -- cgit v1.2.3 From e4ed0f8acd5a994d7098e89e4408698d3b7a6129 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 17 Jun 2018 17:30:09 -0700 Subject: owa: htmlentity encoding encountered in authentication workflow (possibly introduced during Apache mod_rewrite with QSA flag) --- Zotlabs/Module/Magic.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index 4b3a223ba..25c318f30 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -19,7 +19,11 @@ class Magic extends \Zotlabs\Web\Controller { $rev = ((x($_REQUEST,'rev')) ? intval($_REQUEST['rev']) : 0); $owa = ((x($_REQUEST,'owa')) ? intval($_REQUEST['owa']) : 0); $delegate = ((x($_REQUEST,'delegate')) ? $_REQUEST['delegate'] : ''); - + + // Apache(?) appears to perform an htmlentities() operation on this variable + + $dest = html_entity_decode($dest); + $parsed = parse_url($dest); if(! $parsed) { if($test) { @@ -139,6 +143,9 @@ class Magic extends \Zotlabs\Web\Controller { if($owa) { + $dest = strip_zids($dest); + $dest = strip_query_param($dest,'f'); + $headers = []; $headers['Accept'] = 'application/x-zot+json' ; $headers['X-Open-Web-Auth'] = random_string(); -- cgit v1.2.3 From 7850ecbd95f37c86c516c7bde5f3299a6a91e9b5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 17 Jun 2018 20:53:05 -0700 Subject: remove several unused/unreferenced templates --- include/items.php | 12 ++++++ view/tpl/admin_hubloc.tpl | 27 ------------ view/tpl/api_config_xml.tpl | 66 ---------------------------- view/tpl/api_friends_xml.tpl | 5 --- view/tpl/api_ratelimit_xml.tpl | 6 --- view/tpl/api_status_xml.tpl | 46 -------------------- view/tpl/api_test_xml.tpl | 1 - view/tpl/api_timeline_atom.tpl | 90 --------------------------------------- view/tpl/api_timeline_rss.tpl | 26 ----------- view/tpl/api_timeline_xml.tpl | 20 --------- view/tpl/api_user_xml.tpl | 46 -------------------- view/tpl/birthdays_reminder.tpl | 10 ----- view/tpl/contact_head.tpl | 30 ------------- view/tpl/delegate.tpl | 57 ------------------------- view/tpl/display-head.tpl | 8 ---- view/tpl/events_menu_side.tpl | 8 ---- view/tpl/events_reminder.tpl | 10 ----- view/tpl/group_drop.tpl | 7 --- view/tpl/match.tpl | 16 ------- view/tpl/safesearch.tpl | 6 --- view/tpl/select_timezone.tpl | 11 ----- view/tpl/settings_connectors.tpl | 10 ----- view/tpl/toggle_mobile_footer.tpl | 2 - view/tpl/write_pages.tpl | 3 -- 24 files changed, 12 insertions(+), 511 deletions(-) delete mode 100755 view/tpl/admin_hubloc.tpl delete mode 100755 view/tpl/api_config_xml.tpl delete mode 100755 view/tpl/api_friends_xml.tpl delete mode 100755 view/tpl/api_ratelimit_xml.tpl delete mode 100755 view/tpl/api_status_xml.tpl delete mode 100755 view/tpl/api_test_xml.tpl delete mode 100755 view/tpl/api_timeline_atom.tpl delete mode 100755 view/tpl/api_timeline_rss.tpl delete mode 100755 view/tpl/api_timeline_xml.tpl delete mode 100755 view/tpl/api_user_xml.tpl delete mode 100755 view/tpl/birthdays_reminder.tpl delete mode 100755 view/tpl/contact_head.tpl delete mode 100755 view/tpl/delegate.tpl delete mode 100755 view/tpl/display-head.tpl delete mode 100755 view/tpl/events_menu_side.tpl delete mode 100755 view/tpl/events_reminder.tpl delete mode 100755 view/tpl/group_drop.tpl delete mode 100755 view/tpl/match.tpl delete mode 100644 view/tpl/safesearch.tpl delete mode 100644 view/tpl/select_timezone.tpl delete mode 100755 view/tpl/settings_connectors.tpl delete mode 100755 view/tpl/toggle_mobile_footer.tpl delete mode 100644 view/tpl/write_pages.tpl diff --git a/include/items.php b/include/items.php index 54df5d322..caf70b294 100755 --- a/include/items.php +++ b/include/items.php @@ -2948,6 +2948,18 @@ function start_delivery_chain($channel, $item, $item_id, $parent) { } } } + + // This will change the author to the post owner. Useful for RSS feeds which are to be syndicated + // to federated platforms which can't verify the identity of the author. + // This MAY cause you to run afoul of copyright law. + + $rewrite_author = intval(get_abconfig($channel['channel_id'],$item['owner_xchan'],'system','rself')); + if($rewrite_author) { + $item['author_xchan'] = $item['owner_xchan']; + if($item['owner']) { + $item['author'] = $item['owner']; + } + } } // Change this copy of the post to a forum head message and deliver to all the tgroup members diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl deleted file mode 100755 index 1bd1f0122..000000000 --- a/view/tpl/admin_hubloc.tpl +++ /dev/null @@ -1,27 +0,0 @@ -
      -

      {{$title}} - {{$page}}

      - - - - - {{foreach $th_hubloc as $th}}{{/foreach}} - - - - - {{foreach $hubloc as $hub}} - - - - {{/foreach}} - -
      {{$th}}
      {{$hub.hubloc_id}}{{$hub.hubloc_addr}}{{$hub.hubloc_host}}{{$hub.hubloc_status}} -
      - - - - -
      - - -
      diff --git a/view/tpl/api_config_xml.tpl b/view/tpl/api_config_xml.tpl deleted file mode 100755 index 8c0766c73..000000000 --- a/view/tpl/api_config_xml.tpl +++ /dev/null @@ -1,66 +0,0 @@ - - - {{$config.site.name}} - {{$config.site.server}} - default - - {{$config.site.logo}} - - true - en - {{$config.site.email}} - - - UTC - {{$config.site.closed}} - - false - {{$config.site.private}} - {{$config.site.textlimit}} - {{$config.site.ssl}} - {{$config.site.sslserver}} - 30 - - - - cc - - http://creativecommons.org/licenses/by/3.0/ - Creative Commons Attribution 3.0 - http://i.creativecommons.org/l/by/3.0/80x15.png - - - - - - - - - - - - - - - - - false - 20 - 600 - - - - false - INVALID SERVER - 5222 - update - - - StatusNet - - - - false - 0 - - diff --git a/view/tpl/api_friends_xml.tpl b/view/tpl/api_friends_xml.tpl deleted file mode 100755 index f2a7234d1..000000000 --- a/view/tpl/api_friends_xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - {{foreach $users as $user}} - {{include file="api_user_xml.tpl"}} - {{/foreach}} - diff --git a/view/tpl/api_ratelimit_xml.tpl b/view/tpl/api_ratelimit_xml.tpl deleted file mode 100755 index e4b470a25..000000000 --- a/view/tpl/api_ratelimit_xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - {{$hash.remaining_hits}} - {{$hash.hourly_limit}} - {{$hash.reset_time}} - {{$hash.resettime_in_seconds}} - diff --git a/view/tpl/api_status_xml.tpl b/view/tpl/api_status_xml.tpl deleted file mode 100755 index cbb736e22..000000000 --- a/view/tpl/api_status_xml.tpl +++ /dev/null @@ -1,46 +0,0 @@ -{{if $status}} - {{$status.created_at}} - {{$status.id}} - {{$status.text}} - {{$status.source}} - {{$status.truncated}} - {{$status.in_reply_to_status_id}} - {{$status.in_reply_to_user_id}} - {{$status.favorited}} - {{$status.in_reply_to_screen_name}} - {{$status.geo}} - {{$status.coordinates}} - {{$status.place}} - {{$status.contributors}} - - {{$status.user.id}} - {{$status.user.name}} - {{$status.user.screen_name}} - {{$status.user.location}} - {{$status.user.description}} - {{$status.user.profile_image_url}} - {{$status.user.url}} - {{$status.user.protected}} - {{$status.user.followers}} - {{$status.user.profile_background_color}} - {{$status.user.profile_text_color}} - {{$status.user.profile_link_color}} - {{$status.user.profile_sidebar_fill_color}} - {{$status.user.profile_sidebar_border_color}} - {{$status.user.friends_count}} - {{$status.user.created_at}} - {{$status.user.favourites_count}} - {{$status.user.utc_offset}} - {{$status.user.time_zone}} - {{$status.user.profile_background_image_url}} - {{$status.user.profile_background_tile}} - {{$status.user.profile_use_background_image}} - - {{$status.user.geo_enabled}} - {{$status.user.verified}} - - {{$status.user.statuses_count}} - {{$status.user.lang}} - {{$status.user.contributors_enabled}} - -{{/if}} diff --git a/view/tpl/api_test_xml.tpl b/view/tpl/api_test_xml.tpl deleted file mode 100755 index 80a541c39..000000000 --- a/view/tpl/api_test_xml.tpl +++ /dev/null @@ -1 +0,0 @@ -{{$ok}} diff --git a/view/tpl/api_timeline_atom.tpl b/view/tpl/api_timeline_atom.tpl deleted file mode 100755 index e8bfb689e..000000000 --- a/view/tpl/api_timeline_atom.tpl +++ /dev/null @@ -1,90 +0,0 @@ - - StatusNet - {{$rss.self}} - Friendika - Friendika API feed - {{$rss.logo}} - {{$rss.atom_updated}} - - - - - - http://activitystrea.ms/schema/1.0/person - {{$user.url}} - {{$user.name}} - - - - - - - {{$user.screen_name}} - {{$user.name}} - - homepage - {{$user.url}} - true - - - - - - - http://activitystrea.ms/schema/1.0/person - {{$user.contact_url}} - {{$user.name}} - - - - - - {{$user.screen_name}} - {{$user.name}} - - homepage - {{$user.url}} - true - - - - - - {{foreach $statuses as $status}} - - {{$status.objecttype}} - {{$status.message_id}} - {{$status.text}} - {{$status.statusnet_html}} - - {{$status.verb}} - {{$status.published}} - {{$status.updated}} - - - - - - - - http://activitystrea.ms/schema/1.0/person - {{$status.user.url}} - {{$status.user.name}} - - - - - {{$status.user.screen_name}} - {{$status.user.name}} - - - homepage - {{$status.user.url}} - true - - - - - - {{/foreach}} - diff --git a/view/tpl/api_timeline_rss.tpl b/view/tpl/api_timeline_rss.tpl deleted file mode 100755 index 86c645e99..000000000 --- a/view/tpl/api_timeline_rss.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - Friendika - {{$rss.alternate}} - - Friendika timeline - {{$rss.language}} - 40 - - {{$user.link}} - {{$user.name}}'s items - {{$user.profile_image_url}} - - -{{foreach $statuses as $status}} - - {{$status.user.name}}: {{$status.text}} - {{$status.text}} - {{$status.created_at}} - {{$status.url}} - {{$status.url}} - {{$status.source}} - -{{/foreach}} - - diff --git a/view/tpl/api_timeline_xml.tpl b/view/tpl/api_timeline_xml.tpl deleted file mode 100755 index f14d73e9c..000000000 --- a/view/tpl/api_timeline_xml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -{{foreach $statuses as $status}} - {{$status.text}} - {{$status.truncated}} - {{$status.created_at}} - {{$status.in_reply_to_status_id}} - {{$status.source}} - {{$status.id}} - {{$status.in_reply_to_user_id}} - {{$status.in_reply_to_screen_name}} - {{$status.geo}} - {{$status.favorited}} -{{include file="api_user_xml.tpl" user=$status.user}} {{$status.statusnet_html}} - {{$status.statusnet_conversation_id}} - {{$status.url}} - {{$status.coordinates}} - {{$status.place}} - {{$status.contributors}} - -{{/foreach}} diff --git a/view/tpl/api_user_xml.tpl b/view/tpl/api_user_xml.tpl deleted file mode 100755 index 3b51992f6..000000000 --- a/view/tpl/api_user_xml.tpl +++ /dev/null @@ -1,46 +0,0 @@ - - {{$user.id}} - {{$user.name}} - {{$user.screen_name}} - {{$user.location}} - {{$user.description}} - {{$user.profile_image_url}} - {{$user.url}} - {{$user.protected}} - {{$user.followers_count}} - {{$user.friends_count}} - {{$user.created_at}} - {{$user.favourites_count}} - {{$user.utc_offset}} - {{$user.time_zone}} - {{$user.statuses_count}} - {{$user.following}} - {{$user.profile_background_color}} - {{$user.profile_text_color}} - {{$user.profile_link_color}} - {{$user.profile_sidebar_fill_color}} - {{$user.profile_sidebar_border_color}} - {{$user.profile_background_image_url}} - {{$user.profile_background_tile}} - {{$user.profile_use_background_image}} - {{$user.notifications}} - {{$user.geo_enabled}} - {{$user.verified}} - {{$user.lang}} - {{$user.contributors_enabled}} - {{if $user.status}} - {{$user.status.created_at}} - {{$user.status.id}} - {{$user.status.text}} - {{$user.status.source}} - {{$user.status.truncated}} - {{$user.status.in_reply_to_status_id}} - {{$user.status.in_reply_to_user_id}} - {{$user.status.favorited}} - {{$user.status.in_reply_to_screen_name}} - {{$user.status.geo}} - {{$user.status.coordinates}} - {{$user.status.place}} - {{$user.status.contributors}} - {{/if}} - diff --git a/view/tpl/birthdays_reminder.tpl b/view/tpl/birthdays_reminder.tpl deleted file mode 100755 index d0500364a..000000000 --- a/view/tpl/birthdays_reminder.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{if $count}} - - -{{/if}} - diff --git a/view/tpl/contact_head.tpl b/view/tpl/contact_head.tpl deleted file mode 100755 index 72e7edbfb..000000000 --- a/view/tpl/contact_head.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - diff --git a/view/tpl/delegate.tpl b/view/tpl/delegate.tpl deleted file mode 100755 index cbaa8da86..000000000 --- a/view/tpl/delegate.tpl +++ /dev/null @@ -1,57 +0,0 @@ -

      {{$header}}

      - -
      {{$desc}}
      - -{{if $managers}} -

      {{$head_managers}}

      - -{{foreach $managers as $x}} - -
      - - - -
      - -{{/foreach}} -
      -
      -{{/if}} - - -

      {{$head_delegates}}

      - -{{if $delegates}} -{{foreach $delegates as $x}} - -
      - - - -
      - -{{/foreach}} -
      -{{else}} -{{$none}} -{{/if}} -
      - - -

      {{$head_potentials}}

      -{{if $potentials}} -{{foreach $potentials as $x}} - -
      - - - -
      - -{{/foreach}} -
      -{{else}} -{{$none}} -{{/if}} -
      - diff --git a/view/tpl/display-head.tpl b/view/tpl/display-head.tpl deleted file mode 100755 index 913784d98..000000000 --- a/view/tpl/display-head.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/view/tpl/events_menu_side.tpl b/view/tpl/events_menu_side.tpl deleted file mode 100755 index b9a9062b1..000000000 --- a/view/tpl/events_menu_side.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
      -

      {{$title}}

      - -
      diff --git a/view/tpl/events_reminder.tpl b/view/tpl/events_reminder.tpl deleted file mode 100755 index fd6a1a5c7..000000000 --- a/view/tpl/events_reminder.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{if $count}} - - -{{/if}} - diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl deleted file mode 100755 index 627debc80..000000000 --- a/view/tpl/group_drop.tpl +++ /dev/null @@ -1,7 +0,0 @@ -
      - -
      -
      diff --git a/view/tpl/match.tpl b/view/tpl/match.tpl deleted file mode 100755 index a5ebb043c..000000000 --- a/view/tpl/match.tpl +++ /dev/null @@ -1,16 +0,0 @@ -
      -
      - - {{$name}} - -
      -
      -
      - {{$name}} -
      -
      - {{if $connlnk}} -
      {{$conntxt}}
      - {{/if}} - -
      diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl deleted file mode 100644 index 58ce22741..000000000 --- a/view/tpl/safesearch.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
      -

      {{$safemode}}

      - -
      diff --git a/view/tpl/select_timezone.tpl b/view/tpl/select_timezone.tpl deleted file mode 100644 index 2820a54f4..000000000 --- a/view/tpl/select_timezone.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{{* TODO: Make id configurabel *}} - - diff --git a/view/tpl/settings_connectors.tpl b/view/tpl/settings_connectors.tpl deleted file mode 100755 index 8bea9ca63..000000000 --- a/view/tpl/settings_connectors.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
      -

      {{$title}}

      - -
      - - -{{$settings_connectors}} - -
      -
      diff --git a/view/tpl/toggle_mobile_footer.tpl b/view/tpl/toggle_mobile_footer.tpl deleted file mode 100755 index 82c0197ba..000000000 --- a/view/tpl/toggle_mobile_footer.tpl +++ /dev/null @@ -1,2 +0,0 @@ -{{$toggle_text}} - diff --git a/view/tpl/write_pages.tpl b/view/tpl/write_pages.tpl deleted file mode 100644 index 53146ee30..000000000 --- a/view/tpl/write_pages.tpl +++ /dev/null @@ -1,3 +0,0 @@ - -- cgit v1.2.3 From 0dc266153da954f5479979293f9fbd158ec0022e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 17 Jun 2018 21:01:22 -0700 Subject: This effectively reverts 438ce44a which symlinked doc/es to a non-existent file (doc/doc/es-es) --- doc/es | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/es b/doc/es index a170c77bc..c8ba7666b 120000 --- a/doc/es +++ b/doc/es @@ -1 +1 @@ -doc/es-es \ No newline at end of file +es-es \ No newline at end of file -- cgit v1.2.3 From dcd8fb289ee21536359998a64aeef2f4973834e3 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 17 Jun 2018 21:13:46 -0700 Subject: remove admin docs on upgrading from redmatrix; operation is no longer supported --- doc/admin/administrator_guide.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/doc/admin/administrator_guide.md b/doc/admin/administrator_guide.md index 34dfa8cad..5f1d40428 100644 --- a/doc/admin/administrator_guide.md +++ b/doc/admin/administrator_guide.md @@ -331,16 +331,6 @@ empty: util/config system directory_server "" -### Upgrading from RedMatrix to $Projectname - -#### How to migrate an individual channel from RedMatrix to $Projectname - -1. Clone the channel by opening an account on a $Projectname hub and performing a basic import (not content) from the original RedMatrix hub. Give your new clone time to sync connections and settings. -1. Export individual channel content from your RedMatrix hub to a set of JSON text files using the red.hub/uexport tool. Do this in monthly increments if necessary. -1. Import the JSON data files sequentially in chronological order into the $Projectname clone using the new.hub/import_items tool. -1. Inform your Friendica and Diaspora contacts that your channel moves. They need to reconnect to your new address. -1. After successful import (check!) delete your channel on the old RedMatrix Server. -1. On the $Projectname server visit new.hub/locs and upgrade to your channel to a primary one. And when the old Redmatrix server is still listed delete them here as well. Press "Sync" to inform all other server in the grid. ### Administration -- cgit v1.2.3 From 36d73b3da9eda9539a851c1a1e697db9ffa7d935 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 17 Jun 2018 21:41:20 -0700 Subject: consolidate the various project roadmap files and remove stuff that's either finished or abandoned --- doc/roadmap.bb | 46 +++++++++++++--------------------------------- doc/roadmap_hz3.md | 27 --------------------------- doc/roadmapv4.bb | 29 ----------------------------- 3 files changed, 13 insertions(+), 89 deletions(-) delete mode 100644 doc/roadmap_hz3.md delete mode 100644 doc/roadmapv4.bb diff --git a/doc/roadmap.bb b/doc/roadmap.bb index 9ef9f146a..78e6da489 100644 --- a/doc/roadmap.bb +++ b/doc/roadmap.bb @@ -1,49 +1,29 @@ -Roadmap for $Projectname V3 +Roadmap -*HZ = Hubzilla repository +Platform -Crypto - Convert E2EE to dynamic loading (on demand) using jQuery.getScript() [or other methods] to only load encryption libs when you require them. This should also support multiple encryption libraries (e.g. SJCL, others) triggered from the choice of algorithm and remain pluggable. + Convert E2EE and select Javascript resources to dynamic loading to dynamic loading using jQuery.getScript() [or other methods]. -Subscriptions and business models - Build enough into core(/addons) to generate income (or at least try and cover costs) out of the box +Webpages - Resolve the "every photo has an item" confusion, perhaps every file should also - but only if we can explain it and separate them conceptually. - -Migration tools - Friendica importer - Diaspora importer (channel and connection import done, conversations and photos still in progress and waiting for support from Diaspora) - -Webpage design UI improvements - If practical, separate "conversation" sub-themes from overall themes so one can choose different conversation and content layouts within a base theme. Make webpage building easy, with point-n-click selectors to build PDLs - bring back WYSIWYG, which ideally requires a JS abstraction layer so we can use any editor and change it based on mimetype -Social Networking Federation - Friendica native mode? - Pump.io? - Others? - -Lists - Create a list object to contain arbitrary things for system use - Create a list object to contain arbitrary things for personal use Events + Recurring events + Integrate Hubzilla events with CalDAV + + +Connections + + CardDAV integration with abook and profiles -Zot - Provide a way to sync web resources. This could be built on DAV except for preserving resource naming (guids) instead of filenames. -API extensions - More, more, more. +Issues manager -Evangelism - More documentation. More, more, more. - Libzot + Provide easy(easier) channel move (as opposed to channel copy or clone) -DNS abstraction for V3 - Allow a channel to live in an arbitrary "DNS" namespace, for instance "mike@core.hubzilla". Use our directories and zot to find the actual DNS location via redirection. This could potentially allow hubs to be hidden behind tor or alt-roots and accessible only via the matrix. - \ No newline at end of file diff --git a/doc/roadmap_hz3.md b/doc/roadmap_hz3.md deleted file mode 100644 index a64fb2d5c..000000000 --- a/doc/roadmap_hz3.md +++ /dev/null @@ -1,27 +0,0 @@ - -Hubzilla III -============ - -Due: December 2017 -Codename: - - -Wishlist: - -- Move CalDAV/CardDAV server to core - -- Integrate Hubzilla events with CalDAV - -- Connection 'roles' allows you to select different permission roles for your connections; such as follower, friend, contributor, etc. - -- CardDAV integration with abook and profiles - -- App tray - -- issues manager - -- wiki cloning - -- provide easy channel move (as opposed to channel copy or clone), which is currently supported only by the basic server role. - -- provide RSA keychange operation; which cannot affect the primary identity (which is based on the channel keys), so add a secondary dynamic key pair which will be used for all other operations and can be upgraded or revoked at any time. \ No newline at end of file diff --git a/doc/roadmapv4.bb b/doc/roadmapv4.bb deleted file mode 100644 index 419cd8d4c..000000000 --- a/doc/roadmapv4.bb +++ /dev/null @@ -1,29 +0,0 @@ -[h1]Project Roadmap V4[/h1] - -[h2]Hubzilla 2.0 - code name "Universal Thunder"[/h2] - -[h3]Project Core Development[/h3] - -Goals/Highlights: - - -Focus on visual website design tools, widgets, and sharing mechanisms - -[x] App organisation. - -[x] Conversion of core application to a composer format living under the namespace "Zotlabs" - -[x] Conversion of Modules to a more general purpose Controllers layout with DB/memory based -controller routing as opposed to filesystem routing. - -[x] (partial) Conversion of core Zot Protocol to a class library - -[x] Abstraction of nomadic identity so that sending/receiving to/from singleton networks to/from any clone works flawlessly - [b]provided[/b] the clone physically connected to that singleton identity is up. - -[h3]Community Development[/h3] - -[x] CalDAV/CardDAV - -E-Commerce - -Auto Updater \ No newline at end of file -- cgit v1.2.3 From e6d7f22ba91849632f91e306b9f2e802adc6af27 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Mon, 18 Jun 2018 23:17:29 +0200 Subject: fix simple error --- view/nl/hmessages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po index 5d22d74a5..c98121122 100644 --- a/view/nl/hmessages.po +++ b/view/nl/hmessages.po @@ -8378,7 +8378,7 @@ msgstr "Afleveringsrapport" msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d reactie" -msgstr[1] "%d reacties getoond" +msgstr[1] "%d reacties" #: ../../Zotlabs/Lib/ThreadItem.php:343 ../../Zotlabs/Lib/ThreadItem.php:344 #, php-format -- cgit v1.2.3 From eabbad176d7330e09f61517b6c56cfcd230afa4d Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Mon, 18 Jun 2018 23:20:35 +0200 Subject: fix simple error --- view/nl/hstrings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php index 07ecb0602..3581950aa 100644 --- a/view/nl/hstrings.php +++ b/view/nl/hstrings.php @@ -1816,7 +1816,7 @@ App::$strings["share"] = "delen"; App::$strings["Delivery Report"] = "Afleveringsrapport"; App::$strings["%d comment"] = array( 0 => "%d reactie", - 1 => "%d reacties getoond", + 1 => "%d reacties", ); App::$strings["View %s's profile - %s"] = "Profiel van %s bekijken - %s"; App::$strings["to"] = "aan"; -- cgit v1.2.3 From f801f5227459564888a0d35fd65a1d2c4c685df3 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 18 Jun 2018 17:07:20 -0700 Subject: provide flag to collect_recipients to exclude privacy groups (for federation plugin use) --- include/items.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index caf70b294..51a26f78c 100755 --- a/include/items.php +++ b/include/items.php @@ -19,9 +19,10 @@ require_once('include/permissions.php'); * * @param array $item * @param[out] boolean $private_envelope + * @param boolean $include_groups * @return array containing the recipients */ -function collect_recipients($item, &$private_envelope) { +function collect_recipients($item, &$private_envelope,$include_groups = true) { require_once('include/group.php'); @@ -34,7 +35,12 @@ function collect_recipients($item, &$private_envelope) { $allow_people = expand_acl($item['allow_cid']); - $allow_groups = expand_groups(expand_acl($item['allow_gid'])); + if($include_groups) { + $allow_groups = expand_groups(expand_acl($item['allow_gid'])); + } + else { + $allow_groups = []; + } $recipients = array_unique(array_merge($allow_people,$allow_groups)); -- cgit v1.2.3 From d448742ae5059ad4aa6e3381b91e4c0e3b9d7766 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 18 Jun 2018 20:18:29 -0700 Subject: translate dos line endings --- doc/api/api_functions.bb | 266 ++++++------ doc/ca/profiles.bb | 74 ++-- doc/campaign.bb | 474 ++++++++++---------- doc/checking_account_quota_usage.bb | 40 +- doc/comanche.bb | 522 +++++++++++----------- doc/dev_beginner.bb | 838 ++++++++++++++++++------------------ doc/developer_function_primer.bb | 86 ++-- doc/es-es/git_for_non_developers.bb | 156 +++---- doc/external-resource-links.bb | 42 +- doc/extra_features.bb | 196 ++++----- doc/git_for_non_developers.bb | 142 +++--- doc/intro_for_developers.bb | 226 +++++----- doc/plugins.bb | 624 +++++++++++++-------------- doc/problems-following-an-update.bb | 76 ++-- doc/red2pi.bb | 684 ++++++++++++++--------------- doc/schema_development.bb | 156 +++---- doc/sv/main.bb | 160 +++---- 17 files changed, 2381 insertions(+), 2381 deletions(-) diff --git a/doc/api/api_functions.bb b/doc/api/api_functions.bb index e6cde3dc6..fe7cb11ba 100644 --- a/doc/api/api_functions.bb +++ b/doc/api/api_functions.bb @@ -1,133 +1,133 @@ -[b]Red Twitter API[/b] - -The "basic" Red web API is based on the Twitter API, as this provides instant compatibility with a huge number of third-party clients and applications without requiring any code changes on their part. It is also a super-set of the StatusNet version of the Twitter API, as this also has existing wide support. - -Red has a lot more capability that isn't exposed in the Twitter interfaces or where we are forced to "dumb-down" the API functions to work with the primitive Twitter/StatusNet communications and privacy model. So we plan to extend the Twitter API in ways that will allow Red-specific clients to make full use of Red features without being crippled. - -A dedicated Red API is also being developed to work with native data structures and permissions and which do not require translating to different privacy and permission models and storage formats. This will be described in other documents. The prefix for all of the native endpoints is 'api/red'. - -Red provides multiple channels accesible via the same login account. With Red, any API function which requires authentication will accept a parameter &channel={channel_nickname} - and will select that channel and make it current before executing the API command. By default, the default channel associated with an account is selected. - -Red also provides an extended permission model. In the absence of any Red specific API calls to set permissions, they will be set to the default permissions settings which are associated with the current channel. - -Red will probably never be able to support the Twitter 'api/friendships' functions fully because Red is not a social network and has no concept of "friendships" - it only recognises permissions to do stuff (or not do stuff as the case may be). - -Legend: T= Twitter, S= StatusNet, F= Friendica, R= Red, ()=Not yet working, J= JSON only (XML formats deprecated) - -Twitter API compatible functions: - - api/account/verify_credentials T,S,F,R - api/statuses/update T,S,F,R - api/users/show T,S,F,R - api/statuses/home_timeline T,S,F,R - api/statuses/friends_timeline T,S,F,R - api/statuses/public_timeline T,S,F,R - api/statuses/show T,S,F,R - api/statuses/retweet T,S,F,R - api/statuses/destroy T,S,F,(R) - api/statuses/mentions T,S,F,(R) - api/statuses/replies T,S,F,(R) - api/statuses/user_timeline T,S,F,(R) - api/favorites T,S,F,R - api/account/rate_limit_status T,S,F,R - api/help/test T,S,F,R - api/statuses/friends T,S,F,R - api/statuses/followers T,S,F,R - api/friends/ids T,S,F,R - api/followers/ids T,S,F,R - api/direct_messages/new T,S,F,R - api/direct_messages/conversation T,S,F,R - api/direct_messages/all T,S,F,R - api/direct_messages/sent T,S,F,R - api/direct_messages T,S,F,R - api/oauth/request_token T,S,F,R - api/oauth/access_token T,S,F,R - api/favorites T,S,R - api/favorites/create T,S,R - api/favorites/destroy T,S,R - -Twitter API functions supported by StatusNet but not currently by Friendica or Red - - api/statuses/retweets_of_me T,S - api/friendships/create T,S - api/friendships/destroy T,S - api/friendships/exists T,S - api/friendships/show T,S - api/account/update_location T,S - api/account/update_profile_background_image T,S - api/account/update_profile_image T,S - api/blocks/create T,S - api/blocks/destroy T,S - -Twitter API functions not currently supported by StatusNet - - api/statuses/retweeted_to_me T - api/statuses/retweeted_by_me T - api/direct_messages/destroy T - api/account/end_session T,(R) - api/account/update_delivery_device T - api/notifications/follow T - api/notifications/leave T - api/blocks/exists T - api/blocks/blocking T - api/lists T - -Statusnet compatible extensions to the Twitter API supported in both Friendica and Red - - api/statusnet/version S,F,R - api/statusnet/config S,F,R - -Friendica API extensions to the Twitter API supported in both Friendica and Red - - api/statuses/mediap F,R - -Red specific API extensions to the Twitter API not supported in Friendica - - api/account/logout R - api/export/basic R,J - api/friendica/config R - api/red/config R - api/friendica/version R - - api/red/version R - - api/red/channel/export/basic R,J - api/red/channel/stream R,J (currently post only) - api/red/albums R,J - api/red/photos R,J (option album=xxxx) - -Red proposed API extensions to the Twitter API - - api/statuses/edit (R),J - api/statuses/permissions (R),J - api/statuses/permissions/update (R),J - api/statuses/ids (R),J # search for existing message_id before importing a foreign post - api/files/show (R),J - api/files/destroy (R),J - api/files/update (R),J - api/files/permissions (R),J - api/files/permissions/update (R),J - api/pages/show (R),J - api/pages/destroy (R),J - api/pages/update (R),J - api/pages/permissions (R),J - api/pages/permissions/update (R),J - api/events/show (R),J - api/events/update (R),J - api/events/permissions (R),J - api/events/permissions/update (R),J - api/events/destroy (R),J - api/photos/show (R),J - api/photos/update (R),J - api/photos/permissions (R),J - api/photos/permissions/update (R),J - api/albums/destroy (R),J - api/albums/show (R),J - api/albums/update (R),J - api/albums/permissions (R),J - api/albums/permissions/update (R),J - api/albums/destroy (R),J - api/friends/permissions (R),J - -#include doc/macros/main_footer.bb; - +[b]Red Twitter API[/b] + +The "basic" Red web API is based on the Twitter API, as this provides instant compatibility with a huge number of third-party clients and applications without requiring any code changes on their part. It is also a super-set of the StatusNet version of the Twitter API, as this also has existing wide support. + +Red has a lot more capability that isn't exposed in the Twitter interfaces or where we are forced to "dumb-down" the API functions to work with the primitive Twitter/StatusNet communications and privacy model. So we plan to extend the Twitter API in ways that will allow Red-specific clients to make full use of Red features without being crippled. + +A dedicated Red API is also being developed to work with native data structures and permissions and which do not require translating to different privacy and permission models and storage formats. This will be described in other documents. The prefix for all of the native endpoints is 'api/red'. + +Red provides multiple channels accesible via the same login account. With Red, any API function which requires authentication will accept a parameter &channel={channel_nickname} - and will select that channel and make it current before executing the API command. By default, the default channel associated with an account is selected. + +Red also provides an extended permission model. In the absence of any Red specific API calls to set permissions, they will be set to the default permissions settings which are associated with the current channel. + +Red will probably never be able to support the Twitter 'api/friendships' functions fully because Red is not a social network and has no concept of "friendships" - it only recognises permissions to do stuff (or not do stuff as the case may be). + +Legend: T= Twitter, S= StatusNet, F= Friendica, R= Red, ()=Not yet working, J= JSON only (XML formats deprecated) + +Twitter API compatible functions: + + api/account/verify_credentials T,S,F,R + api/statuses/update T,S,F,R + api/users/show T,S,F,R + api/statuses/home_timeline T,S,F,R + api/statuses/friends_timeline T,S,F,R + api/statuses/public_timeline T,S,F,R + api/statuses/show T,S,F,R + api/statuses/retweet T,S,F,R + api/statuses/destroy T,S,F,(R) + api/statuses/mentions T,S,F,(R) + api/statuses/replies T,S,F,(R) + api/statuses/user_timeline T,S,F,(R) + api/favorites T,S,F,R + api/account/rate_limit_status T,S,F,R + api/help/test T,S,F,R + api/statuses/friends T,S,F,R + api/statuses/followers T,S,F,R + api/friends/ids T,S,F,R + api/followers/ids T,S,F,R + api/direct_messages/new T,S,F,R + api/direct_messages/conversation T,S,F,R + api/direct_messages/all T,S,F,R + api/direct_messages/sent T,S,F,R + api/direct_messages T,S,F,R + api/oauth/request_token T,S,F,R + api/oauth/access_token T,S,F,R + api/favorites T,S,R + api/favorites/create T,S,R + api/favorites/destroy T,S,R + +Twitter API functions supported by StatusNet but not currently by Friendica or Red + + api/statuses/retweets_of_me T,S + api/friendships/create T,S + api/friendships/destroy T,S + api/friendships/exists T,S + api/friendships/show T,S + api/account/update_location T,S + api/account/update_profile_background_image T,S + api/account/update_profile_image T,S + api/blocks/create T,S + api/blocks/destroy T,S + +Twitter API functions not currently supported by StatusNet + + api/statuses/retweeted_to_me T + api/statuses/retweeted_by_me T + api/direct_messages/destroy T + api/account/end_session T,(R) + api/account/update_delivery_device T + api/notifications/follow T + api/notifications/leave T + api/blocks/exists T + api/blocks/blocking T + api/lists T + +Statusnet compatible extensions to the Twitter API supported in both Friendica and Red + + api/statusnet/version S,F,R + api/statusnet/config S,F,R + +Friendica API extensions to the Twitter API supported in both Friendica and Red + + api/statuses/mediap F,R + +Red specific API extensions to the Twitter API not supported in Friendica + + api/account/logout R + api/export/basic R,J + api/friendica/config R + api/red/config R + api/friendica/version R + + api/red/version R + + api/red/channel/export/basic R,J + api/red/channel/stream R,J (currently post only) + api/red/albums R,J + api/red/photos R,J (option album=xxxx) + +Red proposed API extensions to the Twitter API + + api/statuses/edit (R),J + api/statuses/permissions (R),J + api/statuses/permissions/update (R),J + api/statuses/ids (R),J # search for existing message_id before importing a foreign post + api/files/show (R),J + api/files/destroy (R),J + api/files/update (R),J + api/files/permissions (R),J + api/files/permissions/update (R),J + api/pages/show (R),J + api/pages/destroy (R),J + api/pages/update (R),J + api/pages/permissions (R),J + api/pages/permissions/update (R),J + api/events/show (R),J + api/events/update (R),J + api/events/permissions (R),J + api/events/permissions/update (R),J + api/events/destroy (R),J + api/photos/show (R),J + api/photos/update (R),J + api/photos/permissions (R),J + api/photos/permissions/update (R),J + api/albums/destroy (R),J + api/albums/show (R),J + api/albums/update (R),J + api/albums/permissions (R),J + api/albums/permissions/update (R),J + api/albums/destroy (R),J + api/friends/permissions (R),J + +#include doc/macros/main_footer.bb; + diff --git a/doc/ca/profiles.bb b/doc/ca/profiles.bb index 513bf5fed..5aa04e706 100644 --- a/doc/ca/profiles.bb +++ b/doc/ca/profiles.bb @@ -1,37 +1,37 @@ -[b]Profiles[/b] - -$Projectname has unlimited profiles. You may use different profiles to show different "sides of yourself" to different audiences. This is different to having different channels. Different channels allow for completely different sets of information. You may have a channel for yourself, a channel for your sports team, a channel for your website, or whatever else. A profile allows for finely graded "sides" of each channel. For example, your default public profile might say "Hello, I'm Fred, and I like laughing". You may show your close friends a profile that adds "and I also enjoy dwarf tossing". - -You always have a profile known as your "default" or "public" profile. This profile is always available to the general public and cannot be hidden (there may be rare exceptions on privately run or disconnected sites). You may, and probably should restrict the information you make available on your public profile. - -That said, if you want other friends to be able to find you, it helps to have the following information in your public profile... - -[ul][*]Your real name or at least a nickname everybody knows -[*]A photo of you -[*]Your location on the planet, at least to a country level.[/ul] - -In addition, if you'd like to meet people that share some general interests with you, please take a moment and add some "Keywords" to your profile. Such as "music, linux, photography" or whatever. You can add as many keywords as you like. - -To create an alternate profile, first go to [zrl=[baseurl]/settings/features]Settings > Additional Features[/zrl] and enable "Multiple Profiles" there, otherwise you won't have the ability to use more than just your default profile. - -Then select "Edit Profiles" from the menu of your $Projectname site. You may edit an existing profile, change the profile photo, add things to a profile or create a new profile. You may also create a "clone" of an existing profile if you only wish to change a few items but don't wish to enter all the information again. To do that, click on the profile you want to clone and choose "Clone this profile" there. - -In the list of your profiles, you can also choose the contacts who can see a specific profile. Just click on "Edit visibility" next to the profile in question (only available for the profiles that are not your default profile) and then click on user images to add them to or remove them from the group of people who can see this profile. - -Once a profile has been selected, when the person views your profile, they will see the private profile you have assigned. If they are not authenticated, they will see your public profile. - -There is a setting which allows you to publish your profile to a directory and ensure that it can be found by others. You can change this setting on the "Settings" page. - -If you do not wish to be found be people unless you give them your channel address, you may leave your profile unpublished. - -[b]Keywords and Directory Search[/b] - -On the directory page, you may search for people with published profiles. Currently, only the name field and the keywords are searched. You may also include such keywords in your default profile - which may be used to search for common interests with other members. Keywords are used in the channel suggestion tool and although they aren't visible in the directory, they are shown if people visit your profile page. - -On your Connnections page and in the directory there is a link to "Suggestions" or "Channel Suggestions", respectively. This will find channels who have matching and/or similar keywords. The more keywords you provide, the more relevant the search results that are returned. These are sorted by relevance. - -See Also - -[zrl=[baseurl]/help/AdvancedSearch]Advanced Searching[/zrl] - -#include doc/macros/main_footer.bb; +[b]Profiles[/b] + +$Projectname has unlimited profiles. You may use different profiles to show different "sides of yourself" to different audiences. This is different to having different channels. Different channels allow for completely different sets of information. You may have a channel for yourself, a channel for your sports team, a channel for your website, or whatever else. A profile allows for finely graded "sides" of each channel. For example, your default public profile might say "Hello, I'm Fred, and I like laughing". You may show your close friends a profile that adds "and I also enjoy dwarf tossing". + +You always have a profile known as your "default" or "public" profile. This profile is always available to the general public and cannot be hidden (there may be rare exceptions on privately run or disconnected sites). You may, and probably should restrict the information you make available on your public profile. + +That said, if you want other friends to be able to find you, it helps to have the following information in your public profile... + +[ul][*]Your real name or at least a nickname everybody knows +[*]A photo of you +[*]Your location on the planet, at least to a country level.[/ul] + +In addition, if you'd like to meet people that share some general interests with you, please take a moment and add some "Keywords" to your profile. Such as "music, linux, photography" or whatever. You can add as many keywords as you like. + +To create an alternate profile, first go to [zrl=[baseurl]/settings/features]Settings > Additional Features[/zrl] and enable "Multiple Profiles" there, otherwise you won't have the ability to use more than just your default profile. + +Then select "Edit Profiles" from the menu of your $Projectname site. You may edit an existing profile, change the profile photo, add things to a profile or create a new profile. You may also create a "clone" of an existing profile if you only wish to change a few items but don't wish to enter all the information again. To do that, click on the profile you want to clone and choose "Clone this profile" there. + +In the list of your profiles, you can also choose the contacts who can see a specific profile. Just click on "Edit visibility" next to the profile in question (only available for the profiles that are not your default profile) and then click on user images to add them to or remove them from the group of people who can see this profile. + +Once a profile has been selected, when the person views your profile, they will see the private profile you have assigned. If they are not authenticated, they will see your public profile. + +There is a setting which allows you to publish your profile to a directory and ensure that it can be found by others. You can change this setting on the "Settings" page. + +If you do not wish to be found be people unless you give them your channel address, you may leave your profile unpublished. + +[b]Keywords and Directory Search[/b] + +On the directory page, you may search for people with published profiles. Currently, only the name field and the keywords are searched. You may also include such keywords in your default profile - which may be used to search for common interests with other members. Keywords are used in the channel suggestion tool and although they aren't visible in the directory, they are shown if people visit your profile page. + +On your Connnections page and in the directory there is a link to "Suggestions" or "Channel Suggestions", respectively. This will find channels who have matching and/or similar keywords. The more keywords you provide, the more relevant the search results that are returned. These are sorted by relevance. + +See Also + +[zrl=[baseurl]/help/AdvancedSearch]Advanced Searching[/zrl] + +#include doc/macros/main_footer.bb; diff --git a/doc/campaign.bb b/doc/campaign.bb index 677abf8c0..dddc614f9 100644 --- a/doc/campaign.bb +++ b/doc/campaign.bb @@ -1,237 +1,237 @@ -[b]Initial Indiegg pitch[/b] - -[b][color= grey][size=20]What have we done, and what we hope to achieve[/size][/color][/b] - -[b][color= grey][size=18]Single-click sign on, nomadic identity, censorship-resistance, privacy, self-hosting[/size][/color][/b] - -We started $Projectname project by asking ourselves a few questions: - -- Imagine if it was possible to just access the content of different web sites, without the need to enter usernames and passwords for every site. Such a feature would permit Single-Click user identification: the ability to access sites simply by clicking on links to remote sites. -Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online. - -We liked this idea and went ahead with coding it immediately. Today, single-click sign is in alpha state. It needs more love, which means a solid three months of full-time development efforts. - -- Think of your Facebook, Twitter, WordPress, or any other website where you currently have an account. Now imagine being able to clone your account, to make an exact duplicate of it (with all of your friends, posts and settings), then export your cloned account into another server that is part of this communication network. After you're done, both of your accounts are synced from the time they were cloned. It doesn't matter where you log in (at your original location, or where you imported your clone). You see the same content, the same friends, posts, and account settings. -At that point, it is more appropriate to call your account an identity that is nomadic (it is not tied to one home, unless you choose to do so!). -It's 2013, our online presence no longer has to be tied to a single server, domain name or IP address. We should be able to clone and import our identities to other servers. In such a network, it should only matter who you are, not where you are. - -We're very intrigued by the possibilities nomadic identities open up for freedom, censorship-resistance, and identity resilience. Consider the following scenarios: - - -- Should a repressive government or corporation decide to delete your account, your cloned identity lives on, because it is located on another server, across the world, which is part of the same communication network. You can't be silenced! - - -- What if there is a server meltdown, and your identity goes off line. No problem, you log into your clone and all is good. - - -- Your server administrator can no longer afford to keep paying to support a free service (a labor love and principle, which all of us have participating in as system administrators of Friendica sites!). She notifies you that you must clone your account before the shutoff date. Rather than loose all your friends, and start from scratch by creating a new identity somewhere, you clone and move to another server. -We feel this is especially helpful for the free web, where administrators of FOSS community sites are often faced with difficult financial decisions. Since many of them rely on donations, sometimes servers have to be taken offline, when costs become prohibitive for the brave DIY souls running those server. Nomadic identities should relieve some of the pressures associated with such situations. - -At the same time, we are also thinking of solutions that would make it possible for people running Red hubs to be financially sustainable. To that end, we're starting to implement service classes in our code, which would allow administrators to structure paid levels of service, if they choose to do so. - -Today, nomadic identity is currently in alpha state. It also needs more love, which means a solid three months of full-time development efforts. - -- Imagine a social network that is censorship-resistant, and privacy-respecting by design. It is not controlled by one mega-corporation, and where users cannot be easily censored by oppressive governments. So, in addition to nomadic identities, we are talking about decentralization, open source, freely software, that can run on any hardware that supports a database and a modern web browser. And we mean "any hardware", from a self-hosted $35 Raspberry Pi, to the very latest Intel Xeon and AMD Bulldozer-powered server behemoths. - -We've realized that privacy requires full control over content. We should be able to delete, backup and download all of our content, as well as associated account/identity information. To this end, we have already implemented the initial version of account export and backup. - -Concerned about pages and pages of posts from months and years past? The solution should be simple: visit your settings page, specify that all content older than 7 days, with the exception of starred posts, should be automatically deleted. Done, the clutter is gone! (Consider also the privacy and anti-mass surveillance implications of this feature. PRISM disclosures have hinted that three-letter spying agencies around the world are recording all internet traffic and storing it for a few days at a time. We feel that automatic post expiration becomes a rather useful feature in this context, and implementing it is one of our near future priorities.) - -[b][color= grey][size=18]The Affinity Slider and Access Control Lists[/size][/color][/b] - -- What if the permissions and access control lists that help secure modern operating systems were extended into a communication network that lived on the internet? This means somebody could log into this network from their home site, and with the simple click of a few buttons dynamically sort who can have access to their online content on a very fine level: from restricting others from seeing your latest blog post, to sharing your bookmarks with the world. - -We've coded the initial version of such a new feature. It is called the "Affinity Slider", and in our very-alpha user interface it looks like this. -[img]https://friendicared.net/photo/b07b0262e3146325508b81a9d1ae4a1e-0.png[/img] - -{INSERT SCREENSHOT OF A MATRIX PAGE} - -Think of it as an easy way to filter content that you see, based on the degree of "closeness" to you. Move the slider to Friends, and only content coming from contacts you've tagged as friends is displayed on your home page. Uncluttering thousands of contacts, friends, RSS feeds, and other content should be a basic feature of modern communication on the web, but not at the expense of ease of use. - -In addition to the Affinity Slider, we also have the ACL (Access Control List). Say you want to share something with only 5 of your contacts (a blog, two friends from college, and two forums). You click on the padlock, choose the recipients, and that's it. Only those identities will recieve their posts. Furthermore, the post will be encrypted via PKI (pulic key encryption) to help maintain privacy. In the age of PRISM, we don't know all the details on what's safe out there, but we still think that privacy by design should be automatically present, invisible to the user, and easy to use. -Attaching permissions to any data that lives on this network, potentially solves a great many headaches, while achieving simplicity in communication. - -Think of it this way: the internet is nothing, but a bunch of permissions and a folder of data. You, the user controls the permissions and thus the data that is relevant to you. - -[b][color= grey][size=20]The Matrix is Born![/size][/color][/b] - -After asking and striving to answer a number of such questions, we realized that we were imagining a general purpose communication network with a number of unique, and potentially game-changing, features. We called it $Projectname and started thinking of it as an over-lay on top of the internet as it exists today; an operating system re-invented as a communication network, with its own permissions, access control lists, protocol, connectors to others services, and open-ended possibilities via its API. The sum of the matrix is greater than it's parts. We're not building website, but a way for websites to link together and grow into something that is unique and ever-changing, with autonomy and privacy. - -It's a lot of work, for anyone. So far, we've got a team of a handful of volunteers, code geeks, brave early adopters, system administrators and other good people, willing to give the project a shot. We're motivated by our commitment to a free web, where privacy is built-in, and corporations don't have a stranglehold on our daily communication. - -We need your help to finish it and release it to the world! - -[b][color= grey][size=20]What have we written so far[/size][/color][/b] - -As of the today, $Projectname is in developer preview (alpha) state. It is not ready for everyday use, but some of the initial set of core features are implemented (again, in alpha state). These include: - -- Zot, the protocol powering the matrix -- Single-signon logins. -- Nomadic identities -- Basic content manipulation: creation, deletion, rudimentary handling of photos, and media files -- A bare-bones outline of the API and user documentation. - - -[b][color= grey][size=20]Our TO-DO List[/size][/color][/b] - -However, in addition to finishing and polishing the above, there are a number of features that have to implemented to make $Projectname ready for daily use. If we meet our fundraising goal, we hope to dive into the following road map, by order of priority: - -- A professionally designed user interface (UI), interface that is adaptive to any user level, from end users who want to use the Matrix as a social network, to tinkerers who will put together a customized blog using Comanche, to hackers who will develop and extend the matrix using a built-in code editor, that hooks to the API and the git. - -- Comanche, our new markup language, similar to BBCode, with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. You can read more about it on our github wiki: https://github.com/friendica/red/wiki/Comanche - -- A unique help system that lives in the matrix, but is not based on the principles of a search engine. We have some interesting ideas about decentralizing help documentation, without going down the road of distributed search engines. Here's a hint: We shouldn't be searching at all, we should just be filtering what's already there in new, and cunning ways. - -- An appropriate logo, along with professionally done documentation system, both for our API, as well as users. - -- WordPress-like single button software upgrades - -- A built-in development environment, using an integrated web-based code editor such as Ace9 - -[b][color= grey][size=20]What will the money be used for[/size][/color][/b] - -If we raise our targeted amount of funds, we plan to use it as follows: - -1) Fund 6 months {OR WHATEVER} of full time work for our current core developers, Mike, Thomas, and Tobias {ANYONE ELSE?] - -2) Pay a professional web developer to design an kick ass reference theme, along with a project logo. - -3) {WHAT ELSE?} - -[b][color= grey][size=20]Deadlines[/size][/color][/b] - -[b]March, 2014: $Projectname Beta with the following features[/b] - -- {LIST FEATURES} - -[b][color= grey][size=20]Who We Are[/size][/color][/b] - -Mike: {FILL IN BIO, reference Friendica, etc.} - -Thomas: {bio blurb} - -Tobias: {bio blurb} - -Arto: {documentation, etc.} - -{WHO ELSE? WE NEED A TEAM, AT LEAST 3-4 PEOPLE} - -[b][color= grey][size=20]What Do I Get as a Supporter?[/size][/color][/b] - -Our ability to reach 1.0 stable release depends on your generosity and support. We appreciate your help, regardless of the amount! Here's what we're thinking as far as different contribution levels go: - -[b]$1: {CATCHY TAGLINE}[/b] - -We'll list your name on our initial supporters list, a Hall of Fame of the matrix! - -[b]$5:[/b] - -[b]$10: [/b] - -[b]$16: [/b] - -You get one of your $Projectname t-shirts, as well as our undying gratitude. - -[b]$32: [/b] - -[b]$64 [/b] - -[b]128 [/b] - -[b]$256: [/b] - -[b]$512: [/b] - -[b]$1024 [/b] - -[b]$2048[/b] - -Each contributor at this level gets their own $Projectname virtual private server, installed, hosted and supported by us for a period of 1 year. - -[b][color= grey][size=20]Why are we so excited about $Projectname?[/size][/color][/b] - -{SOMETHING ABOUT THE POTENTIAL IMPACT OF RED, ITS INNOVATIONS, ETC> - -[b][color= grey][size=20]Other Ways to Help[/size][/color][/b] - -We're a handful of volunteers, and we understand that not everyone can contribute by donating money. There are many other ways you can in getting the Matrix to version 1.0! - -First, you can checkout our source code on github: https://framagit.org/hubzilla/core/ - -Maybe you can dive in and help us out with some development. - -Second, you can install the current developer preview on a server and start compiling bug reports. - -Third, register at one of the public alpha Red hubs, and get a feel for what Red is trying to do! - -Perhaps you're good at writing and documenting stuff. Grab an account at one of the public alphas and give us a hand. - -[b][color= grey][size=20]Frequently Asked Questions[/size][/color][/b] - -[b]1. Is Red a social network?[/b] - -$Projectname is not a social network. We're thinking of it as a general purpose communication network, with sharing, and public/private communications built into the matrix. - -[b]2. What is the difference between Red and Friendica?[/b] - -What's the difference between a passport, and a postcard? - -Friendica is really, really good at sending postcards. It can do all sorts of things with postcards. It can send them to your friends. It can send them to people you don't know. It can put them in an envelope and send them privately. It can run them through a photocopier and plaster them all over the internet. It can even take postcards in one language and convert them to many others so your friends who speak a different language can read them. - -What Friendica can't do, is wave a postcard at somebody and expect them to believe that holding this postcard prove you are who you say you are. Sure, if you've been sending somebody postcards, they might accept that it is you in the picture, but somebody who has never heard of you will not accept ownership of a postcard as proof of identity. - -$Projectname offers a passport. - -You can still use it to send postcards. At the same time, when you wave your passport at somebody, they do accept it as proof of identity. No longer do you need to register at every single site you use. You already have an account - it's just not necessarily at our site - so we'll ask to see your passport instead. - -Once you've proven your identity, a Red hub lets you use our services, as though you'd registered with directly, and we'd verified your credentials as would have happened in the olden days. These resources can, of course, be anything at all. - -[b]2. Why did you choose PHP, instead of Ruby or Python?[/b] - -The reference implementation is in PHP. We chose PHP, because it is available everywhere, and is easily configurable. We understand the debates between proponents and opponents of PHP, Ruby and Python. Nothing prevents implementations of Zot and the matrix in those languages. In fact, people on the matrix have already started developing a version of Red in Python [SOURCE?], and there is talk about future implementations in C (aiming for blazing native performance) and Java. It's free and open source, so we feel it's only a matter of time, once Red is initially completed. - -[b]4. Other than PHP, what other technology does Red use?[/b] - -We use MySQL as our database (this include any forks such as, MariaDB or Percona), and any modern webserver (Apache, nginx, etc.). - -[b]5. How is the Affinity Slider different from Mozilla's Persona?[/b] -{COMPLETE} - -[b]6. Does $Projectname use encryption? Details please![/b] - -Yes, we do our best to use free and open source encryption libraries to help achieve privacy from general, mass surveillance. - -Communication between web browsers and Red hubs is encrypted using SSL certificates. - -Private communication on the matrix is protected by AES symmetric encryption, which is itself protected by RSA PKI (public key encryption). By default, we use AES-256-CBC, and our RSA keys are set to 4096-bits. - -For more info on our initial implementation of encrypted communication, check out our source code at Github: https://github.com/friendica/red/blob/master/include/crypto.php - -[b]7. What do you mean by decentralization? [/b] - - -[b]8. Can I build my own website with in $Projectname?[/b] - -Yes. The short explanation: We've got this spiffy idea we're calling "Comanche", which will allow non-programmers to build complete custom websites, and any such website will be able to connect to any other website or channel in the matrix. The goal of Comanche is to hide the technical complexities of communicating in the matrix, while encouraging people to use their creativity and put together their own unique presence on the matrix. - -The longer explanation: Comanche is a markup language, similar to bbcode, with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. Comanche uses a Page Description Language file (".pdl", pronounced "puddle") to create these pages. Bbcode is not a requirement; an XML PDL file could also be used. The tag delimiters would be different. Usage is the same. - -Additional information is available on our Github project wiki: https://github.com/friendica/red/wiki/Comanche - -Comanche is another one of our priorities for the next six months. - -[b]9. Where can I see some technical description of Zot?[/b] - -Our github wiki contains a number of high-level and technical descriptions of Zot, Comanche, and Red in general: https://github.com/friendica/red/wiki - -[b]10. What happens if you raise more than {TARGETED NUMBER}?[/b] - -Raising more than our initial goal of funds, will speed up our development efforts. More developers will be able to take time off from other jobs, and concentrate efforts on finishing Red. - -[b]11 Can I make a contribution via Bitcoin?[/b] - -{YES/NO} - -[b]12. I have additional Questions[/] - -Awesome. We'd be more than happy to chat. You can find us {HERE} - -#include doc/macros/main_footer.bb; - +[b]Initial Indiegg pitch[/b] + +[b][color= grey][size=20]What have we done, and what we hope to achieve[/size][/color][/b] + +[b][color= grey][size=18]Single-click sign on, nomadic identity, censorship-resistance, privacy, self-hosting[/size][/color][/b] + +We started $Projectname project by asking ourselves a few questions: + +- Imagine if it was possible to just access the content of different web sites, without the need to enter usernames and passwords for every site. Such a feature would permit Single-Click user identification: the ability to access sites simply by clicking on links to remote sites. +Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online. + +We liked this idea and went ahead with coding it immediately. Today, single-click sign is in alpha state. It needs more love, which means a solid three months of full-time development efforts. + +- Think of your Facebook, Twitter, WordPress, or any other website where you currently have an account. Now imagine being able to clone your account, to make an exact duplicate of it (with all of your friends, posts and settings), then export your cloned account into another server that is part of this communication network. After you're done, both of your accounts are synced from the time they were cloned. It doesn't matter where you log in (at your original location, or where you imported your clone). You see the same content, the same friends, posts, and account settings. +At that point, it is more appropriate to call your account an identity that is nomadic (it is not tied to one home, unless you choose to do so!). +It's 2013, our online presence no longer has to be tied to a single server, domain name or IP address. We should be able to clone and import our identities to other servers. In such a network, it should only matter who you are, not where you are. + +We're very intrigued by the possibilities nomadic identities open up for freedom, censorship-resistance, and identity resilience. Consider the following scenarios: + + -- Should a repressive government or corporation decide to delete your account, your cloned identity lives on, because it is located on another server, across the world, which is part of the same communication network. You can't be silenced! + + -- What if there is a server meltdown, and your identity goes off line. No problem, you log into your clone and all is good. + + -- Your server administrator can no longer afford to keep paying to support a free service (a labor love and principle, which all of us have participating in as system administrators of Friendica sites!). She notifies you that you must clone your account before the shutoff date. Rather than loose all your friends, and start from scratch by creating a new identity somewhere, you clone and move to another server. +We feel this is especially helpful for the free web, where administrators of FOSS community sites are often faced with difficult financial decisions. Since many of them rely on donations, sometimes servers have to be taken offline, when costs become prohibitive for the brave DIY souls running those server. Nomadic identities should relieve some of the pressures associated with such situations. + +At the same time, we are also thinking of solutions that would make it possible for people running Red hubs to be financially sustainable. To that end, we're starting to implement service classes in our code, which would allow administrators to structure paid levels of service, if they choose to do so. + +Today, nomadic identity is currently in alpha state. It also needs more love, which means a solid three months of full-time development efforts. + +- Imagine a social network that is censorship-resistant, and privacy-respecting by design. It is not controlled by one mega-corporation, and where users cannot be easily censored by oppressive governments. So, in addition to nomadic identities, we are talking about decentralization, open source, freely software, that can run on any hardware that supports a database and a modern web browser. And we mean "any hardware", from a self-hosted $35 Raspberry Pi, to the very latest Intel Xeon and AMD Bulldozer-powered server behemoths. + +We've realized that privacy requires full control over content. We should be able to delete, backup and download all of our content, as well as associated account/identity information. To this end, we have already implemented the initial version of account export and backup. + +Concerned about pages and pages of posts from months and years past? The solution should be simple: visit your settings page, specify that all content older than 7 days, with the exception of starred posts, should be automatically deleted. Done, the clutter is gone! (Consider also the privacy and anti-mass surveillance implications of this feature. PRISM disclosures have hinted that three-letter spying agencies around the world are recording all internet traffic and storing it for a few days at a time. We feel that automatic post expiration becomes a rather useful feature in this context, and implementing it is one of our near future priorities.) + +[b][color= grey][size=18]The Affinity Slider and Access Control Lists[/size][/color][/b] + +- What if the permissions and access control lists that help secure modern operating systems were extended into a communication network that lived on the internet? This means somebody could log into this network from their home site, and with the simple click of a few buttons dynamically sort who can have access to their online content on a very fine level: from restricting others from seeing your latest blog post, to sharing your bookmarks with the world. + +We've coded the initial version of such a new feature. It is called the "Affinity Slider", and in our very-alpha user interface it looks like this. +[img]https://friendicared.net/photo/b07b0262e3146325508b81a9d1ae4a1e-0.png[/img] + +{INSERT SCREENSHOT OF A MATRIX PAGE} + +Think of it as an easy way to filter content that you see, based on the degree of "closeness" to you. Move the slider to Friends, and only content coming from contacts you've tagged as friends is displayed on your home page. Uncluttering thousands of contacts, friends, RSS feeds, and other content should be a basic feature of modern communication on the web, but not at the expense of ease of use. + +In addition to the Affinity Slider, we also have the ACL (Access Control List). Say you want to share something with only 5 of your contacts (a blog, two friends from college, and two forums). You click on the padlock, choose the recipients, and that's it. Only those identities will recieve their posts. Furthermore, the post will be encrypted via PKI (pulic key encryption) to help maintain privacy. In the age of PRISM, we don't know all the details on what's safe out there, but we still think that privacy by design should be automatically present, invisible to the user, and easy to use. +Attaching permissions to any data that lives on this network, potentially solves a great many headaches, while achieving simplicity in communication. + +Think of it this way: the internet is nothing, but a bunch of permissions and a folder of data. You, the user controls the permissions and thus the data that is relevant to you. + +[b][color= grey][size=20]The Matrix is Born![/size][/color][/b] + +After asking and striving to answer a number of such questions, we realized that we were imagining a general purpose communication network with a number of unique, and potentially game-changing, features. We called it $Projectname and started thinking of it as an over-lay on top of the internet as it exists today; an operating system re-invented as a communication network, with its own permissions, access control lists, protocol, connectors to others services, and open-ended possibilities via its API. The sum of the matrix is greater than it's parts. We're not building website, but a way for websites to link together and grow into something that is unique and ever-changing, with autonomy and privacy. + +It's a lot of work, for anyone. So far, we've got a team of a handful of volunteers, code geeks, brave early adopters, system administrators and other good people, willing to give the project a shot. We're motivated by our commitment to a free web, where privacy is built-in, and corporations don't have a stranglehold on our daily communication. + +We need your help to finish it and release it to the world! + +[b][color= grey][size=20]What have we written so far[/size][/color][/b] + +As of the today, $Projectname is in developer preview (alpha) state. It is not ready for everyday use, but some of the initial set of core features are implemented (again, in alpha state). These include: + +- Zot, the protocol powering the matrix +- Single-signon logins. +- Nomadic identities +- Basic content manipulation: creation, deletion, rudimentary handling of photos, and media files +- A bare-bones outline of the API and user documentation. + + +[b][color= grey][size=20]Our TO-DO List[/size][/color][/b] + +However, in addition to finishing and polishing the above, there are a number of features that have to implemented to make $Projectname ready for daily use. If we meet our fundraising goal, we hope to dive into the following road map, by order of priority: + +- A professionally designed user interface (UI), interface that is adaptive to any user level, from end users who want to use the Matrix as a social network, to tinkerers who will put together a customized blog using Comanche, to hackers who will develop and extend the matrix using a built-in code editor, that hooks to the API and the git. + +- Comanche, our new markup language, similar to BBCode, with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. You can read more about it on our github wiki: https://github.com/friendica/red/wiki/Comanche + +- A unique help system that lives in the matrix, but is not based on the principles of a search engine. We have some interesting ideas about decentralizing help documentation, without going down the road of distributed search engines. Here's a hint: We shouldn't be searching at all, we should just be filtering what's already there in new, and cunning ways. + +- An appropriate logo, along with professionally done documentation system, both for our API, as well as users. + +- WordPress-like single button software upgrades + +- A built-in development environment, using an integrated web-based code editor such as Ace9 + +[b][color= grey][size=20]What will the money be used for[/size][/color][/b] + +If we raise our targeted amount of funds, we plan to use it as follows: + +1) Fund 6 months {OR WHATEVER} of full time work for our current core developers, Mike, Thomas, and Tobias {ANYONE ELSE?] + +2) Pay a professional web developer to design an kick ass reference theme, along with a project logo. + +3) {WHAT ELSE?} + +[b][color= grey][size=20]Deadlines[/size][/color][/b] + +[b]March, 2014: $Projectname Beta with the following features[/b] + +- {LIST FEATURES} + +[b][color= grey][size=20]Who We Are[/size][/color][/b] + +Mike: {FILL IN BIO, reference Friendica, etc.} + +Thomas: {bio blurb} + +Tobias: {bio blurb} + +Arto: {documentation, etc.} + +{WHO ELSE? WE NEED A TEAM, AT LEAST 3-4 PEOPLE} + +[b][color= grey][size=20]What Do I Get as a Supporter?[/size][/color][/b] + +Our ability to reach 1.0 stable release depends on your generosity and support. We appreciate your help, regardless of the amount! Here's what we're thinking as far as different contribution levels go: + +[b]$1: {CATCHY TAGLINE}[/b] + +We'll list your name on our initial supporters list, a Hall of Fame of the matrix! + +[b]$5:[/b] + +[b]$10: [/b] + +[b]$16: [/b] + +You get one of your $Projectname t-shirts, as well as our undying gratitude. + +[b]$32: [/b] + +[b]$64 [/b] + +[b]128 [/b] + +[b]$256: [/b] + +[b]$512: [/b] + +[b]$1024 [/b] + +[b]$2048[/b] + +Each contributor at this level gets their own $Projectname virtual private server, installed, hosted and supported by us for a period of 1 year. + +[b][color= grey][size=20]Why are we so excited about $Projectname?[/size][/color][/b] + +{SOMETHING ABOUT THE POTENTIAL IMPACT OF RED, ITS INNOVATIONS, ETC> + +[b][color= grey][size=20]Other Ways to Help[/size][/color][/b] + +We're a handful of volunteers, and we understand that not everyone can contribute by donating money. There are many other ways you can in getting the Matrix to version 1.0! + +First, you can checkout our source code on github: https://framagit.org/hubzilla/core/ + +Maybe you can dive in and help us out with some development. + +Second, you can install the current developer preview on a server and start compiling bug reports. + +Third, register at one of the public alpha Red hubs, and get a feel for what Red is trying to do! + +Perhaps you're good at writing and documenting stuff. Grab an account at one of the public alphas and give us a hand. + +[b][color= grey][size=20]Frequently Asked Questions[/size][/color][/b] + +[b]1. Is Red a social network?[/b] + +$Projectname is not a social network. We're thinking of it as a general purpose communication network, with sharing, and public/private communications built into the matrix. + +[b]2. What is the difference between Red and Friendica?[/b] + +What's the difference between a passport, and a postcard? + +Friendica is really, really good at sending postcards. It can do all sorts of things with postcards. It can send them to your friends. It can send them to people you don't know. It can put them in an envelope and send them privately. It can run them through a photocopier and plaster them all over the internet. It can even take postcards in one language and convert them to many others so your friends who speak a different language can read them. + +What Friendica can't do, is wave a postcard at somebody and expect them to believe that holding this postcard prove you are who you say you are. Sure, if you've been sending somebody postcards, they might accept that it is you in the picture, but somebody who has never heard of you will not accept ownership of a postcard as proof of identity. + +$Projectname offers a passport. + +You can still use it to send postcards. At the same time, when you wave your passport at somebody, they do accept it as proof of identity. No longer do you need to register at every single site you use. You already have an account - it's just not necessarily at our site - so we'll ask to see your passport instead. + +Once you've proven your identity, a Red hub lets you use our services, as though you'd registered with directly, and we'd verified your credentials as would have happened in the olden days. These resources can, of course, be anything at all. + +[b]2. Why did you choose PHP, instead of Ruby or Python?[/b] + +The reference implementation is in PHP. We chose PHP, because it is available everywhere, and is easily configurable. We understand the debates between proponents and opponents of PHP, Ruby and Python. Nothing prevents implementations of Zot and the matrix in those languages. In fact, people on the matrix have already started developing a version of Red in Python [SOURCE?], and there is talk about future implementations in C (aiming for blazing native performance) and Java. It's free and open source, so we feel it's only a matter of time, once Red is initially completed. + +[b]4. Other than PHP, what other technology does Red use?[/b] + +We use MySQL as our database (this include any forks such as, MariaDB or Percona), and any modern webserver (Apache, nginx, etc.). + +[b]5. How is the Affinity Slider different from Mozilla's Persona?[/b] +{COMPLETE} + +[b]6. Does $Projectname use encryption? Details please![/b] + +Yes, we do our best to use free and open source encryption libraries to help achieve privacy from general, mass surveillance. + +Communication between web browsers and Red hubs is encrypted using SSL certificates. + +Private communication on the matrix is protected by AES symmetric encryption, which is itself protected by RSA PKI (public key encryption). By default, we use AES-256-CBC, and our RSA keys are set to 4096-bits. + +For more info on our initial implementation of encrypted communication, check out our source code at Github: https://github.com/friendica/red/blob/master/include/crypto.php + +[b]7. What do you mean by decentralization? [/b] + + +[b]8. Can I build my own website with in $Projectname?[/b] + +Yes. The short explanation: We've got this spiffy idea we're calling "Comanche", which will allow non-programmers to build complete custom websites, and any such website will be able to connect to any other website or channel in the matrix. The goal of Comanche is to hide the technical complexities of communicating in the matrix, while encouraging people to use their creativity and put together their own unique presence on the matrix. + +The longer explanation: Comanche is a markup language, similar to bbcode, with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. Comanche uses a Page Description Language file (".pdl", pronounced "puddle") to create these pages. Bbcode is not a requirement; an XML PDL file could also be used. The tag delimiters would be different. Usage is the same. + +Additional information is available on our Github project wiki: https://github.com/friendica/red/wiki/Comanche + +Comanche is another one of our priorities for the next six months. + +[b]9. Where can I see some technical description of Zot?[/b] + +Our github wiki contains a number of high-level and technical descriptions of Zot, Comanche, and Red in general: https://github.com/friendica/red/wiki + +[b]10. What happens if you raise more than {TARGETED NUMBER}?[/b] + +Raising more than our initial goal of funds, will speed up our development efforts. More developers will be able to take time off from other jobs, and concentrate efforts on finishing Red. + +[b]11 Can I make a contribution via Bitcoin?[/b] + +{YES/NO} + +[b]12. I have additional Questions[/] + +Awesome. We'd be more than happy to chat. You can find us {HERE} + +#include doc/macros/main_footer.bb; + diff --git a/doc/checking_account_quota_usage.bb b/doc/checking_account_quota_usage.bb index ca7e070ad..7612d03d8 100644 --- a/doc/checking_account_quota_usage.bb +++ b/doc/checking_account_quota_usage.bb @@ -1,20 +1,20 @@ -[b]Checking your account quota usage (service limits usage)[/b] - -Your hub might implement service class limits, assigning limits to the total size of file, photo, channels, top-level posts, etc., that can be created by an account holder for a specific service level. - -Here's how you can quickly check how much of your assigned quota you're currently using: - -[b]Check file storage quota levels[/b] -Visit the following URL in your browser: -[observer=1][observer.baseurl]/filestorage/[observer.webname][/observer] -[observer=0]example.com/filestorage/username[/observer] - -[b]Check uploaded photos storage quota levels[/b] -[observer=1][observer.baseurl]/photos/[observer.webname][/observer] -[observer=0]example.com/photos/username[/observer] - -Example: -[observer=1][observer.baseurl]/filestorage/[observer.webname][/observer] -[observer=0]example.com/filestorage/username[/observer] - -#include doc/macros/main_footer.bb; +[b]Checking your account quota usage (service limits usage)[/b] + +Your hub might implement service class limits, assigning limits to the total size of file, photo, channels, top-level posts, etc., that can be created by an account holder for a specific service level. + +Here's how you can quickly check how much of your assigned quota you're currently using: + +[b]Check file storage quota levels[/b] +Visit the following URL in your browser: +[observer=1][observer.baseurl]/filestorage/[observer.webname][/observer] +[observer=0]example.com/filestorage/username[/observer] + +[b]Check uploaded photos storage quota levels[/b] +[observer=1][observer.baseurl]/photos/[observer.webname][/observer] +[observer=0]example.com/photos/username[/observer] + +Example: +[observer=1][observer.baseurl]/filestorage/[observer.webname][/observer] +[observer=0]example.com/filestorage/username[/observer] + +#include doc/macros/main_footer.bb; diff --git a/doc/comanche.bb b/doc/comanche.bb index 4b198d657..faf7e695e 100644 --- a/doc/comanche.bb +++ b/doc/comanche.bb @@ -1,261 +1,261 @@ -[b]Comanche Page Description Language[/b] - -Comanche is a markup language similar to bbcode with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. Comanche uses a Page Decription Language to create these pages. - -Comanche primarily chooses what content will appear in various regions of the page. The various regions have names and these names can change depending on what layout template you choose. - -[b]Page Templates[/b] -Currently there are five layout templates, unless your site provides additional layouts. - -[code] - [b]default[/b] - The default template defines a "nav" region across the top, "aside" as a fixed width sidebar, - "content" for the main content region, and "footer" for a page footer. - - - [b]full[/b] - The full template defines the same as the default template with the exception that there is no "aside" region. - - - [b]choklet[/b] - The choklet template provides a number of fluid layout styles which can be specified by flavour: - - (default flavour) - a two column layout similar to the "default" template, but more fluid - bannertwo - a two column layout with a banner region, compatible with the "default" template on small displays - three - three column layout (adds a "right_aside" region to the default template) - edgestwo - two column layout with fixed side margins - edgesthree - three column layout with fixed side margins - full - three column layout with fixed side margins and adds a "header" region beneath the navigation bar - - [b]redable[/b] (sic) - A template for reading longer texts full screen (so without navigation bar). Three columns: aside, content and right_aside. - For maximum readability it is advised to only use the middle content column. - - [b]zen[/b] - Gives you the freedom to do everything yourself. Just a blank page with a content region. - -[/code] - -To choose a layout template, use the 'template' tag. - -[code] - [template]full[/template] - -[/code] - -To choose the "choklet" template with the "three" flavour: - -[code] - [template=three]choklet[/template] - -[/code] - -The default template will be used if no other template is specified. The template can use any names it desires for content regions. You will be using 'region' tags to decide what content to place in the respective regions. - -Three "macros" have been defined for your use. -[code] - $htmlhead - replaced with the site head content. - $nav - replaced with the site navigation bar content. - $content - replaced with the main page content. - -[/code] - -By default, $nav is placed in the "nav" page region and $content is placed in the "content" region. You only need to use these macros if you wish to re-arrange where these items appear, either to change the order or to move them to other regions. - - -To select a theme for your page, use the 'theme' tag. -[code] - [theme]suckerberg[/theme] - -[/code] -This will select the theme named "suckerberg". By default your channel's preferred theme will be used. - -[code] - [theme=passion]suckerberg[/theme] - -[/code] -This will select the theme named "suckerberg" and select the "passion" schema (theme variant). Alternatively it may be possible to use a condensed theme notation for this. - -[code] - [theme]suckerberg:passion[/theme] - -[/code] - -The condensed notation isn't part of Comanche itself but is recognised by $Projectname platform as a theme specifier. - -[b]Regions[/b] -Each region has a name, as noted above. You will specify the region of interest using a 'region' tag, which includes the name. Any content you wish placed in this region should be placed between the opening region tag and the closing tag. - -[code] - [region=htmlhead]....content goes here....[/region] - [region=aside]....content goes here....[/region] - [region=nav]....content goes here....[/region] - [region=content]....content goes here....[/region] - -[/code] - -[b]CSS and Javascript[/b] -We have the possibility to include javascript and css libraries in the htmlhead region. At present we make use of jquery (js), bootstrap (css/js) and foundation (css/js). -This will overwrite the selected themes htmlhead. - -[code] - [region=htmlhead] - [css]bootstrap[/css] - [js]jquery[/js] - [js]bootstrap[/js] - [/region] - -[/code] - -[b]Menus and Blocks[/b] -Your webpage creation tools allow you to create menus and blocks, in addition to page content. These provide a chunk of existing content to be placed in whatever regions and whatever order you specify. Each of these has a name which you define when the menu or block is created. - -[code] - [menu]mymenu[/menu] - -[/code] -This places the menu called "mymenu" at this location on the page, which must be inside a region. - -[code] - [menu=horizontal]mymenu[/menu] - -[/code] -This places the menu called "mymenu" at this location on the page, which must be inside a region. Additionally it applies the "horizontal" class to the menu. "horizontal" is defined in the redbasic theme. It may or may not be available in other themes. - -[code] - [menu][var=wrap]none[/var]mymenu[/menu] - -[/code] -The variable [var=wrap]none[/var] in a block removes the wrapping div element from the menu. - -[code] - [block]contributors[/block] -[/code] -This places a block named "contributors" in this region. - -[code] - [block=someclass]contributors[/block] - -[/code] -This places a block named "contributors" in this region. Additionally it applies the "someclass" class to the block. This replaces the default block classes "bblock widget". - -[code] - [block][var=wrap]none[/var]contributors[/block] - -[/code] -The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block. - -[b]Widgets[/b] -Widgets are executable apps provided by the system which you can place on your page. Some widgets take arguments which allows you to tailor the widget to your purpose. (TODO: list available widgets and arguments). The base system provides - -[code] - profile - widget which duplicates the profile sidebar of your channel page. This widget takes no arguments - tagcloud - provides a tag cloud of categories - count - maximum number of category tags to list - -[/code] - -Widgets and arguments are specified with the 'widget' and 'var' tags. -[code] - [widget=recent_visitors][var=count]24[/var][/widget] - -[/code] - -This loads the "recent_visitors" widget and supplies it with the argument "count" set to "24". - -[b]Comments[/b] -The 'comment' tag is used to delimit comments. These comments will not appear on the rendered page. - -[code] - [comment]This is a comment[/comment] - -[/code] - -[b]Conditional Execution[/b] -You can use an 'if' construct to make decisions. These are currently based on system configuration variable or the current observer. - -[code] - [if $config.system.foo] - ... the configuration variable system.foo evaluates to 'true'. - [else] - ... the configuration variable system.foo evaluates to 'false'. - [/if] - - [if $observer] - ... this content will only be show to authenticated viewers - [/if] - -[/code] - - The 'else' clause is optional. - - Several tests are supported besides boolean evaluation. - -[code] - [if $config.system.foo == bar] - ... the configuration variable system.foo is equal to the string 'bar' - [/if] - [if $config.system.foo != bar] - ... the configuration variable system.foo is not equal to the string 'bar' - [/if] - [if $config.system.foo {} bar ] - ... the configuration variable system.foo is a simple array containing a value 'bar' - [/if] - [if $config.system.foo {*} bar] - ... the configuration variable system.foo is a simple array containing a key named 'bar' - [/if] -[/code] - -[b]Complex Example[/b] -[code] - [comment]use an existing page template which provides a banner region plus 3 columns beneath it[/comment] - - [template]3-column-with-header[/template] - - [comment]Use the "darknight" theme[/comment] - - [theme]darkknight[/theme] - - [comment]Use the existing site navigation menu[/comment] - - [region=nav]$nav[/region] - - [region=side] - - [comment]Use my chosen menu and a couple of widgets[/comment] - - [menu]myfavouritemenu[/menu] - - [widget=recent_visitors] - [var=count]24[/var] - [var=names_only]1[/var] - [/widget] - - [widget=tagcloud][/widget] - [block]donate[/block] - - [/region] - - - - [region=middle] - - [comment]Show the normal page content[/comment] - - $content - - [/region] - - - - [region=right] - - [comment]Show my condensed channel "wall" feed and allow interaction if the observer is allowed to interact[/comment] - - [widget]channel[/widget] - - [/region] - -[/code] - -#include doc/macros/main_footer.bb; +[b]Comanche Page Description Language[/b] + +Comanche is a markup language similar to bbcode with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. Comanche uses a Page Decription Language to create these pages. + +Comanche primarily chooses what content will appear in various regions of the page. The various regions have names and these names can change depending on what layout template you choose. + +[b]Page Templates[/b] +Currently there are five layout templates, unless your site provides additional layouts. + +[code] + [b]default[/b] + The default template defines a "nav" region across the top, "aside" as a fixed width sidebar, + "content" for the main content region, and "footer" for a page footer. + + + [b]full[/b] + The full template defines the same as the default template with the exception that there is no "aside" region. + + + [b]choklet[/b] + The choklet template provides a number of fluid layout styles which can be specified by flavour: + + (default flavour) - a two column layout similar to the "default" template, but more fluid + bannertwo - a two column layout with a banner region, compatible with the "default" template on small displays + three - three column layout (adds a "right_aside" region to the default template) + edgestwo - two column layout with fixed side margins + edgesthree - three column layout with fixed side margins + full - three column layout with fixed side margins and adds a "header" region beneath the navigation bar + + [b]redable[/b] (sic) + A template for reading longer texts full screen (so without navigation bar). Three columns: aside, content and right_aside. + For maximum readability it is advised to only use the middle content column. + + [b]zen[/b] + Gives you the freedom to do everything yourself. Just a blank page with a content region. + +[/code] + +To choose a layout template, use the 'template' tag. + +[code] + [template]full[/template] + +[/code] + +To choose the "choklet" template with the "three" flavour: + +[code] + [template=three]choklet[/template] + +[/code] + +The default template will be used if no other template is specified. The template can use any names it desires for content regions. You will be using 'region' tags to decide what content to place in the respective regions. + +Three "macros" have been defined for your use. +[code] + $htmlhead - replaced with the site head content. + $nav - replaced with the site navigation bar content. + $content - replaced with the main page content. + +[/code] + +By default, $nav is placed in the "nav" page region and $content is placed in the "content" region. You only need to use these macros if you wish to re-arrange where these items appear, either to change the order or to move them to other regions. + + +To select a theme for your page, use the 'theme' tag. +[code] + [theme]suckerberg[/theme] + +[/code] +This will select the theme named "suckerberg". By default your channel's preferred theme will be used. + +[code] + [theme=passion]suckerberg[/theme] + +[/code] +This will select the theme named "suckerberg" and select the "passion" schema (theme variant). Alternatively it may be possible to use a condensed theme notation for this. + +[code] + [theme]suckerberg:passion[/theme] + +[/code] + +The condensed notation isn't part of Comanche itself but is recognised by $Projectname platform as a theme specifier. + +[b]Regions[/b] +Each region has a name, as noted above. You will specify the region of interest using a 'region' tag, which includes the name. Any content you wish placed in this region should be placed between the opening region tag and the closing tag. + +[code] + [region=htmlhead]....content goes here....[/region] + [region=aside]....content goes here....[/region] + [region=nav]....content goes here....[/region] + [region=content]....content goes here....[/region] + +[/code] + +[b]CSS and Javascript[/b] +We have the possibility to include javascript and css libraries in the htmlhead region. At present we make use of jquery (js), bootstrap (css/js) and foundation (css/js). +This will overwrite the selected themes htmlhead. + +[code] + [region=htmlhead] + [css]bootstrap[/css] + [js]jquery[/js] + [js]bootstrap[/js] + [/region] + +[/code] + +[b]Menus and Blocks[/b] +Your webpage creation tools allow you to create menus and blocks, in addition to page content. These provide a chunk of existing content to be placed in whatever regions and whatever order you specify. Each of these has a name which you define when the menu or block is created. + +[code] + [menu]mymenu[/menu] + +[/code] +This places the menu called "mymenu" at this location on the page, which must be inside a region. + +[code] + [menu=horizontal]mymenu[/menu] + +[/code] +This places the menu called "mymenu" at this location on the page, which must be inside a region. Additionally it applies the "horizontal" class to the menu. "horizontal" is defined in the redbasic theme. It may or may not be available in other themes. + +[code] + [menu][var=wrap]none[/var]mymenu[/menu] + +[/code] +The variable [var=wrap]none[/var] in a block removes the wrapping div element from the menu. + +[code] + [block]contributors[/block] +[/code] +This places a block named "contributors" in this region. + +[code] + [block=someclass]contributors[/block] + +[/code] +This places a block named "contributors" in this region. Additionally it applies the "someclass" class to the block. This replaces the default block classes "bblock widget". + +[code] + [block][var=wrap]none[/var]contributors[/block] + +[/code] +The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block. + +[b]Widgets[/b] +Widgets are executable apps provided by the system which you can place on your page. Some widgets take arguments which allows you to tailor the widget to your purpose. (TODO: list available widgets and arguments). The base system provides + +[code] + profile - widget which duplicates the profile sidebar of your channel page. This widget takes no arguments + tagcloud - provides a tag cloud of categories + count - maximum number of category tags to list + +[/code] + +Widgets and arguments are specified with the 'widget' and 'var' tags. +[code] + [widget=recent_visitors][var=count]24[/var][/widget] + +[/code] + +This loads the "recent_visitors" widget and supplies it with the argument "count" set to "24". + +[b]Comments[/b] +The 'comment' tag is used to delimit comments. These comments will not appear on the rendered page. + +[code] + [comment]This is a comment[/comment] + +[/code] + +[b]Conditional Execution[/b] +You can use an 'if' construct to make decisions. These are currently based on system configuration variable or the current observer. + +[code] + [if $config.system.foo] + ... the configuration variable system.foo evaluates to 'true'. + [else] + ... the configuration variable system.foo evaluates to 'false'. + [/if] + + [if $observer] + ... this content will only be show to authenticated viewers + [/if] + +[/code] + + The 'else' clause is optional. + + Several tests are supported besides boolean evaluation. + +[code] + [if $config.system.foo == bar] + ... the configuration variable system.foo is equal to the string 'bar' + [/if] + [if $config.system.foo != bar] + ... the configuration variable system.foo is not equal to the string 'bar' + [/if] + [if $config.system.foo {} bar ] + ... the configuration variable system.foo is a simple array containing a value 'bar' + [/if] + [if $config.system.foo {*} bar] + ... the configuration variable system.foo is a simple array containing a key named 'bar' + [/if] +[/code] + +[b]Complex Example[/b] +[code] + [comment]use an existing page template which provides a banner region plus 3 columns beneath it[/comment] + + [template]3-column-with-header[/template] + + [comment]Use the "darknight" theme[/comment] + + [theme]darkknight[/theme] + + [comment]Use the existing site navigation menu[/comment] + + [region=nav]$nav[/region] + + [region=side] + + [comment]Use my chosen menu and a couple of widgets[/comment] + + [menu]myfavouritemenu[/menu] + + [widget=recent_visitors] + [var=count]24[/var] + [var=names_only]1[/var] + [/widget] + + [widget=tagcloud][/widget] + [block]donate[/block] + + [/region] + + + + [region=middle] + + [comment]Show the normal page content[/comment] + + $content + + [/region] + + + + [region=right] + + [comment]Show my condensed channel "wall" feed and allow interaction if the observer is allowed to interact[/comment] + + [widget]channel[/widget] + + [/region] + +[/code] + +#include doc/macros/main_footer.bb; diff --git a/doc/dev_beginner.bb b/doc/dev_beginner.bb index 3e98c6ec3..4ac69c301 100644 --- a/doc/dev_beginner.bb +++ b/doc/dev_beginner.bb @@ -1,419 +1,419 @@ -[h2]You want to contribute code?[/h2] -[b]...and don't know how to start to...[/b] -[list] -[*] debug the red#matrix (php on the webserver), -[*] contribute code to the project, -[*] optionally - do it all from inside a virtual machine -[/list] -This manual was tested for Debian (Wheezy) as virtual machine on Lubuntu (Ubuntu 14.0) as host. - -Content - -[toc] - -[h2]Install a Virtual Machine (KVM)[/h2] - -[url=https://wiki.debian.org/KVM]Here[/url] the installation guide for Linux Debian. -The summary: -[list=1] -[*] install KVM -[code]# apt-get install qemu-kvm libvirt-bin[/code] -[*] add yourself to the group libvirt [code]# adduser libvirt[/code] -[*] install gui to manage virtual machines [code]# apt-get install virt-manager[/code] -[*] download an operating system to run inside the vm ([url=http://ftp.nl.debian.org/debian/dists/wheezy/main/installer-amd64/current/images/netboot/mini.iso]mini.iso[/url]) -[*] start the virt manager -- create new virtual machine (click on icon) -- choose your iso image (just downloaded) as installation source -- optional: configure the new vm: ram, cpu's,... -- start virtual machine > result: linux debian starts in a new window. -[*] (optional) avoid network errors after restart of host os -[code]# virsh net-start default -# virsh net-autostart default[/code] -[/list] - - -[h2]Install Apache Webserver[/h2] - -Open a terminal and make yourself root -[code]su -l[/code] - -Create the standard group for the Apache webserver -[code]groupadd www-data[/code] -might exist already - -[code]usermod -a -G www-data www-data[/code] - -Check if the system is really up to date -[code]apt-get update -apt-get upgrade[/code] - -Optional restart services after installation -[code]reboot[/code] - -If you restarted, make yourself root -[code]su -l[/code] - -Install Apache: [code] -apt-get install apache2 apache2-doc apache2-utils[/code] - -Open webbrowser on PC and check [url=localhost]localhost[/url] -Should show you a page like "It works" - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - -[h2]Install PHP, MySQL, phpMyAdmin[/h2] - -[h3]PHP, MySQL[/h3] - -[code]su -l -apt-get install libapache2-mod-php5 php5 php-pear php5-xcache php5-curl php5-mcrypt php5-xdebug -apt-get install php5-mysql -apt-get install mysql-server mysql-client[/code] -enter and note the mysql passwort - -Optional since its already enabled during phpmyadmin setup -[code] -php5enmod mcrypt -[/code] - -[h3]phpMyAdmin[/h3] - -Install php myadmin -[code]apt-get install phpmyadmin[/code] - -Configuring phpmyadmin -- Select apache2 (hint: use the tab key to select) -- Configure database for phpmyadmin with dbconfig-common?: Choose Yes - -(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - -[h3]Enable rewrite[/h3] - -The default installation of Apache2 comes with mod_rewrite installed. To check whether this is the case, verify the existence of /etc/apache2/mods-available/rewrite.load - -[code] -root@debian /var/www $ nano /etc/apache2/mods-available/rewrite.load -[/code] - - (You should find the content: LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so) -To enable and load mod_rewrite, do the rest of steps. -Create a symbolic link in /etc/apache2/mods-enabled - -[code] -cd /var/www -root@debian /var/www $ a2enmod rewrite -[/code] - -Then open up the following file, and replace every occurrence of "AllowOverride None" with "AllowOverride all". - -[code] -root@debian /var/www $nano /etc/apache2/apache2.conf -[/code] -or -[code] -root@debian:/var# gedit /etc/apache2/sites-enabled/000-default -[/code] - -Finally, restart Apache2. - -[code] -root@debian /var/www $service apache2 restart -[/code] - -[h3]Test installation[/h3] - -[code]cd /var/www[/code] - -create a php file to test the php installation[code]nano phpinfo.php[/code] - -Insert into the file: -[code] - -[/code] -(save CTRL+0, ENTER, CTRL+X) - -open webbrowser on PC and try #^[url=http://localhost/phpinfo.php]http://localhost/phpinfo.php[/url] (page shows infos on php) - -connect phpMyAdmin with MySQL database [code]nano /etc/apache2/apache2.conf -[/code] -- CTRL+V... to the end of the file -- Insert at the end of the file: (save CTRL+0, ENTER, CTRL+X)[code]Include /etc/phpmyadmin/apache.conf[/code] - -restart apache -[code]/etc/init.d/apache2 restart -apt-get update -apt-get upgrade -reboot[/code] - -[b]phpMyAdmin[/b] - -open webbrowser on PC and try #^[url=http://localhost/phpmyadmin]http://localhost/phpmyadmin[/url] - -(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - -[h3]Create an empty database... that is later used by the red#matrix[/h3] - - -open webbrowser on PC and try #^[url=http://localhost/phpmyadmin]http://localhost/phpmyadmin[/url] - -Create an empty database, for example named "red". -Create a database user, for example "red". -Grant all rights for the user "red" to the database "red". - -Note the access details (hostname, username, password, database name). - - -[h2]Fork the project on github[/h2] - -Please follow the instruction in the offiical [url=http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project] documentation[/url] of git. -It is a good idea to read the whole manual! Git is different to other version control systems in many ways. - -Now you should -[list] -[*] create an account at github.com -[*] fork https://framagit.org/hubzilla/core -[*] fork https://framagit.org/hubzilla/addons -[/list] - -If you not want to use GIT from the command line - there is a usefull Eclipse plugin named ""Eclipse Mylyn to GitHub connector". - - -[h2]Install RED and its Addons[/h2] - -[h3]Git at your computer / vm[/h3] - -You should have created an account on github and forked the projects befor you procceed. - -Delete the directory www -[code]root@debian:/var# rm -R www/ -[/code] - -Install git (and optionally git-gui a client gui) -[code]apt-get install git git-gui[/code] - -[h3]Download red#matri and addons[/h3] - -Download the main project red and red-addons -[code] -root@debian:/var# git clone https://github.com/yourname/red www -root@debian:/var# cd www/ -root@debian:/var/www# git clone https://github.com/yourname/red-addons addon -[/code] - -Make this extra folder -[code] -root@debian:/var/www# mkdir -p "store/[data]/smarty3" -[/code] - -Create .htconfig.php and make it writable by the webserver -[code] -root@debian:/var/www# touch .htconfig.php -root@debian:/var/www# chmod ou+w .htconfig.php -[/code] - -Make user www-data (webserver) is the owner all the project files -[code] -root@debian:/var/www# cd .. -root@debian:/var# chown -R www-data:www-data www/ -[/code] - -Add yourself ("surfer" in this example) to the group www-data. Why? Later you want to modify files in eclipse or in another editor. -Then make all files writable by the group www-date you are now a member of. -[code] -root@debian:/var# cd www/ -root@debian:/var/www# usermod -G www-data surfer -root@debian:/var# chmod -R g+w www/ -[/code] - -Restart the computer (or vm) -If you are still not able to modify the project files you can check the members of the group www-data with -[code] -cat /etc/group -[/code] - -[h3]Register yourself as admin[/h3] - -Open http://localhost and init the matrix - -Befor you register a first user switch off the registration mails. -Open /var/www/.htconfig.php -and make sure "0" is set in this line -[code] -App::$config['system']['verify_email'] = 0; -[/code] -You should be able to change the file as "yourself" (instead of using root or www-data). - -[h3]Cron and the poller[/h3] - -Important! -Run the poller to pick up the recent "public" postings of your friends -Set up a cron job or scheduled task to run the poller once every 5-10 -minutes to pick up the recent "public" postings of your friends - -[code] -crontab -e -[/code] - -Add -[code] -*/10 * * * * cd /var/www/; /usr/bin/php include/poller.php -[/code] - -If you don't know the path to PHP type -[code] -whereis php -[/code] - - -[h2]Debug the server via eclipse[/h2] - -[h3]Check the configuration of xdebug[/h3] - -You shoud already have installed xdebug in the steps befor -[code] -apt-get install php5-xdebug -[/code] - -Configuring Xdebug - -Open your terminal and type as root (su -l) -[code] -gedit /etc/php5/mods-available/xdebug.ini -[/code] - -if the file is empty try this location -[code] -gedit /etc/php5/conf.d/xdebug.ini -[/code] - -That command should open the text editor gedit with the Xdebug configuration file -At the end of the file content append the following text - -xdebug.remote_enable=on -xdebug.remote_handler=dbgp -xdebug.remote_host=localhost -xdebug.remote_port=9000 - -Save changes and close the editor. -In you terminal type to restart the web server. -[code] -service apache2 restart -[/code] - - -[h3]Install Eclipse and start debugging[/h3] - -Install eclipse. -Start eclipse with default worspace (or as you like) - -Install the PHP plugin -Menu > Help > Install new software... -Install "PHP Developnent Tools ..." - -Optionally - Install the GitHub connector plugin -Menu > Help > Install new software... -Install "Eclipse Mylyn to GitHub connector" - -Configure the PHP plugin -Menu > Window > Preferences... -> General > Webbrowser > Change to "Use external web browser" -> PHP > Debug > Debug Settings > PHP Debugger > Change to "XDebug" - -Create a new PHP project -Menu > File > New Project > Choose PHP > "PHP Project" -> Choose Create project at existing location" and "/var/www" - -Start debugging -Open index.php and "Debug as..." -Choose as Launch URL: "http://localhost/" - -Expected: -[list] -[*] The web browser starts -[*] The debugger will stop at the first php line -[/list] - - -[h2]Contribute your changes via github[/h2] - -[h3]Preparations[/h3] - -There is a related page in this docs: [zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl]. -As stated befor it is recommended to read the official documentation [url=http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project]GitHub-Contributing-to-a-Project[/url] of git. - -Eclipse has a usefull plugin for GIT: "Eclipse Mylyn to GitHub connector". - -Make sure you have set your data -[code] -surfer@debian:/var/www$ git config --global user.name "Your Name" -surfer@debian:/var/www$ git config --global user.email "your@mail.com" -[/code] - -[h3]Your first contribution[/h3] - -Create a descriptive topic branch -[code] -surfer@debian:/var/www$ git checkout -b dev_beginning -[/code] - -Make sure your local repository is up-to-date with the main project. -Add the original repository as a remote named “upstream” if not done yet -[code] -surfer@debian:/var/www$ git remote add upstream https://framagit.org/hubzilla/core/ -[/code] - -Fetch the newest work from that remote -[code] -surfer@debian:/var/www$ git fetch upstream -surfer@debian:/var/www$ git merge upstream/master -[/code] - -Hint: You can list the branches -[code] -surfer@debian:/var/www$ git branch -v -[/code] - -Make your changes. In this example it is a new doc file. - -Check your modifications -[code] -surfer@debian:/var/www$ git status -[/code] - -Add (stage) the new file -[code] -surfer@debian:/var/www$ git add doc/dev_beginner.bb -[/code] - -Commit the changes to your local branch. This will open an editor to provide a message. -[code] -surfer@debian:/var/www$ git commit -a -[/code] - -Push back up to the same topic branch online -[code] -surfer@debian:/var/www$ git push -[/code] - -Now you can go to your (online) account at github and create the pull request. - -[h3]Following contributions[/h3] - -In case the main devolpers want you to change something. -Fetch the newest work from the remote upstream/master to be sure you have the latest changes. -[code] -surfer@debian:/var/www$ git fetch upstream -surfer@debian:/var/www$ git merge upstream/master -[/code] -Make your changes, test them, commit (to local repository), push (to online repository) -[code] -surfer@debian:/var/www$ git status -surfer@debian:/var/www$ git commit -a -m "added modification of branch" -surfer@debian:/var/www$ git push -[/code] - - -#include doc/macros/main_footer.bb; +[h2]You want to contribute code?[/h2] +[b]...and don't know how to start to...[/b] +[list] +[*] debug the red#matrix (php on the webserver), +[*] contribute code to the project, +[*] optionally - do it all from inside a virtual machine +[/list] +This manual was tested for Debian (Wheezy) as virtual machine on Lubuntu (Ubuntu 14.0) as host. + +Content + +[toc] + +[h2]Install a Virtual Machine (KVM)[/h2] + +[url=https://wiki.debian.org/KVM]Here[/url] the installation guide for Linux Debian. +The summary: +[list=1] +[*] install KVM +[code]# apt-get install qemu-kvm libvirt-bin[/code] +[*] add yourself to the group libvirt [code]# adduser libvirt[/code] +[*] install gui to manage virtual machines [code]# apt-get install virt-manager[/code] +[*] download an operating system to run inside the vm ([url=http://ftp.nl.debian.org/debian/dists/wheezy/main/installer-amd64/current/images/netboot/mini.iso]mini.iso[/url]) +[*] start the virt manager +- create new virtual machine (click on icon) +- choose your iso image (just downloaded) as installation source +- optional: configure the new vm: ram, cpu's,... +- start virtual machine > result: linux debian starts in a new window. +[*] (optional) avoid network errors after restart of host os +[code]# virsh net-start default +# virsh net-autostart default[/code] +[/list] + + +[h2]Install Apache Webserver[/h2] + +Open a terminal and make yourself root +[code]su -l[/code] + +Create the standard group for the Apache webserver +[code]groupadd www-data[/code] +might exist already + +[code]usermod -a -G www-data www-data[/code] + +Check if the system is really up to date +[code]apt-get update +apt-get upgrade[/code] + +Optional restart services after installation +[code]reboot[/code] + +If you restarted, make yourself root +[code]su -l[/code] + +Install Apache: [code] +apt-get install apache2 apache2-doc apache2-utils[/code] + +Open webbrowser on PC and check [url=localhost]localhost[/url] +Should show you a page like "It works" + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + +[h2]Install PHP, MySQL, phpMyAdmin[/h2] + +[h3]PHP, MySQL[/h3] + +[code]su -l +apt-get install libapache2-mod-php5 php5 php-pear php5-xcache php5-curl php5-mcrypt php5-xdebug +apt-get install php5-mysql +apt-get install mysql-server mysql-client[/code] +enter and note the mysql passwort + +Optional since its already enabled during phpmyadmin setup +[code] +php5enmod mcrypt +[/code] + +[h3]phpMyAdmin[/h3] + +Install php myadmin +[code]apt-get install phpmyadmin[/code] + +Configuring phpmyadmin +- Select apache2 (hint: use the tab key to select) +- Configure database for phpmyadmin with dbconfig-common?: Choose Yes + +(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + +[h3]Enable rewrite[/h3] + +The default installation of Apache2 comes with mod_rewrite installed. To check whether this is the case, verify the existence of /etc/apache2/mods-available/rewrite.load + +[code] +root@debian /var/www $ nano /etc/apache2/mods-available/rewrite.load +[/code] + + (You should find the content: LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so) +To enable and load mod_rewrite, do the rest of steps. +Create a symbolic link in /etc/apache2/mods-enabled + +[code] +cd /var/www +root@debian /var/www $ a2enmod rewrite +[/code] + +Then open up the following file, and replace every occurrence of "AllowOverride None" with "AllowOverride all". + +[code] +root@debian /var/www $nano /etc/apache2/apache2.conf +[/code] +or +[code] +root@debian:/var# gedit /etc/apache2/sites-enabled/000-default +[/code] + +Finally, restart Apache2. + +[code] +root@debian /var/www $service apache2 restart +[/code] + +[h3]Test installation[/h3] + +[code]cd /var/www[/code] + +create a php file to test the php installation[code]nano phpinfo.php[/code] + +Insert into the file: +[code] + +[/code] +(save CTRL+0, ENTER, CTRL+X) + +open webbrowser on PC and try #^[url=http://localhost/phpinfo.php]http://localhost/phpinfo.php[/url] (page shows infos on php) + +connect phpMyAdmin with MySQL database [code]nano /etc/apache2/apache2.conf +[/code] +- CTRL+V... to the end of the file +- Insert at the end of the file: (save CTRL+0, ENTER, CTRL+X)[code]Include /etc/phpmyadmin/apache.conf[/code] + +restart apache +[code]/etc/init.d/apache2 restart +apt-get update +apt-get upgrade +reboot[/code] + +[b]phpMyAdmin[/b] + +open webbrowser on PC and try #^[url=http://localhost/phpmyadmin]http://localhost/phpmyadmin[/url] + +(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + +[h3]Create an empty database... that is later used by the red#matrix[/h3] + + +open webbrowser on PC and try #^[url=http://localhost/phpmyadmin]http://localhost/phpmyadmin[/url] + +Create an empty database, for example named "red". +Create a database user, for example "red". +Grant all rights for the user "red" to the database "red". + +Note the access details (hostname, username, password, database name). + + +[h2]Fork the project on github[/h2] + +Please follow the instruction in the offiical [url=http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project] documentation[/url] of git. +It is a good idea to read the whole manual! Git is different to other version control systems in many ways. + +Now you should +[list] +[*] create an account at github.com +[*] fork https://framagit.org/hubzilla/core +[*] fork https://framagit.org/hubzilla/addons +[/list] + +If you not want to use GIT from the command line - there is a usefull Eclipse plugin named ""Eclipse Mylyn to GitHub connector". + + +[h2]Install RED and its Addons[/h2] + +[h3]Git at your computer / vm[/h3] + +You should have created an account on github and forked the projects befor you procceed. + +Delete the directory www +[code]root@debian:/var# rm -R www/ +[/code] + +Install git (and optionally git-gui a client gui) +[code]apt-get install git git-gui[/code] + +[h3]Download red#matri and addons[/h3] + +Download the main project red and red-addons +[code] +root@debian:/var# git clone https://github.com/yourname/red www +root@debian:/var# cd www/ +root@debian:/var/www# git clone https://github.com/yourname/red-addons addon +[/code] + +Make this extra folder +[code] +root@debian:/var/www# mkdir -p "store/[data]/smarty3" +[/code] + +Create .htconfig.php and make it writable by the webserver +[code] +root@debian:/var/www# touch .htconfig.php +root@debian:/var/www# chmod ou+w .htconfig.php +[/code] + +Make user www-data (webserver) is the owner all the project files +[code] +root@debian:/var/www# cd .. +root@debian:/var# chown -R www-data:www-data www/ +[/code] + +Add yourself ("surfer" in this example) to the group www-data. Why? Later you want to modify files in eclipse or in another editor. +Then make all files writable by the group www-date you are now a member of. +[code] +root@debian:/var# cd www/ +root@debian:/var/www# usermod -G www-data surfer +root@debian:/var# chmod -R g+w www/ +[/code] + +Restart the computer (or vm) +If you are still not able to modify the project files you can check the members of the group www-data with +[code] +cat /etc/group +[/code] + +[h3]Register yourself as admin[/h3] + +Open http://localhost and init the matrix + +Befor you register a first user switch off the registration mails. +Open /var/www/.htconfig.php +and make sure "0" is set in this line +[code] +App::$config['system']['verify_email'] = 0; +[/code] +You should be able to change the file as "yourself" (instead of using root or www-data). + +[h3]Cron and the poller[/h3] + +Important! +Run the poller to pick up the recent "public" postings of your friends +Set up a cron job or scheduled task to run the poller once every 5-10 +minutes to pick up the recent "public" postings of your friends + +[code] +crontab -e +[/code] + +Add +[code] +*/10 * * * * cd /var/www/; /usr/bin/php include/poller.php +[/code] + +If you don't know the path to PHP type +[code] +whereis php +[/code] + + +[h2]Debug the server via eclipse[/h2] + +[h3]Check the configuration of xdebug[/h3] + +You shoud already have installed xdebug in the steps befor +[code] +apt-get install php5-xdebug +[/code] + +Configuring Xdebug + +Open your terminal and type as root (su -l) +[code] +gedit /etc/php5/mods-available/xdebug.ini +[/code] + +if the file is empty try this location +[code] +gedit /etc/php5/conf.d/xdebug.ini +[/code] + +That command should open the text editor gedit with the Xdebug configuration file +At the end of the file content append the following text + +xdebug.remote_enable=on +xdebug.remote_handler=dbgp +xdebug.remote_host=localhost +xdebug.remote_port=9000 + +Save changes and close the editor. +In you terminal type to restart the web server. +[code] +service apache2 restart +[/code] + + +[h3]Install Eclipse and start debugging[/h3] + +Install eclipse. +Start eclipse with default worspace (or as you like) + +Install the PHP plugin +Menu > Help > Install new software... +Install "PHP Developnent Tools ..." + +Optionally - Install the GitHub connector plugin +Menu > Help > Install new software... +Install "Eclipse Mylyn to GitHub connector" + +Configure the PHP plugin +Menu > Window > Preferences... +> General > Webbrowser > Change to "Use external web browser" +> PHP > Debug > Debug Settings > PHP Debugger > Change to "XDebug" + +Create a new PHP project +Menu > File > New Project > Choose PHP > "PHP Project" +> Choose Create project at existing location" and "/var/www" + +Start debugging +Open index.php and "Debug as..." +Choose as Launch URL: "http://localhost/" + +Expected: +[list] +[*] The web browser starts +[*] The debugger will stop at the first php line +[/list] + + +[h2]Contribute your changes via github[/h2] + +[h3]Preparations[/h3] + +There is a related page in this docs: [zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl]. +As stated befor it is recommended to read the official documentation [url=http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project]GitHub-Contributing-to-a-Project[/url] of git. + +Eclipse has a usefull plugin for GIT: "Eclipse Mylyn to GitHub connector". + +Make sure you have set your data +[code] +surfer@debian:/var/www$ git config --global user.name "Your Name" +surfer@debian:/var/www$ git config --global user.email "your@mail.com" +[/code] + +[h3]Your first contribution[/h3] + +Create a descriptive topic branch +[code] +surfer@debian:/var/www$ git checkout -b dev_beginning +[/code] + +Make sure your local repository is up-to-date with the main project. +Add the original repository as a remote named “upstream” if not done yet +[code] +surfer@debian:/var/www$ git remote add upstream https://framagit.org/hubzilla/core/ +[/code] + +Fetch the newest work from that remote +[code] +surfer@debian:/var/www$ git fetch upstream +surfer@debian:/var/www$ git merge upstream/master +[/code] + +Hint: You can list the branches +[code] +surfer@debian:/var/www$ git branch -v +[/code] + +Make your changes. In this example it is a new doc file. + +Check your modifications +[code] +surfer@debian:/var/www$ git status +[/code] + +Add (stage) the new file +[code] +surfer@debian:/var/www$ git add doc/dev_beginner.bb +[/code] + +Commit the changes to your local branch. This will open an editor to provide a message. +[code] +surfer@debian:/var/www$ git commit -a +[/code] + +Push back up to the same topic branch online +[code] +surfer@debian:/var/www$ git push +[/code] + +Now you can go to your (online) account at github and create the pull request. + +[h3]Following contributions[/h3] + +In case the main devolpers want you to change something. +Fetch the newest work from the remote upstream/master to be sure you have the latest changes. +[code] +surfer@debian:/var/www$ git fetch upstream +surfer@debian:/var/www$ git merge upstream/master +[/code] +Make your changes, test them, commit (to local repository), push (to online repository) +[code] +surfer@debian:/var/www$ git status +surfer@debian:/var/www$ git commit -a -m "added modification of branch" +surfer@debian:/var/www$ git push +[/code] + + +#include doc/macros/main_footer.bb; diff --git a/doc/developer_function_primer.bb b/doc/developer_function_primer.bb index 183581361..48af9523d 100644 --- a/doc/developer_function_primer.bb +++ b/doc/developer_function_primer.bb @@ -1,43 +1,43 @@ -[b]$Projectname development - some useful basic functions[/b] - -[b]get_account_id()[/b] - -Returns numeric account_id if authenticated or 0. It is possible to be authenticated and not connected to a channel. - -[b]local_channel()[/b] - -Returns authenticated numeric channel_id if authenticated and connected to a channel or 0. Sometimes referred to as $uid in the code. - -[b]remote_channel()[/b] - -Returns authenticated string hash of Red global identifier, if authenticated via remote auth, or an empty string. - -[b]App::get_observer()[/b] - -returns an xchan structure representing the current viewer if authenticated (locally or remotely). - -[b]get_config($family,$key), get_pconfig($uid,$family,$key), get_xconfig($xchan_hash,$family,$key)[/b] - -Returns the config setting for $family and $key or false if unset. - -[b] set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value)[/b] - -Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id). The xconfig version get/sets the value for a specific xchan hash - generally used for remote users. - -[b]dbesc()[/b] - -Always escape strings being used in DB queries. This function returns the escaped string. Integer DB parameters should all be proven integers by wrapping with intval() - -[b]q($sql,$var1...)[/b] - -Perform a DB query with the SQL statement $sql. printf style arguments %s and %d are replaced with variable arguments, which should each be appropriately dbesc() or intval(). SELECT queries return an array of results or false if SQL or DB error. Other queries return true if the command was successful or false if it wasn't. - -[b]t($string)[/b] - -Returns the translated variant of $string for the current language or $string (default 'en' language) if the language is unrecognised or a translated version of the string does not exist. - -[b]x($var), $x($array,$key)[/b] - -Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set. If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0; - -#include doc/macros/main_footer.bb; +[b]$Projectname development - some useful basic functions[/b] + +[b]get_account_id()[/b] + +Returns numeric account_id if authenticated or 0. It is possible to be authenticated and not connected to a channel. + +[b]local_channel()[/b] + +Returns authenticated numeric channel_id if authenticated and connected to a channel or 0. Sometimes referred to as $uid in the code. + +[b]remote_channel()[/b] + +Returns authenticated string hash of Red global identifier, if authenticated via remote auth, or an empty string. + +[b]App::get_observer()[/b] + +returns an xchan structure representing the current viewer if authenticated (locally or remotely). + +[b]get_config($family,$key), get_pconfig($uid,$family,$key), get_xconfig($xchan_hash,$family,$key)[/b] + +Returns the config setting for $family and $key or false if unset. + +[b] set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value)[/b] + +Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id). The xconfig version get/sets the value for a specific xchan hash - generally used for remote users. + +[b]dbesc()[/b] + +Always escape strings being used in DB queries. This function returns the escaped string. Integer DB parameters should all be proven integers by wrapping with intval() + +[b]q($sql,$var1...)[/b] + +Perform a DB query with the SQL statement $sql. printf style arguments %s and %d are replaced with variable arguments, which should each be appropriately dbesc() or intval(). SELECT queries return an array of results or false if SQL or DB error. Other queries return true if the command was successful or false if it wasn't. + +[b]t($string)[/b] + +Returns the translated variant of $string for the current language or $string (default 'en' language) if the language is unrecognised or a translated version of the string does not exist. + +[b]x($var), $x($array,$key)[/b] + +Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set. If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0; + +#include doc/macros/main_footer.bb; diff --git a/doc/es-es/git_for_non_developers.bb b/doc/es-es/git_for_non_developers.bb index 2599c2f7c..904826f94 100644 --- a/doc/es-es/git_for_non_developers.bb +++ b/doc/es-es/git_for_non_developers.bb @@ -1,78 +1,78 @@ -[b]Git para no desarrolladores[/b] - -Así que está manejando una traducción, o está contribuyendo a un tema, y cada vez que hace un pull request tiene que hablar con uno de los desarrolladores antes de que sus cambios puedan ser fusionados? - -Lo más probable es que no haya encontrado una forma rápida de explicar cómo mantener las cosas sincronizadas en su lado. Es realmente muy fácil. - -Después de crear un fork del repositorio (sólo tiene que hacer clic en "fork" en github), necesita clonar su propia copia. - -Por ejemplo, asumiremos que está trabajando en un tema llamado redexample (que no existe). - -[code]git clone https://github.com/username/red.git[/code] - -Así que está manejando una traducción, o está contribuyendo a un tema, y cada vez que hace un pull request tiene que hablar con uno de los desarrolladores antes de que sus cambios puedan ser fusionados? - -Lo más probable es que no haya encontrado una forma rápida de explicar cómo mantener las cosas sincronizadas en su lado. Es realmente muy fácil. - -Después de crear un fork del repositorio (sólo tiene que hacer clic en "fork" en github), necesita clonar su propia copia. - -Por ejemplo, asumiremos que está trabajando en un tema llamado redexample (que no existe). - -Una vez que lo haya hecho, cd en el directorio, y añadir un upstream. - -[code] -cd red -git remote add upstream https://framagit.org/hubzilla/core/ -[/code] - -A partir de ahora, puede realizar cambios en el upstream con el comando -[code]git fetch upstream[/code] - -Antes de que sus cambios puedan fusionarse automáticamente, a menudo necesitará fusionar los cambios anteriores. - -[code] -git merge upstream/master -[/code] - -Siempre debe fusionar upstream antes de subir cualquier cambio, y [i]debe[/i] fusionar upstream con cualquier pull request para que se fusionen automáticamente. - -El 99% de las veces, todo irá bien. La única vez que no lo hará es si alguien más ha estado editando los mismos ficheros que usted y, a menudo, sólo si ha estado editando las mismas líneas de los mismos archivos. Si eso sucede, ese sería un buen momento para solicitar ayuda hasta que se acostumbre a manejar sus propios conflictos de fusión. - -Entonces sólo necesitas añadir tus cambios [code]git añadir vista/tema/redexample/[/code] - -Esto agregará todos los archivos en la vista/tema/redexample y cualquier subdirectorio. Si sus archivos particulares se mezclan a través del código, usted debe agregar uno a la vez. Trata de no hacer git add -a, ya que esto lo agregará todo, incluyendo archivos temporales (mayormente, pero no siempre atrapamos a aquellos con un.gitignore) y cualquier cambio local que tenga, pero que no intente confirmar. - -Una vez que haya agregado todos los archivos que ha cambiado, necesita confirmarlos. [code]git commit[/code] - -Esto abrirá un editor donde podrá describir los cambios que ha realizado. Guarde este archivo y salga del editor. - -Finalmente, suba los cambios en su propio git -[code]git push[/code] - -Y eso es todo, su repo está al día! - -Todo lo que necesita hacer ahora es crear la petición pull. Hay dos maneras de hacerlo. - -La forma más fácil, si está utilizando Github, es simplemente hacer clic en el botón verde en la parte superior de su propia copia del repositorio, introducir una descripción de los cambios, y hacer clic en `crear pull request'. El repositorio principal, los temas y los complementos tienen su rama principal en Github, por lo que este método se puede utilizar la mayor parte del tiempo. - -La mayoría de la gente puede parar aquí. - -Algunos proyectos en la ecosfera extendida de RedMatrix no tienen presencia en Github, para un pull request, los pasos son un poco diferentes: usted tendrá que crear su pull request manualmente. Afortunadamente, esto no es -mucho más difícil. - -[code]git request-pull -p [/code] - -Start es el nombre de un commit por el que empezar. Esto debe existir en el upstream. Normalmente, sólo querr'a la rama master. - -URL es la URL de[i]su[/i] repo. - -También se puede especificar . Este valor predeterminado es HEAD. - -Ejemplo: -[código] -git request-pull master https://ejemplo.com/proyecto -[/código] - -Y simplemente envíe la salida al mantenedor del proyecto. - -#include doc/macros/main_footer.bb; +[b]Git para no desarrolladores[/b] + +Así que está manejando una traducción, o está contribuyendo a un tema, y cada vez que hace un pull request tiene que hablar con uno de los desarrolladores antes de que sus cambios puedan ser fusionados? + +Lo más probable es que no haya encontrado una forma rápida de explicar cómo mantener las cosas sincronizadas en su lado. Es realmente muy fácil. + +Después de crear un fork del repositorio (sólo tiene que hacer clic en "fork" en github), necesita clonar su propia copia. + +Por ejemplo, asumiremos que está trabajando en un tema llamado redexample (que no existe). + +[code]git clone https://github.com/username/red.git[/code] + +Así que está manejando una traducción, o está contribuyendo a un tema, y cada vez que hace un pull request tiene que hablar con uno de los desarrolladores antes de que sus cambios puedan ser fusionados? + +Lo más probable es que no haya encontrado una forma rápida de explicar cómo mantener las cosas sincronizadas en su lado. Es realmente muy fácil. + +Después de crear un fork del repositorio (sólo tiene que hacer clic en "fork" en github), necesita clonar su propia copia. + +Por ejemplo, asumiremos que está trabajando en un tema llamado redexample (que no existe). + +Una vez que lo haya hecho, cd en el directorio, y añadir un upstream. + +[code] +cd red +git remote add upstream https://framagit.org/hubzilla/core/ +[/code] + +A partir de ahora, puede realizar cambios en el upstream con el comando +[code]git fetch upstream[/code] + +Antes de que sus cambios puedan fusionarse automáticamente, a menudo necesitará fusionar los cambios anteriores. + +[code] +git merge upstream/master +[/code] + +Siempre debe fusionar upstream antes de subir cualquier cambio, y [i]debe[/i] fusionar upstream con cualquier pull request para que se fusionen automáticamente. + +El 99% de las veces, todo irá bien. La única vez que no lo hará es si alguien más ha estado editando los mismos ficheros que usted y, a menudo, sólo si ha estado editando las mismas líneas de los mismos archivos. Si eso sucede, ese sería un buen momento para solicitar ayuda hasta que se acostumbre a manejar sus propios conflictos de fusión. + +Entonces sólo necesitas añadir tus cambios [code]git añadir vista/tema/redexample/[/code] + +Esto agregará todos los archivos en la vista/tema/redexample y cualquier subdirectorio. Si sus archivos particulares se mezclan a través del código, usted debe agregar uno a la vez. Trata de no hacer git add -a, ya que esto lo agregará todo, incluyendo archivos temporales (mayormente, pero no siempre atrapamos a aquellos con un.gitignore) y cualquier cambio local que tenga, pero que no intente confirmar. + +Una vez que haya agregado todos los archivos que ha cambiado, necesita confirmarlos. [code]git commit[/code] + +Esto abrirá un editor donde podrá describir los cambios que ha realizado. Guarde este archivo y salga del editor. + +Finalmente, suba los cambios en su propio git +[code]git push[/code] + +Y eso es todo, su repo está al día! + +Todo lo que necesita hacer ahora es crear la petición pull. Hay dos maneras de hacerlo. + +La forma más fácil, si está utilizando Github, es simplemente hacer clic en el botón verde en la parte superior de su propia copia del repositorio, introducir una descripción de los cambios, y hacer clic en `crear pull request'. El repositorio principal, los temas y los complementos tienen su rama principal en Github, por lo que este método se puede utilizar la mayor parte del tiempo. + +La mayoría de la gente puede parar aquí. + +Algunos proyectos en la ecosfera extendida de RedMatrix no tienen presencia en Github, para un pull request, los pasos son un poco diferentes: usted tendrá que crear su pull request manualmente. Afortunadamente, esto no es +mucho más difícil. + +[code]git request-pull -p [/code] + +Start es el nombre de un commit por el que empezar. Esto debe existir en el upstream. Normalmente, sólo querr'a la rama master. + +URL es la URL de[i]su[/i] repo. + +También se puede especificar . Este valor predeterminado es HEAD. + +Ejemplo: +[código] +git request-pull master https://ejemplo.com/proyecto +[/código] + +Y simplemente envíe la salida al mantenedor del proyecto. + +#include doc/macros/main_footer.bb; diff --git a/doc/external-resource-links.bb b/doc/external-resource-links.bb index a679e9381..338db8023 100644 --- a/doc/external-resource-links.bb +++ b/doc/external-resource-links.bb @@ -1,21 +1,21 @@ -[h2]External resource links[/h2] -[h3]Third-Party Themes[/h3] -[ul] -[*][url=https://github.com/omigeot/redstrap3]Redstrap[/url] -[*][url=https://bitbucket.org/tobiasd/red-clean]Clean[/url] -[*][url=https://github.com/tonybaldwin/redmatrixthemes/]nubasic[/url] -[*][url=https://github.com/deadsuperhero/redmatrix-themes]Sean Tilley's themes[/url] -[/ul] -[h3]Third-Party addons[/h3] -[ul] -[*][url=https://abcentric.net/git/abcjsplugin.git]ABCjs integration - display scores in posts (WIP)[/url] -[/ul] -[h3]Related projects[/h3] -[ul] -[*][url=https://addons.mozilla.org/en-US/firefox/addon/redshare/]Redshare for Firefox[/url] -[*][url=https://github.com/cvogeley/red-for-android]Red for Android[/url] -[*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url] -[*][url=https://wordpress.org/plugins/hubzilla-wp/]WordPress gateway (combine with wppost addon for full features)[/url] -[/ul] - -#include doc/macros/main_footer.bb; +[h2]External resource links[/h2] +[h3]Third-Party Themes[/h3] +[ul] +[*][url=https://github.com/omigeot/redstrap3]Redstrap[/url] +[*][url=https://bitbucket.org/tobiasd/red-clean]Clean[/url] +[*][url=https://github.com/tonybaldwin/redmatrixthemes/]nubasic[/url] +[*][url=https://github.com/deadsuperhero/redmatrix-themes]Sean Tilley's themes[/url] +[/ul] +[h3]Third-Party addons[/h3] +[ul] +[*][url=https://abcentric.net/git/abcjsplugin.git]ABCjs integration - display scores in posts (WIP)[/url] +[/ul] +[h3]Related projects[/h3] +[ul] +[*][url=https://addons.mozilla.org/en-US/firefox/addon/redshare/]Redshare for Firefox[/url] +[*][url=https://github.com/cvogeley/red-for-android]Red for Android[/url] +[*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url] +[*][url=https://wordpress.org/plugins/hubzilla-wp/]WordPress gateway (combine with wppost addon for full features)[/url] +[/ul] + +#include doc/macros/main_footer.bb; diff --git a/doc/extra_features.bb b/doc/extra_features.bb index 0044a06a7..17d85228e 100644 --- a/doc/extra_features.bb +++ b/doc/extra_features.bb @@ -1,98 +1,98 @@ -// multiple of these have been enabled by default. should we note this here somewhere, move it or remove them from this file? -[b]Features[/b] - -The default interface of $Projectname was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the Extra Features link of your Settings page. - -[b]Content Expiration[/b] - -Remove posts/comments and/or private messages at a future time. An extra button is added to the post editor which asks you for an expiration. Typically this in "yyyy-mm-dd hh:mm" format, but in the English language you have a bit more freedom and can use most any recognisable date reference such as "next Thursday" or "+1 day". At the specified time (give or take approximately ten minutes based on the remote system's checking frequency) the post is removed. - -[b]Multiple Profiles[/b] - -The ability to create multiple profiles which are visible only to specific persons or groups. Your default profile may be visible to anybody, but secondary profiles can all contain different or additional information and can only be seen by those to whom that profile is assigned. - -[b]Web Pages[/b] - -Provides the ability to use web page design feaures and create custom webpages from your own content and also to design the pages with page layouts, custom menus, and content blocks. - -[b]Private Notes[/b] - -On pages where it is available (your matrix page and personal web pages) provide a "widget" to create and store personal reminders and notes. - -[b]Extended Identity Sharing[/b] - -By default your identity travels with you as you browse the matrix to remote sites - and they know who you are and can show you content that only you can see. With Extended Identity Sharing you can provide this information to any website you visit from within the matrix. - -[b]Expert Mode[/b] - -This allows you to see some advanced configuration options that would confuse some people or cause support issues. In particular this can give you full control over theme features and colours - so that you can tweak a large number of settings of the display theme to your liking. - -[b]Premium Channel[/b] - -This allows you to set restrictions and terms on those that connect with your channel. This may be used by celebrities or anybody else who wishes to describe their channel to people who wish to connect with it. In certain cases you may be asked for payment in order to connect. - -[b]Post Preview[/b] - -Allows previewing posts and comments exactly as they would look on the page before publishing them. - -[b]Channel Sources[/b] - -Automatically import and re-publish channel content from other channels or feeds. This allows you to create sub-channels and super-channels from content provided elsewhere. The rules are that the content must be public, and the channel owner must give you permission to source their channel. - -[b]Even More Encryption[/b] - -Private messages are encrypted during transport and storage. In this day and age, this encyption may not be enough if your communications are extremely sensitive. This options lets you provide optional encryption of content "end-to-end" with a shared secret key. How the recipient learns the secret key is completely up to you. You can provide a hint such as "the name of aunt Claire's first dog". - -[b]Search by Date[/b] - -This provides the ability to select posts by date ranges - -[b]Privacy Group Filter[/b] - -Enable widget to display stream posts only from selected privacy groups. This also toggles the outbound permissions while you are viewing a group. This is analogous to Google "circles" or Disapora "aspects". - -[b]Saved Searches[/b] - -Provides a search widget on your matrix page which can save selected search terms for re-use. - -[b]Personal Tab[/b] - -Enable tab to display only matrix posts that you've interacted with in some way, as an author or a contributor to the conversation. - -[b]New Tab[/b] - -Enables a tab to display all new matrix activity as a firehose or timeline. - -[b]Affinity Tool[/b] - -Filter matrix stream activity by the depth of your relationships - -[b]Edit Sent Posts[/b] - -Edit and correct posts and comments after sending - -[b]Tagging[/b] - -Ability to tag existing posts, including those written by others. - -[b]Post Categories[/b] - -Add categories to your channel posts - -[b]Saved Folders[/b] - -Ability to file posts under folders or tags for later recall - -[b]Dislike Posts[/b] - -Ability to dislike posts/comments - -[b]Star Posts[/b] - -Ability to mark special posts with a star indicator - -[b]Tag Cloud[/b] - -Provide a personal tag cloud on your channel page - -#include doc/macros/main_footer.bb; +// multiple of these have been enabled by default. should we note this here somewhere, move it or remove them from this file? +[b]Features[/b] + +The default interface of $Projectname was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the Extra Features link of your Settings page. + +[b]Content Expiration[/b] + +Remove posts/comments and/or private messages at a future time. An extra button is added to the post editor which asks you for an expiration. Typically this in "yyyy-mm-dd hh:mm" format, but in the English language you have a bit more freedom and can use most any recognisable date reference such as "next Thursday" or "+1 day". At the specified time (give or take approximately ten minutes based on the remote system's checking frequency) the post is removed. + +[b]Multiple Profiles[/b] + +The ability to create multiple profiles which are visible only to specific persons or groups. Your default profile may be visible to anybody, but secondary profiles can all contain different or additional information and can only be seen by those to whom that profile is assigned. + +[b]Web Pages[/b] + +Provides the ability to use web page design feaures and create custom webpages from your own content and also to design the pages with page layouts, custom menus, and content blocks. + +[b]Private Notes[/b] + +On pages where it is available (your matrix page and personal web pages) provide a "widget" to create and store personal reminders and notes. + +[b]Extended Identity Sharing[/b] + +By default your identity travels with you as you browse the matrix to remote sites - and they know who you are and can show you content that only you can see. With Extended Identity Sharing you can provide this information to any website you visit from within the matrix. + +[b]Expert Mode[/b] + +This allows you to see some advanced configuration options that would confuse some people or cause support issues. In particular this can give you full control over theme features and colours - so that you can tweak a large number of settings of the display theme to your liking. + +[b]Premium Channel[/b] + +This allows you to set restrictions and terms on those that connect with your channel. This may be used by celebrities or anybody else who wishes to describe their channel to people who wish to connect with it. In certain cases you may be asked for payment in order to connect. + +[b]Post Preview[/b] + +Allows previewing posts and comments exactly as they would look on the page before publishing them. + +[b]Channel Sources[/b] + +Automatically import and re-publish channel content from other channels or feeds. This allows you to create sub-channels and super-channels from content provided elsewhere. The rules are that the content must be public, and the channel owner must give you permission to source their channel. + +[b]Even More Encryption[/b] + +Private messages are encrypted during transport and storage. In this day and age, this encyption may not be enough if your communications are extremely sensitive. This options lets you provide optional encryption of content "end-to-end" with a shared secret key. How the recipient learns the secret key is completely up to you. You can provide a hint such as "the name of aunt Claire's first dog". + +[b]Search by Date[/b] + +This provides the ability to select posts by date ranges + +[b]Privacy Group Filter[/b] + +Enable widget to display stream posts only from selected privacy groups. This also toggles the outbound permissions while you are viewing a group. This is analogous to Google "circles" or Disapora "aspects". + +[b]Saved Searches[/b] + +Provides a search widget on your matrix page which can save selected search terms for re-use. + +[b]Personal Tab[/b] + +Enable tab to display only matrix posts that you've interacted with in some way, as an author or a contributor to the conversation. + +[b]New Tab[/b] + +Enables a tab to display all new matrix activity as a firehose or timeline. + +[b]Affinity Tool[/b] + +Filter matrix stream activity by the depth of your relationships + +[b]Edit Sent Posts[/b] + +Edit and correct posts and comments after sending + +[b]Tagging[/b] + +Ability to tag existing posts, including those written by others. + +[b]Post Categories[/b] + +Add categories to your channel posts + +[b]Saved Folders[/b] + +Ability to file posts under folders or tags for later recall + +[b]Dislike Posts[/b] + +Ability to dislike posts/comments + +[b]Star Posts[/b] + +Ability to mark special posts with a star indicator + +[b]Tag Cloud[/b] + +Provide a personal tag cloud on your channel page + +#include doc/macros/main_footer.bb; diff --git a/doc/git_for_non_developers.bb b/doc/git_for_non_developers.bb index 54d34fdf5..5fba17439 100644 --- a/doc/git_for_non_developers.bb +++ b/doc/git_for_non_developers.bb @@ -1,71 +1,71 @@ -[b]Git For Non-Developers[/b] - -So you're handling a translation, or you're contributing to a theme, and every time you make a pull request you have to talk to one of the developers before your changes can be merged in? - -Chances are, you just haven't found a quick how-to explaining how to keep things in sync on your end. It's really very easy. - -After you've created a fork of the repo (just click "fork" at github), you need to clone your own copy. - -For the sake of examples, we'll assume you're working on a theme called redexample (which does not exist). - -[code]git clone https://github.com/username/red.git[/code] - -Once you've done that, cd into the directory, and add an upstream. - -[code] -cd red -git remote add upstream https://framagit.org/hubzilla/core/ -[/code] - -From now on, you can pull upstream changes with the command -[code]git fetch upstream[/code] - -Before your changes can be merged automatically, you will often need to merge upstream changes. - -[code] -git merge upstream/master -[/code] - -You should always merge upstream before pushing any changes, and [i]must[/i] merge upstream with any pull requests to make them automatically mergeable. - -99% of the time, this will all go well. The only time it won't is if somebody else has been editing the same files as you - and often, only if they have been editing the same lines of the same files. If that happens, that would be a good time to request help until you get the hang of handling your own merge conflicts. - -Then you just need to add your changes [code]git add view/theme/redexample/[/code] - -This will add all the files in view/theme/redexample and any subdirectories. If your particular files are mixed throughout the code, you should add one at a time. Try not to do git add -a, as this will add everything, including temporary files (we mostly, but not always catch those with a .gitignore) and any local changes you have, but did not intend to commit. - -Once you have added all the files you have changed, you need to commit them. [code]git commit[/code] - -This will open up an editor where you can describe the changes you have made. Save this file, and exit the editor. - -Finally, push the changes to your own git -[code]git push[/code] - -And that's it, your repo is up to date! - -All you need to do now is actually create the pull request. There are two ways to do this. - -The easy way, if you're using Github is to simply click the green button at the top of your own copy of the repository, enter a description of the changes, and click 'create pull request'. The -main repository, themes, and addons all have their main branch at Github, so this method can be used most of the time. - -Most people can stop here. - -Some projects in the extended RedMatrix ecosphere have no Github presence, to pull request these is a bit different - you'll have to create your pull request manually. Fortunately, this isn't -much harder. - -[code]git request-pull -p [/code] - -Start is the name of a commit to start at. This must exist upstream. Normally, you just want master. - -URL is the URL of [i]your[/i] repo. - -One can also specify . This defaults to HEAD. - -Example: -[code] -git request-pull master https://example.com/project -[/code] - -And simply send the output to the project maintainer. - -#include doc/macros/main_footer.bb; +[b]Git For Non-Developers[/b] + +So you're handling a translation, or you're contributing to a theme, and every time you make a pull request you have to talk to one of the developers before your changes can be merged in? + +Chances are, you just haven't found a quick how-to explaining how to keep things in sync on your end. It's really very easy. + +After you've created a fork of the repo (just click "fork" at github), you need to clone your own copy. + +For the sake of examples, we'll assume you're working on a theme called redexample (which does not exist). + +[code]git clone https://github.com/username/red.git[/code] + +Once you've done that, cd into the directory, and add an upstream. + +[code] +cd red +git remote add upstream https://framagit.org/hubzilla/core/ +[/code] + +From now on, you can pull upstream changes with the command +[code]git fetch upstream[/code] + +Before your changes can be merged automatically, you will often need to merge upstream changes. + +[code] +git merge upstream/master +[/code] + +You should always merge upstream before pushing any changes, and [i]must[/i] merge upstream with any pull requests to make them automatically mergeable. + +99% of the time, this will all go well. The only time it won't is if somebody else has been editing the same files as you - and often, only if they have been editing the same lines of the same files. If that happens, that would be a good time to request help until you get the hang of handling your own merge conflicts. + +Then you just need to add your changes [code]git add view/theme/redexample/[/code] + +This will add all the files in view/theme/redexample and any subdirectories. If your particular files are mixed throughout the code, you should add one at a time. Try not to do git add -a, as this will add everything, including temporary files (we mostly, but not always catch those with a .gitignore) and any local changes you have, but did not intend to commit. + +Once you have added all the files you have changed, you need to commit them. [code]git commit[/code] + +This will open up an editor where you can describe the changes you have made. Save this file, and exit the editor. + +Finally, push the changes to your own git +[code]git push[/code] + +And that's it, your repo is up to date! + +All you need to do now is actually create the pull request. There are two ways to do this. + +The easy way, if you're using Github is to simply click the green button at the top of your own copy of the repository, enter a description of the changes, and click 'create pull request'. The +main repository, themes, and addons all have their main branch at Github, so this method can be used most of the time. + +Most people can stop here. + +Some projects in the extended RedMatrix ecosphere have no Github presence, to pull request these is a bit different - you'll have to create your pull request manually. Fortunately, this isn't +much harder. + +[code]git request-pull -p [/code] + +Start is the name of a commit to start at. This must exist upstream. Normally, you just want master. + +URL is the URL of [i]your[/i] repo. + +One can also specify . This defaults to HEAD. + +Example: +[code] +git request-pull master https://example.com/project +[/code] + +And simply send the output to the project maintainer. + +#include doc/macros/main_footer.bb; diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index 99dd8f8f3..6ef7a4d9e 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -1,113 +1,113 @@ -[b]$Projectname Developer Guide[/b] - -[b]File system layout:[/b] - -[addon] optional addons/plugins - -[boot.php] Every process uses this to bootstrap the application structure - -[doc] Help Files - -[images] core required images - -[include] The "model" in MVC - (back-end functions), also contains PHP "executables" for background processing - -[index.php] The front-end controller for web access - -[install] Installation and upgrade files and DB schema - -[library] Third party modules (must be license compatible) - -[mod] Controller modules based on URL pathname (e.g. #^[url=http://sitename/foo]http://sitename/foo[/url] loads mod/foo.php) - -[mod/site/] site-specific mod overrides, excluded from git - -[util] translation tools, main English string database and other miscellaneous utilities - -[version.inc] contains current version (auto-updated via cron for the master repository and distributed via git) - -[view] theming and language files - -[view/(css,js,img,php,tpl)] default theme files - -[view/(en,it,es ...)] language strings and resources - -[view/theme/] individual named themes containing (css,js,img,php,tpl) over-rides - -[b]The Database:[/b] - - [li]abook - contact table, replaces Friendica 'contact'[/li] - [li]account - service provider account[/li] - [li]addon - registered plugins[/li] - [li]app - peronal app data[/li] - [li]attach - file attachments[/li] - [li]auth_codes - OAuth usage[/li] - [li]cache - OEmbed cache[/li] - [li]channel - replaces Friendica 'user'[/li] - [li]chat - chat room content[/li] - [li]chatpresence - channel presence information for chat[/li] - [li]chatroom - data for the actual chat room[/li] - [li]clients - OAuth usage[/li] - [li]config - main configuration storage[/li] - [li]conv - Diaspora private messages[/li] - [li]event - Events[/li] - [li]fcontact - friend suggestion stuff[/li] - [li]ffinder - friend suggestion stuff[/li] - [li]fserver - obsolete[/li] - [li]fsuggest - friend suggestion stuff[/li] - [li]groups - privacy groups[/li] - [li]group_member - privacy groups[/li] - [li]hook - plugin hook registry[/li] - [li]hubloc - Red location storage, ties a location to an xchan[/li] - [li]item - posts[/li] - [li]item_id - other identifiers on other services for posts[/li] - [li]likes - likes of 'things'[/li] - [li]mail - private messages[/li] - [li]menu - channel menu data[/li] - [li]menu_item - items uses by channel menus[/li] - [li]notify - notifications[/li] - [li]notify-threads - need to factor this out and use item thread info on notifications[/li] - [li]obj - object data for things (x has y)[/li] - [li]outq - output queue[/li] - [li]pconfig - personal (per channel) configuration storage[/li] - [li]photo - photo storage[/li] - [li]poll - data for polls[/li] - [li]poll_elm - data for poll elements[/li] - [li]profdef - custom profile field definitions[/li] - [li]profext - custom profile field data[/li] - [li]profile - channel profiles[/li] - [li]profile_check - DFRN remote auth use, may be obsolete[/li] - [li]register - registrations requiring admin approval[/li] - [li]session - web session storage[/li] - [li]shares - shared item information[/li] - [li[sign - Diaspora signatures. To be phased out.[/li] - [li]site - site table to find directory peers[/li] - [li]source - channel sources data[/li] - [li]spam - unfinished[/li] - [li]sys_perms - extensible permissions for the sys channel[/li] - [li]term - item taxonomy (categories, tags, etc.) table[/li] - [li]tokens - OAuth usage[/li] - [li]updates - directory sync updates[/li] - [li]verify - general purpose verification structure[/li] - [li]vote - vote data for polls[/li] - [li]xchan - replaces 'gcontact', list of known channels in the universe[/li] - [li]xchat - bookmarked chat rooms[/li] - [li]xconfig - as pconfig but for channels with no local account[/li] - [li]xlink - "friends of friends" linkages derived from poco[/li] - [li]xprof - if this hub is a directory server, contains basic public profile info of everybody in the network[/li] - [li]xtag - if this hub is a directory server, contains tags or interests of everybody in the network[/li] - - -[b]How to theme $Projectname - by Olivier Migeot[/b] - -This is a short documentation on what I found while trying to modify $Projectname's appearance. - -First, you'll need to create a new theme. This is in /view/theme, and I chose to copy 'redbasic' since it's the only available for now. Let's assume I named it . - -Oh, and don't forget to rename the _init function in /php/theme.php to be _init() instead of redbasic_init(). - -At that point, if you need to add javascript or css files, add them to /js or /css, and then "register" them in _init() through head_add_js('file.js') and head_add_css('file.css'). - -Now you'll probably want to alter a template. These can be found in in /view/tpl OR view//tpl. All you should have to do is copy whatever you want to tweak from the first place to your theme's own tpl directory. - -#include doc/macros/main_footer.bb; +[b]$Projectname Developer Guide[/b] + +[b]File system layout:[/b] + +[addon] optional addons/plugins + +[boot.php] Every process uses this to bootstrap the application structure + +[doc] Help Files + +[images] core required images + +[include] The "model" in MVC - (back-end functions), also contains PHP "executables" for background processing + +[index.php] The front-end controller for web access + +[install] Installation and upgrade files and DB schema + +[library] Third party modules (must be license compatible) + +[mod] Controller modules based on URL pathname (e.g. #^[url=http://sitename/foo]http://sitename/foo[/url] loads mod/foo.php) + +[mod/site/] site-specific mod overrides, excluded from git + +[util] translation tools, main English string database and other miscellaneous utilities + +[version.inc] contains current version (auto-updated via cron for the master repository and distributed via git) + +[view] theming and language files + +[view/(css,js,img,php,tpl)] default theme files + +[view/(en,it,es ...)] language strings and resources + +[view/theme/] individual named themes containing (css,js,img,php,tpl) over-rides + +[b]The Database:[/b] + + [li]abook - contact table, replaces Friendica 'contact'[/li] + [li]account - service provider account[/li] + [li]addon - registered plugins[/li] + [li]app - peronal app data[/li] + [li]attach - file attachments[/li] + [li]auth_codes - OAuth usage[/li] + [li]cache - OEmbed cache[/li] + [li]channel - replaces Friendica 'user'[/li] + [li]chat - chat room content[/li] + [li]chatpresence - channel presence information for chat[/li] + [li]chatroom - data for the actual chat room[/li] + [li]clients - OAuth usage[/li] + [li]config - main configuration storage[/li] + [li]conv - Diaspora private messages[/li] + [li]event - Events[/li] + [li]fcontact - friend suggestion stuff[/li] + [li]ffinder - friend suggestion stuff[/li] + [li]fserver - obsolete[/li] + [li]fsuggest - friend suggestion stuff[/li] + [li]groups - privacy groups[/li] + [li]group_member - privacy groups[/li] + [li]hook - plugin hook registry[/li] + [li]hubloc - Red location storage, ties a location to an xchan[/li] + [li]item - posts[/li] + [li]item_id - other identifiers on other services for posts[/li] + [li]likes - likes of 'things'[/li] + [li]mail - private messages[/li] + [li]menu - channel menu data[/li] + [li]menu_item - items uses by channel menus[/li] + [li]notify - notifications[/li] + [li]notify-threads - need to factor this out and use item thread info on notifications[/li] + [li]obj - object data for things (x has y)[/li] + [li]outq - output queue[/li] + [li]pconfig - personal (per channel) configuration storage[/li] + [li]photo - photo storage[/li] + [li]poll - data for polls[/li] + [li]poll_elm - data for poll elements[/li] + [li]profdef - custom profile field definitions[/li] + [li]profext - custom profile field data[/li] + [li]profile - channel profiles[/li] + [li]profile_check - DFRN remote auth use, may be obsolete[/li] + [li]register - registrations requiring admin approval[/li] + [li]session - web session storage[/li] + [li]shares - shared item information[/li] + [li[sign - Diaspora signatures. To be phased out.[/li] + [li]site - site table to find directory peers[/li] + [li]source - channel sources data[/li] + [li]spam - unfinished[/li] + [li]sys_perms - extensible permissions for the sys channel[/li] + [li]term - item taxonomy (categories, tags, etc.) table[/li] + [li]tokens - OAuth usage[/li] + [li]updates - directory sync updates[/li] + [li]verify - general purpose verification structure[/li] + [li]vote - vote data for polls[/li] + [li]xchan - replaces 'gcontact', list of known channels in the universe[/li] + [li]xchat - bookmarked chat rooms[/li] + [li]xconfig - as pconfig but for channels with no local account[/li] + [li]xlink - "friends of friends" linkages derived from poco[/li] + [li]xprof - if this hub is a directory server, contains basic public profile info of everybody in the network[/li] + [li]xtag - if this hub is a directory server, contains tags or interests of everybody in the network[/li] + + +[b]How to theme $Projectname - by Olivier Migeot[/b] + +This is a short documentation on what I found while trying to modify $Projectname's appearance. + +First, you'll need to create a new theme. This is in /view/theme, and I chose to copy 'redbasic' since it's the only available for now. Let's assume I named it . + +Oh, and don't forget to rename the _init function in /php/theme.php to be _init() instead of redbasic_init(). + +At that point, if you need to add javascript or css files, add them to /js or /css, and then "register" them in _init() through head_add_js('file.js') and head_add_css('file.css'). + +Now you'll probably want to alter a template. These can be found in in /view/tpl OR view//tpl. All you should have to do is copy whatever you want to tweak from the first place to your theme's own tpl directory. + +#include doc/macros/main_footer.bb; diff --git a/doc/plugins.bb b/doc/plugins.bb index a320de790..3aecc458f 100644 --- a/doc/plugins.bb +++ b/doc/plugins.bb @@ -1,312 +1,312 @@ -[b]Plugins[/b] - -So you want to make $Projectname do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. - - -In your $Projectname folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. -[code] - mkdir addon -[/code] -Then figure out a name for your addon. You probably have at least a vague idea of what you want it to do. For our example I'm going to create a plugin called 'randplace' that provides a somewhat random location for each of your posts. The name of your plugin is used to find the functions we need to access and is part of the function names, so to be safe, use only simple text characters. - -Once you've chosen a name, create a directory beneath 'addon' to hold your working file or files. -[code] - mkdir addon/randplace -[/code] -Now create your plugin file. It needs to have the same name, and it's a PHP script, so using your favourite editor, create the file -[code] - addon/randplace/randplace.php -[/code] -The very first line of this file needs to be -[code] - <?php -[/code] -Then we're going to create a comment block to describe the plugin. There's a special format for this. We use /* ... */ comment-style and some tagged lines consisting of -[code] - /** - * - * Name: Random Place (here you can use better descriptions than you could in the filename) - * Description: Sample $Projectname plugin, Sets a random place when posting. - * Version: 1.0 - * Author: Mike Macgirvin <mike@zothub.com> - * - */ -[/code] -These tags will be seen by the site administrator when he/she installs or manages plugins from the admin panel. There can be more than one author. Just add another line starting with 'Author:'. - -The typical plugin will have at least the following functions: -[code] - pluginname_load() - pluginname_unload() -[/code] -In our case, we'll call them randplace_load() and randplace_unload(), as that is the name of our plugin. These functions are called whenever we wish to either initialise the plugin or remove it from the current webpage. Also if your plugin requires things like altering the database schema before it can run for the very first time, you would likely place these instructions in the functions named -[code] - pluginname_install() - pluginname_uninstall() -[/code] - -Next we'll talk about [b]hooks[/b]. Hooks are places in $Projectname code where we allow plugins to do stuff. There are a [url=[baseurl]/help/hooklist]lot of these[/url], and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. - -We register hook handlers with the 'Zotlabs\Extend\Hook::register()' function. It typically takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your $Projectname installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. - -[code] - function randplace_load() { - Zotlabs\Extend\Hook::register('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); - - Zotlabs\Extend\Hook::register('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); - Zotlabs\Extend\Hook::register('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); - - } -[/code] - -So we're going to catch three events, 'post_local' which is triggered when a post is made on the local system, 'feature_settings' to set some preferences for our plugin, and 'feature_settings_post' to store those settings. - -Next we'll create an unload function. This is easy, as it just unregisters our hooks. It takes exactly the same arguments. -[code] - function randplace_unload() { - Zotlabs\Extend\Hook::unregister('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); - - Zotlabs\Extend\Hook::unregister('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); - Zotlabs\Extend\Hook::unregister('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); - } -[/code] - -Hooks are always called with one argument which is specific to the hook you're calling. It contains information relevant to that particular place in the program, and often allows you to look at, and even change it. In order to change it, you need to add '&' to the variable name so it is passed to your function by reference. Otherwise it will create a copy and any changes you make will be lost when the hook process returns. Usually (but not always) the passed data is a named array of data structures. Please see the "hook reference" (not yet written as of this date) for details on any specific hook. Occasionally you may need to view the program source to see precisely how a given hook is called and how the results are processed. - -Let's go ahead and add some code to implement our post_local hook handler. -[code] - function randplace_post_hook(&$item) { - - /** - * - * An item was posted on the local system. - * We are going to look for specific items: - * - A status post by a profile owner - * - The profile owner must have allowed our plugin - * - */ - - logger('randplace invoked'); - - if(! local_channel()) /* non-zero if this is a logged in user of this system */ - return; - - if(local_channel() != $item['uid']) /* Does this person own the post? */ - return; - - if(($item['parent']) || (! is_item_normal($item))) { - /* If the item has a parent, or is not "normal", this is a comment or something else, not a status post. */ - return; - } - - /* Retrieve our personal config setting */ - - $active = get_pconfig(local_channel(), 'randplace', 'enable'); - - if(! $active) - return; - /** - * - * OK, we're allowed to do our stuff. - * Here's what we are going to do: - * load the list of timezone names, and use that to generate a list of world cities. - * Then we'll pick one of those at random and put it in the "location" field for the post. - * - */ - - $cities = array(); - $zones = timezone_identifiers_list(); - foreach($zones as $zone) { - if((strpos($zone,'/')) && (! stristr($zone,'US/')) && (! stristr($zone,'Etc/'))) - $cities[] = str_replace('_', ' ',substr($zone,strpos($zone,'/') + 1)); - } - - if(! count($cities)) - return; - $city = array_rand($cities,1); - $item['location'] = $cities[$city]; - - return; - } -[/code] - -Now let's add our functions to create and store preference settings. -[code] - /** - * - * Callback from the settings post function. - * $post contains the global $_POST array. - * We will make sure we've got a valid user account - * and that only our own submit button was clicked - * and if so set our configuration setting for this person. - * - */ - - function randplace_settings_post($post) { - if(! local_channel()) - return; - if($_POST['randplace-submit']) - set_pconfig(local_channel(),'randplace','enable',intval($_POST['randplace'])); - } - - - - /** - * - * Called from the Feature Setting form. - * The second argument is a string in this case, the HTML content region of the page. - * Add our own settings info to the string. - * - * For uniformity of settings pages, we use the following convention - * <div class="settings-block"> - * <h3>title</h3> - * .... settings html - many elements will be floated... - * <div class="clear"></div> <!-- generic class which clears all floats --> - * <input type="submit" name="pluginnname-submit" class="settings-submit" ..... /> - * </div> - */ - - - - function randplace_settings(&$s) { - - if(! local_channel()) - return; - - /* Add our stylesheet to the page so we can make our settings look nice */ - - head_add_css(/addon/randplace/randplace.css'); - - /* Get the current state of our config variable */ - - $enabled = get_pconfig(local_channel(),'randplace','enable'); - - $checked = (($enabled) ? ' checked="checked" ' : ''); - - /* Add some HTML to the existing form */ - - $s .= '<div class="settings-block">'; - $s .= '<h3>' . t('Randplace Settings') . '</h3>'; - $s .= '<div id="randplace-enable-wrapper">'; - $s .= '<label id="randplace-enable-label" for="randplace-checkbox">' . t('Enable Randplace Plugin') . '</label>'; - $s .= '<input id="randplace-checkbox" type="checkbox" name="randplace" value="1" ' . $checked . '/>'; - $s .= '</div><div class="clear"></div>'; - - /* provide a submit button */ - - $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>'; - - } - -[/code] - - - -[h2]Advanced Plugins[/h2] - -Sometimes your plugins want to provide a range of new functionality which isn't provided at all or is clumsy to provide using hooks. In this case your plugin can also act as a 'module'. A module in our case refers to a structured webpage handler which responds to a given URL. Then anything which accesses that URL will be handled completely by your plugin. - -There are two ways to accomplish this. To create a module object use the following model: -[code] -/.hidden -[/code] - -***Porting Friendica Plugins*** - -$Projectname uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are: - -[li] Friendica's pluginname_install() is pluginname_load()[/li] - -[li] Friendica's pluginname_uninstall() is pluginname_unload()[/li] - -$Projectname has _install and _uninstall functions but these are used differently. - -[li] Friendica's "plugin_settings" hook is called "feature_settings"[/li] - -[li] Friendica's "plugin_settings_post" hook is called "feature_settings_post"[/li] - -Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in $Projectname. Many structured data names (especially DB schema columns) are also quite different. - -#include doc/macros/main_footer.bb; +[b]Plugins[/b] + +So you want to make $Projectname do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. + + +In your $Projectname folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. +[code] + mkdir addon +[/code] +Then figure out a name for your addon. You probably have at least a vague idea of what you want it to do. For our example I'm going to create a plugin called 'randplace' that provides a somewhat random location for each of your posts. The name of your plugin is used to find the functions we need to access and is part of the function names, so to be safe, use only simple text characters. + +Once you've chosen a name, create a directory beneath 'addon' to hold your working file or files. +[code] + mkdir addon/randplace +[/code] +Now create your plugin file. It needs to have the same name, and it's a PHP script, so using your favourite editor, create the file +[code] + addon/randplace/randplace.php +[/code] +The very first line of this file needs to be +[code] + <?php +[/code] +Then we're going to create a comment block to describe the plugin. There's a special format for this. We use /* ... */ comment-style and some tagged lines consisting of +[code] + /** + * + * Name: Random Place (here you can use better descriptions than you could in the filename) + * Description: Sample $Projectname plugin, Sets a random place when posting. + * Version: 1.0 + * Author: Mike Macgirvin <mike@zothub.com> + * + */ +[/code] +These tags will be seen by the site administrator when he/she installs or manages plugins from the admin panel. There can be more than one author. Just add another line starting with 'Author:'. + +The typical plugin will have at least the following functions: +[code] + pluginname_load() + pluginname_unload() +[/code] +In our case, we'll call them randplace_load() and randplace_unload(), as that is the name of our plugin. These functions are called whenever we wish to either initialise the plugin or remove it from the current webpage. Also if your plugin requires things like altering the database schema before it can run for the very first time, you would likely place these instructions in the functions named +[code] + pluginname_install() + pluginname_uninstall() +[/code] + +Next we'll talk about [b]hooks[/b]. Hooks are places in $Projectname code where we allow plugins to do stuff. There are a [url=[baseurl]/help/hooklist]lot of these[/url], and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. + +We register hook handlers with the 'Zotlabs\Extend\Hook::register()' function. It typically takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your $Projectname installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. + +[code] + function randplace_load() { + Zotlabs\Extend\Hook::register('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); + + Zotlabs\Extend\Hook::register('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); + Zotlabs\Extend\Hook::register('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); + + } +[/code] + +So we're going to catch three events, 'post_local' which is triggered when a post is made on the local system, 'feature_settings' to set some preferences for our plugin, and 'feature_settings_post' to store those settings. + +Next we'll create an unload function. This is easy, as it just unregisters our hooks. It takes exactly the same arguments. +[code] + function randplace_unload() { + Zotlabs\Extend\Hook::unregister('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); + + Zotlabs\Extend\Hook::unregister('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); + Zotlabs\Extend\Hook::unregister('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); + } +[/code] + +Hooks are always called with one argument which is specific to the hook you're calling. It contains information relevant to that particular place in the program, and often allows you to look at, and even change it. In order to change it, you need to add '&' to the variable name so it is passed to your function by reference. Otherwise it will create a copy and any changes you make will be lost when the hook process returns. Usually (but not always) the passed data is a named array of data structures. Please see the "hook reference" (not yet written as of this date) for details on any specific hook. Occasionally you may need to view the program source to see precisely how a given hook is called and how the results are processed. + +Let's go ahead and add some code to implement our post_local hook handler. +[code] + function randplace_post_hook(&$item) { + + /** + * + * An item was posted on the local system. + * We are going to look for specific items: + * - A status post by a profile owner + * - The profile owner must have allowed our plugin + * + */ + + logger('randplace invoked'); + + if(! local_channel()) /* non-zero if this is a logged in user of this system */ + return; + + if(local_channel() != $item['uid']) /* Does this person own the post? */ + return; + + if(($item['parent']) || (! is_item_normal($item))) { + /* If the item has a parent, or is not "normal", this is a comment or something else, not a status post. */ + return; + } + + /* Retrieve our personal config setting */ + + $active = get_pconfig(local_channel(), 'randplace', 'enable'); + + if(! $active) + return; + /** + * + * OK, we're allowed to do our stuff. + * Here's what we are going to do: + * load the list of timezone names, and use that to generate a list of world cities. + * Then we'll pick one of those at random and put it in the "location" field for the post. + * + */ + + $cities = array(); + $zones = timezone_identifiers_list(); + foreach($zones as $zone) { + if((strpos($zone,'/')) && (! stristr($zone,'US/')) && (! stristr($zone,'Etc/'))) + $cities[] = str_replace('_', ' ',substr($zone,strpos($zone,'/') + 1)); + } + + if(! count($cities)) + return; + $city = array_rand($cities,1); + $item['location'] = $cities[$city]; + + return; + } +[/code] + +Now let's add our functions to create and store preference settings. +[code] + /** + * + * Callback from the settings post function. + * $post contains the global $_POST array. + * We will make sure we've got a valid user account + * and that only our own submit button was clicked + * and if so set our configuration setting for this person. + * + */ + + function randplace_settings_post($post) { + if(! local_channel()) + return; + if($_POST['randplace-submit']) + set_pconfig(local_channel(),'randplace','enable',intval($_POST['randplace'])); + } + + + + /** + * + * Called from the Feature Setting form. + * The second argument is a string in this case, the HTML content region of the page. + * Add our own settings info to the string. + * + * For uniformity of settings pages, we use the following convention + * <div class="settings-block"> + * <h3>title</h3> + * .... settings html - many elements will be floated... + * <div class="clear"></div> <!-- generic class which clears all floats --> + * <input type="submit" name="pluginnname-submit" class="settings-submit" ..... /> + * </div> + */ + + + + function randplace_settings(&$s) { + + if(! local_channel()) + return; + + /* Add our stylesheet to the page so we can make our settings look nice */ + + head_add_css(/addon/randplace/randplace.css'); + + /* Get the current state of our config variable */ + + $enabled = get_pconfig(local_channel(),'randplace','enable'); + + $checked = (($enabled) ? ' checked="checked" ' : ''); + + /* Add some HTML to the existing form */ + + $s .= '<div class="settings-block">'; + $s .= '<h3>' . t('Randplace Settings') . '</h3>'; + $s .= '<div id="randplace-enable-wrapper">'; + $s .= '<label id="randplace-enable-label" for="randplace-checkbox">' . t('Enable Randplace Plugin') . '</label>'; + $s .= '<input id="randplace-checkbox" type="checkbox" name="randplace" value="1" ' . $checked . '/>'; + $s .= '</div><div class="clear"></div>'; + + /* provide a submit button */ + + $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>'; + + } + +[/code] + + + +[h2]Advanced Plugins[/h2] + +Sometimes your plugins want to provide a range of new functionality which isn't provided at all or is clumsy to provide using hooks. In this case your plugin can also act as a 'module'. A module in our case refers to a structured webpage handler which responds to a given URL. Then anything which accesses that URL will be handled completely by your plugin. + +There are two ways to accomplish this. To create a module object use the following model: +[code] +/.hidden +[/code] + +***Porting Friendica Plugins*** + +$Projectname uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are: + +[li] Friendica's pluginname_install() is pluginname_load()[/li] + +[li] Friendica's pluginname_uninstall() is pluginname_unload()[/li] + +$Projectname has _install and _uninstall functions but these are used differently. + +[li] Friendica's "plugin_settings" hook is called "feature_settings"[/li] + +[li] Friendica's "plugin_settings_post" hook is called "feature_settings_post"[/li] + +Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in $Projectname. Many structured data names (especially DB schema columns) are also quite different. + +#include doc/macros/main_footer.bb; diff --git a/doc/problems-following-an-update.bb b/doc/problems-following-an-update.bb index 2d1fefc5b..7376d6163 100644 --- a/doc/problems-following-an-update.bb +++ b/doc/problems-following-an-update.bb @@ -1,38 +1,38 @@ -[b]Problems Following An Update[/b] - -A good 90% of all bugs encountered immediately after updating the code to the latest version are simple cache errors of one sort or another. If you update and find something very obvious is broken - like your matrix page doesn't load, notifications are missing, or comment boxes are missing - the chances are it's not a bug at all. Breaking basic functionality is the kind of thing developers tend to notice. - -If this happens to you, there are a few simple steps to take before resorting to the support forums: - -[b]Browser Cache[/b] - -Symptoms: Menus do not expand, ACL selector does not open, progress indicator does not display (or loops forever), Matrix and channel pages do not load. - -Force reload the page. Shift reload, or ctrl+f5. Occasionally, but very, very rarely, you will also need to clear the session data - which is achieved by restarting the browser. - -[b]FastCGI[/b] - -Symptoms: Incorrect variables. The basic UI mostly works, but displays incorrect content or is missing content entirely. - -If you're using php5-fpm, this problem is usually resolved with [code]service php5-fpm restart[/code] - -[b]Smarty Cache[/b] - -Symptoms: - -1) White Screen Of Death. This is most prevalent on the settings and admin pages. - -2) Missing icons, tabs, menus or features. - -We use the Smarty3 template engine to generate pages. These templates are compiled before they are displayed. Occasionally, a new or modified template will fail to overwrite the old compiled version. To clear the Smarty cache, delete all the files in store/[data]/smarty3/compiled [b]but do not delete the directory itself[/b]. Templates will then be recompiled on their next access. - -[b]Theme Issues[/b] - -There are many themes for $Projectname. Only Redbasic is officialy supported by the core developers. This applies [i]even if a core developer happens to support an additional theme[/i]. This means new features are only guaranteed to work in Redbasic. - -Redbasic uses a few javascript libraries that are done differently, or entirely absent in other themes. This means new features may only work properly in Redbasic. Before reporting an issue, therefore, you should switch to Redbasic to see if it exists there. If the issue goes away, this is not a bug - it's a theme that isn't up to date. - -Should you report an issue with the theme developers then? No. Theme developers use their themes. Chances are, they know. Give them two or three days to catch up and [i]then[/i] report the issue if it's still not fixed. There are two workarounds for this situation. Firstly, you can temporarily use Redbasic. Secondly, most themes are open source too - open a pull request and make yourself a friend. - -#include doc/macros/troubleshooting_footer.bb; - +[b]Problems Following An Update[/b] + +A good 90% of all bugs encountered immediately after updating the code to the latest version are simple cache errors of one sort or another. If you update and find something very obvious is broken - like your matrix page doesn't load, notifications are missing, or comment boxes are missing - the chances are it's not a bug at all. Breaking basic functionality is the kind of thing developers tend to notice. + +If this happens to you, there are a few simple steps to take before resorting to the support forums: + +[b]Browser Cache[/b] + +Symptoms: Menus do not expand, ACL selector does not open, progress indicator does not display (or loops forever), Matrix and channel pages do not load. + +Force reload the page. Shift reload, or ctrl+f5. Occasionally, but very, very rarely, you will also need to clear the session data - which is achieved by restarting the browser. + +[b]FastCGI[/b] + +Symptoms: Incorrect variables. The basic UI mostly works, but displays incorrect content or is missing content entirely. + +If you're using php5-fpm, this problem is usually resolved with [code]service php5-fpm restart[/code] + +[b]Smarty Cache[/b] + +Symptoms: + +1) White Screen Of Death. This is most prevalent on the settings and admin pages. + +2) Missing icons, tabs, menus or features. + +We use the Smarty3 template engine to generate pages. These templates are compiled before they are displayed. Occasionally, a new or modified template will fail to overwrite the old compiled version. To clear the Smarty cache, delete all the files in store/[data]/smarty3/compiled [b]but do not delete the directory itself[/b]. Templates will then be recompiled on their next access. + +[b]Theme Issues[/b] + +There are many themes for $Projectname. Only Redbasic is officialy supported by the core developers. This applies [i]even if a core developer happens to support an additional theme[/i]. This means new features are only guaranteed to work in Redbasic. + +Redbasic uses a few javascript libraries that are done differently, or entirely absent in other themes. This means new features may only work properly in Redbasic. Before reporting an issue, therefore, you should switch to Redbasic to see if it exists there. If the issue goes away, this is not a bug - it's a theme that isn't up to date. + +Should you report an issue with the theme developers then? No. Theme developers use their themes. Chances are, they know. Give them two or three days to catch up and [i]then[/i] report the issue if it's still not fixed. There are two workarounds for this situation. Firstly, you can temporarily use Redbasic. Secondly, most themes are open source too - open a pull request and make yourself a friend. + +#include doc/macros/troubleshooting_footer.bb; + diff --git a/doc/red2pi.bb b/doc/red2pi.bb index 8a056b81b..8ae087fbf 100644 --- a/doc/red2pi.bb +++ b/doc/red2pi.bb @@ -1,342 +1,342 @@ -[b]How to install $Projectname on a Raspberry Pi[/b] - -You just bought a Raspberry Pi and want to run the RED Matrix with your own domain name? - -Then this page is for you! You will: -[list=1] -[*] Install Raspberry OS (Debian Linux) on a Raspberry -[*] Install Apache Web Server, PHP, MaySQL, phpMyAdmin -[*] Register a free domain (dynamic DNS) and use it for your hub -[*] Install $Projectname -[*] Keep your Raspberry Pi and $Projectname up-to-date -[*] TODO Setting up SSL -[*] TODO Running with SSL -[*] TODO Make the webserver less vulnarable to attacks -[/list] - -[size=large]1. Install Raspberry OS (Debian Linux)[/size] - -instructions under [url=http://www.raspberrypi.org/downloads]http://www.raspberrypi.org/downloads[/url] -This page links to the quick start containing detailed instruction. - -[b]Format SD card[/b] - -using the program gparted under Linux Mint 15 - -format as FAT32 - -[b]Download NOOBS (offline and network install)[/b] - -[url=http://downloads.raspberrypi.org/noobs]http://downloads.raspberrypi.org/noobs[/url] - -unzip - -copy unzipped files to SD card - -[b]Install Raspbian as OS on the Rasperry Pi[/b] - -connect with keyboard via USB - -connect with monitor via HDMI - -Insert SD card into Rasperry Pi - -Connect with power supply to switch on the Rasperry - -choose Raspbian as OS (> installs Raspbian....) - -wait for the coniguration program raspi-config (you can later start it by sudo raspi-config) - -[b]Configure Raspbian[/b] - -in raspi-config > advanced > choose to use ssh (!! You need this to connect to administrate your Pi from your PC !!) - -in raspi-config > change the password (of default user "pi" from "raspberry" to your password) - -in raspi-config (optional) > Internationalisation options > Change Locale > to de_DE.utf-8 utf-8 (for example) - -in raspi-config (optional) > Internationalisation options > Change Timezoe > set your timezone - -in raspi-config (optional) > Overlock > medium - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - -[b]More[/b] - -[code]sudo reboot[/code] - -Now its time to connect the Pi to the network. -[ul] -[*] pull out keyboard -[*] pull out monitor -[*] you even can pull out the power supply (USB) -[*] plug-in the network cable to the router -[*] plug-in the power supply again -[*] wait for a minute or to give the Pi time to boot and start ssh... -[/ul] - -On your PC connect to the Pi to administrate (here update it). -Open the console on the PC (Window: Start > cmd, Linux: Shell) - -Hint: use the router admin tool to find out the IP of your PI[code]ssh pi@192.168.178.37 -sudo apt-get update -sudo apt-get dist-upgrade[/code] - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - - -[size=large]2. Install Apache Web Server, PHP, MaySQL, phpMyAdmin[/size] - -[b]Install Apache Webserver[/b] - -[code]sudo bash -sudo groupadd www-data[/code] might exist already - -[code]sudo usermod -a -G www-data www-data -sudo apt-get update -sudo reboot[/code] - -wait... -reconnect via ssh, example: [code]ssh pi@192.168.178.37 -sudo apt-get install apache2 apache2-doc apache2-utils[/code] - -Open webbrowser on PC and check [url=http://192.168.178.37]http://192.168.178.37[/url] -Should show you a page like "It works" - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - -[b]Install PHP, MaySQL, phpMyAdmin[/b] - -[code]sudo bash -apt-get install libapache2-mod-php5 php5 php-pear php5-xcache php5-curl -apt-get install php5-mysql -apt-get install mysql-server mysql-client[/code] enter and note the mysql passwort - -[code]apt-get install phpmyadmin[/code] - -Configuring phpmyadmin -- Select apache2 -- Configure database for phpmyadmin with dbconfig-common?: Choose Yes - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - -[b]Test installation[/b] - -[code]cd /var/www[/code] - -create a php file to test the php installation[code]sudo nano phpinfo.php[/code] - -Insert into the file:[code] -<?php - phpinfo(); -?> -[/code] -(save CTRL+0, ENTER, CTRL+X) - -open webbrowser on PC and try [url=http://192.168.178.37/phpinfo.php]http://192.168.178.37/phpinfo.php[/url] (page shows infos on php) - -connect phpMyAdmin with MySQL database [code]nano /etc/apache2/apache2.conf[/code] -- CTRL+V... to the end of the file -- Insert at the end of the file: (save CTRL+0, ENTER, CTRL+X)[code]Include /etc/phpmyadmin/apache.conf[/code] - -restart apache[code]/etc/init.d/apache2 restart -sudo apt-get update -sudo apt-get upgrade -sudo reboot[/code] - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - -[b]phpMyAdmin[/b] - -open webbrowser on PC and try #^[url=http://192.168.178.37/phpmyadmin]http://192.168.178.37/phpmyadmin[/url] - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - -[b]Create an empty database... that is later used by RED[/b] - -open webbrowser on PC and try #^[url=http://192.168.178.37/phpmyadmin]http://192.168.178.37/phpmyadmin[/url] - -Create an empty database - -Note the access details (hostname, username, password, database name). - - -[size=large]3. Selfhost[/size] - -(Source: #^[url=http://www.techjawab.com/2013/06/setup-dynamic-dns-dyndns-for-free-on.html]http://www.techjawab.com/2013/06/setup-dynamic-dns-dyndns-for-free-on.html[/url]) - -[url=http://freedns.afraid.org/signup/]http://freedns.afraid.org/signup/[/url] - -[b]Step 1[/b] -Register for a Free domain at #^[url=http://freedns.afraid.org/signup/]http://freedns.afraid.org/signup/[/url] -(We will take techhome.homenet.org in this guide) - -[b]Step 2[/b] - -Logon to FreeDNS (where you just registered) and goto #^[url=http://freedns.afraid.org/dynamic/]http://freedns.afraid.org/dynamic/[/url] -Right click on "Direct Link" and copy the URL and paste it somewhere. -You should notice a large and unique alpha-numeric key in the URL, make a note of it as shown below: -[code]http://freedns.afraid.org/dynamic/update.php?alphanumeric-key[/code] - - -[b]Step 3[/b] -Install inadyn using the following command:[code]sudo apt-get install inadyn[/code] - -[b]Step 4[/b] -Configure inadyn using the below steps:[code]sudo nano /etc/inadyn.conf[/code] -And add the following contains in it replacing the actual values: -[code] ---username [color=red]techhome[/color] ---password [color=red]mypassword[/color] ---update_period 3600 ---forced_update_period 14400 ---alias [color=red]techhome.homenet.org</b>,[color=red]alphanumeric key[/color] ---background ---dyndns_system default@freedns.afraid.org ---syslog - [/code] - - -[b]Step 5[/b] - -Now, we need to ensure that the DNS updater (Inadyn) runs automatically after every re-boot[code]export EDITOR=gedit && sudo crontab -e[/code] -Add the following line:[code]@reboot /usr/sbin/inadyn[/code] - - -[b]Step 6[/b] - -Reboot system and then run the following command to ensure inadyn is running:[code] -sudo reboot -ps -A | grep inadyn -[/code] -Now your host is ready and up for accessing from internet... -You can trying ssh-ing from another computer over the internet -[code]ssh username@techhome.homenet.org[/code] -Or, if any web server is running, then simply browse to #^[url=http://techhome.homenet.org]http://techhome.homenet.org[/url] -Or, you can just ping it to test ping techhome.homenet.org -To check the logs you can use this: -[code]more /var/log/messages |grep INADYN[/code] - - -[size=large]4. Install $Projectname[/size] - -(Source: [zrl=[baseurl]/help/Install][baseurl]/help/Install[/zrl]) - -Linux Appache document root is /var/www/ -Two files exist there (created by the steps above): index.html, phpinfo.php - - -[b]Install $Projectname and its Addons[/b] - -Cleanup: Remove the directory www/ (Git will not create files and folders in directories that are not empty.) Make sure you are in directory var[code]pi@pi /var $ cd /var[/code] - -Remove directory[code]pi@pi /var $ sudo rm -rf www/[/code] - -Download the sources of $Projectname from GIT -[code]pi@pi /var $ sudo git clone https://framagit.org/hubzilla/core.git www[/code] - -Download the sources of the addons from GIT -[code]pi@pi /var/www $ sudo git clone https://framagit.org/hubzilla/addons.git addon[/code] - -Make user www-data the owner of the whole web directory (including subdirectories and files) -(TODO: This step has to be proofed by the next installation.) -[code]pi@pi /var $ chown -R www-data:www-data /var/www/[/code] - -Check if you can update the sources from git[code] -pi@pi /var $ cd www -pi@pi /var/www $ git pull -[/code] - -Check if you can update the addons -[code]pi@pi /var/www $ cd addon/ -pi@pi /var/www/addon $ sudo git pull[/code] - -Make sure folder store/[data]/smarty3 exists and is writable by the webserver -[code]pi@pi /var/www $ sudo chmod ou+w "store/\[data\]/smarty3"[/code] - -Create .htconfig.php and is writable by the webserver -[code]pi@pi /var/www $ sudo touch .htconfig.php -pi@pi /var/www $ sudo chmod ou+w .htconfig.php[/code] - -[b]First start and initial configuration of your RED Matrix hub[/b] - -In browser open #^[zrl=http://einervonvielen.mooo.com/]http://einervonvielen.mooo.com/[/zrl] -(Replace einervonvielen.mooo.com by your domain, see chapter selfhost. Be patient. It takes time.) -(#^[zrl=http://einervonvielen.mooo.com/index.php?q=setup]http://einervonvielen.mooo.com/index.php?q=setup[/zrl]) - -There might be errors like the following. - -Error: libCURL PHP module required but not installed. -Solution: -apt-get install php5-curl - -Error: Apache webserver mod-rewrite module is required but not installed. -Solution -(Source: [url=http://xmodulo.com/2013/01/how-to-enable-mod_rewrite-in-apache2-on-debian-ubuntu.html]http://xmodulo.com/2013/01/how-to-enable-mod_rewrite-in-apache2-on-debian-ubuntu.html[/url]) -The default installation of Apache2 comes with mod_rewrite installed. To check whether this is the case, verify the existence of /etc/apache2/mods-available/rewrite.load -- pi@pi /var/www $ nano /etc/apache2/mods-available/rewrite.load - (You should find the contendt: LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so) -To enable and load mod_rewrite, do the rest of steps. -Create a symbolic link in /etc/apache2/mods-enabled -- pi@pi /var/www $ sudo a2enmod rewrite -Then open up the following file, and replace every occurrence of "AllowOverride None" with "AllowOverride all". -- pi@pi /var/www $ sudo nano /etc/apache2/sites-available/default -Finally, restart Apache2. -- pi@pi /var/www $ sudo service apache2 restart - -Error store is writable (not checked) -Solution: -(TODO: Make writeable to group www-data only?) -pi@pi /var/www $ sudo mkdir store -pi@pi /var/www $ chown -R www-data:www-data /var/www/red/ -pi@pi /var/www $ sudo chmod ou+w view - -[b]More[/b] - -Set up a cron job to run the poller once every 15 minutes in order to perform background processing. -- pi@pi /var/www $ which php -Make sure you are in the document root directory of the webserver -- pi@pi /var/www $ cd /var/www/ -Try to execute the poller in order to make sure it works -- pi@pi /var/www $ /usr/bin/php include/poller.php -Create the cronjob -- pi@pi /var/www $ crontab -e -Enter -- */15 * * * * cd /var/www/; /usr/bin/php include/poller.php -- Save and exit. - -Prevent search engines from indexing your search pages. Why? This can cause heavy resource use. - -[code] -php util/config system block_public_search 1 -[/code] - - - -[size=large]5. Keep your Raspberry Pi and your $Projectname up-to-date[/size] - -Git update every day at 4 am and addons at 5 am every day -Try if the command is working -- pi@pi /var/www $ sudo git pull -Create the cronjob -- pi@pi /var/www $ crontab -e -Enter the following to update at 4:01 am every day -- 01 04 * * * cd /var/www/; sudo git pull -Enter the following to update the addons at 5:01 am every day -- 01 05 * * * cd /var/www/addon/; sudo git pull -Enter the following to update the Raspberry Pi (Raspbian OS = Debian) at 6:01 am every day -- 01 06 * * * sudo aptitude -y update && sudo aptitude -y safe-upgrade -Save and exit. - -[size=large]6. Running with SSL[/size] - -Follow the instructions here: -[url=https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL]https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL[/url] - -#include doc/macros/main_footer.bb; +[b]How to install $Projectname on a Raspberry Pi[/b] + +You just bought a Raspberry Pi and want to run the RED Matrix with your own domain name? + +Then this page is for you! You will: +[list=1] +[*] Install Raspberry OS (Debian Linux) on a Raspberry +[*] Install Apache Web Server, PHP, MaySQL, phpMyAdmin +[*] Register a free domain (dynamic DNS) and use it for your hub +[*] Install $Projectname +[*] Keep your Raspberry Pi and $Projectname up-to-date +[*] TODO Setting up SSL +[*] TODO Running with SSL +[*] TODO Make the webserver less vulnarable to attacks +[/list] + +[size=large]1. Install Raspberry OS (Debian Linux)[/size] + +instructions under [url=http://www.raspberrypi.org/downloads]http://www.raspberrypi.org/downloads[/url] +This page links to the quick start containing detailed instruction. + +[b]Format SD card[/b] + +using the program gparted under Linux Mint 15 + +format as FAT32 + +[b]Download NOOBS (offline and network install)[/b] + +[url=http://downloads.raspberrypi.org/noobs]http://downloads.raspberrypi.org/noobs[/url] + +unzip + +copy unzipped files to SD card + +[b]Install Raspbian as OS on the Rasperry Pi[/b] + +connect with keyboard via USB + +connect with monitor via HDMI + +Insert SD card into Rasperry Pi + +Connect with power supply to switch on the Rasperry + +choose Raspbian as OS (> installs Raspbian....) + +wait for the coniguration program raspi-config (you can later start it by sudo raspi-config) + +[b]Configure Raspbian[/b] + +in raspi-config > advanced > choose to use ssh (!! You need this to connect to administrate your Pi from your PC !!) + +in raspi-config > change the password (of default user "pi" from "raspberry" to your password) + +in raspi-config (optional) > Internationalisation options > Change Locale > to de_DE.utf-8 utf-8 (for example) + +in raspi-config (optional) > Internationalisation options > Change Timezoe > set your timezone + +in raspi-config (optional) > Overlock > medium + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + +[b]More[/b] + +[code]sudo reboot[/code] + +Now its time to connect the Pi to the network. +[ul] +[*] pull out keyboard +[*] pull out monitor +[*] you even can pull out the power supply (USB) +[*] plug-in the network cable to the router +[*] plug-in the power supply again +[*] wait for a minute or to give the Pi time to boot and start ssh... +[/ul] + +On your PC connect to the Pi to administrate (here update it). +Open the console on the PC (Window: Start > cmd, Linux: Shell) + +Hint: use the router admin tool to find out the IP of your PI[code]ssh pi@192.168.178.37 +sudo apt-get update +sudo apt-get dist-upgrade[/code] + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + + +[size=large]2. Install Apache Web Server, PHP, MaySQL, phpMyAdmin[/size] + +[b]Install Apache Webserver[/b] + +[code]sudo bash +sudo groupadd www-data[/code] might exist already + +[code]sudo usermod -a -G www-data www-data +sudo apt-get update +sudo reboot[/code] + +wait... +reconnect via ssh, example: [code]ssh pi@192.168.178.37 +sudo apt-get install apache2 apache2-doc apache2-utils[/code] + +Open webbrowser on PC and check [url=http://192.168.178.37]http://192.168.178.37[/url] +Should show you a page like "It works" + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + +[b]Install PHP, MaySQL, phpMyAdmin[/b] + +[code]sudo bash +apt-get install libapache2-mod-php5 php5 php-pear php5-xcache php5-curl +apt-get install php5-mysql +apt-get install mysql-server mysql-client[/code] enter and note the mysql passwort + +[code]apt-get install phpmyadmin[/code] + +Configuring phpmyadmin +- Select apache2 +- Configure database for phpmyadmin with dbconfig-common?: Choose Yes + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + +[b]Test installation[/b] + +[code]cd /var/www[/code] + +create a php file to test the php installation[code]sudo nano phpinfo.php[/code] + +Insert into the file:[code] +<?php + phpinfo(); +?> +[/code] +(save CTRL+0, ENTER, CTRL+X) + +open webbrowser on PC and try [url=http://192.168.178.37/phpinfo.php]http://192.168.178.37/phpinfo.php[/url] (page shows infos on php) + +connect phpMyAdmin with MySQL database [code]nano /etc/apache2/apache2.conf[/code] +- CTRL+V... to the end of the file +- Insert at the end of the file: (save CTRL+0, ENTER, CTRL+X)[code]Include /etc/phpmyadmin/apache.conf[/code] + +restart apache[code]/etc/init.d/apache2 restart +sudo apt-get update +sudo apt-get upgrade +sudo reboot[/code] + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + +[b]phpMyAdmin[/b] + +open webbrowser on PC and try #^[url=http://192.168.178.37/phpmyadmin]http://192.168.178.37/phpmyadmin[/url] + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + +[b]Create an empty database... that is later used by RED[/b] + +open webbrowser on PC and try #^[url=http://192.168.178.37/phpmyadmin]http://192.168.178.37/phpmyadmin[/url] + +Create an empty database + +Note the access details (hostname, username, password, database name). + + +[size=large]3. Selfhost[/size] + +(Source: #^[url=http://www.techjawab.com/2013/06/setup-dynamic-dns-dyndns-for-free-on.html]http://www.techjawab.com/2013/06/setup-dynamic-dns-dyndns-for-free-on.html[/url]) + +[url=http://freedns.afraid.org/signup/]http://freedns.afraid.org/signup/[/url] + +[b]Step 1[/b] +Register for a Free domain at #^[url=http://freedns.afraid.org/signup/]http://freedns.afraid.org/signup/[/url] +(We will take techhome.homenet.org in this guide) + +[b]Step 2[/b] + +Logon to FreeDNS (where you just registered) and goto #^[url=http://freedns.afraid.org/dynamic/]http://freedns.afraid.org/dynamic/[/url] +Right click on "Direct Link" and copy the URL and paste it somewhere. +You should notice a large and unique alpha-numeric key in the URL, make a note of it as shown below: +[code]http://freedns.afraid.org/dynamic/update.php?alphanumeric-key[/code] + + +[b]Step 3[/b] +Install inadyn using the following command:[code]sudo apt-get install inadyn[/code] + +[b]Step 4[/b] +Configure inadyn using the below steps:[code]sudo nano /etc/inadyn.conf[/code] +And add the following contains in it replacing the actual values: +[code] +--username [color=red]techhome[/color] +--password [color=red]mypassword[/color] +--update_period 3600 +--forced_update_period 14400 +--alias [color=red]techhome.homenet.org</b>,[color=red]alphanumeric key[/color] +--background +--dyndns_system default@freedns.afraid.org +--syslog + [/code] + + +[b]Step 5[/b] + +Now, we need to ensure that the DNS updater (Inadyn) runs automatically after every re-boot[code]export EDITOR=gedit && sudo crontab -e[/code] +Add the following line:[code]@reboot /usr/sbin/inadyn[/code] + + +[b]Step 6[/b] + +Reboot system and then run the following command to ensure inadyn is running:[code] +sudo reboot +ps -A | grep inadyn +[/code] +Now your host is ready and up for accessing from internet... +You can trying ssh-ing from another computer over the internet +[code]ssh username@techhome.homenet.org[/code] +Or, if any web server is running, then simply browse to #^[url=http://techhome.homenet.org]http://techhome.homenet.org[/url] +Or, you can just ping it to test ping techhome.homenet.org +To check the logs you can use this: +[code]more /var/log/messages |grep INADYN[/code] + + +[size=large]4. Install $Projectname[/size] + +(Source: [zrl=[baseurl]/help/Install][baseurl]/help/Install[/zrl]) + +Linux Appache document root is /var/www/ +Two files exist there (created by the steps above): index.html, phpinfo.php + + +[b]Install $Projectname and its Addons[/b] + +Cleanup: Remove the directory www/ (Git will not create files and folders in directories that are not empty.) Make sure you are in directory var[code]pi@pi /var $ cd /var[/code] + +Remove directory[code]pi@pi /var $ sudo rm -rf www/[/code] + +Download the sources of $Projectname from GIT +[code]pi@pi /var $ sudo git clone https://framagit.org/hubzilla/core.git www[/code] + +Download the sources of the addons from GIT +[code]pi@pi /var/www $ sudo git clone https://framagit.org/hubzilla/addons.git addon[/code] + +Make user www-data the owner of the whole web directory (including subdirectories and files) +(TODO: This step has to be proofed by the next installation.) +[code]pi@pi /var $ chown -R www-data:www-data /var/www/[/code] + +Check if you can update the sources from git[code] +pi@pi /var $ cd www +pi@pi /var/www $ git pull +[/code] + +Check if you can update the addons +[code]pi@pi /var/www $ cd addon/ +pi@pi /var/www/addon $ sudo git pull[/code] + +Make sure folder store/[data]/smarty3 exists and is writable by the webserver +[code]pi@pi /var/www $ sudo chmod ou+w "store/\[data\]/smarty3"[/code] + +Create .htconfig.php and is writable by the webserver +[code]pi@pi /var/www $ sudo touch .htconfig.php +pi@pi /var/www $ sudo chmod ou+w .htconfig.php[/code] + +[b]First start and initial configuration of your RED Matrix hub[/b] + +In browser open #^[zrl=http://einervonvielen.mooo.com/]http://einervonvielen.mooo.com/[/zrl] +(Replace einervonvielen.mooo.com by your domain, see chapter selfhost. Be patient. It takes time.) +(#^[zrl=http://einervonvielen.mooo.com/index.php?q=setup]http://einervonvielen.mooo.com/index.php?q=setup[/zrl]) + +There might be errors like the following. + +Error: libCURL PHP module required but not installed. +Solution: +apt-get install php5-curl + +Error: Apache webserver mod-rewrite module is required but not installed. +Solution +(Source: [url=http://xmodulo.com/2013/01/how-to-enable-mod_rewrite-in-apache2-on-debian-ubuntu.html]http://xmodulo.com/2013/01/how-to-enable-mod_rewrite-in-apache2-on-debian-ubuntu.html[/url]) +The default installation of Apache2 comes with mod_rewrite installed. To check whether this is the case, verify the existence of /etc/apache2/mods-available/rewrite.load +- pi@pi /var/www $ nano /etc/apache2/mods-available/rewrite.load + (You should find the contendt: LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so) +To enable and load mod_rewrite, do the rest of steps. +Create a symbolic link in /etc/apache2/mods-enabled +- pi@pi /var/www $ sudo a2enmod rewrite +Then open up the following file, and replace every occurrence of "AllowOverride None" with "AllowOverride all". +- pi@pi /var/www $ sudo nano /etc/apache2/sites-available/default +Finally, restart Apache2. +- pi@pi /var/www $ sudo service apache2 restart + +Error store is writable (not checked) +Solution: +(TODO: Make writeable to group www-data only?) +pi@pi /var/www $ sudo mkdir store +pi@pi /var/www $ chown -R www-data:www-data /var/www/red/ +pi@pi /var/www $ sudo chmod ou+w view + +[b]More[/b] + +Set up a cron job to run the poller once every 15 minutes in order to perform background processing. +- pi@pi /var/www $ which php +Make sure you are in the document root directory of the webserver +- pi@pi /var/www $ cd /var/www/ +Try to execute the poller in order to make sure it works +- pi@pi /var/www $ /usr/bin/php include/poller.php +Create the cronjob +- pi@pi /var/www $ crontab -e +Enter +- */15 * * * * cd /var/www/; /usr/bin/php include/poller.php +- Save and exit. + +Prevent search engines from indexing your search pages. Why? This can cause heavy resource use. + +[code] +php util/config system block_public_search 1 +[/code] + + + +[size=large]5. Keep your Raspberry Pi and your $Projectname up-to-date[/size] + +Git update every day at 4 am and addons at 5 am every day +Try if the command is working +- pi@pi /var/www $ sudo git pull +Create the cronjob +- pi@pi /var/www $ crontab -e +Enter the following to update at 4:01 am every day +- 01 04 * * * cd /var/www/; sudo git pull +Enter the following to update the addons at 5:01 am every day +- 01 05 * * * cd /var/www/addon/; sudo git pull +Enter the following to update the Raspberry Pi (Raspbian OS = Debian) at 6:01 am every day +- 01 06 * * * sudo aptitude -y update && sudo aptitude -y safe-upgrade +Save and exit. + +[size=large]6. Running with SSL[/size] + +Follow the instructions here: +[url=https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL]https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL[/url] + +#include doc/macros/main_footer.bb; diff --git a/doc/schema_development.bb b/doc/schema_development.bb index 3d4c84e85..10832684a 100644 --- a/doc/schema_development.bb +++ b/doc/schema_development.bb @@ -1,78 +1,78 @@ -[b]Red Development - A Guide To The Schema System[/b] - -A schema, in a nutshell, is a collection of settings for a bunch of variables to define -certain elements of a theme. A schema is loaded as though it were part of config.php -and has access to all the same information. Importantly, this means it is identity aware, -and can be used to do some interesting things. One could, for example, restrict options -by service class, or present different options to different members. - -By default, we filter only by whether or not expert mode is enabled. If expert mode is -enabled, all options are presented to the member. If it is not, only scheme, background -image, font face, and iconset are available as choices. - -A schema is loaded *after* the member's personal settings. Therefore, to allow a member -to overwrite a particular aspect of a schema you would use the following syntax: -[code] - if (! $foo) - $foo = 'bar'; -[/code] -However, there are circumstances - particularly with positional elements - where it -may be desirable (or necessary) to override a member's settings. In this case, the syntax -is even simpler: -[code] - $foo = 'bar'; -[/code] -Members will not thank you for this, however, so only use it when it is required. - -If no personal options are set, and no schema is selected, we will first try to load a schema -with the file name "default.php". This file should never be included with a theme. If it -is, merge conflicts will occur as people update their code. Rather, this should be defined -by administrators on a site by site basis. -default.php and default.css MUST be symlinks to existing scheme files. - -You schema does not need to - and should not - contain all of these values. Only the values -that differ from the defaults should be listed. This gives you some very powerful options -with very few lines of code. - -Note the options available differ with each theme. The options available with the Redbasic -theme are as follows: - -[li] nav_colour - The colour of the navigation bar. Options are red, black and silver. Alternatively, - one can set $nav_bg_1, $nav_bg_2, $nav_bg_3 and $nav_bg_4 to provide gradient and - hover effects.[/li] -[li] banner_colour - The font colour of the banner element. Accepts an RGB or Hex value.[/li] -[li] bgcolour - Set the body background colour. Accepts an RGB or Hex value.[/li] -[li] background_image - Sets a background image. Accepts a URL or path.[/li] -[li] item_colour - Set the background colour of items. Accepts an RGB or Hex value.[/li] -[li] item_opacity - Set the opacity of items. Accepts a value from 0.01 to 1[/li] -[li] toolicon_colour - Set the colour of tool icons. Accepts an RGB or Hex value.[/li] -[li] toolicon_activecolour - Set the colour of active or hovered icon tools.[/li] -[li] font_size - Set the size of fonts in items and posts. Accepts px or em.[/li] -[li] body_font_size - Sets the size of fonts at the body level. Accepts px or em.[/li] -[li] font_colour - Sets the font colour. Accepts an RGB or Hex value.[/li] -[li] radius - Set the radius of corners. Accepts a numeral, and is always in px.[/li] -[li] shadow - Set the size of shadows shown with inline images. Accepts a numerical - value. Note shadows are not applied to smileys.[/li] -[li] converse_width - Set the maximum width of the content region in px.[/li] -[li] nav_min_opacity[/li] -[li] top_photo[/li] -[li] reply_photo[/li] - -If a your_schema_name.css file is found, the content of this file will be attached to the end of style.css. -This gives the schem developer the possiblity to override any style component. - -#include doc/macros/main_footer.bb; +[b]Red Development - A Guide To The Schema System[/b] + +A schema, in a nutshell, is a collection of settings for a bunch of variables to define +certain elements of a theme. A schema is loaded as though it were part of config.php +and has access to all the same information. Importantly, this means it is identity aware, +and can be used to do some interesting things. One could, for example, restrict options +by service class, or present different options to different members. + +By default, we filter only by whether or not expert mode is enabled. If expert mode is +enabled, all options are presented to the member. If it is not, only scheme, background +image, font face, and iconset are available as choices. + +A schema is loaded *after* the member's personal settings. Therefore, to allow a member +to overwrite a particular aspect of a schema you would use the following syntax: +[code] + if (! $foo) + $foo = 'bar'; +[/code] +However, there are circumstances - particularly with positional elements - where it +may be desirable (or necessary) to override a member's settings. In this case, the syntax +is even simpler: +[code] + $foo = 'bar'; +[/code] +Members will not thank you for this, however, so only use it when it is required. + +If no personal options are set, and no schema is selected, we will first try to load a schema +with the file name "default.php". This file should never be included with a theme. If it +is, merge conflicts will occur as people update their code. Rather, this should be defined +by administrators on a site by site basis. +default.php and default.css MUST be symlinks to existing scheme files. + +You schema does not need to - and should not - contain all of these values. Only the values +that differ from the defaults should be listed. This gives you some very powerful options +with very few lines of code. + +Note the options available differ with each theme. The options available with the Redbasic +theme are as follows: + +[li] nav_colour + The colour of the navigation bar. Options are red, black and silver. Alternatively, + one can set $nav_bg_1, $nav_bg_2, $nav_bg_3 and $nav_bg_4 to provide gradient and + hover effects.[/li] +[li] banner_colour + The font colour of the banner element. Accepts an RGB or Hex value.[/li] +[li] bgcolour + Set the body background colour. Accepts an RGB or Hex value.[/li] +[li] background_image + Sets a background image. Accepts a URL or path.[/li] +[li] item_colour + Set the background colour of items. Accepts an RGB or Hex value.[/li] +[li] item_opacity + Set the opacity of items. Accepts a value from 0.01 to 1[/li] +[li] toolicon_colour + Set the colour of tool icons. Accepts an RGB or Hex value.[/li] +[li] toolicon_activecolour + Set the colour of active or hovered icon tools.[/li] +[li] font_size + Set the size of fonts in items and posts. Accepts px or em.[/li] +[li] body_font_size + Sets the size of fonts at the body level. Accepts px or em.[/li] +[li] font_colour + Sets the font colour. Accepts an RGB or Hex value.[/li] +[li] radius + Set the radius of corners. Accepts a numeral, and is always in px.[/li] +[li] shadow + Set the size of shadows shown with inline images. Accepts a numerical + value. Note shadows are not applied to smileys.[/li] +[li] converse_width + Set the maximum width of the content region in px.[/li] +[li] nav_min_opacity[/li] +[li] top_photo[/li] +[li] reply_photo[/li] + +If a your_schema_name.css file is found, the content of this file will be attached to the end of style.css. +This gives the schem developer the possiblity to override any style component. + +#include doc/macros/main_footer.bb; diff --git a/doc/sv/main.bb b/doc/sv/main.bb index 1c6ad3f63..e304a84cd 100644 --- a/doc/sv/main.bb +++ b/doc/sv/main.bb @@ -1,80 +1,80 @@ -[img][baseurl]/images/hubzilla-banner.png[/img] - -[zrl=[baseurl]/help/about][b]Vad är $Projectname?[/b][/zrl] -$Projectname är en decentraliserad publicerings- och kommunikationsplattform som möjliggör att du behåller kontrollen över dina kommunikationer med hjälp av automatisk kryptering och fininställbar behörighetskontroll. Det är du, och bara du, som beslutar vem som är behörig att ta del av ditt innehåll. - -[zrl=[baseurl]/help/features][b]$Projectname funktioner[/b][/zrl] -$Projectname används redan och bildar ett globalt distribuerad närverk och bevisar* dagligen sin skalbarhet och diversitet i allt från installationer med en kanal till installationer med många användare och många kanaler med en stor mängd innehåll. -Föreställ dig isolerade familjekommunikationsplatformer, distribuerade nätforum med fildelning, hjälpforum, bloggar och hemsidor. Eller proffesionellt anpassade innehållsleverantörer med kommersiella premium* kanaler och målriktat innehållsstyrning. Vad du än önskar så finns $Projectname för att stödja dig i förverkligande av din kreativitet. - -[zrl=[baseurl]/help/what_is_zot][b]Har du Zot? Skaffa det, direkt.[/b][/zrl] -Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för $Projectname. Som medlem är du inte längre bunden till en enskild sida eller hub tack vara "nomadiska identiteter". Flytt lätt till en annan server och håll dina kontakter och förbindelser intakta eller klona och kör den samma kanal på flera servrar simultant. I tillfälle av att en av dem stänger ner så går du inte miste om något. Plus när du är loggat in i $Projectname så är det inga flera inloggningar även när du kontakter andra hubbar i nätverket. Zot är det som gör $Projectname till något särskilt värdefullt/som urskiljer $Projectname från mängden. - -[h3]Kom igång[/h3] -[zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl] -[zrl=[baseurl]/help/registration]Account Registration[/zrl] -[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at $Projectname: accounts, profiles and channels in short[/zrl] -[zrl=[baseurl]/help/profiles]Profiles[/zrl] -[zrl=[baseurl]/help/channels]Channels[/zrl] -[zrl=[baseurl]/help/sv/roles]Behörighetsförval för kanaler[/zrl] -[zrl=[baseurl]/help/first-post]Your first posting[/zrl] -[zrl=[baseurl]/help/connecting_to_channels]Connecting To Other Channels[/zrl] -[zrl=[baseurl]/help/permissions]Permissions And Encryption: You Are In Control[/zrl] -[zrl=[baseurl]/help/cloud]Cloud Storage[/zrl] -[zrl=[baseurl]/help/remove_account]Remove Channel or Account[/zrl] - -[h3]Hjälp till medlemmar[/h3] -[zrl=[baseurl]/help/tags_and_mentions]Tags and Mentions[/zrl] -[zrl=[baseurl]/help/webpages]Web Pages[/zrl] -[zrl=[baseurl]/help/bbcode]BBcode reference for posts and comments[/zrl] -[zrl=[baseurl]/help/checking_account_quota_usage]Checking Account Quota Usage[/zrl] -[zrl=[baseurl]/help/cloud_desktop_clients]Cloud Desktop Clients[/zrl] -[zrl=[baseurl]/help/AdvancedSearch]Advanced Directory Search[/zrl] -[zrl=[baseurl]/help/addons]Help With Addons[/zrl] -[zrl=[baseurl]/help/diaspora_compat]Diaspora Communications Compatibility (Diaspora and Friendica)[/zrl] -[zrl=[baseurl]/help/faq_members]FAQ For Members[/zrl] - -[h3]Hjälp till administratorer[/h3] -[zrl=[baseurl]/help/install]Install[/zrl] -[zrl=[baseurl]/help/debian_install]Easy Install on Debian via script[/zrl] -[zrl=[baseurl]/help/red2pi]Installing Red on the Raspberry Pi[/zrl] -[zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl] -[zrl=[baseurl]/help/hidden_configs]Tweaking $Projectname's Hidden Configurations[/zrl] -[zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl] - -[h3]Teknisk dokumentation[/h3] -[zrl=[baseurl]/help/Zot---A-High-Level-Overview]A high level overview of Zot[/zrl] -[zrl=[baseurl]/help/zot]An introduction to Zot[/zrl] -[zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl] -[zrl=[baseurl]/help/comanche]Comanche Page Descriptions[/zrl] -[zrl=[baseurl]/help/Creating-Templates]Creating Comanche Templates[/zrl] -[zrl=[baseurl]/help/Widgets]Core Widgets[/zrl] -[zrl=[baseurl]/help/plugins]Plugins[/zrl] -[zrl=[baseurl]/help/doco]Contributing Documentation[/zrl] -[zrl=[baseurl]/help/DerivedTheme1]Creating Derivative Themes[/zrl] -[zrl=[baseurl]/help/schema_development]Schemas[/zrl] -[zrl=[baseurl]/help/Translations]Translations[/zrl] -[zrl=[baseurl]/help/developers]Developers[/zrl] -[zrl=[baseurl]/help/intro_for_developers]Intro for Developers[/zrl] -[zrl=[baseurl]/help/api_functions]API functions[/zrl] -[zrl=[baseurl]/help/api_posting]Posting to the red# using the API[/zrl] -[zrl=[baseurl]/help/developer_function_primer]Red Functions 101[/zrl] -[zrl=[baseurl]/doc/html/]Code Reference (doxygen generated - sets cookies)[/zrl] -[zrl=[baseurl]/help/to_do_doco]To-Do list for the Red Documentation Project[/zrl] -[zrl=[baseurl]/help/to_do_code]To-Do list for Developers[/zrl] -[zrl=[baseurl]/help/roadmap]Version 3 roadmap[/zrl] -[zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl] -[zrl=[baseurl]/help/dev_beginner]Sep-for-step manual for beginning developers[/zrl] - -[h3]Externa resurser[/h3] -[zrl=[baseurl]/help/external-resource-links]External Resource Links[/zrl] -[url=https://github.com/friendica/red]Main Website[/url] -[url=https://github.com/friendica/red-addons]Addon Website[/url] -[url=https://zothub.com/channel/one]Development Channel[/url] - -[url=[baseurl]/help/credits]$Projectname Credits[/url] - -[h3]About This $Projectname Hub[/h3] -[zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl] -[zrl=[baseurl]/siteinfo]Hub Information (/siteinfo)[/zrl] -[zrl=[baseurl]/siteinfo_json]Detailed Technical Hub Information (/siteinfo_json)[/zrl] +[img][baseurl]/images/hubzilla-banner.png[/img] + +[zrl=[baseurl]/help/about][b]Vad är $Projectname?[/b][/zrl] +$Projectname är en decentraliserad publicerings- och kommunikationsplattform som möjliggör att du behåller kontrollen över dina kommunikationer med hjälp av automatisk kryptering och fininställbar behörighetskontroll. Det är du, och bara du, som beslutar vem som är behörig att ta del av ditt innehåll. + +[zrl=[baseurl]/help/features][b]$Projectname funktioner[/b][/zrl] +$Projectname används redan och bildar ett globalt distribuerad närverk och bevisar* dagligen sin skalbarhet och diversitet i allt från installationer med en kanal till installationer med många användare och många kanaler med en stor mängd innehåll. +Föreställ dig isolerade familjekommunikationsplatformer, distribuerade nätforum med fildelning, hjälpforum, bloggar och hemsidor. Eller proffesionellt anpassade innehållsleverantörer med kommersiella premium* kanaler och målriktat innehållsstyrning. Vad du än önskar så finns $Projectname för att stödja dig i förverkligande av din kreativitet. + +[zrl=[baseurl]/help/what_is_zot][b]Har du Zot? Skaffa det, direkt.[/b][/zrl] +Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för $Projectname. Som medlem är du inte längre bunden till en enskild sida eller hub tack vara "nomadiska identiteter". Flytt lätt till en annan server och håll dina kontakter och förbindelser intakta eller klona och kör den samma kanal på flera servrar simultant. I tillfälle av att en av dem stänger ner så går du inte miste om något. Plus när du är loggat in i $Projectname så är det inga flera inloggningar även när du kontakter andra hubbar i nätverket. Zot är det som gör $Projectname till något särskilt värdefullt/som urskiljer $Projectname från mängden. + +[h3]Kom igång[/h3] +[zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl] +[zrl=[baseurl]/help/registration]Account Registration[/zrl] +[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at $Projectname: accounts, profiles and channels in short[/zrl] +[zrl=[baseurl]/help/profiles]Profiles[/zrl] +[zrl=[baseurl]/help/channels]Channels[/zrl] +[zrl=[baseurl]/help/sv/roles]Behörighetsförval för kanaler[/zrl] +[zrl=[baseurl]/help/first-post]Your first posting[/zrl] +[zrl=[baseurl]/help/connecting_to_channels]Connecting To Other Channels[/zrl] +[zrl=[baseurl]/help/permissions]Permissions And Encryption: You Are In Control[/zrl] +[zrl=[baseurl]/help/cloud]Cloud Storage[/zrl] +[zrl=[baseurl]/help/remove_account]Remove Channel or Account[/zrl] + +[h3]Hjälp till medlemmar[/h3] +[zrl=[baseurl]/help/tags_and_mentions]Tags and Mentions[/zrl] +[zrl=[baseurl]/help/webpages]Web Pages[/zrl] +[zrl=[baseurl]/help/bbcode]BBcode reference for posts and comments[/zrl] +[zrl=[baseurl]/help/checking_account_quota_usage]Checking Account Quota Usage[/zrl] +[zrl=[baseurl]/help/cloud_desktop_clients]Cloud Desktop Clients[/zrl] +[zrl=[baseurl]/help/AdvancedSearch]Advanced Directory Search[/zrl] +[zrl=[baseurl]/help/addons]Help With Addons[/zrl] +[zrl=[baseurl]/help/diaspora_compat]Diaspora Communications Compatibility (Diaspora and Friendica)[/zrl] +[zrl=[baseurl]/help/faq_members]FAQ For Members[/zrl] + +[h3]Hjälp till administratorer[/h3] +[zrl=[baseurl]/help/install]Install[/zrl] +[zrl=[baseurl]/help/debian_install]Easy Install on Debian via script[/zrl] +[zrl=[baseurl]/help/red2pi]Installing Red on the Raspberry Pi[/zrl] +[zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl] +[zrl=[baseurl]/help/hidden_configs]Tweaking $Projectname's Hidden Configurations[/zrl] +[zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl] + +[h3]Teknisk dokumentation[/h3] +[zrl=[baseurl]/help/Zot---A-High-Level-Overview]A high level overview of Zot[/zrl] +[zrl=[baseurl]/help/zot]An introduction to Zot[/zrl] +[zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl] +[zrl=[baseurl]/help/comanche]Comanche Page Descriptions[/zrl] +[zrl=[baseurl]/help/Creating-Templates]Creating Comanche Templates[/zrl] +[zrl=[baseurl]/help/Widgets]Core Widgets[/zrl] +[zrl=[baseurl]/help/plugins]Plugins[/zrl] +[zrl=[baseurl]/help/doco]Contributing Documentation[/zrl] +[zrl=[baseurl]/help/DerivedTheme1]Creating Derivative Themes[/zrl] +[zrl=[baseurl]/help/schema_development]Schemas[/zrl] +[zrl=[baseurl]/help/Translations]Translations[/zrl] +[zrl=[baseurl]/help/developers]Developers[/zrl] +[zrl=[baseurl]/help/intro_for_developers]Intro for Developers[/zrl] +[zrl=[baseurl]/help/api_functions]API functions[/zrl] +[zrl=[baseurl]/help/api_posting]Posting to the red# using the API[/zrl] +[zrl=[baseurl]/help/developer_function_primer]Red Functions 101[/zrl] +[zrl=[baseurl]/doc/html/]Code Reference (doxygen generated - sets cookies)[/zrl] +[zrl=[baseurl]/help/to_do_doco]To-Do list for the Red Documentation Project[/zrl] +[zrl=[baseurl]/help/to_do_code]To-Do list for Developers[/zrl] +[zrl=[baseurl]/help/roadmap]Version 3 roadmap[/zrl] +[zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl] +[zrl=[baseurl]/help/dev_beginner]Sep-for-step manual for beginning developers[/zrl] + +[h3]Externa resurser[/h3] +[zrl=[baseurl]/help/external-resource-links]External Resource Links[/zrl] +[url=https://github.com/friendica/red]Main Website[/url] +[url=https://github.com/friendica/red-addons]Addon Website[/url] +[url=https://zothub.com/channel/one]Development Channel[/url] + +[url=[baseurl]/help/credits]$Projectname Credits[/url] + +[h3]About This $Projectname Hub[/h3] +[zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl] +[zrl=[baseurl]/siteinfo]Hub Information (/siteinfo)[/zrl] +[zrl=[baseurl]/siteinfo_json]Detailed Technical Hub Information (/siteinfo_json)[/zrl] -- cgit v1.2.3 From 48a25b1b858b5d43eb64e1e45e0c8ad850957e4e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 18 Jun 2018 20:44:59 -0700 Subject: channel sources: add 'resend' option to discard original author - similar to the Friendica remote_self setting --- Zotlabs/Module/Sources.php | 17 +++++++++++------ view/tpl/sources_edit.tpl | 1 + view/tpl/sources_new.tpl | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Sources.php b/Zotlabs/Module/Sources.php index a180d9b6e..91e2efa60 100644 --- a/Zotlabs/Module/Sources.php +++ b/Zotlabs/Module/Sources.php @@ -12,12 +12,13 @@ class Sources extends \Zotlabs\Web\Controller { return ''; $source = intval($_REQUEST['source']); - $xchan = $_REQUEST['xchan']; + $xchan = escape_tags($_REQUEST['xchan']); $abook = intval($_REQUEST['abook']); - $words = $_REQUEST['words']; + $words = escape_tags($_REQUEST['words']); + $resend = intval($_REQUEST['resend']); $frequency = $_REQUEST['frequency']; - $name = $_REQUEST['name']; - $tags = $_REQUEST['tags']; + $name = escape_tags($_REQUEST['name']); + $tags = escape_tags($_REQUEST['tags']); $channel = \App::get_channel(); @@ -38,6 +39,8 @@ class Sources extends \Zotlabs\Web\Controller { return; } + set_abconfig(local_channel(),$xchan, 'system','rself',$resend); + if(! $source) { $r = q("insert into source ( src_channel_id, src_channel_xchan, src_xchan, src_patt, src_tag ) values ( %d, '%s', '%s', '%s', '%s' ) ", @@ -69,7 +72,7 @@ class Sources extends \Zotlabs\Web\Controller { } - function get() { + function get() { if(! local_channel()) { notice( t('Permission denied.') . EOL); return ''; @@ -110,7 +113,7 @@ class Sources extends \Zotlabs\Web\Controller { '$words' => array( 'words', t('Only import content with these words (one per line)'),'',t('Leave blank to import all public content')), '$name' => array( 'name', t('Channel Name'), '', ''), '$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'),'',t('Optional')), - + '$resend' => [ 'resend', t('Resend posts with this channel as author'), 0, t('Copyrights may apply'), [ t('No'), t('Yes') ]], '$submit' => t('Submit') )); return $o; @@ -145,6 +148,8 @@ class Sources extends \Zotlabs\Web\Controller { '$xchan' => $r[0]['src_xchan'], '$abook' => $x[0]['abook_id'], '$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'),$r[0]['src_tag'],t('Optional')), + '$resend' => [ 'resend', t('Resend posts with this channel as author'), get_abconfig(local_channel(), $r[0]['xchan_hash'],'system','rself'), t('Copyrights may apply'), [ t('No'), t('Yes') ]], + '$name' => array( 'name', t('Channel Name'), $r[0]['xchan_name'], ''), '$submit' => t('Submit') )); diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl index 61f6e8cb0..094440ee7 100644 --- a/view/tpl/sources_edit.tpl +++ b/view/tpl/sources_edit.tpl @@ -8,6 +8,7 @@ {{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$tags}} +{{include file="field_checkbox.tpl" field=$resend}} {{include file="field_textarea.tpl" field=$words}}
      diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl index bbc22df84..7cda9998d 100644 --- a/view/tpl/sources_new.tpl +++ b/view/tpl/sources_new.tpl @@ -7,6 +7,7 @@ {{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$tags}} +{{include file="field_checkbox.tpl" field=$resend}} {{include file="field_textarea.tpl" field=$words}}
      -- cgit v1.2.3 From 6cf040d3ee2ad750ac5e3539a33f2eccecadf146 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 18 Jun 2018 21:11:39 -0700 Subject: whitespace --- include/items.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/items.php b/include/items.php index 51a26f78c..8e7a8df34 100755 --- a/include/items.php +++ b/include/items.php @@ -3026,8 +3026,6 @@ function start_delivery_chain($channel, $item, $item_id, $parent) { ); - - if($r) Zotlabs\Daemon\Master::Summon(array('Notifier','tgroup',$item_id)); else { -- cgit v1.2.3 From 3716f4e80928f160965dde6fa475e9fa3155b25a Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 18 Jun 2018 22:57:38 -0700 Subject: hiding a channel from the directory also hides them from the cloud rootdir --- Zotlabs/Storage/Directory.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index 73548fda0..642af6300 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -722,14 +722,13 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo function ChannelList(&$auth) { $ret = array(); - $r = q("SELECT channel_id, channel_address FROM channel WHERE channel_removed = 0 - AND channel_system = 0 AND (channel_pageflags & %d) = 0", + $r = q("SELECT channel_id, channel_address, profile.publish FROM channel left join profile on profile.uid = channel.channel_id WHERE channel_removed = 0 AND channel_system = 0 AND (channel_pageflags & %d) = 0", intval(PAGE_HIDDEN) ); if ($r) { foreach ($r as $rr) { - if (perm_is_allowed($rr['channel_id'], $auth->observer, 'view_storage')) { + if (perm_is_allowed($rr['channel_id'], $auth->observer, 'view_storage') && $rr['publish']) { logger('found channel: /cloud/' . $rr['channel_address'], LOGGER_DATA); // @todo can't we drop '/cloud'? It gets stripped off anyway in RedDirectory $ret[] = new Directory('/cloud/' . $rr['channel_address'], $auth); -- cgit v1.2.3 From 35f29b5d8a42b3ccc2953d72a0bb329e36d8f6fc Mon Sep 17 00:00:00 2001 From: gia vec Date: Tue, 19 Jun 2018 23:04:50 +0200 Subject: Update roadmap.bb --- doc/roadmap.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/roadmap.bb b/doc/roadmap.bb index 78e6da489..dce19848a 100644 --- a/doc/roadmap.bb +++ b/doc/roadmap.bb @@ -1,11 +1,10 @@ - Roadmap Platform - Convert E2EE and select Javascript resources to dynamic loading to dynamic loading using jQuery.getScript() [or other methods]. + Convert E2EE and select Javascript resources to dynamic loading using jQuery.getScript() [or other methods]. Webpages -- cgit v1.2.3 From 86e93664d02cecb2fc27584135961cf121f283b9 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 24 Jun 2018 16:56:23 -0700 Subject: remote_self wasn't working correctly --- include/items.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/items.php b/include/items.php index 8e7a8df34..ab42b7cd3 100755 --- a/include/items.php +++ b/include/items.php @@ -2961,10 +2961,12 @@ function start_delivery_chain($channel, $item, $item_id, $parent) { $rewrite_author = intval(get_abconfig($channel['channel_id'],$item['owner_xchan'],'system','rself')); if($rewrite_author) { - $item['author_xchan'] = $item['owner_xchan']; - if($item['owner']) { - $item['author'] = $item['owner']; - } + $item['author_xchan'] = $channel['channel_hash']; + + $r = q("update item set author_xchan = '%s' where id = %d", + dbesc($item['author_xchan']), + intval($item_id) + ); } } @@ -3025,7 +3027,6 @@ function start_delivery_chain($channel, $item, $item_id, $parent) { intval($item_id) ); - if($r) Zotlabs\Daemon\Master::Summon(array('Notifier','tgroup',$item_id)); else { -- cgit v1.2.3 From 4866ed52836028008af795da65faa2c0cd6e5df2 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 24 Jun 2018 21:56:58 -0700 Subject: remove the white-space pre-wrap property on code blocks. This should probably be done with the word-break property instead --- include/items.php | 10 ++-------- view/css/conversation.css | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/include/items.php b/include/items.php index ab42b7cd3..83ee219a2 100755 --- a/include/items.php +++ b/include/items.php @@ -980,11 +980,7 @@ function empty_acl($item) { } function encode_item($item,$mirror = false) { - $x = array(); - $x['type'] = 'activity'; - $x['encoding'] = 'zot'; - -// logger('encode_item: ' . print_r($item,true)); + $x = []; $r = q("select channel_id from channel where channel_id = %d limit 1", intval($item['uid']) @@ -1362,9 +1358,7 @@ function encode_item_flags($item) { } function encode_mail($item,$extended = false) { - $x = array(); - $x['type'] = 'mail'; - $x['encoding'] = 'zot'; + $x = []; if(array_key_exists('mail_obscured',$item) && intval($item['mail_obscured'])) { if($item['title']) diff --git a/view/css/conversation.css b/view/css/conversation.css index 0f69ffaba..e6324b30d 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -297,7 +297,6 @@ code { font-size: 1em; padding: 1em 1.5em; display: block; - white-space: pre-wrap; } code.inline-code { -- cgit v1.2.3 From 259417815820d85deadaf90f6c0ed003880f373f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 25 Jun 2018 14:29:07 +0200 Subject: updates justified gallery lib to version 3.7 and minor fixes for full template --- .../justifiedGallery/jquery.justifiedGallery.js | 433 +++++++++++---------- .../jquery.justifiedGallery.min.js | 5 +- library/justifiedGallery/justifiedGallery.css | 2 +- library/justifiedGallery/justifiedGallery.min.css | 99 ++++- view/php/full.php | 9 +- 5 files changed, 338 insertions(+), 210 deletions(-) diff --git a/library/justifiedGallery/jquery.justifiedGallery.js b/library/justifiedGallery/jquery.justifiedGallery.js index 85a4168bd..e1495d870 100644 --- a/library/justifiedGallery/jquery.justifiedGallery.js +++ b/library/justifiedGallery/jquery.justifiedGallery.js @@ -1,26 +1,49 @@ /*! - * Justified Gallery - v3.6.5 + * justifiedGallery - v3.7.0 * http://miromannino.github.io/Justified-Gallery/ * Copyright (c) 2018 Miro Mannino * Licensed under the MIT license. */ -(function($) { - - function hasScrollBar() { - return $("body").height() > $(window).height(); +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(['jquery'], factory); + } else if (typeof module === 'object' && module.exports) { + // Node/CommonJS + module.exports = function( root, jQuery ) { + if ( jQuery === undefined ) { + // require('jQuery') returns a factory that requires window to + // build a jQuery instance, we normalize how we use modules + // that require this pattern but the window provided is a noop + // if it's defined (how jquery works) + if ( typeof window !== 'undefined' ) { + jQuery = require('jquery'); + } + else { + jQuery = require('jquery')(root); + } + } + factory(jQuery); + return jQuery; + }; + } else { + // Browser globals + factory(jQuery); } +}(function ($) { + /** * Justified Gallery controller constructor * * @param $gallery the gallery to build - * @param settings the settings (the defaults are in $.fn.justifiedGallery.defaults) + * @param settings the settings (the defaults are in JustifiedGallery.defaults) * @constructor */ var JustifiedGallery = function ($gallery, settings) { - + this.settings = settings; this.checkSettings(); - + this.imgAnalyzerTimeout = null; this.entries = null; this.buildingRow = { @@ -46,12 +69,13 @@ $el : $(''), intervalId : null }; + this.scrollBarOn = false; this.checkWidthIntervalId = null; this.galleryWidth = $gallery.width(); this.$gallery = $gallery; - + }; - + /** @returns {String} the best suffix given the width and the height */ JustifiedGallery.prototype.getSuffix = function (width, height) { var longestSide, i; @@ -63,7 +87,7 @@ } return this.settings.sizeRangeSuffixes[this.suffixRanges[i - 1]]; }; - + /** * Remove the suffix from the string * @@ -72,14 +96,14 @@ JustifiedGallery.prototype.removeSuffix = function (str, suffix) { return str.substring(0, str.length - suffix.length); }; - + /** * @returns {boolean} a boolean to say if the suffix is contained in the str or not */ JustifiedGallery.prototype.endsWith = function (str, suffix) { return str.indexOf(suffix, str.length - suffix.length) !== -1; }; - + /** * Get the used suffix of a particular url * @@ -95,7 +119,7 @@ } return ''; }; - + /** * Given an image src, with the width and the height, returns the new image src with the * best suffix to show the best quality thumbnail. @@ -104,7 +128,7 @@ */ JustifiedGallery.prototype.newSrc = function (imageSrc, imgWidth, imgHeight, image) { var newImageSrc; - + if (this.settings.thumbnailPath) { newImageSrc = this.settings.thumbnailPath(imageSrc, imgWidth, imgHeight, image); } else { @@ -114,10 +138,10 @@ newImageSrc = this.removeSuffix(newImageSrc, this.getUsedSuffix(newImageSrc)); newImageSrc += this.getSuffix(imgWidth, imgHeight) + ext; } - + return newImageSrc; }; - + /** * Shows the images that is in the given entry * @@ -133,7 +157,7 @@ $entry.find(this.settings.imgSelector).stop().fadeTo(this.settings.imagesAnimationDuration, 1.0, callback); } }; - + /** * Extract the image src form the image, looking from the 'safe-src', and if it can't be found, from the * 'src' attribute. It saves in the image data the 'jg.originalSrc' field, with the extracted src. @@ -146,19 +170,19 @@ $image.data('jg.originalSrc', imageSrc); return imageSrc; }; - + /** @returns {jQuery} the image in the given entry */ JustifiedGallery.prototype.imgFromEntry = function ($entry) { var $img = $entry.find(this.settings.imgSelector); return $img.length === 0 ? null : $img; }; - + /** @returns {jQuery} the caption in the given entry */ JustifiedGallery.prototype.captionFromEntry = function ($entry) { var $caption = $entry.find('> .caption'); return $caption.length === 0 ? null : $caption; }; - + /** * Display the entry * @@ -174,28 +198,28 @@ $entry.height(rowHeight); $entry.css('top', y); $entry.css('left', x); - + var $image = this.imgFromEntry($entry); if ($image !== null) { $image.css('width', imgWidth); $image.css('height', imgHeight); $image.css('margin-left', - imgWidth / 2); $image.css('margin-top', - imgHeight / 2); - + // Image reloading for an high quality of thumbnails var imageSrc = $image.attr('src'); var newImageSrc = this.newSrc(imageSrc, imgWidth, imgHeight, $image[0]); - + $image.one('error', function () { $image.attr('src', $image.data('jg.originalSrc')); //revert to the original thumbnail, we got it. }); - + var loadNewImage = function () { if (imageSrc !== newImageSrc) { //load the new image after the fadeIn $image.attr('src', newImageSrc); } }; - + if ($entry.data('jg.loaded') === 'skipped') { this.onImageEvent(imageSrc, $.proxy(function() { this.showImg($entry, loadNewImage); @@ -204,14 +228,14 @@ } else { this.showImg($entry, loadNewImage); } - + } else { this.showImg($entry); } - + this.displayEntryCaption($entry); }; - + /** * Display the entry caption. If the caption element doesn't exists, it creates the caption using the 'alt' * or the 'title' attributes. @@ -222,7 +246,7 @@ var $image = this.imgFromEntry($entry); if ($image !== null && this.settings.captions) { var $imgCaption = this.captionFromEntry($entry); - + // Create it if it doesn't exists if ($imgCaption === null) { var caption = $image.attr('alt'); @@ -233,7 +257,7 @@ $entry.data('jg.createdCaption', true); } } - + // Create events (we check again the $imgCaption because it can be still inexistent) if ($imgCaption !== null) { if (!this.settings.cssAnimation) $imgCaption.stop().fadeTo(0, this.settings.captionSettings.nonVisibleOpacity); @@ -243,7 +267,7 @@ this.removeCaptionEventsHandlers($entry); } }; - + /** * Validates the caption * @@ -253,7 +277,7 @@ JustifiedGallery.prototype.isValidCaption = function (caption) { return (typeof caption !== 'undefined' && caption.length > 0); }; - + /** * The callback for the event 'mouseenter'. It assumes that the event currentTarget is an entry. * It shows the caption using jQuery (or using CSS if it is configured so) @@ -269,7 +293,7 @@ this.settings.captionSettings.visibleOpacity); } }; - + /** * The callback for the event 'mouseleave'. It assumes that the event currentTarget is an entry. * It hides the caption using jQuery (or using CSS if it is configured so) @@ -285,7 +309,7 @@ this.settings.captionSettings.nonVisibleOpacity); } }; - + /** * Add the handlers of the entry for the caption * @@ -303,7 +327,7 @@ $entry.data('jg.captionMouseEvents', captionMouseEvents); } }; - + /** * Remove the handlers of the entry for the caption * @@ -317,7 +341,7 @@ $entry.removeData('jg.captionMouseEvents'); } }; - + /** * Clear the building row data to be used for a new row */ @@ -326,7 +350,7 @@ this.buildingRow.aspectRatio = 0; this.buildingRow.width = 0; }; - + /** * Justify the building row, preparing it to * @@ -341,7 +365,7 @@ var rowHeight = availableWidth / this.buildingRow.aspectRatio; var defaultRowHeight = this.settings.rowHeight; var justifiable = this.buildingRow.width / availableWidth > this.settings.justifyThreshold; - + //Skip the last row if we can't justify it and the lastRow == 'hide' if (isLastRow && this.settings.lastRow === 'hide' && !justifiable) { for (i = 0; i < this.buildingRow.entriesBuff.length; i++) { @@ -355,21 +379,21 @@ } return -1; } - + // With lastRow = nojustify, justify if is justificable (the images will not become too big) if (isLastRow && !justifiable && this.settings.lastRow !== 'justify' && this.settings.lastRow !== 'hide') { justify = false; - + if (this.rows > 0) { defaultRowHeight = (this.offY - this.border - this.settings.margins * this.rows) / this.rows; justify = defaultRowHeight * this.buildingRow.aspectRatio / availableWidth > this.settings.justifyThreshold; } } - + for (i = 0; i < this.buildingRow.entriesBuff.length; i++) { $entry = this.buildingRow.entriesBuff[i]; imgAspectRatio = $entry.data('jg.width') / $entry.data('jg.height'); - + if (justify) { newImgW = (i === this.buildingRow.entriesBuff.length - 1) ? availableWidth : rowHeight * imgAspectRatio; newImgH = rowHeight; @@ -377,17 +401,17 @@ newImgW = defaultRowHeight * imgAspectRatio; newImgH = defaultRowHeight; } - + availableWidth -= Math.round(newImgW); $entry.data('jg.jwidth', Math.round(newImgW)); $entry.data('jg.jheight', Math.ceil(newImgH)); if (i === 0 || minHeight > newImgH) minHeight = newImgH; } - + this.buildingRow.height = minHeight; return justify; }; - + /** * Flush a row: justify it, modify the gallery height accordingly to the row height * @@ -396,115 +420,120 @@ JustifiedGallery.prototype.flushRow = function (isLastRow) { var settings = this.settings; var $entry, buildingRowRes, offX = this.border, i; - + buildingRowRes = this.prepareBuildingRow(isLastRow); if (isLastRow && settings.lastRow === 'hide' && buildingRowRes === -1) { this.clearBuildingRow(); return; } - + if(this.maxRowHeight) { if(this.maxRowHeight < this.buildingRow.height) this.buildingRow.height = this.maxRowHeight; } - + //Align last (unjustified) row if (isLastRow && (settings.lastRow === 'center' || settings.lastRow === 'right')) { var availableWidth = this.galleryWidth - 2 * this.border - (this.buildingRow.entriesBuff.length - 1) * settings.margins; - + for (i = 0; i < this.buildingRow.entriesBuff.length; i++) { $entry = this.buildingRow.entriesBuff[i]; availableWidth -= $entry.data('jg.jwidth'); } - + if (settings.lastRow === 'center') offX += availableWidth / 2; else if (settings.lastRow === 'right') offX += availableWidth; } - + var lastEntryIdx = this.buildingRow.entriesBuff.length - 1; for (i = 0; i <= lastEntryIdx; i++) { $entry = this.buildingRow.entriesBuff[ this.settings.rtl ? lastEntryIdx - i : i ]; this.displayEntry($entry, offX, this.offY, $entry.data('jg.jwidth'), $entry.data('jg.jheight'), this.buildingRow.height); offX += $entry.data('jg.jwidth') + settings.margins; } - + //Gallery Height this.galleryHeightToSet = this.offY + this.buildingRow.height + this.border; this.setGalleryTempHeight(this.galleryHeightToSet + this.getSpinnerHeight()); - + if (!isLastRow || (this.buildingRow.height <= settings.rowHeight && buildingRowRes)) { //Ready for a new row this.offY += this.buildingRow.height + settings.margins; this.rows += 1; this.clearBuildingRow(); - this.$gallery.trigger('jg.rowflush'); + this.settings.triggerEvent.call(this, 'jg.rowflush'); } }; - - - // Scroll position not restoring: https://github.com/miromannino/Justified-Gallery/issues/221 + + + // Scroll position not restoring: https://github.com/miromannino/Justified-Gallery/issues/221 var galleryPrevStaticHeight = 0; - + JustifiedGallery.prototype.rememberGalleryHeight = function () { galleryPrevStaticHeight = this.$gallery.height(); this.$gallery.height(galleryPrevStaticHeight); }; - + // grow only JustifiedGallery.prototype.setGalleryTempHeight = function (height) { galleryPrevStaticHeight = Math.max(height, galleryPrevStaticHeight); this.$gallery.height(galleryPrevStaticHeight); }; - + JustifiedGallery.prototype.setGalleryFinalHeight = function (height) { galleryPrevStaticHeight = height; this.$gallery.height(height); }; - - + + /** + * @returns {boolean} a boolean saying if the scrollbar is active or not + */ + function hasScrollBar() { + return $("body").height() > $(window).height(); + } + /** * Checks the width of the gallery container, to know if a new justification is needed */ - var scrollBarOn = false; JustifiedGallery.prototype.checkWidth = function () { this.checkWidthIntervalId = setInterval($.proxy(function () { - + // if the gallery is not currently visible, abort. if (!this.$gallery.is(":visible")) return; - + var galleryWidth = parseFloat(this.$gallery.width()); - if (hasScrollBar() === scrollBarOn) { + if (hasScrollBar() === this.scrollBarOn) { if (Math.abs(galleryWidth - this.galleryWidth) > this.settings.refreshSensitivity) { this.galleryWidth = galleryWidth; this.rewind(); - + this.rememberGalleryHeight(); - + // Restart to analyze this.startImgAnalyzer(true); } } else { - scrollBarOn = hasScrollBar(); + this.scrollBarOn = hasScrollBar(); this.galleryWidth = galleryWidth; } }, this), this.settings.refreshTime); }; - + /** * @returns {boolean} a boolean saying if the spinner is active or not */ JustifiedGallery.prototype.isSpinnerActive = function () { return this.spinner.intervalId !== null; }; - + /** * @returns {int} the spinner height */ JustifiedGallery.prototype.getSpinnerHeight = function () { return this.spinner.$el.innerHeight(); }; - + /** * Stops the spinner animation and modify the gallery height to exclude the spinner */ @@ -514,7 +543,7 @@ this.setGalleryTempHeight(this.$gallery.height() - this.getSpinnerHeight()); this.spinner.$el.detach(); }; - + /** * Starts the spinner animation */ @@ -533,7 +562,7 @@ spinnerContext.phase = (spinnerContext.phase + 1) % ($spinnerPoints.length * 2); }, spinnerContext.timeSlot); }; - + /** * Rewind the image analysis to start from the first entry. */ @@ -544,7 +573,7 @@ this.rows = 0; this.clearBuildingRow(); }; - + /** * Update the entries searching it from the justified gallery HTML element * @@ -553,16 +582,16 @@ */ JustifiedGallery.prototype.updateEntries = function (norewind) { var newEntries; - + if (norewind && this.lastFetchedEntry != null) { newEntries = $(this.lastFetchedEntry).nextAll(this.settings.selector).toArray(); } else { this.entries = []; newEntries = this.$gallery.children(this.settings.selector).toArray(); } - + if (newEntries.length > 0) { - + // Sort or randomize if ($.isFunction(this.settings.sort)) { newEntries = this.sortArray(newEntries); @@ -570,20 +599,20 @@ newEntries = this.shuffleArray(newEntries); } this.lastFetchedEntry = newEntries[newEntries.length - 1]; - + // Filter if (this.settings.filter) { newEntries = this.filterArray(newEntries); } else { this.resetFilters(newEntries); } - + } - + this.entries = this.entries.concat(newEntries); return true; }; - + /** * Apply the entries order to the DOM, iterating the entries and appending the images * @@ -595,7 +624,7 @@ $(this).appendTo(that.$gallery); }); }; - + /** * Shuffle the array using the Fisher-Yates shuffle algorithm * @@ -613,7 +642,7 @@ this.insertToGallery(a); return a; }; - + /** * Sort the array using settings.comparator as comparator * @@ -625,7 +654,7 @@ this.insertToGallery(a); return a; }; - + /** * Reset the filters removing the 'jg-filtered' class from all the entries * @@ -634,7 +663,7 @@ JustifiedGallery.prototype.resetFilters = function (a) { for (var i = 0; i < a.length; i++) $(a[i]).removeClass('jg-filtered'); }; - + /** * Filter the entries considering theirs classes (if a string has been passed) or using a function for filtering. * @@ -668,7 +697,7 @@ return filteredArr; } }; - + /** * Destroy the Justified Gallery instance. * @@ -680,10 +709,10 @@ */ JustifiedGallery.prototype.destroy = function () { clearInterval(this.checkWidthIntervalId); - + $.each(this.entries, $.proxy(function(_, entry) { var $entry = $(entry); - + // Reset entry style $entry.css('width', ''); $entry.css('height', ''); @@ -691,7 +720,7 @@ $entry.css('left', ''); $entry.data('jg.loaded', undefined); $entry.removeClass('jg-entry'); - + // Reset image style var $img = this.imgFromEntry($entry); $img.css('width', ''); @@ -700,7 +729,7 @@ $img.css('margin-top', ''); $img.attr('src', $img.data('jg.originalSrc')); $img.data('jg.originalSrc', undefined); - + // Remove caption this.removeCaptionEventsHandlers($entry); var $caption = this.captionFromEntry($entry); @@ -711,14 +740,14 @@ } else { if ($caption !== null) $caption.fadeTo(0, 1); } - + }, this)); - + this.$gallery.css('height', ''); this.$gallery.removeClass('justified-gallery'); this.$gallery.data('jg.controller', undefined); }; - + /** * Analyze the images and builds the rows. It returns if it found an image that is not loaded. * @@ -733,41 +762,41 @@ var imgAspectRatio = $entry.data('jg.width') / $entry.data('jg.height'); if (availableWidth / (this.buildingRow.aspectRatio + imgAspectRatio) < this.settings.rowHeight) { this.flushRow(false); - + if(++this.yield.flushed >= this.yield.every) { this.startImgAnalyzer(isForResize); return; } } - + this.buildingRow.entriesBuff.push($entry); this.buildingRow.aspectRatio += imgAspectRatio; this.buildingRow.width += imgAspectRatio * this.settings.rowHeight; this.lastAnalyzedIndex = i; - + } else if ($entry.data('jg.loaded') !== 'error') { return; } } - + // Last row flush (the row is not full) if (this.buildingRow.entriesBuff.length > 0) this.flushRow(true); - + if (this.isSpinnerActive()) { this.stopLoadingSpinnerAnimation(); } - + /* Stop, if there is, the timeout to start the analyzeImages. This is because an image can be set loaded, and the timeout can be set, but this image can be analyzed yet. */ this.stopImgAnalyzerStarter(); - + //On complete callback - this.$gallery.trigger(isForResize ? 'jg.resize' : 'jg.complete'); + this.settings.triggerEvent.call(this, isForResize ? 'jg.resize' : 'jg.complete'); this.setGalleryFinalHeight(this.galleryHeightToSet); }; - + /** * Stops any ImgAnalyzer starter (that has an assigned timeout) */ @@ -778,7 +807,7 @@ this.imgAnalyzerTimeout = null; } }; - + /** * Starts the image analyzer. It is not immediately called to let the browser to update the view * @@ -791,7 +820,7 @@ that.analyzeImages(isForResize); }, 0.001); // we can't start it immediately due to a IE different behaviour }; - + /** * Checks if the image is loaded or not using another image object. We cannot use the 'complete' image property, * because some browsers, with a 404 set complete = true. @@ -802,7 +831,7 @@ */ JustifiedGallery.prototype.onImageEvent = function (imageSrc, onLoad, onError) { if (!onLoad && !onError) return; - + var memImage = new Image(); var $memImage = $(memImage); if (onLoad) { @@ -819,7 +848,7 @@ } memImage.src = imageSrc; }; - + /** * Init of Justified Gallery controlled * It analyzes all the entries starting theirs loading and calling the image analyzer (that works with loaded images) @@ -829,23 +858,23 @@ $.each(this.entries, function (index, entry) { var $entry = $(entry); var $image = that.imgFromEntry($entry); - + $entry.addClass('jg-entry'); - + if ($entry.data('jg.loaded') !== true && $entry.data('jg.loaded') !== 'skipped') { - + // Link Rel global overwrite if (that.settings.rel !== null) $entry.attr('rel', that.settings.rel); - + // Link Target global overwrite if (that.settings.target !== null) $entry.attr('target', that.settings.target); - + if ($image !== null) { - + // Image src var imageSrc = that.extractImgSrcFromImage($image); $image.attr('src', imageSrc); - + /* If we have the height and the width, we don't wait that the image is loaded, but we start directly * with the justification */ if (that.settings.waitThumbnailsLoad === false) { @@ -860,13 +889,13 @@ return true; // continue } } - + $entry.data('jg.loaded', false); imagesToLoad = true; - + // Spinner start if (!that.isSpinnerActive()) that.startLoadingSpinnerAnimation(); - + that.onImageEvent(imageSrc, function (loadImg) { // image loaded $entry.data('jg.width', loadImg.width); $entry.data('jg.height', loadImg.height); @@ -876,21 +905,21 @@ $entry.data('jg.loaded', 'error'); that.startImgAnalyzer(false); }); - + } else { $entry.data('jg.loaded', true); $entry.data('jg.width', $entry.width() | parseFloat($entry.css('width')) | 1); $entry.data('jg.height', $entry.height() | parseFloat($entry.css('height')) | 1); } - + } - + }); - + if (!imagesToLoad && !skippedImages) this.startImgAnalyzer(false); this.checkWidth(); }; - + /** * Checks that it is a valid number. If a string is passed it is converted to a number * @@ -901,14 +930,14 @@ if ($.type(settingContainer[settingName]) === 'string') { settingContainer[settingName] = parseFloat(settingContainer[settingName]); } - + if ($.type(settingContainer[settingName]) === 'number') { if (isNaN(settingContainer[settingName])) throw 'invalid number for ' + settingName; } else { throw settingName + ' must be a number'; } }; - + /** * Checks the sizeRangeSuffixes and, if necessary, converts * its keys from string (e.g. old settings with 'lt100') to int. @@ -917,12 +946,12 @@ if ($.type(this.settings.sizeRangeSuffixes) !== 'object') { throw 'sizeRangeSuffixes must be defined and must be an object'; } - + var suffixRanges = []; for (var rangeIdx in this.settings.sizeRangeSuffixes) { if (this.settings.sizeRangeSuffixes.hasOwnProperty(rangeIdx)) suffixRanges.push(rangeIdx); } - + var newSizeRngSuffixes = {0: ''}; for (var i = 0; i < suffixRanges.length; i++) { if ($.type(suffixRanges[i]) === 'string') { @@ -936,10 +965,10 @@ newSizeRngSuffixes[suffixRanges[i]] = this.settings.sizeRangeSuffixes[suffixRanges[i]]; } } - + this.settings.sizeRangeSuffixes = newSizeRngSuffixes; }; - + /** * check and convert the maxRowHeight setting * requires rowHeight to be already set @@ -949,7 +978,7 @@ JustifiedGallery.prototype.retrieveMaxRowHeight = function () { var newMaxRowHeight = null; var rowHeight = this.settings.rowHeight; - + if ($.type(this.settings.maxRowHeight) === 'string') { if (this.settings.maxRowHeight.match(/^[0-9]+%$/)) { newMaxRowHeight = rowHeight * parseFloat(this.settings.maxRowHeight.match(/^([0-9]+)%$/)[1]) / 100; @@ -963,26 +992,26 @@ } else { throw 'maxRowHeight must be a number or a percentage'; } - + // check if the converted value is not a number if (isNaN(newMaxRowHeight)) throw 'invalid number for maxRowHeight'; - + // check values, maxRowHeight must be >= rowHeight if (newMaxRowHeight < rowHeight) newMaxRowHeight = rowHeight; - + return newMaxRowHeight; }; - + /** * Checks the settings */ JustifiedGallery.prototype.checkSettings = function () { this.checkSizeRangesSuffixes(); - + this.checkOrConvertNumber(this.settings, 'rowHeight'); this.checkOrConvertNumber(this.settings, 'margins'); this.checkOrConvertNumber(this.settings, 'border'); - + var lastRowModes = [ 'justify', 'nojustify', @@ -994,7 +1023,7 @@ if (lastRowModes.indexOf(this.settings.lastRow) === -1) { throw 'lastRow must be one of: ' + lastRowModes.join(', '); } - + this.checkOrConvertNumber(this.settings, 'justifyThreshold'); if (this.settings.justifyThreshold < 0 || this.settings.justifyThreshold > 1) { throw 'justifyThreshold must be in the interval [0,1]'; @@ -1002,38 +1031,38 @@ if ($.type(this.settings.cssAnimation) !== 'boolean') { throw 'cssAnimation must be a boolean'; } - + if ($.type(this.settings.captions) !== 'boolean') throw 'captions must be a boolean'; this.checkOrConvertNumber(this.settings.captionSettings, 'animationDuration'); - + this.checkOrConvertNumber(this.settings.captionSettings, 'visibleOpacity'); if (this.settings.captionSettings.visibleOpacity < 0 || this.settings.captionSettings.visibleOpacity > 1) { throw 'captionSettings.visibleOpacity must be in the interval [0, 1]'; } - + this.checkOrConvertNumber(this.settings.captionSettings, 'nonVisibleOpacity'); if (this.settings.captionSettings.nonVisibleOpacity < 0 || this.settings.captionSettings.nonVisibleOpacity > 1) { throw 'captionSettings.nonVisibleOpacity must be in the interval [0, 1]'; } - + this.checkOrConvertNumber(this.settings, 'imagesAnimationDuration'); this.checkOrConvertNumber(this.settings, 'refreshTime'); this.checkOrConvertNumber(this.settings, 'refreshSensitivity'); if ($.type(this.settings.randomize) !== 'boolean') throw 'randomize must be a boolean'; if ($.type(this.settings.selector) !== 'string') throw 'selector must be a string'; - + if (this.settings.sort !== false && !$.isFunction(this.settings.sort)) { throw 'sort must be false or a comparison function'; } - + if (this.settings.filter !== false && !$.isFunction(this.settings.filter) && $.type(this.settings.filter) !== 'string') { throw 'filter must be false, a string or a filter function'; } }; - + /** * It brings all the indexes from the sizeRangeSuffixes and it orders them. They are then sorted and returned. * @returns {Array} sorted suffix ranges @@ -1046,7 +1075,7 @@ suffixRanges.sort(function (a, b) { return a > b ? 1 : a < b ? -1 : 0; }); return suffixRanges; }; - + /** * Update the existing settings only changing some of them * @@ -1056,63 +1085,15 @@ // In this case Justified Gallery has been called again changing only some options this.settings = $.extend({}, this.settings, newSettings); this.checkSettings(); - + // As reported in the settings: negative value = same as margins, 0 = disabled this.border = this.settings.border >= 0 ? this.settings.border : this.settings.margins; - + this.maxRowHeight = this.retrieveMaxRowHeight(); this.suffixRanges = this.retrieveSuffixRanges(); }; - - /** - * Justified Gallery plugin for jQuery - * - * Events - * - jg.complete : called when all the gallery has been created - * - jg.resize : called when the gallery has been resized - * - jg.rowflush : when a new row appears - * - * @param arg the action (or the settings) passed when the plugin is called - * @returns {*} the object itself - */ - $.fn.justifiedGallery = function (arg) { - return this.each(function (index, gallery) { - - var $gallery = $(gallery); - $gallery.addClass('justified-gallery'); - - var controller = $gallery.data('jg.controller'); - if (typeof controller === 'undefined') { - // Create controller and assign it to the object data - if (typeof arg !== 'undefined' && arg !== null && $.type(arg) !== 'object') { - if (arg === 'destroy') return; // Just a call to an unexisting object - throw 'The argument must be an object'; - } - controller = new JustifiedGallery($gallery, $.extend({}, $.fn.justifiedGallery.defaults, arg)); - $gallery.data('jg.controller', controller); - } else if (arg === 'norewind') { - // In this case we don't rewind: we analyze only the latest images (e.g. to complete the last unfinished row - // ... left to be more readable - } else if (arg === 'destroy') { - controller.destroy(); - return; - } else { - // In this case Justified Gallery has been called again changing only some options - controller.updateSettings(arg); - controller.rewind(); - } - - // Update the entries list - if (!controller.updateEntries(arg === 'norewind')) return; - - // Init justified gallery - controller.init(); - - }); - }; - - // Default options - $.fn.justifiedGallery.defaults = { + + JustifiedGallery.prototype.defaults = { sizeRangeSuffixes: { }, /* e.g. Flickr configuration { 100: '_t', // used when longest is less than 100px @@ -1132,9 +1113,9 @@ // can't exceed 3 * rowHeight) margins: 1, border: -1, // negative value = same as margins, 0 = disabled, any other value to set the border - + lastRow: 'nojustify', // … which is the same as 'left', or can be 'justify', 'center', 'right' or 'hide' - + justifyThreshold: 0.90, /* if row width / available space > 0.90 it will be always justified * (i.e. lastRow setting is not considered) */ waitThumbnailsLoad: true, @@ -1165,7 +1146,57 @@ It follows the specifications of the Array.prototype.filter() function of JavaScript. */ selector: 'a, div:not(.spinner)', // The selector that is used to know what are the entries of the gallery - imgSelector: '> img, > a > img' // The selector that is used to know what are the images of each entry + imgSelector: '> img, > a > img', // The selector that is used to know what are the images of each entry + triggerEvent: function (event) { // This is called to trigger events, the default behavior is to call $.trigger + this.$gallery.trigger(event); // Consider that 'this' is this set to the JustifiedGallery object, so it can + } // access to fields such as $gallery, useful to trigger events with jQuery. + }; + + /** + * Justified Gallery plugin for jQuery + * + * Events + * - jg.complete : called when all the gallery has been created + * - jg.resize : called when the gallery has been resized + * - jg.rowflush : when a new row appears + * + * @param arg the action (or the settings) passed when the plugin is called + * @returns {*} the object itself + */ + $.fn.justifiedGallery = function (arg) { + return this.each(function (index, gallery) { + + var $gallery = $(gallery); + $gallery.addClass('justified-gallery'); + + var controller = $gallery.data('jg.controller'); + if (typeof controller === 'undefined') { + // Create controller and assign it to the object data + if (typeof arg !== 'undefined' && arg !== null && $.type(arg) !== 'object') { + if (arg === 'destroy') return; // Just a call to an unexisting object + throw 'The argument must be an object'; + } + controller = new JustifiedGallery($gallery, $.extend({}, JustifiedGallery.prototype.defaults, arg)); + $gallery.data('jg.controller', controller); + } else if (arg === 'norewind') { + // In this case we don't rewind: we analyze only the latest images (e.g. to complete the last unfinished row + // ... left to be more readable + } else if (arg === 'destroy') { + controller.destroy(); + return; + } else { + // In this case Justified Gallery has been called again changing only some options + controller.updateSettings(arg); + controller.rewind(); + } + + // Update the entries list + if (!controller.updateEntries(arg === 'norewind')) return; + + // Init justified gallery + controller.init(); + + }); }; -}(jQuery)); +})); \ No newline at end of file diff --git a/library/justifiedGallery/jquery.justifiedGallery.min.js b/library/justifiedGallery/jquery.justifiedGallery.min.js index 87519987b..bda51a188 100644 --- a/library/justifiedGallery/jquery.justifiedGallery.min.js +++ b/library/justifiedGallery/jquery.justifiedGallery.min.js @@ -1,7 +1,8 @@ /*! - * Justified Gallery - v3.6.5 + * justifiedGallery - v3.7.0 * http://miromannino.github.io/Justified-Gallery/ * Copyright (c) 2018 Miro Mannino * Licensed under the MIT license. */ -!function(a){function b(){return a("body").height()>a(window).height()}var c=function(b,c){this.settings=c,this.checkSettings(),this.imgAnalyzerTimeout=null,this.entries=null,this.buildingRow={entriesBuff:[],width:0,height:0,aspectRatio:0},this.lastFetchedEntry=null,this.lastAnalyzedIndex=-1,this.yield={every:2,flushed:0},this.border=c.border>=0?c.border:c.margins,this.maxRowHeight=this.retrieveMaxRowHeight(),this.suffixRanges=this.retrieveSuffixRanges(),this.offY=this.border,this.rows=0,this.spinner={phase:0,timeSlot:150,$el:a(''),intervalId:null},this.checkWidthIntervalId=null,this.galleryWidth=b.width(),this.$gallery=b};c.prototype.getSuffix=function(a,b){var c,d;for(c=a>b?a:b,d=0;d .caption");return 0===b.length?null:b},c.prototype.displayEntry=function(b,c,d,e,f,g){b.width(e),b.height(g),b.css("top",d),b.css("left",c);var h=this.imgFromEntry(b);if(null!==h){h.css("width",e),h.css("height",f),h.css("margin-left",-e/2),h.css("margin-top",-f/2);var i=h.attr("src"),j=this.newSrc(i,e,f,h[0]);h.one("error",function(){h.attr("src",h.data("jg.originalSrc"))});var k=function(){i!==j&&h.attr("src",j)};"skipped"===b.data("jg.loaded")?this.onImageEvent(i,a.proxy(function(){this.showImg(b,k),b.data("jg.loaded",!0)},this)):this.showImg(b,k)}else this.showImg(b);this.displayEntryCaption(b)},c.prototype.displayEntryCaption=function(b){var c=this.imgFromEntry(b);if(null!==c&&this.settings.captions){var d=this.captionFromEntry(b);if(null===d){var e=c.attr("alt");this.isValidCaption(e)||(e=b.attr("title")),this.isValidCaption(e)&&(d=a('
      '+e+"
      "),b.append(d),b.data("jg.createdCaption",!0))}null!==d&&(this.settings.cssAnimation||d.stop().fadeTo(0,this.settings.captionSettings.nonVisibleOpacity),this.addCaptionEventsHandlers(b))}else this.removeCaptionEventsHandlers(b)},c.prototype.isValidCaption=function(a){return"undefined"!=typeof a&&a.length>0},c.prototype.onEntryMouseEnterForCaption=function(b){var c=this.captionFromEntry(a(b.currentTarget));this.settings.cssAnimation?c.addClass("caption-visible").removeClass("caption-hidden"):c.stop().fadeTo(this.settings.captionSettings.animationDuration,this.settings.captionSettings.visibleOpacity)},c.prototype.onEntryMouseLeaveForCaption=function(b){var c=this.captionFromEntry(a(b.currentTarget));this.settings.cssAnimation?c.removeClass("caption-visible").removeClass("caption-hidden"):c.stop().fadeTo(this.settings.captionSettings.animationDuration,this.settings.captionSettings.nonVisibleOpacity)},c.prototype.addCaptionEventsHandlers=function(b){var c=b.data("jg.captionMouseEvents");"undefined"==typeof c&&(c={mouseenter:a.proxy(this.onEntryMouseEnterForCaption,this),mouseleave:a.proxy(this.onEntryMouseLeaveForCaption,this)},b.on("mouseenter",void 0,void 0,c.mouseenter),b.on("mouseleave",void 0,void 0,c.mouseleave),b.data("jg.captionMouseEvents",c))},c.prototype.removeCaptionEventsHandlers=function(a){var b=a.data("jg.captionMouseEvents");"undefined"!=typeof b&&(a.off("mouseenter",void 0,b.mouseenter),a.off("mouseleave",void 0,b.mouseleave),a.removeData("jg.captionMouseEvents"))},c.prototype.clearBuildingRow=function(){this.buildingRow.entriesBuff=[],this.buildingRow.aspectRatio=0,this.buildingRow.width=0},c.prototype.prepareBuildingRow=function(a){var b,c,d,e,f,g=!0,h=0,i=this.galleryWidth-2*this.border-(this.buildingRow.entriesBuff.length-1)*this.settings.margins,j=i/this.buildingRow.aspectRatio,k=this.settings.rowHeight,l=this.buildingRow.width/i>this.settings.justifyThreshold;if(a&&"hide"===this.settings.lastRow&&!l){for(b=0;b img, > a > img").fadeTo(0,0));return-1}for(a&&!l&&"justify"!==this.settings.lastRow&&"hide"!==this.settings.lastRow&&(g=!1,this.rows>0&&(k=(this.offY-this.border-this.settings.margins*this.rows)/this.rows,g=k*this.buildingRow.aspectRatio/i>this.settings.justifyThreshold)),b=0;bf)&&(h=f);return this.buildingRow.height=h,g},c.prototype.flushRow=function(a){var b,c,d,e=this.settings,f=this.border;if(c=this.prepareBuildingRow(a),a&&"hide"===e.lastRow&&-1===c)return void this.clearBuildingRow();if(this.maxRowHeight&&this.maxRowHeight=d;d++)b=this.buildingRow.entriesBuff[this.settings.rtl?h-d:d],this.displayEntry(b,f,this.offY,b.data("jg.jwidth"),b.data("jg.jheight"),this.buildingRow.height),f+=b.data("jg.jwidth")+e.margins;this.galleryHeightToSet=this.offY+this.buildingRow.height+this.border,this.setGalleryTempHeight(this.galleryHeightToSet+this.getSpinnerHeight()),(!a||this.buildingRow.height<=e.rowHeight&&c)&&(this.offY+=this.buildingRow.height+e.margins,this.rows+=1,this.clearBuildingRow(),this.$gallery.trigger("jg.rowflush"))};var d=0;c.prototype.rememberGalleryHeight=function(){d=this.$gallery.height(),this.$gallery.height(d)},c.prototype.setGalleryTempHeight=function(a){d=Math.max(a,d),this.$gallery.height(d)},c.prototype.setGalleryFinalHeight=function(a){d=a,this.$gallery.height(a)};var e=!1;c.prototype.checkWidth=function(){this.checkWidthIntervalId=setInterval(a.proxy(function(){if(this.$gallery.is(":visible")){var a=parseFloat(this.$gallery.width());b()===e?Math.abs(a-this.galleryWidth)>this.settings.refreshSensitivity&&(this.galleryWidth=a,this.rewind(),this.rememberGalleryHeight(),this.startImgAnalyzer(!0)):(e=b(),this.galleryWidth=a)}},this),this.settings.refreshTime)},c.prototype.isSpinnerActive=function(){return null!==this.spinner.intervalId},c.prototype.getSpinnerHeight=function(){return this.spinner.$el.innerHeight()},c.prototype.stopLoadingSpinnerAnimation=function(){clearInterval(this.spinner.intervalId),this.spinner.intervalId=null,this.setGalleryTempHeight(this.$gallery.height()-this.getSpinnerHeight()),this.spinner.$el.detach()},c.prototype.startLoadingSpinnerAnimation=function(){var a=this.spinner,b=a.$el.find("span");clearInterval(a.intervalId),this.$gallery.append(a.$el),this.setGalleryTempHeight(this.offY+this.buildingRow.height+this.getSpinnerHeight()),a.intervalId=setInterval(function(){a.phase0&&(a.isFunction(this.settings.sort)?c=this.sortArray(c):this.settings.randomize&&(c=this.shuffleArray(c)),this.lastFetchedEntry=c[c.length-1],this.settings.filter?c=this.filterArray(c):this.resetFilters(c)),this.entries=this.entries.concat(c),!0},c.prototype.insertToGallery=function(b){var c=this;a.each(b,function(){a(this).appendTo(c.$gallery)})},c.prototype.shuffleArray=function(a){var b,c,d;for(b=a.length-1;b>0;b--)c=Math.floor(Math.random()*(b+1)),d=a[b],a[b]=a[c],a[c]=d;return this.insertToGallery(a),a},c.prototype.sortArray=function(a){return a.sort(this.settings.sort),this.insertToGallery(a),a},c.prototype.resetFilters=function(b){for(var c=0;c=this.yield.every))return void this.startImgAnalyzer(b);this.buildingRow.entriesBuff.push(d),this.buildingRow.aspectRatio+=f,this.buildingRow.width+=f*this.settings.rowHeight,this.lastAnalyzedIndex=c}else if("error"!==d.data("jg.loaded"))return}this.buildingRow.entriesBuff.length>0&&this.flushRow(!0),this.isSpinnerActive()&&this.stopLoadingSpinnerAnimation(),this.stopImgAnalyzerStarter(),this.$gallery.trigger(b?"jg.resize":"jg.complete"),this.setGalleryFinalHeight(this.galleryHeightToSet)},c.prototype.stopImgAnalyzerStarter=function(){this.yield.flushed=0,null!==this.imgAnalyzerTimeout&&(clearTimeout(this.imgAnalyzerTimeout),this.imgAnalyzerTimeout=null)},c.prototype.startImgAnalyzer=function(a){var b=this;this.stopImgAnalyzerStarter(),this.imgAnalyzerTimeout=setTimeout(function(){b.analyzeImages(a)},.001)},c.prototype.onImageEvent=function(b,c,d){if(c||d){var e=new Image,f=a(e);c&&f.one("load",function(){f.off("load error"),c(e)}),d&&f.one("error",function(){f.off("load error"),d(e)}),e.src=b}},c.prototype.init=function(){var b=!1,c=!1,d=this;a.each(this.entries,function(e,f){var g=a(f),h=d.imgFromEntry(g);if(g.addClass("jg-entry"),g.data("jg.loaded")!==!0&&"skipped"!==g.data("jg.loaded"))if(null!==d.settings.rel&&g.attr("rel",d.settings.rel),null!==d.settings.target&&g.attr("target",d.settings.target),null!==h){var i=d.extractImgSrcFromImage(h);if(h.attr("src",i),d.settings.waitThumbnailsLoad===!1){var j=parseFloat(h.prop("width")),k=parseFloat(h.prop("height"));if(!isNaN(j)&&!isNaN(k))return g.data("jg.width",j),g.data("jg.height",k),g.data("jg.loaded","skipped"),c=!0,d.startImgAnalyzer(!1),!0}g.data("jg.loaded",!1),b=!0,d.isSpinnerActive()||d.startLoadingSpinnerAnimation(),d.onImageEvent(i,function(a){g.data("jg.width",a.width),g.data("jg.height",a.height),g.data("jg.loaded",!0),d.startImgAnalyzer(!1)},function(){g.data("jg.loaded","error"),d.startImgAnalyzer(!1)})}else g.data("jg.loaded",!0),g.data("jg.width",g.width()|parseFloat(g.css("width"))|1),g.data("jg.height",g.height()|parseFloat(g.css("height"))|1)}),b||c||this.startImgAnalyzer(!1),this.checkWidth()},c.prototype.checkOrConvertNumber=function(b,c){if("string"===a.type(b[c])&&(b[c]=parseFloat(b[c])),"number"!==a.type(b[c]))throw c+" must be a number";if(isNaN(b[c]))throw"invalid number for "+c},c.prototype.checkSizeRangesSuffixes=function(){if("object"!==a.type(this.settings.sizeRangeSuffixes))throw"sizeRangeSuffixes must be defined and must be an object";var b=[];for(var c in this.settings.sizeRangeSuffixes)this.settings.sizeRangeSuffixes.hasOwnProperty(c)&&b.push(c);for(var d={0:""},e=0;eb&&(b=c),b},c.prototype.checkSettings=function(){this.checkSizeRangesSuffixes(),this.checkOrConvertNumber(this.settings,"rowHeight"),this.checkOrConvertNumber(this.settings,"margins"),this.checkOrConvertNumber(this.settings,"border");var b=["justify","nojustify","left","center","right","hide"];if(-1===b.indexOf(this.settings.lastRow))throw"lastRow must be one of: "+b.join(", ");if(this.checkOrConvertNumber(this.settings,"justifyThreshold"),this.settings.justifyThreshold<0||this.settings.justifyThreshold>1)throw"justifyThreshold must be in the interval [0,1]";if("boolean"!==a.type(this.settings.cssAnimation))throw"cssAnimation must be a boolean";if("boolean"!==a.type(this.settings.captions))throw"captions must be a boolean";if(this.checkOrConvertNumber(this.settings.captionSettings,"animationDuration"),this.checkOrConvertNumber(this.settings.captionSettings,"visibleOpacity"),this.settings.captionSettings.visibleOpacity<0||this.settings.captionSettings.visibleOpacity>1)throw"captionSettings.visibleOpacity must be in the interval [0, 1]";if(this.checkOrConvertNumber(this.settings.captionSettings,"nonVisibleOpacity"),this.settings.captionSettings.nonVisibleOpacity<0||this.settings.captionSettings.nonVisibleOpacity>1)throw"captionSettings.nonVisibleOpacity must be in the interval [0, 1]";if(this.checkOrConvertNumber(this.settings,"imagesAnimationDuration"),this.checkOrConvertNumber(this.settings,"refreshTime"),this.checkOrConvertNumber(this.settings,"refreshSensitivity"),"boolean"!==a.type(this.settings.randomize))throw"randomize must be a boolean";if("string"!==a.type(this.settings.selector))throw"selector must be a string";if(this.settings.sort!==!1&&!a.isFunction(this.settings.sort))throw"sort must be false or a comparison function";if(this.settings.filter!==!1&&!a.isFunction(this.settings.filter)&&"string"!==a.type(this.settings.filter))throw"filter must be false, a string or a filter function"},c.prototype.retrieveSuffixRanges=function(){var a=[];for(var b in this.settings.sizeRangeSuffixes)this.settings.sizeRangeSuffixes.hasOwnProperty(b)&&a.push(parseInt(b,10));return a.sort(function(a,b){return a>b?1:b>a?-1:0}),a},c.prototype.updateSettings=function(b){this.settings=a.extend({},this.settings,b),this.checkSettings(),this.border=this.settings.border>=0?this.settings.border:this.settings.margins,this.maxRowHeight=this.retrieveMaxRowHeight(),this.suffixRanges=this.retrieveSuffixRanges()},a.fn.justifiedGallery=function(b){return this.each(function(d,e){var f=a(e);f.addClass("justified-gallery");var g=f.data("jg.controller");if("undefined"==typeof g){if("undefined"!=typeof b&&null!==b&&"object"!==a.type(b)){if("destroy"===b)return;throw"The argument must be an object"}g=new c(f,a.extend({},a.fn.justifiedGallery.defaults,b)),f.data("jg.controller",g)}else if("norewind"===b);else{if("destroy"===b)return void g.destroy();g.updateSettings(b),g.rewind()}g.updateEntries("norewind"===b)&&g.init()})},a.fn.justifiedGallery.defaults={sizeRangeSuffixes:{},thumbnailPath:void 0,rowHeight:120,maxRowHeight:!1,margins:1,border:-1,lastRow:"nojustify",justifyThreshold:.9,waitThumbnailsLoad:!0,captions:!0,cssAnimation:!0,imagesAnimationDuration:500,captionSettings:{animationDuration:500,visibleOpacity:.7,nonVisibleOpacity:0},rel:null,target:null,extension:/\.[^.\\/]+$/,refreshTime:200,refreshSensitivity:0,randomize:!1,rtl:!1,sort:!1,filter:!1,selector:"a, div:not(.spinner)",imgSelector:"> img, > a > img"}}(jQuery); \ No newline at end of file + +!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof module&&module.exports?module.exports=function(t,i){return void 0===i&&(i="undefined"!=typeof window?require("jquery"):require("jquery")(t)),e(i),i}:e(jQuery)}(function(g){var r=function(t,i){this.settings=i,this.checkSettings(),this.imgAnalyzerTimeout=null,this.entries=null,this.buildingRow={entriesBuff:[],width:0,height:0,aspectRatio:0},this.lastFetchedEntry=null,this.lastAnalyzedIndex=-1,this.yield={every:2,flushed:0},this.border=0<=i.border?i.border:i.margins,this.maxRowHeight=this.retrieveMaxRowHeight(),this.suffixRanges=this.retrieveSuffixRanges(),this.offY=this.border,this.rows=0,this.spinner={phase:0,timeSlot:150,$el:g(''),intervalId:null},this.scrollBarOn=!1,this.checkWidthIntervalId=null,this.galleryWidth=t.width(),this.$gallery=t};r.prototype.getSuffix=function(t,i){var e,s;for(e=i .caption");return 0===i.length?null:i},r.prototype.displayEntry=function(t,i,e,s,n,r){t.width(s),t.height(r),t.css("top",e),t.css("left",i);var o=this.imgFromEntry(t);if(null!==o){o.css("width",s),o.css("height",n),o.css("margin-left",-s/2),o.css("margin-top",-n/2);var a=o.attr("src"),h=this.newSrc(a,s,n,o[0]);o.one("error",function(){o.attr("src",o.data("jg.originalSrc"))});var l=function(){a!==h&&o.attr("src",h)};"skipped"===t.data("jg.loaded")?this.onImageEvent(a,g.proxy(function(){this.showImg(t,l),t.data("jg.loaded",!0)},this)):this.showImg(t,l)}else this.showImg(t);this.displayEntryCaption(t)},r.prototype.displayEntryCaption=function(t){var i=this.imgFromEntry(t);if(null!==i&&this.settings.captions){var e=this.captionFromEntry(t);if(null===e){var s=i.attr("alt");this.isValidCaption(s)||(s=t.attr("title")),this.isValidCaption(s)&&(e=g('
      '+s+"
      "),t.append(e),t.data("jg.createdCaption",!0))}null!==e&&(this.settings.cssAnimation||e.stop().fadeTo(0,this.settings.captionSettings.nonVisibleOpacity),this.addCaptionEventsHandlers(t))}else this.removeCaptionEventsHandlers(t)},r.prototype.isValidCaption=function(t){return void 0!==t&&0this.settings.justifyThreshold;if(t&&"hide"===this.settings.lastRow&&!u){for(i=0;i img, > a > img").fadeTo(0,0));return-1}for(t&&!u&&"justify"!==this.settings.lastRow&&"hide"!==this.settings.lastRow&&(o=!1,0this.settings.justifyThreshold)),i=0;ig(window).height()}r.prototype.rememberGalleryHeight=function(){i=this.$gallery.height(),this.$gallery.height(i)},r.prototype.setGalleryTempHeight=function(t){i=Math.max(t,i),this.$gallery.height(i)},r.prototype.setGalleryFinalHeight=function(t){i=t,this.$gallery.height(t)},r.prototype.checkWidth=function(){this.checkWidthIntervalId=setInterval(g.proxy(function(){if(this.$gallery.is(":visible")){var t=parseFloat(this.$gallery.width());e()===this.scrollBarOn?Math.abs(t-this.galleryWidth)>this.settings.refreshSensitivity&&(this.galleryWidth=t,this.rewind(),this.rememberGalleryHeight(),this.startImgAnalyzer(!0)):(this.scrollBarOn=e(),this.galleryWidth=t)}},this),this.settings.refreshTime)},r.prototype.isSpinnerActive=function(){return null!==this.spinner.intervalId},r.prototype.getSpinnerHeight=function(){return this.spinner.$el.innerHeight()},r.prototype.stopLoadingSpinnerAnimation=function(){clearInterval(this.spinner.intervalId),this.spinner.intervalId=null,this.setGalleryTempHeight(this.$gallery.height()-this.getSpinnerHeight()),this.spinner.$el.detach()},r.prototype.startLoadingSpinnerAnimation=function(){var t=this.spinner,i=t.$el.find("span");clearInterval(t.intervalId),this.$gallery.append(t.$el),this.setGalleryTempHeight(this.offY+this.buildingRow.height+this.getSpinnerHeight()),t.intervalId=setInterval(function(){t.phase=this.yield.every))return void this.startImgAnalyzer(t);this.buildingRow.entriesBuff.push(e),this.buildingRow.aspectRatio+=n,this.buildingRow.width+=n*this.settings.rowHeight,this.lastAnalyzedIndex=i}else if("error"!==e.data("jg.loaded"))return}0 img, > a > img",triggerEvent:function(t){this.$gallery.trigger(t)}},g.fn.justifiedGallery=function(n){return this.each(function(t,i){var e=g(i);e.addClass("justified-gallery");var s=e.data("jg.controller");if(void 0===s){if(null!=n&&"object"!==g.type(n)){if("destroy"===n)return;throw"The argument must be an object"}s=new r(e,g.extend({},r.prototype.defaults,n)),e.data("jg.controller",s)}else if("norewind"===n);else{if("destroy"===n)return void s.destroy();s.updateSettings(n),s.rewind()}s.updateEntries("norewind"===n)&&s.init()})}}); \ No newline at end of file diff --git a/library/justifiedGallery/justifiedGallery.css b/library/justifiedGallery/justifiedGallery.css index 3b1da6850..8b753dc38 100644 --- a/library/justifiedGallery/justifiedGallery.css +++ b/library/justifiedGallery/justifiedGallery.css @@ -1,5 +1,5 @@ /*! - * Justified Gallery - v3.6.5 + * justifiedGallery - v3.7.0 * http://miromannino.github.io/Justified-Gallery/ * Copyright (c) 2018 Miro Mannino * Licensed under the MIT license. diff --git a/library/justifiedGallery/justifiedGallery.min.css b/library/justifiedGallery/justifiedGallery.min.css index ba8b177d7..8b753dc38 100644 --- a/library/justifiedGallery/justifiedGallery.min.css +++ b/library/justifiedGallery/justifiedGallery.min.css @@ -1,7 +1,102 @@ /*! - * Justified Gallery - v3.6.5 + * justifiedGallery - v3.7.0 * http://miromannino.github.io/Justified-Gallery/ * Copyright (c) 2018 Miro Mannino * Licensed under the MIT license. */ -.justified-gallery{width:100%;position:relative;overflow:hidden}.justified-gallery>a,.justified-gallery>div,.justified-gallery>figure{position:absolute;display:inline-block;overflow:hidden;filter:"alpha(opacity=10)";opacity:.1;margin:0;padding:0}.justified-gallery>a>img,.justified-gallery>div>img,.justified-gallery>figure>img,.justified-gallery>a>a>img,.justified-gallery>div>a>img,.justified-gallery>figure>a>img{position:absolute;top:50%;left:50%;margin:0;padding:0;border:0;filter:"alpha(opacity=0)";opacity:0}.justified-gallery>a>.caption,.justified-gallery>div>.caption,.justified-gallery>figure>.caption{display:none;position:absolute;bottom:0;padding:5px;background-color:#000;left:0;right:0;margin:0;color:#fff;font-size:12px;font-weight:300;font-family:sans-serif}.justified-gallery>a>.caption.caption-visible,.justified-gallery>div>.caption.caption-visible,.justified-gallery>figure>.caption.caption-visible{display:initial;filter:"alpha(opacity=70)";opacity:.7;-webkit-transition:opacity 500ms ease-in;-moz-transition:opacity 500ms ease-in;-o-transition:opacity 500ms ease-in;transition:opacity 500ms ease-in}.justified-gallery>.entry-visible{filter:"alpha(opacity=100)";opacity:1;background:0 0}.justified-gallery>.entry-visible>img,.justified-gallery>.entry-visible>a>img{filter:"alpha(opacity=100)";opacity:1;-webkit-transition:opacity 500ms ease-in;-moz-transition:opacity 500ms ease-in;-o-transition:opacity 500ms ease-in;transition:opacity 500ms ease-in}.justified-gallery>.jg-filtered{display:none}.justified-gallery>.spinner{position:absolute;bottom:0;margin-left:-24px;padding:10px 0;left:50%;filter:"alpha(opacity=100)";opacity:1;overflow:initial}.justified-gallery>.spinner>span{display:inline-block;filter:"alpha(opacity=0)";opacity:0;width:8px;height:8px;margin:0 4px;background-color:#000;border-radius:6px} \ No newline at end of file +.justified-gallery { + width: 100%; + position: relative; + overflow: hidden; +} +.justified-gallery > a, +.justified-gallery > div, +.justified-gallery > figure { + position: absolute; + display: inline-block; + overflow: hidden; + /* background: #888888; To have gray placeholders while the gallery is loading with waitThumbnailsLoad = false */ + filter: "alpha(opacity=10)"; + opacity: 0.1; + margin: 0; + padding: 0; +} +.justified-gallery > a > img, +.justified-gallery > div > img, +.justified-gallery > figure > img, +.justified-gallery > a > a > img, +.justified-gallery > div > a > img, +.justified-gallery > figure > a > img { + position: absolute; + top: 50%; + left: 50%; + margin: 0; + padding: 0; + border: none; + filter: "alpha(opacity=0)"; + opacity: 0; +} +.justified-gallery > a > .caption, +.justified-gallery > div > .caption, +.justified-gallery > figure > .caption { + display: none; + position: absolute; + bottom: 0; + padding: 5px; + background-color: #000000; + left: 0; + right: 0; + margin: 0; + color: white; + font-size: 12px; + font-weight: 300; + font-family: sans-serif; +} +.justified-gallery > a > .caption.caption-visible, +.justified-gallery > div > .caption.caption-visible, +.justified-gallery > figure > .caption.caption-visible { + display: initial; + filter: "alpha(opacity=70)"; + opacity: 0.7; + -webkit-transition: opacity 500ms ease-in; + -moz-transition: opacity 500ms ease-in; + -o-transition: opacity 500ms ease-in; + transition: opacity 500ms ease-in; +} +.justified-gallery > .entry-visible { + filter: "alpha(opacity=100)"; + opacity: 1; + background: none; +} +.justified-gallery > .entry-visible > img, +.justified-gallery > .entry-visible > a > img { + filter: "alpha(opacity=100)"; + opacity: 1; + -webkit-transition: opacity 500ms ease-in; + -moz-transition: opacity 500ms ease-in; + -o-transition: opacity 500ms ease-in; + transition: opacity 500ms ease-in; +} +.justified-gallery > .jg-filtered { + display: none; +} +.justified-gallery > .spinner { + position: absolute; + bottom: 0; + margin-left: -24px; + padding: 10px 0 10px 0; + left: 50%; + filter: "alpha(opacity=100)"; + opacity: 1; + overflow: initial; +} +.justified-gallery > .spinner > span { + display: inline-block; + filter: "alpha(opacity=0)"; + opacity: 0; + width: 8px; + height: 8px; + margin: 0 4px 0 4px; + background-color: #000; + border-radius: 6px; +} diff --git a/view/php/full.php b/view/php/full.php index 094874766..1a9cd9a84 100644 --- a/view/php/full.php +++ b/view/php/full.php @@ -1,14 +1,15 @@ - + <?php if(x($page,'title')) echo $page['title'] ?> - + > +
      - -
      + +
      -- cgit v1.2.3 From bb786b1f61e1738949f625aff97ea42bd1edd6af Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 25 Jun 2018 14:30:52 +0200 Subject: version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index f3603acc9..2c4fad641 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.5.7' ); +define ( 'STD_VERSION', '3.5.8' ); define ( 'ZOT_REVISION', '6.0a' ); -- cgit v1.2.3 From f66fb8e2a866f5ad638f34385cf6c24da7419c1b Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 25 Jun 2018 13:20:12 -0700 Subject: SECURITY: logging: hash the session_id in case somebody posts log snippets from active sessions; also provide a hashed process_id if using a daemon process (with no session) for easier tracking of related log events --- include/text.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/include/text.php b/include/text.php index 8bade6e90..7d62895bd 100644 --- a/include/text.php +++ b/include/text.php @@ -665,7 +665,7 @@ function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) { $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2); $where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': '; - $s = datetime_convert('UTC','UTC', 'now', ATOM_TIME) . ':' . log_priority_str($priority) . ':' . session_id() . ':' . $where . $msg . PHP_EOL; + $s = datetime_convert('UTC','UTC', 'now', ATOM_TIME) . ':' . log_priority_str($priority) . ':' . logid() . ':' . $where . $msg . PHP_EOL; $pluginfo = array('filename' => $logfile, 'loglevel' => $level, 'message' => $s,'priority' => $priority, 'logged' => false); if(! (App::$module == 'setup')) @@ -675,6 +675,13 @@ function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) { @file_put_contents($pluginfo['filename'], $pluginfo['message'], FILE_APPEND); } +function logid() { + $x = session_id(); + if(! $x) + $x = getmypid(); + return hash('crc32',$x); +} + /** * @brief like logger() but with a function backtrace to pinpoint certain classes * of problems which show up deep in the calling stack. @@ -693,7 +700,7 @@ function btlogger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) { if(file_exists(BTLOGGER_DEBUG_FILE) && is_writable(BTLOGGER_DEBUG_FILE)) { $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2); $where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': '; - $s = datetime_convert('UTC','UTC', 'now', ATOM_TIME) . ':' . log_priority_str($priority) . ':' . session_id() . ':' . $where . $msg . PHP_EOL; + $s = datetime_convert('UTC','UTC', 'now', ATOM_TIME) . ':' . log_priority_str($priority) . ':' . logid() . ':' . $where . $msg . PHP_EOL; @file_put_contents(BTLOGGER_DEBUG_FILE, $s, FILE_APPEND); } @@ -764,7 +771,7 @@ function dlogger($msg, $level = 0) { $where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': '; - @file_put_contents($logfile, datetime_convert('UTC','UTC', 'now', ATOM_TIME) . ':' . session_id() . ' ' . $where . $msg . PHP_EOL, FILE_APPEND); + @file_put_contents($logfile, datetime_convert('UTC','UTC', 'now', ATOM_TIME) . ':' . logid() . ' ' . $where . $msg . PHP_EOL, FILE_APPEND); } -- cgit v1.2.3 From 66fc12c928c51aab95b0803b1e1fb980d38c502b Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 25 Jun 2018 13:33:23 -0700 Subject: crc32 is potentially reversible --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index 7d62895bd..122605443 100644 --- a/include/text.php +++ b/include/text.php @@ -679,7 +679,7 @@ function logid() { $x = session_id(); if(! $x) $x = getmypid(); - return hash('crc32',$x); + return substr(hash('whirlpool',$x),0,10); } /** -- cgit v1.2.3 From 712759ea4b587f9d5b9dfac7216b7f14f32e7792 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 25 Jun 2018 13:42:21 -0700 Subject: disable log noise until it is needed --- Zotlabs/Module/Acl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 7b52e88b5..0c2ad7522 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -24,7 +24,7 @@ class Acl extends \Zotlabs\Web\Controller { function init() { - logger('mod_acl: ' . print_r($_REQUEST,true),LOGGER_DATA); + // logger('mod_acl: ' . print_r($_GET,true),LOGGER_DATA); $start = (x($_REQUEST,'start') ? $_REQUEST['start'] : 0); $count = (x($_REQUEST,'count') ? $_REQUEST['count'] : 500); -- cgit v1.2.3 From 524551a05c9ea7436afc713e2564aacd9276541e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 25 Jun 2018 23:20:02 -0700 Subject: do not include system channels in directory results --- Zotlabs/Module/Dirsearch.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php index 08f1f7a13..81942860f 100644 --- a/Zotlabs/Module/Dirsearch.php +++ b/Zotlabs/Module/Dirsearch.php @@ -257,7 +257,7 @@ class Dirsearch extends \Zotlabs\Web\Controller { else { $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash - where ( $logic $sql_extra ) $hub_query and xchan_network = 'zot' and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 + where ( $logic $sql_extra ) $hub_query and xchan_network = 'zot' and xchan_system = 0 and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 $safesql $order $qlimit " ); -- cgit v1.2.3 From 156010050c874eb51f8d2b2334d36909f99e732c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 26 Jun 2018 17:19:32 -0700 Subject: imagick converter: -thumbnail doesn't preserve exif, -resize does --- Zotlabs/Module/Cover_photo.php | 2 +- Zotlabs/Thumbs/Pdf.php | 2 +- Zotlabs/Thumbs/Video.php | 2 +- include/photos.php | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index 88fd4485d..b911ac991 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -95,7 +95,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { $fname = dbunescbin($r[0]['content']); $tmp_name = $fname . '-001'; $newsize = photo_calculate_scale(array_merge(getimagesize($fname),['max' => $max_thumb])); - $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -thumbnail ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); + $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); // logger('imagick thumbnail command: ' . $cmd); for($x = 0; $x < 4; $x ++) { exec($cmd); diff --git a/Zotlabs/Thumbs/Pdf.php b/Zotlabs/Thumbs/Pdf.php index 98bcf11b5..11714ad53 100644 --- a/Zotlabs/Thumbs/Pdf.php +++ b/Zotlabs/Thumbs/Pdf.php @@ -27,7 +27,7 @@ class Pdf { $imagick_path = get_config('system','imagick_convert_path'); if($imagick_path && @file_exists($imagick_path)) { - $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -thumbnail ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile); + $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -resize ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile); // logger('imagick thumbnail command: ' . $cmd); for($x = 0; $x < 4; $x ++) { exec($cmd); diff --git a/Zotlabs/Thumbs/Video.php b/Zotlabs/Thumbs/Video.php index ff4d10a36..15d3ace12 100644 --- a/Zotlabs/Thumbs/Video.php +++ b/Zotlabs/Thumbs/Video.php @@ -46,7 +46,7 @@ class Video { $imagick_path = get_config('system','imagick_convert_path'); if($imagick_path && @file_exists($imagick_path)) { - $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -thumbnail ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile); + $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -resize ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile); // logger('imagick thumbnail command: ' . $cmd); /** @scrutinizer ignore-unhandled */ diff --git a/include/photos.php b/include/photos.php index 9fb872700..d0c5f77fc 100644 --- a/include/photos.php +++ b/include/photos.php @@ -80,8 +80,8 @@ function photo_upload($channel, $observer, $args) { if($imagick_path && @file_exists($imagick_path)) { $tmp_name = $args['os_syspath'] . '-001'; $newsize = photo_calculate_scale(array_merge($args['getimagesize'],['max' => $max_thumb])); - $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $args['os_syspath']) . ' -thumbnail ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); - // logger('imagick thumbnail command: ' . $cmd); + $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $args['os_syspath']) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); + logger('imagick thumbnail command: ' . $cmd); for($x = 0; $x < 4; $x ++) { exec($cmd); if(file_exists($tmp_name)) { @@ -97,7 +97,7 @@ function photo_upload($channel, $observer, $args) { $imagedata = @file_get_contents($tmp_name); $filesize = @filesize($args['os_syspath']); - @unlink($tmp_name); +// @unlink($tmp_name); } else { $imagedata = @file_get_contents($args['os_syspath']); -- cgit v1.2.3 From cae0a26ac087448a12b3bb913bc53f6c9b6603d4 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 28 Jun 2018 13:38:15 -0700 Subject: String change to reflect the current forum tagging method --- Zotlabs/Access/Permissions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Access/Permissions.php b/Zotlabs/Access/Permissions.php index bca40a9c1..20dc22a72 100644 --- a/Zotlabs/Access/Permissions.php +++ b/Zotlabs/Access/Permissions.php @@ -67,7 +67,7 @@ class Permissions { 'post_comments' => t('Can comment on or like my posts'), 'post_mail' => t('Can send me private mail messages'), 'post_like' => t('Can like/dislike profiles and profile things'), - 'tag_deliver' => t('Can forward to all my channel connections via @+ mentions in posts'), + 'tag_deliver' => t('Can forward to all my channel connections via ! mentions in posts'), 'chat' => t('Can chat with me'), 'republish' => t('Can source my public posts in derived channels'), 'delegate' => t('Can administer my channel') -- cgit v1.2.3 From fa6e5e4d754fec3acee019ed1edaa68357f0c2d0 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 28 Jun 2018 16:43:22 -0700 Subject: plugins -> addons --- Zotlabs/Module/Admin.php | 2 +- Zotlabs/Module/Admin/Addons.php | 479 +++++++++++++++++++++ Zotlabs/Module/Admin/Plugins.php | 479 --------------------- Zotlabs/Widget/Admin.php | 6 +- .../en/admin/addons/assets/addon_repo_gui_1.png | Bin 0 -> 16983 bytes doc/context/en/admin/addons/help.html | 14 + .../en/admin/plugins/assets/addon_repo_gui_1.png | Bin 16983 -> 0 bytes doc/context/en/admin/plugins/help.html | 14 - .../es-es/admin/addons/assets/addon_repo_gui_1.png | Bin 0 -> 16983 bytes doc/context/es-es/admin/addons/help.html | 14 + .../admin/plugins/assets/addon_repo_gui_1.png | Bin 16983 -> 0 bytes doc/context/es-es/admin/plugins/help.html | 14 - view/tpl/admin_plugins.tpl | 8 +- 13 files changed, 515 insertions(+), 515 deletions(-) create mode 100644 Zotlabs/Module/Admin/Addons.php delete mode 100644 Zotlabs/Module/Admin/Plugins.php create mode 100644 doc/context/en/admin/addons/assets/addon_repo_gui_1.png create mode 100644 doc/context/en/admin/addons/help.html delete mode 100644 doc/context/en/admin/plugins/assets/addon_repo_gui_1.png delete mode 100644 doc/context/en/admin/plugins/help.html create mode 100644 doc/context/es-es/admin/addons/assets/addon_repo_gui_1.png create mode 100644 doc/context/es-es/admin/addons/help.html delete mode 100644 doc/context/es-es/admin/plugins/assets/addon_repo_gui_1.png delete mode 100644 doc/context/es-es/admin/plugins/help.html diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 934312efe..2df8dc25d 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -144,7 +144,7 @@ class Admin extends \Zotlabs\Web\Controller { '$accounts' => array( t('Registered accounts'), $accounts), '$pending' => array( t('Pending registrations'), $pending), '$channels' => array( t('Registered channels'), $channels), - '$plugins' => array( t('Active plugins'), $plugins ), + '$plugins' => array( t('Active addons'), $plugins ), '$version' => array( t('Version'), STD_VERSION), '$vmaster' => array( t('Repository version (master)'), $vmaster), '$vdev' => array( t('Repository version (dev)'), $vdev), diff --git a/Zotlabs/Module/Admin/Addons.php b/Zotlabs/Module/Admin/Addons.php new file mode 100644 index 000000000..b35922aef --- /dev/null +++ b/Zotlabs/Module/Admin/Addons.php @@ -0,0 +1,479 @@ + 2 && is_file("addon/" . argv(2) . "/" . argv(2) . ".php")) { + @include_once("addon/" . argv(2) . "/" . argv(2) . ".php"); + if(function_exists(argv(2).'_plugin_admin_post')) { + $func = argv(2) . '_plugin_admin_post'; + $func($a); + } + + goaway(z_root() . '/admin/addons/' . argv(2) ); + } + elseif(argc() > 2) { + switch(argv(2)) { + case 'updaterepo': + if (array_key_exists('repoName', $_REQUEST)) { + $repoName = $_REQUEST['repoName']; + } + else { + json_return_and_die(array('message' => 'No repo name provided.', 'success' => false)); + } + $extendDir = 'store/[data]/git/sys/extend'; + $addonDir = $extendDir . '/addon'; + if (!file_exists($extendDir)) { + if (!mkdir($extendDir, 0770, true)) { + logger('Error creating extend folder: ' . $extendDir); + json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); + } + else { + if (!symlink(realpath('extend/addon'), $addonDir)) { + logger('Error creating symlink to addon folder: ' . $addonDir); + json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); + } + } + } + $repoDir = 'store/[data]/git/sys/extend/addon/' . $repoName; + if (!is_dir($repoDir)) { + logger('Repo directory does not exist: ' . $repoDir); + json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false)); + } + if (!is_writable($repoDir)) { + logger('Repo directory not writable to web server: ' . $repoDir); + json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false)); + } + $git = new GitRepo('sys', null, false, $repoName, $repoDir); + try { + if ($git->pull()) { + $files = array_diff(scandir($repoDir), array('.', '..')); + foreach ($files as $file) { + if (is_dir($repoDir . '/' . $file) && $file !== '.git') { + $source = '../extend/addon/' . $repoName . '/' . $file; + $target = realpath('addon/') . '/' . $file; + unlink($target); + if (!symlink($source, $target)) { + logger('Error linking addons to /addon'); + json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false)); + } + } + } + json_return_and_die(array('message' => 'Repo updated.', 'success' => true)); + } else { + json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false)); + } + } catch (\PHPGit\Exception\GitException $e) { + json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false)); + } + case 'removerepo': + if (array_key_exists('repoName', $_REQUEST)) { + $repoName = $_REQUEST['repoName']; + } else { + json_return_and_die(array('message' => 'No repo name provided.', 'success' => false)); + } + $extendDir = 'store/[data]/git/sys/extend'; + $addonDir = $extendDir . '/addon'; + if (!file_exists($extendDir)) { + if (!mkdir($extendDir, 0770, true)) { + logger('Error creating extend folder: ' . $extendDir); + json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); + } else { + if (!symlink(realpath('extend/addon'), $addonDir)) { + logger('Error creating symlink to addon folder: ' . $addonDir); + json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); + } + } + } + $repoDir = 'store/[data]/git/sys/extend/addon/' . $repoName; + if (!is_dir($repoDir)) { + logger('Repo directory does not exist: ' . $repoDir); + json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false)); + } + if (!is_writable($repoDir)) { + logger('Repo directory not writable to web server: ' . $repoDir); + json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false)); + } + /// @TODO remove directory and unlink /addon/files + if (rrmdir($repoDir)) { + json_return_and_die(array('message' => 'Repo deleted.', 'success' => true)); + } else { + json_return_and_die(array('message' => 'Error deleting addon repo.', 'success' => false)); + } + case 'installrepo': + if (array_key_exists('repoURL', $_REQUEST)) { + require_once('library/PHPGit.autoload.php'); // Load PHPGit dependencies + $repoURL = $_REQUEST['repoURL']; + $extendDir = 'store/[data]/git/sys/extend'; + $addonDir = $extendDir . '/addon'; + if (!file_exists($extendDir)) { + if (!mkdir($extendDir, 0770, true)) { + logger('Error creating extend folder: ' . $extendDir); + json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); + } else { + if (!symlink(realpath('extend/addon'), $addonDir)) { + logger('Error creating symlink to addon folder: ' . $addonDir); + json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); + } + } + } + if (!is_writable($extendDir)) { + logger('Directory not writable to web server: ' . $extendDir); + json_return_and_die(array('message' => 'Directory not writable to web server.', 'success' => false)); + } + $repoName = null; + if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') { + $repoName = $_REQUEST['repoName']; + } else { + $repoName = GitRepo::getRepoNameFromURL($repoURL); + } + if (!$repoName) { + logger('Invalid git repo'); + json_return_and_die(array('message' => 'Invalid git repo', 'success' => false)); + } + $repoDir = $addonDir . '/' . $repoName; + $tempRepoBaseDir = 'store/[data]/git/sys/temp/'; + $tempAddonDir = $tempRepoBaseDir . $repoName; + + if (!is_writable($addonDir) || !is_writable($tempAddonDir)) { + logger('Temp repo directory or /extend/addon not writable to web server: ' . $tempAddonDir); + json_return_and_die(array('message' => 'Temp repo directory not writable to web server.', 'success' => false)); + } + rename($tempAddonDir, $repoDir); + + if (!is_writable(realpath('addon/'))) { + logger('/addon directory not writable to web server: ' . $tempAddonDir); + json_return_and_die(array('message' => '/addon directory not writable to web server.', 'success' => false)); + } + $files = array_diff(scandir($repoDir), array('.', '..')); + foreach ($files as $file) { + if (is_dir($repoDir . '/' . $file) && $file !== '.git') { + $source = '../extend/addon/' . $repoName . '/' . $file; + $target = realpath('addon/') . '/' . $file; + unlink($target); + if (!symlink($source, $target)) { + logger('Error linking addons to /addon'); + json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false)); + } + } + } + $git = new GitRepo('sys', $repoURL, false, $repoName, $repoDir); + $repo = $git->probeRepo(); + json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true)); + } + case 'addrepo': + if (array_key_exists('repoURL', $_REQUEST)) { + require_once('library/PHPGit.autoload.php'); // Load PHPGit dependencies + $repoURL = $_REQUEST['repoURL']; + $extendDir = 'store/[data]/git/sys/extend'; + $addonDir = $extendDir . '/addon'; + $tempAddonDir = realpath('store/[data]') . '/git/sys/temp'; + if (!file_exists($extendDir)) { + if (!mkdir($extendDir, 0770, true)) { + logger('Error creating extend folder: ' . $extendDir); + json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); + } else { + if (!symlink(realpath('extend/addon'), $addonDir)) { + logger('Error creating symlink to addon folder: ' . $addonDir); + json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); + } + } + } + if (!is_dir($tempAddonDir)) { + if (!mkdir($tempAddonDir, 0770, true)) { + logger('Error creating temp plugin repo folder: ' . $tempAddonDir); + json_return_and_die(array('message' => 'Error creating temp plugin repo folder: ' . $tempAddonDir, 'success' => false)); + } + } + $repoName = null; + if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') { + $repoName = $_REQUEST['repoName']; + } else { + $repoName = GitRepo::getRepoNameFromURL($repoURL); + } + if (!$repoName) { + logger('Invalid git repo'); + json_return_and_die(array('message' => 'Invalid git repo: ' . $repoName, 'success' => false)); + } + $repoDir = $tempAddonDir . '/' . $repoName; + if (!is_writable($tempAddonDir)) { + logger('Temporary directory for new addon repo is not writable to web server: ' . $tempAddonDir); + json_return_and_die(array('message' => 'Temporary directory for new addon repo is not writable to web server.', 'success' => false)); + } + // clone the repo if new automatically + $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir); + + $remotes = $git->git->remote(); + $fetchURL = $remotes['origin']['fetch']; + if ($fetchURL !== $git->url) { + if (rrmdir($repoDir)) { + $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir); + } else { + json_return_and_die(array('message' => 'Error deleting existing addon repo.', 'success' => false)); + } + } + $repo = $git->probeRepo(); + $repo['readme'] = $repo['manifest'] = null; + foreach ($git->git->tree('master') as $object) { + if ($object['type'] == 'blob' && (strtolower($object['file']) === 'readme.md' || strtolower($object['file']) === 'readme')) { + $repo['readme'] = MarkdownExtra::defaultTransform($git->git->cat->blob($object['hash'])); + } else if ($object['type'] == 'blob' && strtolower($object['file']) === 'manifest.json') { + $repo['manifest'] = $git->git->cat->blob($object['hash']); + } + } + json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true)); + } else { + json_return_and_die(array('message' => 'No repo URL provided', 'success' => false)); + } + break; + default: + break; + } + } + } + + /** + * @brief Addons admin page. + * + * @return string with parsed HTML + */ + function get() { + + /* + * Single plugin + */ + + if (\App::$argc == 3){ + $plugin = \App::$argv[2]; + if (!is_file("addon/$plugin/$plugin.php")){ + notice( t("Item not found.") ); + return ''; + } + + $enabled = in_array($plugin,\App::$plugins); + $info = get_plugin_info($plugin); + $x = check_plugin_versions($info); + + // disable plugins which are installed but incompatible versions + + if($enabled && ! $x) { + $enabled = false; + $idz = array_search($plugin, \App::$plugins); + if ($idz !== false) { + unset(\App::$plugins[$idz]); + uninstall_plugin($plugin); + set_config("system","addon", implode(", ",\App::$plugins)); + } + } + $info['disabled'] = 1-intval($x); + + if (x($_GET,"a") && $_GET['a']=="t"){ + check_form_security_token_redirectOnErr('/admin/addons', 'admin_addons', 't'); + $pinstalled = false; + // Toggle plugin status + $idx = array_search($plugin, \App::$plugins); + if ($idx !== false){ + unset(\App::$plugins[$idx]); + uninstall_plugin($plugin); + $pinstalled = false; + info( sprintf( t("Plugin %s disabled."), $plugin ) ); + } else { + \App::$plugins[] = $plugin; + install_plugin($plugin); + $pinstalled = true; + info( sprintf( t("Plugin %s enabled."), $plugin ) ); + } + set_config("system","addon", implode(", ",\App::$plugins)); + + if($pinstalled) { + @require_once("addon/$plugin/$plugin.php"); + if(function_exists($plugin.'_plugin_admin')) + goaway(z_root() . '/admin/addons/' . $plugin); + } + goaway(z_root() . '/admin/addons' ); + } + + // display plugin details + + if (in_array($plugin, \App::$plugins)){ + $status = 'on'; + $action = t('Disable'); + } else { + $status = 'off'; + $action = t('Enable'); + } + + $readme = null; + if (is_file("addon/$plugin/README.md")){ + $readme = file_get_contents("addon/$plugin/README.md"); + $readme = MarkdownExtra::defaultTransform($readme); + } else if (is_file("addon/$plugin/README")){ + $readme = "
      ". file_get_contents("addon/$plugin/README") ."
      "; + } + + $admin_form = ''; + + $r = q("select * from addon where plugin_admin = 1 and aname = '%s' limit 1", + dbesc($plugin) + ); + + if($r) { + @require_once("addon/$plugin/$plugin.php"); + if(function_exists($plugin.'_plugin_admin')) { + $func = $plugin.'_plugin_admin'; + $func($a, $admin_form); + } + } + + + $t = get_markup_template('admin_plugins_details.tpl'); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Addons'), + '$toggle' => t('Toggle'), + '$settings' => t('Settings'), + '$baseurl' => z_root(), + + '$plugin' => $plugin, + '$status' => $status, + '$action' => $action, + '$info' => $info, + '$str_author' => t('Author: '), + '$str_maintainer' => t('Maintainer: '), + '$str_minversion' => t('Minimum project version: '), + '$str_maxversion' => t('Maximum project version: '), + '$str_minphpversion' => t('Minimum PHP version: '), + '$str_serverroles' => t('Compatible Server Roles: '), + '$str_requires' => t('Requires: '), + '$disabled' => t('Disabled - version incompatibility'), + + '$admin_form' => $admin_form, + '$function' => 'addons', + '$screenshot' => '', + '$readme' => $readme, + + '$form_security_token' => get_form_security_token('admin_addons'), + )); + } + + + /* + * List plugins + */ + $plugins = array(); + $files = glob('addon/*/'); + if($files) { + foreach($files as $file) { + if (is_dir($file)){ + list($tmp, $id) = array_map('trim', explode('/', $file)); + $info = get_plugin_info($id); + $enabled = in_array($id,\App::$plugins); + $x = check_plugin_versions($info); + + // disable plugins which are installed but incompatible versions + + if($enabled && ! $x) { + $enabled = false; + $idz = array_search($id, \App::$plugins); + if ($idz !== false) { + unset(\App::$plugins[$idz]); + uninstall_plugin($id); + set_config("system","addon", implode(", ",\App::$plugins)); + } + } + $info['disabled'] = 1-intval($x); + + $plugins[] = array( $id, (($enabled)?"on":"off") , $info); + } + } + } + + usort($plugins,'self::plugin_sort'); + + $allowManageRepos = false; + if(is_writable('extend/addon') && is_writable('store/[data]')) { + $allowManageRepos = true; + } + + $admin_plugins_add_repo_form= replace_macros( + get_markup_template('admin_plugins_addrepo.tpl'), array( + '$post' => 'admin/addons/addrepo', + '$desc' => t('Enter the public git repository URL of the addon repo.'), + '$repoURL' => array('repoURL', t('Addon repo git URL'), '', ''), + '$repoName' => array('repoName', t('Custom repo name'), '', '', t('(optional)')), + '$submit' => t('Download Addon Repo') + ) + ); + $newRepoModalID = random_string(3); + $newRepoModal = replace_macros( + get_markup_template('generic_modal.tpl'), array( + '$id' => $newRepoModalID, + '$title' => t('Install new repo'), + '$ok' => t('Install'), + '$cancel' => t('Cancel') + ) + ); + + $reponames = $this->listAddonRepos(); + $addonrepos = []; + foreach($reponames as $repo) { + $addonrepos[] = array('name' => $repo, 'description' => ''); + /// @TODO Parse repo info to provide more information about repos + } + + $t = get_markup_template('admin_plugins.tpl'); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Addons'), + '$submit' => t('Submit'), + '$baseurl' => z_root(), + '$function' => 'addons', + '$plugins' => $plugins, + '$disabled' => t('Disabled - version incompatibility'), + '$form_security_token' => get_form_security_token('admin_addons'), + '$allowManageRepos' => $allowManageRepos, + '$managerepos' => t('Manage Repos'), + '$installedtitle' => t('Installed Addon Repositories'), + '$addnewrepotitle' => t('Install a New Addon Repository'), + '$expandform' => false, + '$form' => $admin_plugins_add_repo_form, + '$newRepoModal' => $newRepoModal, + '$newRepoModalID' => $newRepoModalID, + '$addonrepos' => $addonrepos, + '$repoUpdateButton' => t('Update'), + '$repoBranchButton' => t('Switch branch'), + '$repoRemoveButton' => t('Remove') + )); + } + + function listAddonRepos() { + $addonrepos = []; + $addonDir = 'extend/addon/'; + if(is_dir($addonDir)) { + if ($handle = opendir($addonDir)) { + while (false !== ($entry = readdir($handle))) { + if ($entry != "." && $entry != "..") { + $addonrepos[] = $entry; + } + } + closedir($handle); + } + } + return $addonrepos; + } + + static public function plugin_sort($a,$b) { + return(strcmp(strtolower($a[2]['name']),strtolower($b[2]['name']))); + } + +} \ No newline at end of file diff --git a/Zotlabs/Module/Admin/Plugins.php b/Zotlabs/Module/Admin/Plugins.php deleted file mode 100644 index feb29e9d6..000000000 --- a/Zotlabs/Module/Admin/Plugins.php +++ /dev/null @@ -1,479 +0,0 @@ - 2 && is_file("addon/" . argv(2) . "/" . argv(2) . ".php")) { - @include_once("addon/" . argv(2) . "/" . argv(2) . ".php"); - if(function_exists(argv(2).'_plugin_admin_post')) { - $func = argv(2) . '_plugin_admin_post'; - $func($a); - } - - goaway(z_root() . '/admin/plugins/' . argv(2) ); - } - elseif(argc() > 2) { - switch(argv(2)) { - case 'updaterepo': - if (array_key_exists('repoName', $_REQUEST)) { - $repoName = $_REQUEST['repoName']; - } - else { - json_return_and_die(array('message' => 'No repo name provided.', 'success' => false)); - } - $extendDir = 'store/[data]/git/sys/extend'; - $addonDir = $extendDir . '/addon'; - if (!file_exists($extendDir)) { - if (!mkdir($extendDir, 0770, true)) { - logger('Error creating extend folder: ' . $extendDir); - json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); - } - else { - if (!symlink(realpath('extend/addon'), $addonDir)) { - logger('Error creating symlink to addon folder: ' . $addonDir); - json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); - } - } - } - $repoDir = 'store/[data]/git/sys/extend/addon/' . $repoName; - if (!is_dir($repoDir)) { - logger('Repo directory does not exist: ' . $repoDir); - json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false)); - } - if (!is_writable($repoDir)) { - logger('Repo directory not writable to web server: ' . $repoDir); - json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false)); - } - $git = new GitRepo('sys', null, false, $repoName, $repoDir); - try { - if ($git->pull()) { - $files = array_diff(scandir($repoDir), array('.', '..')); - foreach ($files as $file) { - if (is_dir($repoDir . '/' . $file) && $file !== '.git') { - $source = '../extend/addon/' . $repoName . '/' . $file; - $target = realpath('addon/') . '/' . $file; - unlink($target); - if (!symlink($source, $target)) { - logger('Error linking addons to /addon'); - json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false)); - } - } - } - json_return_and_die(array('message' => 'Repo updated.', 'success' => true)); - } else { - json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false)); - } - } catch (\PHPGit\Exception\GitException $e) { - json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false)); - } - case 'removerepo': - if (array_key_exists('repoName', $_REQUEST)) { - $repoName = $_REQUEST['repoName']; - } else { - json_return_and_die(array('message' => 'No repo name provided.', 'success' => false)); - } - $extendDir = 'store/[data]/git/sys/extend'; - $addonDir = $extendDir . '/addon'; - if (!file_exists($extendDir)) { - if (!mkdir($extendDir, 0770, true)) { - logger('Error creating extend folder: ' . $extendDir); - json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); - } else { - if (!symlink(realpath('extend/addon'), $addonDir)) { - logger('Error creating symlink to addon folder: ' . $addonDir); - json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); - } - } - } - $repoDir = 'store/[data]/git/sys/extend/addon/' . $repoName; - if (!is_dir($repoDir)) { - logger('Repo directory does not exist: ' . $repoDir); - json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false)); - } - if (!is_writable($repoDir)) { - logger('Repo directory not writable to web server: ' . $repoDir); - json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false)); - } - /// @TODO remove directory and unlink /addon/files - if (rrmdir($repoDir)) { - json_return_and_die(array('message' => 'Repo deleted.', 'success' => true)); - } else { - json_return_and_die(array('message' => 'Error deleting addon repo.', 'success' => false)); - } - case 'installrepo': - if (array_key_exists('repoURL', $_REQUEST)) { - require_once('library/PHPGit.autoload.php'); // Load PHPGit dependencies - $repoURL = $_REQUEST['repoURL']; - $extendDir = 'store/[data]/git/sys/extend'; - $addonDir = $extendDir . '/addon'; - if (!file_exists($extendDir)) { - if (!mkdir($extendDir, 0770, true)) { - logger('Error creating extend folder: ' . $extendDir); - json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); - } else { - if (!symlink(realpath('extend/addon'), $addonDir)) { - logger('Error creating symlink to addon folder: ' . $addonDir); - json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); - } - } - } - if (!is_writable($extendDir)) { - logger('Directory not writable to web server: ' . $extendDir); - json_return_and_die(array('message' => 'Directory not writable to web server.', 'success' => false)); - } - $repoName = null; - if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') { - $repoName = $_REQUEST['repoName']; - } else { - $repoName = GitRepo::getRepoNameFromURL($repoURL); - } - if (!$repoName) { - logger('Invalid git repo'); - json_return_and_die(array('message' => 'Invalid git repo', 'success' => false)); - } - $repoDir = $addonDir . '/' . $repoName; - $tempRepoBaseDir = 'store/[data]/git/sys/temp/'; - $tempAddonDir = $tempRepoBaseDir . $repoName; - - if (!is_writable($addonDir) || !is_writable($tempAddonDir)) { - logger('Temp repo directory or /extend/addon not writable to web server: ' . $tempAddonDir); - json_return_and_die(array('message' => 'Temp repo directory not writable to web server.', 'success' => false)); - } - rename($tempAddonDir, $repoDir); - - if (!is_writable(realpath('addon/'))) { - logger('/addon directory not writable to web server: ' . $tempAddonDir); - json_return_and_die(array('message' => '/addon directory not writable to web server.', 'success' => false)); - } - $files = array_diff(scandir($repoDir), array('.', '..')); - foreach ($files as $file) { - if (is_dir($repoDir . '/' . $file) && $file !== '.git') { - $source = '../extend/addon/' . $repoName . '/' . $file; - $target = realpath('addon/') . '/' . $file; - unlink($target); - if (!symlink($source, $target)) { - logger('Error linking addons to /addon'); - json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false)); - } - } - } - $git = new GitRepo('sys', $repoURL, false, $repoName, $repoDir); - $repo = $git->probeRepo(); - json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true)); - } - case 'addrepo': - if (array_key_exists('repoURL', $_REQUEST)) { - require_once('library/PHPGit.autoload.php'); // Load PHPGit dependencies - $repoURL = $_REQUEST['repoURL']; - $extendDir = 'store/[data]/git/sys/extend'; - $addonDir = $extendDir . '/addon'; - $tempAddonDir = realpath('store/[data]') . '/git/sys/temp'; - if (!file_exists($extendDir)) { - if (!mkdir($extendDir, 0770, true)) { - logger('Error creating extend folder: ' . $extendDir); - json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); - } else { - if (!symlink(realpath('extend/addon'), $addonDir)) { - logger('Error creating symlink to addon folder: ' . $addonDir); - json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); - } - } - } - if (!is_dir($tempAddonDir)) { - if (!mkdir($tempAddonDir, 0770, true)) { - logger('Error creating temp plugin repo folder: ' . $tempAddonDir); - json_return_and_die(array('message' => 'Error creating temp plugin repo folder: ' . $tempAddonDir, 'success' => false)); - } - } - $repoName = null; - if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') { - $repoName = $_REQUEST['repoName']; - } else { - $repoName = GitRepo::getRepoNameFromURL($repoURL); - } - if (!$repoName) { - logger('Invalid git repo'); - json_return_and_die(array('message' => 'Invalid git repo: ' . $repoName, 'success' => false)); - } - $repoDir = $tempAddonDir . '/' . $repoName; - if (!is_writable($tempAddonDir)) { - logger('Temporary directory for new addon repo is not writable to web server: ' . $tempAddonDir); - json_return_and_die(array('message' => 'Temporary directory for new addon repo is not writable to web server.', 'success' => false)); - } - // clone the repo if new automatically - $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir); - - $remotes = $git->git->remote(); - $fetchURL = $remotes['origin']['fetch']; - if ($fetchURL !== $git->url) { - if (rrmdir($repoDir)) { - $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir); - } else { - json_return_and_die(array('message' => 'Error deleting existing addon repo.', 'success' => false)); - } - } - $repo = $git->probeRepo(); - $repo['readme'] = $repo['manifest'] = null; - foreach ($git->git->tree('master') as $object) { - if ($object['type'] == 'blob' && (strtolower($object['file']) === 'readme.md' || strtolower($object['file']) === 'readme')) { - $repo['readme'] = MarkdownExtra::defaultTransform($git->git->cat->blob($object['hash'])); - } else if ($object['type'] == 'blob' && strtolower($object['file']) === 'manifest.json') { - $repo['manifest'] = $git->git->cat->blob($object['hash']); - } - } - json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true)); - } else { - json_return_and_die(array('message' => 'No repo URL provided', 'success' => false)); - } - break; - default: - break; - } - } - } - - /** - * @brief Plugins admin page. - * - * @return string with parsed HTML - */ - function get() { - - /* - * Single plugin - */ - - if (\App::$argc == 3){ - $plugin = \App::$argv[2]; - if (!is_file("addon/$plugin/$plugin.php")){ - notice( t("Item not found.") ); - return ''; - } - - $enabled = in_array($plugin,\App::$plugins); - $info = get_plugin_info($plugin); - $x = check_plugin_versions($info); - - // disable plugins which are installed but incompatible versions - - if($enabled && ! $x) { - $enabled = false; - $idz = array_search($plugin, \App::$plugins); - if ($idz !== false) { - unset(\App::$plugins[$idz]); - uninstall_plugin($plugin); - set_config("system","addon", implode(", ",\App::$plugins)); - } - } - $info['disabled'] = 1-intval($x); - - if (x($_GET,"a") && $_GET['a']=="t"){ - check_form_security_token_redirectOnErr('/admin/plugins', 'admin_plugins', 't'); - $pinstalled = false; - // Toggle plugin status - $idx = array_search($plugin, \App::$plugins); - if ($idx !== false){ - unset(\App::$plugins[$idx]); - uninstall_plugin($plugin); - $pinstalled = false; - info( sprintf( t("Plugin %s disabled."), $plugin ) ); - } else { - \App::$plugins[] = $plugin; - install_plugin($plugin); - $pinstalled = true; - info( sprintf( t("Plugin %s enabled."), $plugin ) ); - } - set_config("system","addon", implode(", ",\App::$plugins)); - - if($pinstalled) { - @require_once("addon/$plugin/$plugin.php"); - if(function_exists($plugin.'_plugin_admin')) - goaway(z_root() . '/admin/plugins/' . $plugin); - } - goaway(z_root() . '/admin/plugins' ); - } - - // display plugin details - - if (in_array($plugin, \App::$plugins)){ - $status = 'on'; - $action = t('Disable'); - } else { - $status = 'off'; - $action = t('Enable'); - } - - $readme = null; - if (is_file("addon/$plugin/README.md")){ - $readme = file_get_contents("addon/$plugin/README.md"); - $readme = MarkdownExtra::defaultTransform($readme); - } else if (is_file("addon/$plugin/README")){ - $readme = "
      ". file_get_contents("addon/$plugin/README") ."
      "; - } - - $admin_form = ''; - - $r = q("select * from addon where plugin_admin = 1 and aname = '%s' limit 1", - dbesc($plugin) - ); - - if($r) { - @require_once("addon/$plugin/$plugin.php"); - if(function_exists($plugin.'_plugin_admin')) { - $func = $plugin.'_plugin_admin'; - $func($a, $admin_form); - } - } - - - $t = get_markup_template('admin_plugins_details.tpl'); - return replace_macros($t, array( - '$title' => t('Administration'), - '$page' => t('Plugins'), - '$toggle' => t('Toggle'), - '$settings' => t('Settings'), - '$baseurl' => z_root(), - - '$plugin' => $plugin, - '$status' => $status, - '$action' => $action, - '$info' => $info, - '$str_author' => t('Author: '), - '$str_maintainer' => t('Maintainer: '), - '$str_minversion' => t('Minimum project version: '), - '$str_maxversion' => t('Maximum project version: '), - '$str_minphpversion' => t('Minimum PHP version: '), - '$str_serverroles' => t('Compatible Server Roles: '), - '$str_requires' => t('Requires: '), - '$disabled' => t('Disabled - version incompatibility'), - - '$admin_form' => $admin_form, - '$function' => 'plugins', - '$screenshot' => '', - '$readme' => $readme, - - '$form_security_token' => get_form_security_token('admin_plugins'), - )); - } - - - /* - * List plugins - */ - $plugins = array(); - $files = glob('addon/*/'); - if($files) { - foreach($files as $file) { - if (is_dir($file)){ - list($tmp, $id) = array_map('trim', explode('/', $file)); - $info = get_plugin_info($id); - $enabled = in_array($id,\App::$plugins); - $x = check_plugin_versions($info); - - // disable plugins which are installed but incompatible versions - - if($enabled && ! $x) { - $enabled = false; - $idz = array_search($id, \App::$plugins); - if ($idz !== false) { - unset(\App::$plugins[$idz]); - uninstall_plugin($id); - set_config("system","addon", implode(", ",\App::$plugins)); - } - } - $info['disabled'] = 1-intval($x); - - $plugins[] = array( $id, (($enabled)?"on":"off") , $info); - } - } - } - - usort($plugins,'self::plugin_sort'); - - $allowManageRepos = false; - if(is_writable('extend/addon') && is_writable('store/[data]')) { - $allowManageRepos = true; - } - - $admin_plugins_add_repo_form= replace_macros( - get_markup_template('admin_plugins_addrepo.tpl'), array( - '$post' => 'admin/plugins/addrepo', - '$desc' => t('Enter the public git repository URL of the plugin repo.'), - '$repoURL' => array('repoURL', t('Plugin repo git URL'), '', ''), - '$repoName' => array('repoName', t('Custom repo name'), '', '', t('(optional)')), - '$submit' => t('Download Plugin Repo') - ) - ); - $newRepoModalID = random_string(3); - $newRepoModal = replace_macros( - get_markup_template('generic_modal.tpl'), array( - '$id' => $newRepoModalID, - '$title' => t('Install new repo'), - '$ok' => t('Install'), - '$cancel' => t('Cancel') - ) - ); - - $reponames = $this->listAddonRepos(); - $addonrepos = []; - foreach($reponames as $repo) { - $addonrepos[] = array('name' => $repo, 'description' => ''); - /// @TODO Parse repo info to provide more information about repos - } - - $t = get_markup_template('admin_plugins.tpl'); - return replace_macros($t, array( - '$title' => t('Administration'), - '$page' => t('Plugins'), - '$submit' => t('Submit'), - '$baseurl' => z_root(), - '$function' => 'plugins', - '$plugins' => $plugins, - '$disabled' => t('Disabled - version incompatibility'), - '$form_security_token' => get_form_security_token('admin_plugins'), - '$allowManageRepos' => $allowManageRepos, - '$managerepos' => t('Manage Repos'), - '$installedtitle' => t('Installed Plugin Repositories'), - '$addnewrepotitle' => t('Install a New Plugin Repository'), - '$expandform' => false, - '$form' => $admin_plugins_add_repo_form, - '$newRepoModal' => $newRepoModal, - '$newRepoModalID' => $newRepoModalID, - '$addonrepos' => $addonrepos, - '$repoUpdateButton' => t('Update'), - '$repoBranchButton' => t('Switch branch'), - '$repoRemoveButton' => t('Remove') - )); - } - - function listAddonRepos() { - $addonrepos = []; - $addonDir = 'extend/addon/'; - if(is_dir($addonDir)) { - if ($handle = opendir($addonDir)) { - while (false !== ($entry = readdir($handle))) { - if ($entry != "." && $entry != "..") { - $addonrepos[] = $entry; - } - } - closedir($handle); - } - } - return $addonrepos; - } - - static public function plugin_sort($a,$b) { - return(strcmp(strtolower($a[2]['name']),strtolower($b[2]['name']))); - } - -} \ No newline at end of file diff --git a/Zotlabs/Widget/Admin.php b/Zotlabs/Widget/Admin.php index a761eebe3..f349377a0 100644 --- a/Zotlabs/Widget/Admin.php +++ b/Zotlabs/Widget/Admin.php @@ -24,7 +24,7 @@ class Admin { 'channels' => array(z_root() . '/admin/channels/', t('Channels'), 'channels'), 'security' => array(z_root() . '/admin/security/', t('Security'), 'security'), 'features' => array(z_root() . '/admin/features/', t('Features'), 'features'), - 'plugins' => array(z_root() . '/admin/plugins/', t('Plugins'), 'plugins'), + 'addons' => array(z_root() . '/admin/addons/', t('Addons'), 'addons'), 'themes' => array(z_root() . '/admin/themes/', t('Themes'), 'themes'), 'queue' => array(z_root() . '/admin/queue', t('Inspect queue'), 'queue'), 'profs' => array(z_root() . '/admin/profs', t('Profile Fields'), 'profs'), @@ -39,7 +39,7 @@ class Admin { if($r) { foreach ($r as $h){ $plugin = $h['aname']; - $plugins[] = array(z_root() . '/admin/plugins/' . $plugin, $plugin, 'plugin'); + $plugins[] = array(z_root() . '/admin/addons/' . $plugin, $plugin, 'plugin'); // temp plugins with admin \App::$plugins_admin[] = $plugin; } @@ -53,7 +53,7 @@ class Admin { $o .= replace_macros(get_markup_template('admin_aside.tpl'), array( '$admin' => $aside, '$admtxt' => t('Admin'), - '$plugadmtxt' => t('Plugin Features'), + '$plugadmtxt' => t('Addon Features'), '$plugins' => $plugins, '$logtxt' => t('Logs'), '$logs' => $logs, diff --git a/doc/context/en/admin/addons/assets/addon_repo_gui_1.png b/doc/context/en/admin/addons/assets/addon_repo_gui_1.png new file mode 100644 index 000000000..37139b345 Binary files /dev/null and b/doc/context/en/admin/addons/assets/addon_repo_gui_1.png differ diff --git a/doc/context/en/admin/addons/help.html b/doc/context/en/admin/addons/help.html new file mode 100644 index 000000000..bfb5e416a --- /dev/null +++ b/doc/context/en/admin/addons/help.html @@ -0,0 +1,14 @@ +
      +
      General
      +
      This page manages which addons (also known as plugins) are installed.
      +
      Manage Repos
      +
      If your webserver has the necessary write permissions, you will see a button labeled Manage Repos, + which opens a control panel for managing what plugin repositories are installed. These repos are + stored in extend/addon/[repo name]/. The official Hubzilla + addon repo can be added by entering the repo URL + https://framagit.org/hubzilla/addons.git + and choosing a name for the repo such as official. You should see this repo in the list similar + to the following: +
      +
      +
      diff --git a/doc/context/en/admin/plugins/assets/addon_repo_gui_1.png b/doc/context/en/admin/plugins/assets/addon_repo_gui_1.png deleted file mode 100644 index 37139b345..000000000 Binary files a/doc/context/en/admin/plugins/assets/addon_repo_gui_1.png and /dev/null differ diff --git a/doc/context/en/admin/plugins/help.html b/doc/context/en/admin/plugins/help.html deleted file mode 100644 index 320d93040..000000000 --- a/doc/context/en/admin/plugins/help.html +++ /dev/null @@ -1,14 +0,0 @@ -
      -
      General
      -
      This page manages which plugins (also known as addons) are installed.
      -
      Manage Repos
      -
      If your webserver has the necessary write permissions, you will see a button labeled Manage Repos, - which opens a control panel for managing what plugin repositories are installed. These repos are - stored in extend/addon/[repo name]/. The official Hubzilla - plugin repo can be added by entering the repo URL - https://framagit.org/hubzilla/addons.git - and choosing a name for the repo such as official. You should see this repo in the list similar - to the following: -
      -
      -
      \ No newline at end of file diff --git a/doc/context/es-es/admin/addons/assets/addon_repo_gui_1.png b/doc/context/es-es/admin/addons/assets/addon_repo_gui_1.png new file mode 100644 index 000000000..37139b345 Binary files /dev/null and b/doc/context/es-es/admin/addons/assets/addon_repo_gui_1.png differ diff --git a/doc/context/es-es/admin/addons/help.html b/doc/context/es-es/admin/addons/help.html new file mode 100644 index 000000000..49a047f5e --- /dev/null +++ b/doc/context/es-es/admin/addons/help.html @@ -0,0 +1,14 @@ +
      +
      General
      +
      Esta página gestiona qué addons (también llamados plugins o complementos) están instalados.
      +
      Gestión de los repositorios
      +
      Si su servidor web tiene los permisos de escritura necesarios, verá un botón etiquetado como Gestión de repositorios, + que abre un panel de control para administrar qué repositorios de addons están instalados. Estos repositorios están + almacenados en extend/addon/[nombre del repositorio]/. El repositorio de addons oficial de Hubzilla + se puede añadir escribiendo la URL del repositorio + https://framagit.org/hubzilla/addons.git + y eligiendo un nombre para el repositorio como oficial. Debería ver este repositorio en una lista parecida + a esta: +
      +
      +
      diff --git a/doc/context/es-es/admin/plugins/assets/addon_repo_gui_1.png b/doc/context/es-es/admin/plugins/assets/addon_repo_gui_1.png deleted file mode 100644 index 37139b345..000000000 Binary files a/doc/context/es-es/admin/plugins/assets/addon_repo_gui_1.png and /dev/null differ diff --git a/doc/context/es-es/admin/plugins/help.html b/doc/context/es-es/admin/plugins/help.html deleted file mode 100644 index 520425b17..000000000 --- a/doc/context/es-es/admin/plugins/help.html +++ /dev/null @@ -1,14 +0,0 @@ -
      -
      General
      -
      Esta página gestiona qué plugins (también llamados addons o complementos) están instalados.
      -
      Gestión de los repositorios
      -
      Si su servidor web tiene los permisos de escritura necesarios, verá un botón etiquetado como Gestión de repositorios, - que abre un panel de control para administrar qué repositorios de plugins están instalados. Estos repositorios están - almacenados en extend/addon/[nombre del repositorio]/. El repositorio de plugins oficial de Hubzilla - se puede añadir escribiendo la URL del repositorio - https://framagit.org/hubzilla/addons.git - y eligiendo un nombre para el repositorio como oficial. Debería ver este repositorio en una lista parecida - a esta: -
      -
      -
      \ No newline at end of file diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index adc0db434..d8e1a6711 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -77,7 +77,7 @@ var repoName = $('#id_repoName').val(); $('#chat-rotator').show(); $.post( - "/admin/plugins/addrepo", {repoURL: repoURL, repoName: repoName}, + "/admin/addons/addrepo", {repoURL: repoURL, repoName: repoName}, function(response) { $('#chat-rotator').hide(); if (response.success) { @@ -104,7 +104,7 @@ var repoURL = $('#id_repoURL').val(); var repoName = $('#id_repoName').val(); $.post( - "/admin/plugins/installrepo", {repoURL: repoURL, repoName: repoName}, + "/admin/addons/installrepo", {repoURL: repoURL, repoName: repoName}, function(response) { if (response.success) { $('#generic-modal-title-{{$newRepoModalID}}').html('Addon repo installed'); @@ -137,7 +137,7 @@ function updateAddonRepo(repoName) { if(confirm('Are you sure you want to update the addon repo ' + repoName + '?')) { $.post( - "/admin/plugins/updaterepo", {repoName: repoName}, + "/admin/addons/updaterepo", {repoName: repoName}, function(response) { if (response.success) { window.console.log('Addon repo '+repoName+' successfully updated :' + response['message']); @@ -170,7 +170,7 @@ // TODO: Unlink the addons if(confirm('Are you sure you want to remove the addon repo ' + repoName + '?')) { $.post( - "/admin/plugins/removerepo", {repoName: repoName}, + "/admin/addons/removerepo", {repoName: repoName}, function(response) { if (response.success) { window.console.log('Addon repo '+repoName+' successfully removed :' + response['message']); -- cgit v1.2.3 From c28e27357a1ce700b91021344050ec531bce3889 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 28 Jun 2018 23:17:50 -0700 Subject: add the missing link to manage privacy groups --- Zotlabs/Widget/Activity_filter.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php index fadf39144..2df9e518a 100644 --- a/Zotlabs/Widget/Activity_filter.php +++ b/Zotlabs/Widget/Activity_filter.php @@ -63,6 +63,14 @@ class Activity_filter { 'title' => sprintf(t('Show posts related to the %s privacy group'), $g['gname']) ]; } + $gsub[] = [ + 'label' => t('Manage Privacy Groups'), + 'icon' => 'gear', + 'url' => z_root() . '/group', + 'sel' => '', + 'title' => t('Create and edit privacy groups and members') + ]; + $tabs[] = [ 'id' => 'privacy_groups', 'label' => t('Privacy Groups'), -- cgit v1.2.3 From 63a3f5149a32de1b3fb2f47535f061c53496bde2 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 30 Jun 2018 15:47:06 -0700 Subject: be very precise about what a url looks like --- doc/member/bbcode.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/member/bbcode.html b/doc/member/bbcode.html index a61289364..e3e079b4d 100644 --- a/doc/member/bbcode.html +++ b/doc/member/bbcode.html @@ -193,7 +193,7 @@ If a rendering plugin is not installed or an unsupported language is specified, [url=https://hubzilla.org]Hubzilla[/url]Hubzilla - An image [img]url/of/image.jpg[/img] + An image [img]https://example.org/image.jpg[/img] in some text An image Image/photo in some text -- cgit v1.2.3 From 5d7d30f7898171f0a7bd687bf4888695b2dd8af3 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 30 Jun 2018 23:57:25 -0700 Subject: propagate expired posts to other networks --- Zotlabs/Daemon/Cron.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index 01c43262a..d1c516f96 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -50,14 +50,19 @@ class Cron { // expire any expired items - $r = q("select id from item where expires > '2001-01-01 00:00:00' and expires < %s + $r = q("select id,item_wall from item where expires > '2001-01-01 00:00:00' and expires < %s and item_deleted = 0 ", db_utcnow() ); if($r) { require_once('include/items.php'); - foreach($r as $rr) - drop_item($rr['id'],false); + foreach($r as $rr) { + drop_item($rr['id'],false,(($rr['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL)); + if($rr['item_wall']) { + // The notifier isn't normally invoked unless item_drop is interactive. + Zotlabs\Daemon\Master::Summon( [ 'Notifier', 'drop', $rr['id'] ] ); + } + } } -- cgit v1.2.3 From 8c26db63ddf449a033e488b5d95af83fe08bdb2e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 1 Jul 2018 19:12:45 -0700 Subject: some changes to support plume --- Zotlabs/Lib/ActivityStreams.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php index 3a99e7b49..37e717f58 100644 --- a/Zotlabs/Lib/ActivityStreams.php +++ b/Zotlabs/Lib/ActivityStreams.php @@ -36,6 +36,7 @@ class ActivityStreams { $this->raw = $string; $this->data = json_decode($string, true); + if($this->data) { $this->valid = true; } @@ -206,7 +207,7 @@ class ActivityStreams { } $x = z_fetch_url($url, true, $redirects, - ['headers' => [ 'Accept: application/ld+json; profile="https://www.w3.org/ns/activitystreams", application/activity+json' ]]); + ['headers' => [ 'Accept: application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"' ]]); if($x['success']) return json_decode($x['body'], true); -- cgit v1.2.3 From d753492382cf2351886ca94580ea7fbb021f06f0 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 1 Jul 2018 22:48:05 -0700 Subject: bad merge --- include/items.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/items.php b/include/items.php index 83ee219a2..9dd5d005b 100755 --- a/include/items.php +++ b/include/items.php @@ -981,6 +981,8 @@ function empty_acl($item) { function encode_item($item,$mirror = false) { $x = []; + $x['type'] = 'activity'; + $x['encoding'] = 'zot'; $r = q("select channel_id from channel where channel_id = %d limit 1", intval($item['uid']) @@ -1359,6 +1361,8 @@ function encode_item_flags($item) { function encode_mail($item,$extended = false) { $x = []; + $x['type'] = 'mail'; + $x['encoding'] = 'zot'; if(array_key_exists('mail_obscured',$item) && intval($item['mail_obscured'])) { if($item['title']) -- cgit v1.2.3 From 18dbc490fe4a00b8d542bf20325984ed6453677c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 3 Jul 2018 18:26:34 -0700 Subject: remove broken include path hack --- boot.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/boot.php b/boot.php index 2c4fad641..e13910ecf 100755 --- a/boot.php +++ b/boot.php @@ -873,8 +873,6 @@ class App { self::$path = $path; } - set_include_path("include/self::$hostname" . PATH_SEPARATOR . get_include_path()); - if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 2) === "q=") { self::$query_string = escape_tags(substr($_SERVER['QUERY_STRING'], 2)); // removing trailing / - maybe a nginx problem -- cgit v1.2.3 From b88a9c2627e632d0f963e0078191eb616e5a1668 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 4 Jul 2018 10:53:07 +0200 Subject: Revert "add the missing link to manage privacy groups" This reverts commit c28e27357a1ce700b91021344050ec531bce3889. --- Zotlabs/Widget/Activity_filter.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php index 2df9e518a..fadf39144 100644 --- a/Zotlabs/Widget/Activity_filter.php +++ b/Zotlabs/Widget/Activity_filter.php @@ -63,14 +63,6 @@ class Activity_filter { 'title' => sprintf(t('Show posts related to the %s privacy group'), $g['gname']) ]; } - $gsub[] = [ - 'label' => t('Manage Privacy Groups'), - 'icon' => 'gear', - 'url' => z_root() . '/group', - 'sel' => '', - 'title' => t('Create and edit privacy groups and members') - ]; - $tabs[] = [ 'id' => 'privacy_groups', 'label' => t('Privacy Groups'), -- cgit v1.2.3 From d9ece80fda867768fb3b8de47bf4eb7c3e6108e8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 4 Jul 2018 10:55:38 +0200 Subject: order nouveau by created instead of received since ordering by received returns unexpected results once old expired items get re-imported --- Zotlabs/Module/Network.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 172157aab..77a08585b 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -480,7 +480,7 @@ class Network extends \Zotlabs\Web\Controller { if($nouveau && $load) { // "New Item View" - show all items unthreaded in reverse created date order - $items = q("SELECT item.*, item.id AS item_id, received FROM item + $items = q("SELECT item.*, item.id AS item_id, created FROM item left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) $net_query WHERE true $uids $item_normal @@ -488,7 +488,7 @@ class Network extends \Zotlabs\Web\Controller { $simple_update $sql_extra $sql_options $sql_nets $net_query2 - ORDER BY item.received DESC $pager_sql " + ORDER BY item.created DESC $pager_sql " ); require_once('include/items.php'); -- cgit v1.2.3 From 1387b88ba491c855e717cd3803dcaaa06901ae95 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 4 Jul 2018 19:04:12 -0700 Subject: remove manage group link from activity_filter, already in personal menu --- Zotlabs/Widget/Activity_filter.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php index 2df9e518a..fadf39144 100644 --- a/Zotlabs/Widget/Activity_filter.php +++ b/Zotlabs/Widget/Activity_filter.php @@ -63,14 +63,6 @@ class Activity_filter { 'title' => sprintf(t('Show posts related to the %s privacy group'), $g['gname']) ]; } - $gsub[] = [ - 'label' => t('Manage Privacy Groups'), - 'icon' => 'gear', - 'url' => z_root() . '/group', - 'sel' => '', - 'title' => t('Create and edit privacy groups and members') - ]; - $tabs[] = [ 'id' => 'privacy_groups', 'label' => t('Privacy Groups'), -- cgit v1.2.3 From 51a2e64a897e5afdb3e607915534a1562a215563 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 4 Jul 2018 19:51:16 -0700 Subject: issue syncing pageflags --- include/zot.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/include/zot.php b/include/zot.php index 14c9f6ae5..5c74947d6 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3548,15 +3548,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if(array_key_exists('channel_pageflags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) { - // These flags cannot be sync'd. - // remove the bits from the incoming flags. + // Several pageflags are site-specific and cannot be sync'd. + // Only allow those bits which are shareable from the remote and then + // logically OR with the local flags - // These correspond to PAGE_REMOVED and PAGE_SYSTEM on redmatrix - - if($arr['channel']['channel_pageflags'] & 0x8000) - $arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] - 0x8000; - if($arr['channel']['channel_pageflags'] & 0x1000) - $arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] - 0x1000; + $arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] & (PAGE_HIDDEN|PAGE_AUTOCONNECT|PAGE_APPLICATION|PAGE_PREMIUM|PAGE_ADULT); + $arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] | $channel['channel_pageflags']; } $disallowed = [ -- cgit v1.2.3 From f6e8ce5516eeaf2e0525f69099d68a55df9501e3 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 4 Jul 2018 23:20:35 -0700 Subject: appstore changes --- Zotlabs/Lib/Apps.php | 88 +++++++++++++++++++++++++++++++++++----- Zotlabs/Module/Apps.php | 6 ++- Zotlabs/Widget/Appcategories.php | 3 ++ Zotlabs/Widget/Appstore.php | 18 ++++++++ view/pdl/mod_apps.pdl | 1 + view/tpl/appstore.tpl | 8 ++++ 6 files changed, 112 insertions(+), 12 deletions(-) create mode 100644 Zotlabs/Widget/Appstore.php create mode 100644 view/tpl/appstore.tpl diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 2dded1aaa..81f426f4b 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -13,7 +13,12 @@ require_once('include/channel.php'); class Apps { - static public $installed_system_apps = null; + static public $available_apps = null; + static public $installed_apps = null; + + static public $base_apps = null; + + static public function get_system_apps($translate = true) { @@ -55,22 +60,52 @@ class Apps { static public function import_system_apps() { if(! local_channel()) return; + + self::$base_apps = get_config('system','base_apps',[ + 'Connections', + 'Suggest Channels', + 'Grid', + 'Settings', + 'Files', + 'Channel Home', + 'View Profile', + 'Photos', + 'Events', + 'Directory', + 'Search', + 'Help', + 'Mail', + 'Profile Photo' + ]); + $apps = self::get_system_apps(false); - self::$installed_system_apps = q("select * from app where app_system = 1 and app_channel = %d", + self::$available_apps = q("select * from app where app_channel = 0"); + + self::$installed_apps = q("select * from app where app_channel = %d", intval(local_channel()) ); if($apps) { foreach($apps as $app) { $id = self::check_install_system_app($app); + + // $id will be boolean true or false to install an app, or an integer id to update an existing app + if($id !== false) { + $app['uid'] = 0; + $app['guid'] = hash('whirlpool',$app['name']); + $app['system'] = 1; + self::app_install(0,$app); + } + + $id = self::check_install_personal_app($app); // $id will be boolean true or false to install an app, or an integer id to update an existing app if($id === false) continue; if($id !== true) { // if we already installed this app, but it changed, preserve any categories we created - $s = ''; - $r = q("select * from term where otype = %d and oid = %d", + $s = EMPTY_STR; + $r = q("select term from term where otype = %d and oid = %d", intval(TERM_OBJ_APP), intval($id) ); @@ -87,6 +122,7 @@ class Apps { $app['guid'] = hash('whirlpool',$app['name']); $app['system'] = 1; self::app_install(local_channel(),$app); + } } } @@ -97,11 +133,11 @@ class Apps { */ static public function check_install_system_app($app) { - if((! is_array(self::$installed_system_apps)) || (! count(self::$installed_system_apps))) { + if((! is_array(self::$available_apps)) || (! count(self::$available_apps))) { return true; } $notfound = true; - foreach(self::$installed_system_apps as $iapp) { + foreach(self::$available_apps as $iapp) { if($iapp['app_id'] == hash('whirlpool',$app['name'])) { $notfound = false; if(($iapp['app_version'] != $app['version']) @@ -115,6 +151,28 @@ class Apps { } + /** + * Install the system app if no system apps have been installed, or if a new system app + * is discovered, or if the version of a system app changes. + */ + + static public function check_install_personal_app($app) { + foreach(self::$installed_apps as $iapp) { + $install = false; + if($iapp['app_id'] == hash('whirlpool',$app['name'])) { + if(($iapp['app_version'] != $app['version']) + || ($app['plugin'] && (! $iapp['app_plugin']))) { + return intval($iapp['app_id']); + } + } + } + if(in_array($app['name'],self::$base_apps)) { + return true; + } + return false; + } + + static public function app_name_compare($a,$b) { return strcasecmp($a['name'],$b['name']); } @@ -235,7 +293,6 @@ class Apps { 'View Bookmarks' => t('View Bookmarks'), 'My Chatrooms' => t('My Chatrooms'), 'Connections' => t('Connections'), - 'Firefox Share' => t('Firefox Share'), 'Remote Diagnostics' => t('Remote Diagnostics'), 'Suggest Channels' => t('Suggest Channels'), 'Login' => t('Login'), @@ -290,6 +347,7 @@ class Apps { * modes: * view: normal mode for viewing an app via bbcode from a conversation or page * provides install/update button if you're logged in locally + * install: like view but does not display app-bin options if they are present * list: normal mode for viewing an app on the app page * no buttons are shown * edit: viewing the app page in editing mode provides a delete button @@ -302,7 +360,7 @@ class Apps { return; if(! $papp['photo']) - $papp['photo'] = z_root() . '/' . get_default_profile_photo(80); + $papp['photo'] = 'icon:gear'; self::translate_system_apps($papp); @@ -402,12 +460,15 @@ class Apps { )); } + if($mode === 'install') { + $papp['embed'] = true; + } return replace_macros(get_markup_template('app.tpl'),array( '$app' => $papp, '$icon' => $icon, '$hosturl' => $hosturl, '$purchase' => (($papp['page'] && (! $installed)) ? t('Purchase') : ''), - '$install' => (($hosturl && $mode == 'view') ? $install_action : ''), + '$install' => (($hosturl && in_array($mode, ['view','install'])) ? $install_action : ''), '$edit' => ((local_channel() && $installed && $mode == 'edit') ? t('Edit') : ''), '$delete' => ((local_channel() && $installed && $mode == 'edit') ? t('Delete') : ''), '$undelete' => ((local_channel() && $installed && $mode == 'edit') ? t('Undelete') : ''), @@ -738,12 +799,19 @@ class Apps { $darray = array(); $ret = array('success' => false); + $sys = get_sys_channel(); + + $darray['app_url'] = ((x($arr,'url')) ? $arr['url'] : ''); $darray['app_channel'] = ((x($arr,'uid')) ? $arr['uid'] : 0); - if((! $darray['app_url']) || (! $darray['app_channel'])) + if(! $darray['app_url']) return $ret; + if((! $arr['uid']) && (! $arr['author'])) { + $arr['author'] = $sys['channel_hash']; + } + if($arr['photo'] && (strpos($arr['photo'],'icon:') !== 0) && (! strstr($arr['photo'],z_root()))) { $x = import_xchan_photo($arr['photo'],get_observer_hash(),true); $arr['photo'] = $x[1]; diff --git a/Zotlabs/Module/Apps.php b/Zotlabs/Module/Apps.php index c672ea467..10f40af71 100644 --- a/Zotlabs/Module/Apps.php +++ b/Zotlabs/Module/Apps.php @@ -15,6 +15,8 @@ class Apps extends \Zotlabs\Web\Controller { else $mode = 'list'; + $available = ((argc() == 2 && argv(1) === 'available') ? true : false); + $_SESSION['return_url'] = \App::$query_string; $apps = array(); @@ -23,7 +25,7 @@ class Apps extends \Zotlabs\Web\Controller { Zlib\Apps::import_system_apps(); $syslist = array(); $cat = ((array_key_exists('cat',$_GET) && $_GET['cat']) ? [ escape_tags($_GET['cat']) ] : ''); - $list = Zlib\Apps::app_list(local_channel(), (($mode == 'edit') ? true : false), $cat); + $list = Zlib\Apps::app_list((($available) ? 0 : local_channel()), (($mode == 'edit') ? true : false), $cat); if($list) { foreach($list as $x) { $syslist[] = Zlib\Apps::app_encode($x); @@ -39,7 +41,7 @@ class Apps extends \Zotlabs\Web\Controller { // logger('apps: ' . print_r($syslist,true)); foreach($syslist as $app) { - $apps[] = Zlib\Apps::app_render($app,$mode); + $apps[] = Zlib\Apps::app_render($app,(($available) ? 'install' : $mode)); } return replace_macros(get_markup_template('myapps.tpl'), array( diff --git a/Zotlabs/Widget/Appcategories.php b/Zotlabs/Widget/Appcategories.php index 8ff14230f..aebd144d0 100644 --- a/Zotlabs/Widget/Appcategories.php +++ b/Zotlabs/Widget/Appcategories.php @@ -17,6 +17,9 @@ class Appcategories { // Leaving this line which negates the effect of the two invalid lines prior $srchurl = z_root() . '/apps'; + if(argc() > 1 && argv(1) === 'available') + $srchurl .= '/available'; + $terms = array(); diff --git a/Zotlabs/Widget/Appstore.php b/Zotlabs/Widget/Appstore.php new file mode 100644 index 000000000..237707733 --- /dev/null +++ b/Zotlabs/Widget/Appstore.php @@ -0,0 +1,18 @@ + 1 && argv(1) === 'available') ? 1 : 0); + return replace_macros(get_markup_template('appstore.tpl'), [ + '$title' => t('App Collections'), + '$options' => [ + [ z_root() . '/apps/available', t('Available Apps'), $store ], + [ z_root() . '/apps', t('Installed apps'), 1 - $store ] + ] + ]); + } +} \ No newline at end of file diff --git a/view/pdl/mod_apps.pdl b/view/pdl/mod_apps.pdl index 8bd407372..32e2ce560 100644 --- a/view/pdl/mod_apps.pdl +++ b/view/pdl/mod_apps.pdl @@ -1,4 +1,5 @@ [region=aside] +[widget=appstore][/widget] [widget=appcategories][/widget] [/region] [region=right_aside] diff --git a/view/tpl/appstore.tpl b/view/tpl/appstore.tpl new file mode 100644 index 000000000..47f144752 --- /dev/null +++ b/view/tpl/appstore.tpl @@ -0,0 +1,8 @@ +
      +

      {{$title}}

      +
        +{{foreach $options as $x}} +
      • {{$x.1}}
        • +{{/foreach}} +
      +
      -- cgit v1.2.3 From c80e009cf3750f559c18c526ebac62def7c3defb Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 5 Jul 2018 21:46:34 -0700 Subject: app store fixes --- Zotlabs/Lib/Apps.php | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 81f426f4b..c2ec5c967 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -156,17 +156,20 @@ class Apps { * is discovered, or if the version of a system app changes. */ + + static public function check_install_personal_app($app) { - foreach(self::$installed_apps as $iapp) { - $install = false; + $installed = false; + foreach(self::$installed_apps as $iapp) { if($iapp['app_id'] == hash('whirlpool',$app['name'])) { + $installed = true; if(($iapp['app_version'] != $app['version']) || ($app['plugin'] && (! $iapp['app_plugin']))) { return intval($iapp['app_id']); } } } - if(in_array($app['name'],self::$base_apps)) { + if(! $installed && in_array($app['name'],self::$base_apps)) { return true; } return false; @@ -531,21 +534,13 @@ class Apps { intval(TERM_OBJ_APP), intval($x[0]['id']) ); - if($x[0]['app_system']) { - $r = q("update app set app_deleted = 1 where app_id = '%s' and app_channel = %d", - dbesc($app['guid']), - intval($uid) - ); - } - else { - $r = q("delete from app where app_id = '%s' and app_channel = %d", - dbesc($app['guid']), - intval($uid) - ); + $r = q("delete from app where app_id = '%s' and app_channel = %d", + dbesc($app['guid']), + intval($uid) + ); - // we don't sync system apps - they may be completely different on the other system - build_sync_packet($uid,array('app' => $x)); - } + // we don't sync system apps - they may be completely different on the other system + build_sync_packet($uid,array('app' => $x)); } else { self::app_undestroy($uid,$app); @@ -945,7 +940,7 @@ class Apps { // if updating an embed app, don't mess with any existing categories. - if(array_key_exists('embed',$arr) && intval($arr['embed'])) + if(array_key_exists('embed',$arr) && intval($arr['embed']) && (intval($darray['app_channel']))) return $ret; if($x) { -- cgit v1.2.3 From fe44ebee93da2b0c4256cd2dcf5d509ce96ac2d2 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 5 Jul 2018 21:55:03 -0700 Subject: change to import system apps at most once a day per person --- include/nav.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nav.php b/include/nav.php index 5642f438f..41358c93e 100644 --- a/include/nav.php +++ b/include/nav.php @@ -212,9 +212,9 @@ function nav($template = 'default') { //app bin if($is_owner) { - if(get_pconfig(local_channel(), 'system','initial_import_system_apps') === false) { + if(get_pconfig(local_channel(), 'system','import_system_apps') !== datetime_convert('UTC','UTC','now','Y-m-d')) { Zlib\Apps::import_system_apps(); - set_pconfig(local_channel(), 'system','initial_import_system_apps', 1); + set_pconfig(local_channel(), 'system','import_system_apps', datetime_convert('UTC','UTC','now','Y-m-d')); } $syslist = array(); -- cgit v1.2.3 From cc71e507cbb08a4dfec3fa273484297d048a940e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 5 Jul 2018 22:03:41 -0700 Subject: don't provide manage apps button when viewing all available --- Zotlabs/Module/Apps.php | 2 +- view/tpl/myapps.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Apps.php b/Zotlabs/Module/Apps.php index 10f40af71..78c8d99ae 100644 --- a/Zotlabs/Module/Apps.php +++ b/Zotlabs/Module/Apps.php @@ -50,7 +50,7 @@ class Apps extends \Zotlabs\Web\Controller { '$title' => t('Apps'), '$apps' => $apps, '$authed' => ((local_channel()) ? true : false), - '$manage' => t('Manage apps'), + '$manage' => (($available) ? '' : t('Manage apps')), '$create' => (($mode == 'edit') ? t('Create new app') : '') )); diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index 0ac836b38..2cc747436 100755 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -3,7 +3,7 @@ {{if $authed}} {{if $create}}  {{$create}} - {{else}} + {{elseif $manage}} {{$manage}} {{/if}} {{/if}} -- cgit v1.2.3 From d9037728313a6efcac069dc77ae4c6bc932455e7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 6 Jul 2018 08:44:25 +0200 Subject: this is messing with names containing a comma and is superfluous now --- Zotlabs/Module/Notifications.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/Zotlabs/Module/Notifications.php b/Zotlabs/Module/Notifications.php index dfa007548..1762ad5f6 100644 --- a/Zotlabs/Module/Notifications.php +++ b/Zotlabs/Module/Notifications.php @@ -41,8 +41,6 @@ class Notifications extends \Zotlabs\Web\Controller { $notifications_available = 1; foreach ($r as $rr) { $x = strip_tags(bbcode($rr['msg'])); - if(strpos($x,',')) - $x = substr($x,strpos($x,',')+1); $notif_content .= replace_macros(get_markup_template('notify.tpl'),array( '$item_link' => z_root().'/notify/view/'. $rr['id'], '$item_image' => $rr['photo'], -- cgit v1.2.3 From ac8db6479eabd93d1d2e784bd67e43a3797a1fc8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 7 Jul 2018 08:14:11 +0200 Subject: fix css regression --- view/theme/redbasic/css/style.css | 1 - view/tpl/micropro_card.tpl | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6ffccb4e9..970e4bc89 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1152,7 +1152,6 @@ img.mail-conv-sender-photo { .wall-item-ago, .dropdown-sub-text { color: #777; - display: block; } .wall-item-content, diff --git a/view/tpl/micropro_card.tpl b/view/tpl/micropro_card.tpl index c1b621349..a3c693dbd 100644 --- a/view/tpl/micropro_card.tpl +++ b/view/tpl/micropro_card.tpl @@ -1,6 +1,5 @@ {{if $oneway}}{{/if}} {{$name}} - {{$addr}} - {{$network}} + {{$addr}}
      {{$network}}             -- cgit v1.2.3 From b81f1111d1e2726913dfb7559996f4c8d1eff436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Heiko=20F=C3=B6rster?= Date: Sun, 8 Jul 2018 16:48:37 +0200 Subject: =?UTF-8?q?Update=20hstrings.php=20-=20spelling=20-=20Privatsph?= =?UTF-8?q?=C3=A4re?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/de-de/hstrings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/de-de/hstrings.php b/view/de-de/hstrings.php index 749afef5d..884267319 100644 --- a/view/de-de/hstrings.php +++ b/view/de-de/hstrings.php @@ -277,7 +277,7 @@ App::$strings["Name or caption"] = "Name oder Titel"; App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "; App::$strings["Choose a short nickname"] = "Wähle einen kurzen Spitznamen"; App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst, z.B. nickname%s"; -App::$strings["Channel role and privacy"] = "Kanaltyp und Privatspäre-Einstellungen"; +App::$strings["Channel role and privacy"] = "Kanaltyp und Privatsphäre-Einstellungen"; App::$strings["Select a channel role with your privacy requirements."] = "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre."; App::$strings["Read more about roles"] = "Mehr Informationen über Rollen"; App::$strings["Create Channel"] = "Einen neuen Kanal anlegen"; -- cgit v1.2.3 From 38bccecc04c9fe0cabab865deb686f0e85f18009 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 11 Jul 2018 18:00:47 -0700 Subject: fix to cart behaviour --- include/follow.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/follow.php b/include/follow.php index e2f0a8f4d..964c43ff2 100644 --- a/include/follow.php +++ b/include/follow.php @@ -204,7 +204,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $singleton = intval($x['singleton']); $aid = $channel['channel_account_id']; - $hash = get_observer_hash(); + $hash = $channel['channel_hash']; $default_group = $channel['channel_default_group']; if($hash == $xchan_hash) { -- cgit v1.2.3 From 38cc88c861f1c646fe5896635b1981acc2760586 Mon Sep 17 00:00:00 2001 From: "M. Dent" Date: Fri, 13 Jul 2018 09:34:48 +0200 Subject: Hookable csp mr --- boot.php | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index e13910ecf..3b8347c30 100755 --- a/boot.php +++ b/boot.php @@ -1720,7 +1720,7 @@ function can_view_public_stream() { if(observer_prohibited(true)) { return false; } - + if(! (intval(get_config('system','open_pubstream',1)))) { if(! get_observer_hash()) { return false; @@ -2234,8 +2234,35 @@ function construct_page() { if(App::get_scheme() === 'https' && App::$config['system']['transport_security_header']) header("Strict-Transport-Security: max-age=31536000"); - if(App::$config['system']['content_security_policy']) - header("Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'"); + if(App::$config['system']['content_security_policy']) { + $cspsettings = Array ( + 'script-src' => Array ("'self'","'unsafe-inline'","'unsafe-eval'"), + 'style-src' => Array ("'self'","'unsafe-inline'") + ); + call_hooks('content_security_policy',$cspsettings); + + // Legitimate CSP directives (cxref: https://content-security-policy.com/) + $validcspdirectives=Array( + "default-src", "script-src", "style-src", + "img-src", "connect-src", "font-src", + "object-src", "media-src", 'frame-src', + 'sandbox', 'report-uri', 'child-src', + 'form-action', 'frame-ancestors', 'plugin-types' + ); + $cspheader = "Content-Security-Policy:"; + foreach ($cspsettings as $cspdirective => $csp) { + if (!in_array($cspdirective,$validcspdirectives)) { + logger("INVALID CSP DIRECTIVE: ".$cspdirective,LOGGER_DEBUG); + continue; + } + $cspsettingsarray=array_unique($cspsettings[$cspdirective]); + $cspsetpolicy = implode(' ',$cspsettingsarray); + if ($cspsetpolicy) { + $cspheader .= " ".$cspdirective." ".$cspsetpolicy.";"; + } + } + header($cspheader); + } if(App::$config['system']['x_security_headers']) { header("X-Frame-Options: SAMEORIGIN"); -- cgit v1.2.3 From 5076e38c1cd883be5db0a3f84fe75a8af7a6d197 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 13 Jul 2018 10:12:11 +0200 Subject: update jquery.timeago lib --- library/jquery.timeago.js | 41 ++++++++++++++++++++++++++--------------- view/js/mod_mail.js | 4 ++-- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/library/jquery.timeago.js b/library/jquery.timeago.js index ef9327aac..f7b640149 100644 --- a/library/jquery.timeago.js +++ b/library/jquery.timeago.js @@ -3,7 +3,7 @@ * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago"). * * @name timeago - * @version 1.4.1 + * @version 1.6.3 * @requires jQuery v1.2.3+ * @author Ryan McGeary * @license MIT License - http://www.opensource.org/licenses/mit-license.php @@ -11,13 +11,15 @@ * For usage and examples, visit: * http://timeago.yarp.com/ * - * Copyright (c) 2008-2013, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org) + * Copyright (c) 2008-2017, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org) */ (function (factory) { if (typeof define === 'function' && define.amd) { // AMD. Register as an anonymous module. define(['jquery'], factory); + } else if (typeof module === 'object' && typeof module.exports === 'object') { + factory(require('jquery')); } else { // Browser globals factory(jQuery); @@ -43,6 +45,7 @@ allowFuture: false, localeTitle: false, cutoff: 0, + autoDispose: true, strings: { prefixAgo: null, prefixFromNow: null, @@ -66,7 +69,7 @@ }, inWords: function(distanceMillis) { - if(!this.settings.allowPast && ! this.settings.allowFuture) { + if (!this.settings.allowPast && ! this.settings.allowFuture) { throw 'timeago allowPast and allowFuture settings can not both be set to false.'; } @@ -80,7 +83,7 @@ } } - if(!this.settings.allowPast && distanceMillis >= 0) { + if (!this.settings.allowPast && distanceMillis >= 0) { return this.settings.strings.inPast; } @@ -136,7 +139,8 @@ // init is default when no action is given // functions are called with context of a single element var functions = { - init: function(){ + init: function() { + functions.dispose.call(this); var refresh_el = $.proxy(refresh, this); refresh_el(); var $s = $t.settings; @@ -144,13 +148,15 @@ this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis); } }, - update: function(time){ - var parsedTime = $t.parse(time); - $(this).data('timeago', { datetime: parsedTime }); - if($t.settings.localeTitle) $(this).attr("title", parsedTime.toLocaleString()); + update: function(timestamp) { + var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp); + $(this).data('timeago', { datetime: date }); + if ($t.settings.localeTitle) { + $(this).attr("title", date.toLocaleString()); + } refresh.apply(this); }, - updateFromDOM: function(){ + updateFromDOM: function() { $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) }); refresh.apply(this); }, @@ -164,30 +170,35 @@ $.fn.timeago = function(action, options) { var fn = action ? functions[action] : functions.init; - if(!fn){ + if (!fn) { throw new Error("Unknown function name '"+ action +"' for timeago"); } // each over objects here and call the requested function - this.each(function(){ + this.each(function() { fn.call(this, options); }); return this; }; function refresh() { + var $s = $t.settings; + //check if it's still visible - if(!$.contains(document.documentElement,this)){ + if ($s.autoDispose && !$.contains(document.documentElement,this)) { //stop if it has been removed $(this).timeago("dispose"); return this; } var data = prepareData(this); - var $s = $t.settings; if (!isNaN(data.datetime)) { - if ( $s.cutoff == 0 || Math.abs(distance(data.datetime)) < $s.cutoff) { + if ( $s.cutoff === 0 || Math.abs(distance(data.datetime)) < $s.cutoff) { $(this).text(inWords(data.datetime)); + } else { + if ($(this).attr('title').length > 0) { + $(this).text($(this).attr('title')); + } } } return this; diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js index 15a45519b..e3c891c2c 100644 --- a/view/js/mod_mail.js +++ b/view/js/mod_mail.js @@ -1,8 +1,8 @@ $(document).ready(function() { + $(".autotime").timeago(); $("#recip").name_autocomplete(baseurl + '/acl', 'm', false, function(data) { $("#recip-complete").val(data.xid); }); - $(".autotime").timeago() $('#prvmail-text').bbco_autocomplete('bbcode'); - $("#prvmail-text").editor_autocomplete(baseurl+"/acl"); + $("#prvmail-text").editor_autocomplete(baseurl+"/acl"); }); -- cgit v1.2.3 From a8cef79b1a2a9178c615e279e681eac43f5e3737 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 13 Jul 2018 10:13:11 +0200 Subject: let timeago render the date --- view/tpl/mail_conv.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index 759517b7f..cd810e999 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -6,7 +6,7 @@
      {{if $mail.is_recalled}}{{$mail.is_recalled}}{{/if}}
      {{$mail.from_name}}
      -
      {{$mail.date}}
      +
      -- cgit v1.2.3 From 98fb2ec639c907ff7b232c6a99db26a757f540c8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 13 Jul 2018 10:16:07 +0200 Subject: let timeago render the date --- view/tpl/mail_list.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 65d8dcdb4..a1784e1e6 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -2,6 +2,6 @@ {{$message.subject}}
      {{$message.from_name}} > {{$message.to_name}}
      - {{$message.date}} +       -- cgit v1.2.3 From bb7022350943c6f049641d50d28cb99caf019b83 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 13 Jul 2018 11:00:37 +0200 Subject: when calling timeago() from mod_mail.js it is called before the translations are applied - move the call to main.js and be more specific with the selector to not trigger calls for other modules (eg network) which is handled elsewhere to not be to much of an performance hog (to many dates at a time) --- view/js/main.js | 3 +++ view/js/mod_mail.js | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/view/js/main.js b/view/js/main.js index 45c412296..17f94dd16 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -62,6 +62,9 @@ $(document).ready(function() { numbers : aStr['t17'], }; + //mod_mail only + $(".mail-conv-detail .autotime").timeago(); + savedTitle = document.title; updateInit(); diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js index e3c891c2c..917e5414c 100644 --- a/view/js/mod_mail.js +++ b/view/js/mod_mail.js @@ -1,5 +1,4 @@ $(document).ready(function() { - $(".autotime").timeago(); $("#recip").name_autocomplete(baseurl + '/acl', 'm', false, function(data) { $("#recip-complete").val(data.xid); }); -- cgit v1.2.3 From 23f3d554b833b8b4b180dfd432b3e66112391362 Mon Sep 17 00:00:00 2001 From: kostikov Date: Tue, 17 Jul 2018 21:27:08 +0200 Subject: Fix wrong plural function logic (cherry picked from commit 42840886119420b4efad511da0cb307f74542545) --- view/ru/hmessages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index 0ff952e8d..058e4dc5a 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +Plural-Forms: nplurals=3; plural=($n%10==1 && $n%100!=11 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : 2))\n #: ../../include/dba/dba_driver.php:50 #, php-format -- cgit v1.2.3 From 67cbeaa3d4d95bcbd31828a7227e5b8febebebb6 Mon Sep 17 00:00:00 2001 From: kostikov Date: Wed, 18 Jul 2018 00:28:04 +0200 Subject: Update hmessages.po (cherry picked from commit cbab7d215046d999c3f808b3946ea378c4475a72) --- view/ru/hmessages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index 058e4dc5a..023e2674f 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -Plural-Forms: nplurals=3; plural=($n%10==1 && $n%100!=11 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : 2))\n +Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))\n #: ../../include/dba/dba_driver.php:50 #, php-format -- cgit v1.2.3 From 5fd1674d502046ee91b65d1ff83ef4748ff07fe0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 18 Jul 2018 11:39:22 +0200 Subject: version 3.6RC --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 3b8347c30..04cb7c24c 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.5.8' ); +define ( 'STD_VERSION', '3.6RC' ); define ( 'ZOT_REVISION', '6.0a' ); -- cgit v1.2.3 From 4c633a9fb8b082b6935e056dc594fc3f372207d0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 18 Jul 2018 11:49:32 +0200 Subject: update strings --- util/hmessages.po | 3593 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 2025 insertions(+), 1568 deletions(-) diff --git a/util/hmessages.po b/util/hmessages.po index 03c8d92da..98dbc59e6 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.5\n" +"Project-Id-Version: 3.6RC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-23 11:34+0200\n" +"POT-Creation-Date: 2018-07-18 11:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "Can like/dislike profiles and profile things" msgstr "" #: ../../Zotlabs/Access/Permissions.php:70 -msgid "Can forward to all my channel connections via @+ mentions in posts" +msgid "Can forward to all my channel connections via ! mentions in posts" msgstr "" #: ../../Zotlabs/Access/Permissions.php:71 @@ -150,14 +150,14 @@ msgid "Special - Group Repository" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:306 -#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:144 -#: ../../Zotlabs/Module/Settings/Channel.php:479 +#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:172 +#: ../../Zotlabs/Module/Settings/Channel.php:496 #: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795 -#: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49 +#: ../../Zotlabs/Module/Register.php:233 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 #: ../../include/selectors.php:140 ../../include/event.php:1315 -#: ../../include/event.php:1322 ../../include/connections.php:697 -#: ../../include/connections.php:704 +#: ../../include/event.php:1322 ../../include/connections.php:703 +#: ../../include/connections.php:710 msgid "Other" msgstr "" @@ -169,23 +169,24 @@ msgstr "" #: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Connect.php:17 #: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 -#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32 -#: ../../Zotlabs/Module/Cards.php:33 ../../Zotlabs/Module/Webpages.php:33 -#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1197 +#: ../../Zotlabs/Module/Menu.php:91 ../../Zotlabs/Module/Layouts.php:31 +#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Cards.php:33 +#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Filestorage.php:51 +#: ../../include/channel.php:1197 msgid "Requested profile is not available." msgstr "" #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 #: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94 #: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Editlayout.php:67 -#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:110 -#: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288 +#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:115 +#: ../../Zotlabs/Module/Channel.php:281 ../../Zotlabs/Module/Channel.php:320 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 -#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271 -#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Events.php:271 +#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:20 #: ../../Zotlabs/Module/Article_edit.php:51 -#: ../../Zotlabs/Module/New_channel.php:91 -#: ../../Zotlabs/Module/New_channel.php:116 +#: ../../Zotlabs/Module/New_channel.php:105 +#: ../../Zotlabs/Module/New_channel.php:130 #: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 #: ../../Zotlabs/Module/Moderate.php:13 #: ../../Zotlabs/Module/Settings/Features.php:38 @@ -202,30 +203,32 @@ msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:315 #: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229 #: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256 -#: ../../Zotlabs/Module/Item.php:1106 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Item.php:1108 ../../Zotlabs/Module/Page.php:34 #: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389 #: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 -#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71 -#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 -#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:13 -#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 +#: ../../Zotlabs/Module/Menu.php:129 ../../Zotlabs/Module/Menu.php:140 +#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 +#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Cloud.php:40 +#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:12 +#: ../../Zotlabs/Module/Group.php:24 ../../Zotlabs/Module/Profiles.php:198 +#: ../../Zotlabs/Module/Profiles.php:635 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10 #: ../../Zotlabs/Module/Cards.php:72 ../../Zotlabs/Module/Webpages.php:118 #: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 -#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:74 +#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:77 #: ../../Zotlabs/Module/Like.php:185 ../../Zotlabs/Module/Suggest.php:28 #: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146 #: ../../Zotlabs/Module/Register.php:77 -#: ../../Zotlabs/Module/Cover_photo.php:281 -#: ../../Zotlabs/Module/Cover_photo.php:294 +#: ../../Zotlabs/Module/Cover_photo.php:313 +#: ../../Zotlabs/Module/Cover_photo.php:326 #: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 -#: ../../Zotlabs/Module/Filestorage.php:85 -#: ../../Zotlabs/Module/Filestorage.php:117 ../../Zotlabs/Module/Common.php:38 +#: ../../Zotlabs/Module/Filestorage.php:96 +#: ../../Zotlabs/Module/Filestorage.php:140 ../../Zotlabs/Module/Common.php:38 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Rate.php:113 @@ -234,12 +237,11 @@ msgstr "" #: ../../Zotlabs/Web/WebServer.php:123 ../../addon/keepout/keepout.php:36 #: ../../addon/openid/Mod_Id.php:53 ../../addon/pumpio/pumpio.php:40 #: ../../include/attach.php:150 ../../include/attach.php:197 -#: ../../include/attach.php:270 ../../include/attach.php:284 -#: ../../include/attach.php:293 ../../include/attach.php:366 -#: ../../include/attach.php:380 ../../include/attach.php:387 -#: ../../include/attach.php:469 ../../include/attach.php:1029 -#: ../../include/attach.php:1103 ../../include/attach.php:1268 -#: ../../include/items.php:3706 ../../include/photos.php:27 +#: ../../include/attach.php:270 ../../include/attach.php:379 +#: ../../include/attach.php:393 ../../include/attach.php:400 +#: ../../include/attach.php:482 ../../include/attach.php:1042 +#: ../../include/attach.php:1116 ../../include/attach.php:1281 +#: ../../include/items.php:3653 ../../include/photos.php:27 msgid "Permission denied." msgstr "" @@ -248,7 +250,7 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2422 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2458 msgid "Blocks" msgstr "" @@ -256,22 +258,22 @@ msgstr "" msgid "Block Title" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114 +#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:177 #: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251 msgid "Created" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115 +#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:178 #: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252 msgid "Edited" msgstr "" #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96 -#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:160 -#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:118 +#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:188 +#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:181 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239 -#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:382 +#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:390 #: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165 msgid "Create" msgstr "" @@ -279,27 +281,27 @@ msgstr "" #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Article_edit.php:99 #: ../../Zotlabs/Module/Admin/Profs.php:175 -#: ../../Zotlabs/Module/Settings/Oauth2.php:149 +#: ../../Zotlabs/Module/Settings/Oauth2.php:150 #: ../../Zotlabs/Module/Settings/Oauth.php:150 #: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114 #: ../../Zotlabs/Module/Connections.php:281 #: ../../Zotlabs/Module/Connections.php:319 #: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202 -#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:112 -#: ../../Zotlabs/Module/Layouts.php:193 +#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:175 +#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:216 #: ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99 -#: ../../Zotlabs/Lib/Apps.php:409 ../../Zotlabs/Lib/ThreadItem.php:121 -#: ../../Zotlabs/Storage/Browser.php:288 ../../Zotlabs/Widget/Cdav.php:126 +#: ../../Zotlabs/Lib/Apps.php:475 ../../Zotlabs/Lib/ThreadItem.php:128 +#: ../../Zotlabs/Storage/Browser.php:290 ../../Zotlabs/Widget/Cdav.php:126 #: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296 -#: ../../include/channel.php:1300 ../../include/menu.php:113 +#: ../../include/channel.php:1300 ../../include/menu.php:118 msgid "Edit" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1107 #: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124 -#: ../../include/conversation.php:1366 +#: ../../include/conversation.php:1374 msgid "Share" msgstr "" @@ -309,18 +311,17 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:175 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:176 -#: ../../Zotlabs/Module/Settings/Oauth2.php:150 +#: ../../Zotlabs/Module/Settings/Oauth2.php:151 #: ../../Zotlabs/Module/Settings/Oauth.php:151 #: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139 #: ../../Zotlabs/Module/Connections.php:289 -#: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654 -#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Group.php:179 -#: ../../Zotlabs/Module/Profiles.php:800 +#: ../../Zotlabs/Module/Photos.php:1208 ../../Zotlabs/Module/Connedit.php:654 +#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/Editwebpage.php:167 #: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Module/Card_edit.php:129 -#: ../../Zotlabs/Lib/Apps.php:410 ../../Zotlabs/Lib/ThreadItem.php:141 -#: ../../Zotlabs/Storage/Browser.php:289 ../../include/conversation.php:690 -#: ../../include/conversation.php:733 +#: ../../Zotlabs/Lib/Apps.php:476 ../../Zotlabs/Lib/ThreadItem.php:148 +#: ../../Zotlabs/Storage/Browser.php:291 ../../include/conversation.php:691 +#: ../../include/conversation.php:736 msgid "Delete" msgstr "" @@ -401,49 +402,49 @@ msgid "3. Click [Connect]" msgstr "" #: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493 +#: ../../Zotlabs/Module/Mitem.php:259 ../../Zotlabs/Module/Events.php:493 #: ../../Zotlabs/Module/Appman.php:153 #: ../../Zotlabs/Module/Import_items.php:129 ../../Zotlabs/Module/Setup.php:308 #: ../../Zotlabs/Module/Setup.php:349 ../../Zotlabs/Module/Connect.php:98 #: ../../Zotlabs/Module/Admin/Features.php:66 -#: ../../Zotlabs/Module/Admin/Plugins.php:438 #: ../../Zotlabs/Module/Admin/Accounts.php:168 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Addons.php:438 #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Account_edit.php:74 -#: ../../Zotlabs/Module/Admin/Security.php:104 +#: ../../Zotlabs/Module/Admin/Security.php:112 #: ../../Zotlabs/Module/Settings/Permcats.php:115 -#: ../../Zotlabs/Module/Settings/Channel.php:495 +#: ../../Zotlabs/Module/Settings/Channel.php:516 #: ../../Zotlabs/Module/Settings/Features.php:79 #: ../../Zotlabs/Module/Settings/Tokens.php:168 -#: ../../Zotlabs/Module/Settings/Oauth2.php:84 +#: ../../Zotlabs/Module/Settings/Oauth2.php:85 #: ../../Zotlabs/Module/Settings/Account.php:118 #: ../../Zotlabs/Module/Settings/Featured.php:54 #: ../../Zotlabs/Module/Settings/Display.php:192 #: ../../Zotlabs/Module/Settings/Oauth.php:88 #: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379 -#: ../../Zotlabs/Module/Import.php:530 ../../Zotlabs/Module/Cal.php:345 -#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082 -#: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240 +#: ../../Zotlabs/Module/Import.php:565 ../../Zotlabs/Module/Cal.php:345 +#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1087 +#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1245 #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98 #: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:887 #: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242 #: ../../Zotlabs/Module/Email_validation.php:40 #: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249 -#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:723 -#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Sources.php:114 -#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Lib/ThreadItem.php:752 -#: ../../Zotlabs/Widget/Eventstools.php:16 +#: ../../Zotlabs/Module/Group.php:121 ../../Zotlabs/Module/Group.php:137 +#: ../../Zotlabs/Module/Profiles.php:723 ../../Zotlabs/Module/Editpost.php:85 +#: ../../Zotlabs/Module/Sources.php:117 ../../Zotlabs/Module/Sources.php:154 +#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431 +#: ../../Zotlabs/Module/Filestorage.php:183 ../../Zotlabs/Module/Rate.php:166 +#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../Zotlabs/Widget/Eventstools.php:16 #: ../../Zotlabs/Widget/Wiki_pages.php:40 #: ../../Zotlabs/Widget/Wiki_pages.php:97 #: ../../view/theme/redbasic_c/php/config.php:95 #: ../../view/theme/redbasic/php/config.php:93 -#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:275 +#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:284 #: ../../addon/planets/planets.php:153 #: ../../addon/openclipatar/openclipatar.php:53 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 @@ -451,7 +452,7 @@ msgstr "" #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:825 +#: ../../addon/diaspora/diaspora.php:830 #: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84 #: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161 #: ../../addon/mailtest/mailtest.php:100 @@ -460,7 +461,7 @@ msgstr "" #: ../../addon/jappixmini/jappixmini.php:371 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1072 +#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1159 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 @@ -468,7 +469,10 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:432 #: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:218 #: ../../addon/twitter/twitter.php:265 -#: ../../addon/smileybutton/smileybutton.php:219 ../../addon/cart/cart.php:1104 +#: ../../addon/smileybutton/smileybutton.php:219 ../../addon/cart/cart.php:1251 +#: ../../addon/cart/submodules/paypalbutton.php:144 +#: ../../addon/cart/submodules/hzservices.php:78 +#: ../../addon/cart/submodules/hzservices.php:647 #: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48 #: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69 #: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124 @@ -477,8 +481,8 @@ msgid "Submit" msgstr "" #: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191 -#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:133 -#: ../../include/nav.php:469 +#: ../../Zotlabs/Lib/Apps.php:292 ../../include/features.php:133 +#: ../../include/nav.php:461 msgid "Articles" msgstr "" @@ -508,13 +512,32 @@ msgstr "" msgid "Edit Layout" msgstr "" +#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:899 +#: ../../Zotlabs/Module/Cdav.php:1188 ../../Zotlabs/Module/Article_edit.php:131 +#: ../../Zotlabs/Module/Admin/Addons.php:423 +#: ../../Zotlabs/Module/Settings/Oauth2.php:86 +#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth.php:89 +#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:347 +#: ../../Zotlabs/Module/Wiki.php:379 ../../Zotlabs/Module/Profile_photo.php:465 +#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66 +#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 +#: ../../Zotlabs/Module/Editwebpage.php:169 +#: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Filer.php:55 +#: ../../Zotlabs/Module/Cover_photo.php:399 ../../Zotlabs/Module/Tagrm.php:15 +#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Card_edit.php:131 +#: ../../include/conversation.php:1397 ../../include/conversation.php:1446 +msgid "Cancel" +msgstr "" + #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86 -#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Cloud.php:117 -#: ../../Zotlabs/Module/Group.php:74 ../../Zotlabs/Module/Dreport.php:10 +#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Cloud.php:126 +#: ../../Zotlabs/Module/Group.php:83 ../../Zotlabs/Module/Dreport.php:10 #: ../../Zotlabs/Module/Dreport.php:68 ../../Zotlabs/Module/Like.php:296 #: ../../Zotlabs/Web/WebServer.php:122 ../../addon/redphotos/redphotos.php:119 #: ../../addon/hzfiles/hzfiles.php:73 ../../addon/frphotos/frphotos.php:82 -#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:358 +#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:364 msgid "Permission denied" msgstr "" @@ -553,11 +576,11 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787 #: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146 -#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273 -#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833 +#: ../../Zotlabs/Module/Photos.php:822 ../../Zotlabs/Module/Photos.php:1278 +#: ../../Zotlabs/Lib/Apps.php:819 ../../Zotlabs/Lib/Apps.php:898 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891 -#: ../../include/conversation.php:1160 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:961 +#: ../../include/conversation.php:1165 msgid "Unknown" msgstr "" @@ -596,6 +619,7 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101 #: ../../addon/rendezvous/rendezvous.php:173 +#: ../../addon/cart/submodules/hzservices.php:659 msgid "Description" msgstr "" @@ -608,14 +632,14 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Events.php:689 #: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:339 -#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:971 +#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:976 msgid "Previous" msgstr "" #: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Events.php:690 #: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263 #: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347 -#: ../../Zotlabs/Module/Photos.php:980 +#: ../../Zotlabs/Module/Photos.php:985 msgid "Next" msgstr "" @@ -664,35 +688,20 @@ msgstr "" msgid "Delete all" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188 -#: ../../Zotlabs/Module/Admin/Plugins.php:423 -#: ../../Zotlabs/Module/Settings/Oauth2.php:85 -#: ../../Zotlabs/Module/Settings/Oauth2.php:113 -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -#: ../../Zotlabs/Module/Settings/Oauth.php:115 -#: ../../Zotlabs/Module/Wiki.php:347 ../../Zotlabs/Module/Wiki.php:379 -#: ../../Zotlabs/Module/Profile_photo.php:464 -#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66 -#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:366 -#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 -#: ../../include/conversation.php:1389 ../../include/conversation.php:1438 -msgid "Cancel" -msgstr "" - #: ../../Zotlabs/Module/Cdav.php:900 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" #: ../../Zotlabs/Module/Cdav.php:1170 ../../Zotlabs/Module/Sharedwithme.php:105 #: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Settings/Oauth2.php:86 -#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 #: ../../Zotlabs/Module/Settings/Oauth.php:90 #: ../../Zotlabs/Module/Settings/Oauth.php:116 #: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906 -#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558 -#: ../../Zotlabs/Storage/Browser.php:283 +#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Module/Group.php:125 +#: ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Storage/Browser.php:285 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 msgid "Name" @@ -717,7 +726,7 @@ msgstr "" #: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1770 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1769 msgid "Email" msgstr "" @@ -745,19 +754,19 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915 #: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308 -#: ../../include/connections.php:690 +#: ../../include/connections.php:696 msgid "Mobile" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916 #: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309 -#: ../../include/connections.php:691 +#: ../../include/connections.php:697 msgid "Home" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917 #: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312 -#: ../../include/connections.php:694 +#: ../../include/connections.php:700 msgid "Work" msgstr "" @@ -772,14 +781,13 @@ msgstr "" msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1186 -#: ../../Zotlabs/Module/Admin/Plugins.php:453 -#: ../../Zotlabs/Module/Settings/Oauth2.php:39 -#: ../../Zotlabs/Module/Settings/Oauth2.php:112 +#: ../../Zotlabs/Module/Cdav.php:1186 ../../Zotlabs/Module/Admin/Addons.php:453 +#: ../../Zotlabs/Module/Settings/Oauth2.php:40 +#: ../../Zotlabs/Module/Settings/Oauth2.php:113 #: ../../Zotlabs/Module/Settings/Oauth.php:43 #: ../../Zotlabs/Module/Settings/Oauth.php:114 #: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799 -#: ../../Zotlabs/Lib/Apps.php:393 +#: ../../Zotlabs/Lib/Apps.php:456 msgid "Update" msgstr "" @@ -824,25 +832,35 @@ msgstr "" msgid "This site is not a directory server" msgstr "" -#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Ochannel.php:32 +#: ../../Zotlabs/Module/Channel.php:35 ../../Zotlabs/Module/Ochannel.php:32 #: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508 msgid "You must be logged in to see this page." msgstr "" -#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:37 +#: ../../Zotlabs/Module/Channel.php:50 ../../Zotlabs/Module/Hcard.php:37 #: ../../Zotlabs/Module/Profile.php:45 msgid "Posts and comments" msgstr "" -#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:44 +#: ../../Zotlabs/Module/Channel.php:57 ../../Zotlabs/Module/Hcard.php:44 #: ../../Zotlabs/Module/Profile.php:52 msgid "Only posts" msgstr "" -#: ../../Zotlabs/Module/Channel.php:107 +#: ../../Zotlabs/Module/Channel.php:112 msgid "Insufficient permissions. Request redirected to profile page." msgstr "" +#: ../../Zotlabs/Module/Channel.php:129 ../../Zotlabs/Module/Network.php:174 +msgid "Search Results For:" +msgstr "" + +#: ../../Zotlabs/Module/Channel.php:164 ../../Zotlabs/Module/Hq.php:134 +#: ../../Zotlabs/Module/Pubstream.php:80 ../../Zotlabs/Module/Display.php:81 +#: ../../Zotlabs/Module/Network.php:204 +msgid "Reset form" +msgstr "" + #: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58 msgid "Export Channel" msgstr "" @@ -909,7 +927,7 @@ msgstr "" msgid "You have got no unseen posts..." msgstr "" -#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:540 +#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:545 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63 #: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30 #: ../../Zotlabs/Module/Viewconnections.php:23 @@ -917,9 +935,10 @@ msgid "Public access denied." msgstr "" #: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335 -#: ../../Zotlabs/Lib/Apps.php:256 ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../include/text.php:1051 ../../include/text.php:1063 -#: ../../include/acl_selectors.php:118 ../../include/nav.php:179 +#: ../../Zotlabs/Lib/Apps.php:318 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../Zotlabs/Widget/Activity_filter.php:148 ../../include/text.php:1062 +#: ../../include/text.php:1074 ../../include/acl_selectors.php:118 +#: ../../include/nav.php:185 msgid "Search" msgstr "" @@ -934,7 +953,7 @@ msgid "Search results for: %s" msgstr "" #: ../../Zotlabs/Module/Pubstream.php:95 -#: ../../Zotlabs/Widget/Notifications.php:131 +#: ../../Zotlabs/Widget/Notifications.php:142 msgid "Public Stream" msgstr "" @@ -964,11 +983,11 @@ msgstr "" msgid "Manage Channel Locations" msgstr "" -#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:111 +#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:115 msgid "Primary" msgstr "" -#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113 +#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:176 msgid "Drop" msgstr "" @@ -1008,66 +1027,69 @@ msgstr "" msgid "Use arrows to move the corresponding app up or down in the app tray" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144 +#: ../../Zotlabs/Module/Mitem.php:31 ../../Zotlabs/Module/Menu.php:208 msgid "Menu not found." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:52 +#: ../../Zotlabs/Module/Mitem.php:63 msgid "Unable to create element." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:76 +#: ../../Zotlabs/Module/Mitem.php:87 msgid "Unable to update menu element." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:92 +#: ../../Zotlabs/Module/Mitem.php:103 msgid "Unable to add menu element." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:120 ../../Zotlabs/Module/Menu.php:166 +#: ../../Zotlabs/Module/Mitem.php:134 ../../Zotlabs/Module/Menu.php:231 #: ../../Zotlabs/Module/Xchan.php:41 msgid "Not found." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230 +#: ../../Zotlabs/Module/Mitem.php:167 ../../Zotlabs/Module/Mitem.php:246 msgid "Menu Item Permissions" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "(click to open/close)" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176 +#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191 msgid "Link Name" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239 +#: ../../Zotlabs/Module/Mitem.php:175 ../../Zotlabs/Module/Mitem.php:255 msgid "Link or Submenu Target" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:161 +#: ../../Zotlabs/Module/Mitem.php:175 msgid "Enter URL of the link or select a menu name to create a submenu" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:256 msgid "Use magic-auth if available" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 -#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:259 -#: ../../Zotlabs/Module/Settings/Channel.php:307 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:266 +#: ../../Zotlabs/Module/Settings/Channel.php:315 #: ../../Zotlabs/Module/Settings/Display.php:100 -#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:697 -#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 -#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Connedit.php:779 -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Filestorage.php:155 -#: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594 +#: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 +#: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:99 +#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Wiki.php:218 +#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Connedit.php:396 +#: ../../Zotlabs/Module/Connedit.php:779 ../../Zotlabs/Module/Menu.php:162 +#: ../../Zotlabs/Module/Menu.php:221 ../../Zotlabs/Module/Defperms.php:180 +#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Sources.php:116 +#: ../../Zotlabs/Module/Sources.php:151 +#: ../../Zotlabs/Module/Filestorage.php:178 +#: ../../Zotlabs/Module/Filestorage.php:186 +#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1618 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1095,8 +1117,13 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:243 #: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 #: ../../addon/smileybutton/smileybutton.php:211 -#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/cart/cart.php:1075 -#: ../../addon/cart/cart.php:1082 ../../addon/cart/cart.php:1090 +#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/cart/cart.php:1206 +#: ../../addon/cart/cart.php:1213 ../../addon/cart/cart.php:1221 +#: ../../addon/cart/submodules/paypalbutton.php:99 +#: ../../addon/cart/submodules/paypalbutton.php:104 +#: ../../addon/cart/submodules/hzservices.php:73 +#: ../../addon/cart/submodules/hzservices.php:653 +#: ../../addon/cart/submodules/hzservices.php:657 #: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 #: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 #: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 @@ -1105,20 +1132,22 @@ msgstr "" msgid "No" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 -#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:261 -#: ../../Zotlabs/Module/Settings/Channel.php:307 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:268 +#: ../../Zotlabs/Module/Settings/Channel.php:315 #: ../../Zotlabs/Module/Settings/Display.php:100 -#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:697 -#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 -#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Defperms.php:180 -#: ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Filestorage.php:155 -#: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594 +#: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 +#: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:98 +#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Wiki.php:218 +#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Connedit.php:396 +#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221 +#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +#: ../../Zotlabs/Module/Filestorage.php:178 +#: ../../Zotlabs/Module/Filestorage.php:186 +#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1618 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1146,8 +1175,13 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:243 #: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 #: ../../addon/smileybutton/smileybutton.php:211 -#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/cart/cart.php:1075 -#: ../../addon/cart/cart.php:1082 ../../addon/cart/cart.php:1090 +#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/cart/cart.php:1206 +#: ../../addon/cart/cart.php:1213 ../../addon/cart/cart.php:1221 +#: ../../addon/cart/submodules/paypalbutton.php:99 +#: ../../addon/cart/submodules/paypalbutton.php:104 +#: ../../addon/cart/submodules/hzservices.php:73 +#: ../../addon/cart/submodules/hzservices.php:653 +#: ../../addon/cart/submodules/hzservices.php:657 #: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 #: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 #: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 @@ -1156,83 +1190,83 @@ msgstr "" msgid "Yes" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:257 msgid "Open link in new window" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258 msgid "Order in list" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258 msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:165 +#: ../../Zotlabs/Module/Mitem.php:179 msgid "Submit and finish" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:166 +#: ../../Zotlabs/Module/Mitem.php:180 msgid "Submit and continue" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:174 +#: ../../Zotlabs/Module/Mitem.php:189 msgid "Menu:" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:192 msgid "Link Target" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:180 +#: ../../Zotlabs/Module/Mitem.php:195 msgid "Edit menu" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:183 +#: ../../Zotlabs/Module/Mitem.php:198 msgid "Edit element" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:184 +#: ../../Zotlabs/Module/Mitem.php:199 msgid "Drop element" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:185 +#: ../../Zotlabs/Module/Mitem.php:200 msgid "New element" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:186 +#: ../../Zotlabs/Module/Mitem.php:201 msgid "Edit this menu container" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:187 +#: ../../Zotlabs/Module/Mitem.php:202 msgid "Add menu element" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:188 +#: ../../Zotlabs/Module/Mitem.php:203 msgid "Delete this menu item" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:189 +#: ../../Zotlabs/Module/Mitem.php:204 msgid "Edit this menu item" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:206 +#: ../../Zotlabs/Module/Mitem.php:222 msgid "Menu item not found." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:219 +#: ../../Zotlabs/Module/Mitem.php:235 msgid "Menu item deleted." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:221 +#: ../../Zotlabs/Module/Mitem.php:237 msgid "Menu item could not be deleted." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:228 +#: ../../Zotlabs/Module/Mitem.php:244 msgid "Edit Menu Element" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:238 +#: ../../Zotlabs/Module/Mitem.php:254 msgid "Link text" msgstr "" @@ -1263,7 +1297,7 @@ msgstr "" #: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73 #: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119 -#: ../../include/text.php:2008 ../../include/event.php:1153 +#: ../../include/text.php:2025 ../../include/event.php:1153 msgid "event" msgstr "" @@ -1324,13 +1358,13 @@ msgstr "" msgid "Edit Location" msgstr "" -#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:762 -#: ../../include/conversation.php:1333 +#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1128 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:767 +#: ../../include/conversation.php:1341 msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1405 +#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1413 msgid "Permission settings" msgstr "" @@ -1355,7 +1389,7 @@ msgid "Delete event" msgstr "" #: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315 -#: ../../include/text.php:1827 +#: ../../include/text.php:1844 msgid "Link to Source" msgstr "" @@ -1440,21 +1474,21 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../Zotlabs/Module/Magic.php:72 +#: ../../Zotlabs/Module/Magic.php:76 msgid "Hub not found." msgstr "" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 #: ../../Zotlabs/Module/Like.php:384 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 -#: ../../include/conversation.php:116 ../../include/text.php:2005 +#: ../../addon/diaspora/Receiver.php:1530 ../../addon/pubcrawl/as.php:1509 +#: ../../include/conversation.php:116 ../../include/text.php:2022 msgid "photo" msgstr "" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 -#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 -#: ../../include/conversation.php:144 ../../include/text.php:2011 +#: ../../addon/diaspora/Receiver.php:1530 ../../addon/pubcrawl/as.php:1509 +#: ../../include/conversation.php:144 ../../include/text.php:2028 msgid "status" msgstr "" @@ -1479,14 +1513,14 @@ msgstr "" #: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207 #: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 #: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101 -#: ../../include/conversation.php:1278 +#: ../../include/conversation.php:1283 msgid "Insert web link" msgstr "" #: ../../Zotlabs/Module/Article_edit.php:117 -#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:698 -#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Card_edit.php:117 -#: ../../include/conversation.php:1401 +#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:703 +#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Card_edit.php:117 +#: ../../include/conversation.php:1409 msgid "Title (optional)" msgstr "" @@ -1494,16 +1528,16 @@ msgstr "" msgid "Edit Article" msgstr "" -#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64 +#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:66 msgid "Nothing to import." msgstr "" -#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79 -#: ../../Zotlabs/Module/Import.php:95 +#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:81 +#: ../../Zotlabs/Module/Import.php:97 msgid "Unable to download data from old server" msgstr "" -#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:102 +#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:104 msgid "Imported file is empty." msgstr "" @@ -1525,81 +1559,84 @@ msgid "Use this form to import existing posts and content from an export file." msgstr "" #: ../../Zotlabs/Module/Import_items.php:127 -#: ../../Zotlabs/Module/Import.php:517 +#: ../../Zotlabs/Module/Import.php:548 msgid "File to Upload" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:133 ../../Zotlabs/Module/Manage.php:138 +#: ../../Zotlabs/Module/New_channel.php:147 ../../Zotlabs/Module/Manage.php:138 #, php-format msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:146 -#: ../../Zotlabs/Module/Register.php:254 -msgid "Name or caption" +#: ../../Zotlabs/Module/New_channel.php:154 +#: ../../Zotlabs/Module/New_channel.php:161 +#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240 +#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:276 +msgid "Loading" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:146 -#: ../../Zotlabs/Module/Register.php:254 +#: ../../Zotlabs/Module/New_channel.php:156 +msgid "Your real name is recommended." +msgstr "" + +#: ../../Zotlabs/Module/New_channel.php:157 msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:148 -#: ../../Zotlabs/Module/Register.php:256 -msgid "Choose a short nickname" +#: ../../Zotlabs/Module/New_channel.php:162 +msgid "" +"This will be used to create a unique network address (like an email address)." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:148 -#: ../../Zotlabs/Module/Register.php:256 -#, php-format -msgid "" -"Your nickname will be used to create an easy to remember channel address e." -"g. nickname%s" +#: ../../Zotlabs/Module/New_channel.php:164 +msgid "Allowed characters are a-z 0-9, - and _" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:149 -#: ../../Zotlabs/Module/Settings/Channel.php:539 -#: ../../Zotlabs/Module/Register.php:257 +#: ../../Zotlabs/Module/New_channel.php:174 +msgid "Channel name" +msgstr "" + +#: ../../Zotlabs/Module/New_channel.php:176 +#: ../../Zotlabs/Module/Register.php:265 +msgid "Choose a short nickname" +msgstr "" + +#: ../../Zotlabs/Module/New_channel.php:177 +#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Register.php:266 msgid "Channel role and privacy" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:149 -#: ../../Zotlabs/Module/Register.php:257 -msgid "Select a channel role with your privacy requirements." +#: ../../Zotlabs/Module/New_channel.php:177 +msgid "" +"Select a channel permission role compatible with your usage needs and " +"privacy requirements." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:149 -#: ../../Zotlabs/Module/Register.php:257 -msgid "Read more about roles" +#: ../../Zotlabs/Module/New_channel.php:177 +#: ../../Zotlabs/Module/Register.php:266 +msgid "Read more about channel permission roles" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:152 -msgid "Create Channel" +#: ../../Zotlabs/Module/New_channel.php:180 +msgid "Create a Channel" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:153 +#: ../../Zotlabs/Module/New_channel.php:181 msgid "" "A channel is a unique network identity. It can represent a person (social " "network profile), a forum (group), a business or celebrity page, a newsfeed, " -"and many other things. Channels can make connections with other channels to " -"share information with each other." +"and many other things." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:153 -msgid "" -"The type of channel you create affects the basic privacy settings, the " -"permissions that are granted to connections/friends, and also the channel's " -"visibility across the network." -msgstr "" - -#: ../../Zotlabs/Module/New_channel.php:154 +#: ../../Zotlabs/Module/New_channel.php:182 msgid "" "or import an existing channel from another location." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:159 +#: ../../Zotlabs/Module/New_channel.php:187 msgid "Validate" msgstr "" @@ -1645,7 +1682,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:622 msgid "Remove Channel" msgstr "" @@ -1658,12 +1695,12 @@ msgid "NEW" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:107 -#: ../../Zotlabs/Storage/Browser.php:285 ../../include/text.php:1434 +#: ../../Zotlabs/Storage/Browser.php:287 ../../include/text.php:1451 msgid "Size" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:108 -#: ../../Zotlabs/Storage/Browser.php:286 +#: ../../Zotlabs/Storage/Browser.php:288 msgid "Last Modified" msgstr "" @@ -2238,150 +2275,6 @@ msgstr "" msgid "No failed updates." msgstr "" -#: ../../Zotlabs/Module/Admin/Plugins.php:259 -#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94 -#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 -#: ../../Zotlabs/Module/Display.php:453 ../../Zotlabs/Module/Filestorage.php:24 -#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3619 -msgid "Item not found." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:289 -#, php-format -msgid "Plugin %s disabled." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:294 -#, php-format -msgid "Plugin %s enabled." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:310 -#: ../../Zotlabs/Module/Admin/Themes.php:95 -msgid "Disable" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:313 -#: ../../Zotlabs/Module/Admin/Themes.php:97 -msgid "Enable" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:341 -#: ../../Zotlabs/Module/Admin/Plugins.php:436 -#: ../../Zotlabs/Module/Admin/Accounts.php:166 -#: ../../Zotlabs/Module/Admin/Logs.php:82 -#: ../../Zotlabs/Module/Admin/Channels.php:145 -#: ../../Zotlabs/Module/Admin/Themes.php:122 -#: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Site.php:294 -#: ../../Zotlabs/Module/Admin/Security.php:86 -#: ../../Zotlabs/Module/Admin.php:136 -msgid "Administration" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:342 -#: ../../Zotlabs/Module/Admin/Plugins.php:437 ../../Zotlabs/Widget/Admin.php:27 -msgid "Plugins" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:343 -#: ../../Zotlabs/Module/Admin/Themes.php:124 -msgid "Toggle" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:344 -#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242 -#: ../../Zotlabs/Widget/Newmember.php:46 -#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:105 -#: ../../include/nav.php:192 -msgid "Settings" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:351 -#: ../../Zotlabs/Module/Admin/Themes.php:134 -msgid "Author: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:352 -#: ../../Zotlabs/Module/Admin/Themes.php:135 -msgid "Maintainer: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:353 -msgid "Minimum project version: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:354 -msgid "Maximum project version: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:355 -msgid "Minimum PHP version: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:356 -msgid "Compatible Server Roles: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:357 -msgid "Requires: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:358 -#: ../../Zotlabs/Module/Admin/Plugins.php:442 -msgid "Disabled - version incompatibility" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:411 -msgid "Enter the public git repository URL of the plugin repo." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:412 -msgid "Plugin repo git URL" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:413 -msgid "Custom repo name" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:413 -msgid "(optional)" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:414 -msgid "Download Plugin Repo" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:421 -msgid "Install new repo" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:393 -msgid "Install" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:445 -msgid "Manage Repos" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:446 -msgid "Installed Plugin Repositories" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:447 -msgid "Install a New Plugin Repository" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:454 -msgid "Switch branch" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:455 -#: ../../Zotlabs/Module/Photos.php:1020 ../../Zotlabs/Module/Tagrm.php:137 -#: ../../addon/superblock/superblock.php:116 -msgid "Remove" -msgstr "" - #: ../../Zotlabs/Module/Admin/Accounts.php:37 #, php-format msgid "%s account blocked/unblocked" @@ -2400,7 +2293,7 @@ msgstr[1] "" msgid "Account not found" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2473 +#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2490 #, php-format msgid "Account '%s' deleted" msgstr "" @@ -2415,6 +2308,19 @@ msgstr "" msgid "Account '%s' unblocked" msgstr "" +#: ../../Zotlabs/Module/Admin/Accounts.php:166 +#: ../../Zotlabs/Module/Admin/Logs.php:82 +#: ../../Zotlabs/Module/Admin/Channels.php:145 +#: ../../Zotlabs/Module/Admin/Themes.php:122 +#: ../../Zotlabs/Module/Admin/Themes.php:156 +#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Addons.php:341 +#: ../../Zotlabs/Module/Admin/Addons.php:436 +#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin.php:140 +msgid "Administration" +msgstr "" + #: ../../Zotlabs/Module/Admin/Accounts.php:167 #: ../../Zotlabs/Module/Admin/Accounts.php:180 #: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23 @@ -2439,7 +2345,7 @@ msgid "No registrations." msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:173 -#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:732 +#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:735 msgid "Approve" msgstr "" @@ -2462,7 +2368,7 @@ msgstr "" msgid "ID" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/group.php:284 +#: ../../Zotlabs/Module/Admin/Accounts.php:184 msgid "All Channels" msgstr "" @@ -2576,7 +2482,7 @@ msgid "Channel '%s' code disallowed" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:146 -#: ../../Zotlabs/Module/Admin.php:110 ../../Zotlabs/Widget/Admin.php:24 +#: ../../Zotlabs/Module/Admin.php:114 ../../Zotlabs/Widget/Admin.php:24 msgid "Channels" msgstr "" @@ -2597,7 +2503,7 @@ msgid "Disallow Code" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1811 ../../include/nav.php:378 +#: ../../include/conversation.php:1820 ../../include/nav.php:370 msgid "Channel" msgstr "" @@ -2625,6 +2531,24 @@ msgstr "" msgid "No themes found." msgstr "" +#: ../../Zotlabs/Module/Admin/Themes.php:72 +#: ../../Zotlabs/Module/Admin/Addons.php:259 ../../Zotlabs/Module/Thing.php:94 +#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 +#: ../../Zotlabs/Module/Display.php:453 ../../Zotlabs/Module/Filestorage.php:24 +#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3566 +msgid "Item not found." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Themes.php:95 +#: ../../Zotlabs/Module/Admin/Addons.php:310 +msgid "Disable" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Themes.php:97 +#: ../../Zotlabs/Module/Admin/Addons.php:313 +msgid "Enable" +msgstr "" + #: ../../Zotlabs/Module/Admin/Themes.php:116 msgid "Screenshot" msgstr "" @@ -2634,6 +2558,28 @@ msgstr "" msgid "Themes" msgstr "" +#: ../../Zotlabs/Module/Admin/Themes.php:124 +#: ../../Zotlabs/Module/Admin/Addons.php:343 +msgid "Toggle" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Themes.php:125 +#: ../../Zotlabs/Module/Admin/Addons.php:344 ../../Zotlabs/Lib/Apps.php:304 +#: ../../Zotlabs/Widget/Newmember.php:46 +#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:99 +msgid "Settings" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Themes.php:134 +#: ../../Zotlabs/Module/Admin/Addons.php:351 +msgid "Author: " +msgstr "" + +#: ../../Zotlabs/Module/Admin/Themes.php:135 +#: ../../Zotlabs/Module/Admin/Addons.php:352 +msgid "Maintainer: " +msgstr "" + #: ../../Zotlabs/Module/Admin/Themes.php:162 msgid "[Experimental]" msgstr "" @@ -2642,466 +2588,581 @@ msgstr "" msgid "[Unsupported]" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:165 +#: ../../Zotlabs/Module/Admin/Site.php:172 msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:191 +#: ../../Zotlabs/Module/Admin/Site.php:198 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3106 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3078 msgid "Default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:202 +#: ../../Zotlabs/Module/Admin/Site.php:209 #: ../../Zotlabs/Module/Settings/Display.php:130 #, php-format msgid "%s - (Incompatible)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:209 +#: ../../Zotlabs/Module/Admin/Site.php:216 msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:211 +#: ../../Zotlabs/Module/Admin/Site.php:218 msgid "experimental" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:213 +#: ../../Zotlabs/Module/Admin/Site.php:220 msgid "unsupported" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:260 +#: ../../Zotlabs/Module/Admin/Site.php:267 msgid "Yes - with approval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:266 +#: ../../Zotlabs/Module/Admin/Site.php:273 msgid "My site is not a public server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:267 +#: ../../Zotlabs/Module/Admin/Site.php:274 msgid "My site has paid access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:268 +#: ../../Zotlabs/Module/Admin/Site.php:275 msgid "My site has free access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:269 +#: ../../Zotlabs/Module/Admin/Site.php:276 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:281 +#: ../../Zotlabs/Module/Admin/Site.php:288 msgid "Beginner/Basic" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:282 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "Novice - not skilled but willing to learn" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:290 msgid "Intermediate - somewhat comfortable" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:284 +#: ../../Zotlabs/Module/Admin/Site.php:291 msgid "Advanced - very comfortable" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "Expert - I can write computer code" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:286 +#: ../../Zotlabs/Module/Admin/Site.php:293 msgid "Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:295 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:299 +msgid "Default permission role for new accounts" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:299 +msgid "" +"This role will be used for the first channel created after registration." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:308 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:297 -#: ../../Zotlabs/Module/Register.php:269 +#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Register.php:278 msgid "Registration" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "File upload" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Policies" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:300 ../../include/contact_widgets.php:16 +#: ../../Zotlabs/Module/Admin/Site.php:313 ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:317 #: ../../addon/statusnet/statusnet.php:891 msgid "Site name" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Site default technical skill level" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Used to provide a member experience matched to technical comfort level" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Lock the technical skill level setting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Members can set their own technical comfort level by default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Banner/Logo" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Administrator Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 ../../Zotlabs/Module/Siteinfo.php:21 +#: ../../Zotlabs/Module/Admin/Site.php:325 ../../Zotlabs/Module/Siteinfo.php:24 msgid "Site Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "System language" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "Invitation only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Minimum age" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Minimum age (in years) for who may register on this site." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:335 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:339 msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:339 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Accounts abandoned after x days" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:341 msgid "Allowed friend domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:341 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "Verify Email Addresses" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "Force publish" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Import Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "Site only Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "" "Allow access to public content originating only from this site if Imported " "Public Streams are disabled." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "Allow anybody on the internet to access the Public streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "" "Disable to require authentication before viewing. Warning: this content is " "unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:347 +msgid "Only import Public stream posts with this text" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:348 +msgid "Do not import Public stream posts with this text" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "Login on Homepage" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "Enable context help" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:354 msgid "Reply-to email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:355 msgid "Sender (From) email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:356 msgid "Name of email sender for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Directory Server URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Default directory server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:360 msgid "Proxy user" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:361 msgid "Proxy URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:362 msgid "Network timeout" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:362 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:363 msgid "Delivery interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:363 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:364 msgid "Deliveries per process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:364 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust " "if necessary to tune system performance. Recommend: 1-5." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:365 msgid "Queue Threshold" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:365 msgid "" "Always defer immediate delivery if queue contains more than this number of " "entries." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:366 msgid "Poll interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:366 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:367 msgid "Path to ImageMagick convert program" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:367 msgid "" "If set, use this program to generate photo thumbnails for huge images ( > " "4000 pixels in either dimension), otherwise memory exhaustion may occur. " "Example: /usr/bin/convert" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:368 msgid "Allow SVG thumbnails in file browser" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:368 msgid "WARNING: SVG images may contain malicious code." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:351 +#: ../../Zotlabs/Module/Admin/Site.php:369 msgid "Maximum Load Average" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:351 +#: ../../Zotlabs/Module/Admin/Site.php:369 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:370 msgid "Expiration period in days for imported (grid/network) content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:370 msgid "0 for no expiration of imported content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:353 +#: ../../Zotlabs/Module/Admin/Site.php:371 msgid "" "Do not expire any posts which have comments less than this many days ago" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:355 +#: ../../Zotlabs/Module/Admin/Site.php:373 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:355 +#: ../../Zotlabs/Module/Admin/Site.php:373 #, php-format msgid "Create this page first. Default is %s/register" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:356 +#: ../../Zotlabs/Module/Admin/Site.php:374 msgid "Page to display after creating a new channel" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:356 -msgid "Recommend: profiles, go, or settings" +#: ../../Zotlabs/Module/Admin/Site.php:374 +msgid "Default: profiles" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:358 +#: ../../Zotlabs/Module/Admin/Site.php:376 msgid "Optional: site location" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:358 +#: ../../Zotlabs/Module/Admin/Site.php:376 msgid "Region or country" msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:289 +#, php-format +msgid "Plugin %s disabled." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:294 +#, php-format +msgid "Plugin %s enabled." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:342 +#: ../../Zotlabs/Module/Admin/Addons.php:437 ../../Zotlabs/Widget/Admin.php:27 +msgid "Addons" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:353 +msgid "Minimum project version: " +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:354 +msgid "Maximum project version: " +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:355 +msgid "Minimum PHP version: " +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:356 +msgid "Compatible Server Roles: " +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:357 +msgid "Requires: " +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:358 +#: ../../Zotlabs/Module/Admin/Addons.php:442 +msgid "Disabled - version incompatibility" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:411 +msgid "Enter the public git repository URL of the addon repo." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:412 +msgid "Addon repo git URL" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:413 +msgid "Custom repo name" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:413 +msgid "(optional)" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:414 +msgid "Download Addon Repo" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:421 +msgid "Install new repo" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:422 ../../Zotlabs/Lib/Apps.php:456 +msgid "Install" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:445 +msgid "Manage Repos" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:446 +msgid "Installed Addon Repositories" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:447 +msgid "Install a New Addon Repository" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:454 +msgid "Switch branch" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:455 +#: ../../Zotlabs/Module/Photos.php:1025 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../addon/superblock/superblock.php:116 +msgid "Remove" +msgstr "" + #: ../../Zotlabs/Module/Admin/Profs.php:89 msgid "New Profile Field" msgstr "" @@ -3144,8 +3205,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:94 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 -#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1052 -#: ../../include/text.php:1064 +#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1063 +#: ../../include/text.php:1075 msgid "Save" msgstr "" @@ -3222,114 +3283,127 @@ msgstr "" msgid "Service class" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:77 +#: ../../Zotlabs/Module/Admin/Security.php:83 msgid "" "By default, unfiltered HTML is allowed in embedded media. This is inherently " "insecure." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:80 +#: ../../Zotlabs/Module/Admin/Security.php:86 msgid "" "The recommended setting is to only allow unfiltered HTML from the following " "sites:" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:81 +#: ../../Zotlabs/Module/Admin/Security.php:87 msgid "" "https://youtube.com/
      https://www.youtube.com/
      https://youtu.be/" "
      https://vimeo.com/
      https://soundcloud.com/
      " msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:82 +#: ../../Zotlabs/Module/Admin/Security.php:88 msgid "" "All other embedded content will be filtered, unless " "embedded content from that site is explicitly blocked." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:87 ../../Zotlabs/Widget/Admin.php:25 +#: ../../Zotlabs/Module/Admin/Security.php:93 ../../Zotlabs/Widget/Admin.php:25 msgid "Security" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:89 +#: ../../Zotlabs/Module/Admin/Security.php:95 msgid "Block public" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:89 +#: ../../Zotlabs/Module/Admin/Security.php:95 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently authenticated." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:90 +#: ../../Zotlabs/Module/Admin/Security.php:96 +msgid "Provide a cloud root directory" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Security.php:96 +msgid "" +"The cloud root directory lists all channel names which provide public files" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Security.php:97 +msgid "Show total disk space available to cloud uploads" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Security.php:98 msgid "Set \"Transport Security\" HTTP header" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:91 +#: ../../Zotlabs/Module/Admin/Security.php:99 msgid "Set \"Content Security Policy\" HTTP header" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin/Security.php:100 msgid "Allowed email domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin/Security.php:100 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:93 +#: ../../Zotlabs/Module/Admin/Security.php:101 msgid "Not allowed email domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:93 +#: ../../Zotlabs/Module/Admin/Security.php:101 msgid "" "Comma separated list of domains which are not allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains, unless allowed domains have been defined." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:94 +#: ../../Zotlabs/Module/Admin/Security.php:102 msgid "Allow communications only from these sites" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:94 +#: ../../Zotlabs/Module/Admin/Security.php:102 msgid "" "One site per line. Leave empty to allow communication from anywhere by " "default" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:95 +#: ../../Zotlabs/Module/Admin/Security.php:103 msgid "Block communications from these sites" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:96 +#: ../../Zotlabs/Module/Admin/Security.php:104 msgid "Allow communications only from these channels" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:96 +#: ../../Zotlabs/Module/Admin/Security.php:104 msgid "" "One channel (hash) per line. Leave empty to allow from any channel by default" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:97 +#: ../../Zotlabs/Module/Admin/Security.php:105 msgid "Block communications from these channels" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:98 +#: ../../Zotlabs/Module/Admin/Security.php:106 msgid "Only allow embeds from secure (SSL) websites and links." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:99 +#: ../../Zotlabs/Module/Admin/Security.php:107 msgid "Allow unfiltered embedded HTML content only from these domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:99 +#: ../../Zotlabs/Module/Admin/Security.php:107 msgid "One site per line. By default embedded content is filtered." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:100 +#: ../../Zotlabs/Module/Admin/Security.php:108 msgid "Block embedded HTML from these domains" msgstr "" @@ -3342,7 +3416,7 @@ msgid "Visible to:" msgstr "" #: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 -#: ../../Zotlabs/Module/Acl.php:121 ../../include/acl_selectors.php:88 +#: ../../Zotlabs/Module/Acl.php:120 ../../include/acl_selectors.php:88 msgctxt "acl" msgid "Profile" msgstr "" @@ -3370,6 +3444,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Settings/Permcats.php:99 +#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240 msgid "Permission Categories" msgstr "" @@ -3404,18 +3479,18 @@ msgid "" "individual settings. You can not change those settings here." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:64 #: ../../Zotlabs/Module/Settings/Channel.php:68 -#: ../../Zotlabs/Module/Settings/Channel.php:69 #: ../../Zotlabs/Module/Settings/Channel.php:72 -#: ../../Zotlabs/Module/Settings/Channel.php:83 +#: ../../Zotlabs/Module/Settings/Channel.php:73 +#: ../../Zotlabs/Module/Settings/Channel.php:76 +#: ../../Zotlabs/Module/Settings/Channel.php:87 #: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:24 #: ../../include/selectors.php:123 ../../include/channel.php:437 #: ../../include/channel.php:438 ../../include/channel.php:445 msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:264 +#: ../../Zotlabs/Module/Settings/Channel.php:272 #: ../../Zotlabs/Module/Defperms.php:103 #: ../../addon/rendezvous/rendezvous.php:82 #: ../../addon/openstreetmap/openstreetmap.php:184 @@ -3425,400 +3500,414 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:325 +#: ../../Zotlabs/Module/Settings/Channel.php:333 msgid "Nobody except yourself" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:326 +#: ../../Zotlabs/Module/Settings/Channel.php:334 msgid "Only those you specifically allow" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:327 +#: ../../Zotlabs/Module/Settings/Channel.php:335 msgid "Approved connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:328 +#: ../../Zotlabs/Module/Settings/Channel.php:336 msgid "Any connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:329 +#: ../../Zotlabs/Module/Settings/Channel.php:337 msgid "Anybody on this website" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:330 +#: ../../Zotlabs/Module/Settings/Channel.php:338 msgid "Anybody in this network" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:331 +#: ../../Zotlabs/Module/Settings/Channel.php:339 msgid "Anybody authenticated" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:332 +#: ../../Zotlabs/Module/Settings/Channel.php:340 msgid "Anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:407 +#: ../../Zotlabs/Module/Settings/Channel.php:415 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:412 +#: ../../Zotlabs/Module/Settings/Channel.php:420 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:416 +#: ../../Zotlabs/Module/Settings/Channel.php:424 msgid "or" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:425 +#: ../../Zotlabs/Module/Settings/Channel.php:433 msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:428 +#: ../../Zotlabs/Module/Settings/Channel.php:436 msgid "Your files/photos are accessible via WebDAV at" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:493 +#: ../../Zotlabs/Module/Settings/Channel.php:488 +msgid "Automatic membership approval" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Defperms.php:239 +msgid "" +"If enabled, connection requests will be approved without your interaction" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:514 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:501 ../../include/channel.php:1521 +#: ../../Zotlabs/Module/Settings/Channel.php:522 ../../include/channel.php:1521 msgid "Full Name:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:502 +#: ../../Zotlabs/Module/Settings/Channel.php:523 #: ../../Zotlabs/Module/Settings/Account.php:119 msgid "Email Address:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:505 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:509 +#: ../../Zotlabs/Module/Settings/Channel.php:530 msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:532 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:513 +#: ../../Zotlabs/Module/Settings/Channel.php:534 msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:513 +#: ../../Zotlabs/Module/Settings/Channel.php:534 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:515 +#: ../../Zotlabs/Module/Settings/Channel.php:536 msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:537 msgid "" "Very Public - extremely permissive (should be used with caution)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:517 +#: ../../Zotlabs/Module/Settings/Channel.php:538 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:539 msgid "Private - default private, never open or public" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:544 msgid "Channel Permission Limits" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:526 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:526 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:527 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "Default Privacy Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:530 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "Profile to assign new connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:540 +#: ../../Zotlabs/Module/Settings/Channel.php:561 msgid "Default Permissions Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:570 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "making an interesting profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:559 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:561 +#: ../../Zotlabs/Module/Settings/Channel.php:582 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:564 +#: ../../Zotlabs/Module/Settings/Channel.php:585 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:588 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "Unseen grid activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Unseen private messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 -#: ../../Zotlabs/Module/Settings/Channel.php:576 -#: ../../Zotlabs/Module/Settings/Channel.php:577 -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:598 +#: ../../Zotlabs/Module/Settings/Channel.php:599 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:598 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:599 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:579 +#: ../../Zotlabs/Module/Settings/Channel.php:600 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:601 msgid "Unseen shared files" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:602 msgid "Unseen public activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:582 +#: ../../Zotlabs/Module/Settings/Channel.php:603 msgid "Unseen likes and dislikes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:604 +msgid "Unseen forum posts" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:605 msgid "Email notification hub (hostname)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:605 #, php-format msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:584 +#: ../../Zotlabs/Module/Settings/Channel.php:606 msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:586 +#: ../../Zotlabs/Module/Settings/Channel.php:608 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:586 +#: ../../Zotlabs/Module/Settings/Channel.php:608 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:614 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:615 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:617 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:618 msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:596 -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:618 +#: ../../Zotlabs/Module/Settings/Channel.php:619 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:619 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:599 +#: ../../Zotlabs/Module/Settings/Channel.php:621 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:601 +#: ../../Zotlabs/Module/Settings/Channel.php:623 msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:602 +#: ../../Zotlabs/Module/Settings/Channel.php:624 msgid "Firefox Share $Projectname provider" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:625 msgid "Start calendar week on Monday" msgstr "" @@ -3887,93 +3976,93 @@ msgstr "" msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:35 +#: ../../Zotlabs/Module/Settings/Oauth2.php:36 msgid "Name and Secret are required" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:83 +#: ../../Zotlabs/Module/Settings/Oauth2.php:84 msgid "Add OAuth2 application" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:86 -#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 #: ../../Zotlabs/Module/Settings/Oauth.php:90 msgid "Name of application" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:87 -#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 #: ../../Zotlabs/Module/Settings/Oauth.php:92 #: ../../Zotlabs/Module/Settings/Oauth.php:118 #: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782 msgid "Consumer Secret" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:87 -#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 #: ../../Zotlabs/Module/Settings/Oauth.php:91 #: ../../Zotlabs/Module/Settings/Oauth.php:92 msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:88 -#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 #: ../../Zotlabs/Module/Settings/Oauth.php:93 #: ../../Zotlabs/Module/Settings/Oauth.php:119 msgid "Redirect" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:88 -#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 #: ../../Zotlabs/Module/Settings/Oauth.php:93 msgid "" "Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:89 -#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 msgid "Grant Types" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:89 #: ../../Zotlabs/Module/Settings/Oauth2.php:90 -#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +#: ../../Zotlabs/Module/Settings/Oauth2.php:91 #: ../../Zotlabs/Module/Settings/Oauth2.php:118 +#: ../../Zotlabs/Module/Settings/Oauth2.php:119 msgid "leave blank unless your application sepcifically requires this" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:90 -#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +#: ../../Zotlabs/Module/Settings/Oauth2.php:91 +#: ../../Zotlabs/Module/Settings/Oauth2.php:119 msgid "Authorization scope" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:102 +#: ../../Zotlabs/Module/Settings/Oauth2.php:103 msgid "OAuth2 Application not found." msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:111 -#: ../../Zotlabs/Module/Settings/Oauth2.php:148 +#: ../../Zotlabs/Module/Settings/Oauth2.php:112 +#: ../../Zotlabs/Module/Settings/Oauth2.php:149 #: ../../Zotlabs/Module/Settings/Oauth.php:87 #: ../../Zotlabs/Module/Settings/Oauth.php:113 #: ../../Zotlabs/Module/Settings/Oauth.php:149 msgid "Add application" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:147 +#: ../../Zotlabs/Module/Settings/Oauth2.php:148 msgid "Connected OAuth2 Apps" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:151 +#: ../../Zotlabs/Module/Settings/Oauth2.php:152 #: ../../Zotlabs/Module/Settings/Oauth.php:152 msgid "Client key starts with" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:152 +#: ../../Zotlabs/Module/Settings/Oauth2.php:153 #: ../../Zotlabs/Module/Settings/Oauth.php:153 msgid "No name" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:153 +#: ../../Zotlabs/Module/Settings/Oauth2.php:154 #: ../../Zotlabs/Module/Settings/Oauth.php:154 msgid "Remove authorization" msgstr "" @@ -4212,7 +4301,7 @@ msgid "Icon url" msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:94 -#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 +#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150 msgid "Optional" msgstr "" @@ -4224,21 +4313,21 @@ msgstr "" msgid "Connected Apps" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:811 -#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Widget/Portfolio.php:87 +#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:816 +#: ../../Zotlabs/Module/Photos.php:1355 ../../Zotlabs/Widget/Portfolio.php:87 #: ../../Zotlabs/Widget/Album.php:78 msgid "View Photo" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:842 +#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:847 #: ../../Zotlabs/Widget/Portfolio.php:108 ../../Zotlabs/Widget/Album.php:95 msgid "Edit Album" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:712 -#: ../../Zotlabs/Module/Profile_photo.php:458 -#: ../../Zotlabs/Module/Cover_photo.php:362 -#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Widget/Cdav.php:133 +#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:717 +#: ../../Zotlabs/Module/Profile_photo.php:459 +#: ../../Zotlabs/Module/Cover_photo.php:395 +#: ../../Zotlabs/Storage/Browser.php:392 ../../Zotlabs/Widget/Cdav.php:133 #: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110 #: ../../Zotlabs/Widget/Album.php:97 msgid "Upload" @@ -4302,9 +4391,9 @@ msgid "URL for photo of thing (optional)" msgstr "" #: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372 -#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071 +#: ../../Zotlabs/Module/Photos.php:707 ../../Zotlabs/Module/Photos.php:1076 #: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235 -#: ../../Zotlabs/Module/Filestorage.php:147 ../../include/acl_selectors.php:123 +#: ../../Zotlabs/Module/Filestorage.php:170 ../../include/acl_selectors.php:123 msgid "Permissions" msgstr "" @@ -4312,11 +4401,11 @@ msgstr "" msgid "Add Thing to your Profile" msgstr "" -#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:57 +#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:55 msgid "No more system notifications." msgstr "" -#: ../../Zotlabs/Module/Notify.php:65 ../../Zotlabs/Module/Notifications.php:61 +#: ../../Zotlabs/Module/Notify.php:65 ../../Zotlabs/Module/Notifications.php:59 msgid "System Notifications" msgstr "" @@ -4324,52 +4413,56 @@ msgstr "" msgid "Connection added." msgstr "" -#: ../../Zotlabs/Module/Import.php:144 +#: ../../Zotlabs/Module/Import.php:146 #, php-format msgid "Your service plan only allows %d channels." msgstr "" -#: ../../Zotlabs/Module/Import.php:158 +#: ../../Zotlabs/Module/Import.php:173 msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Import.php:482 +#: ../../Zotlabs/Module/Import.php:513 #: ../../addon/diaspora/import_diaspora.php:139 msgid "Import completed." msgstr "" -#: ../../Zotlabs/Module/Import.php:510 +#: ../../Zotlabs/Module/Import.php:541 msgid "You must be logged in to use this feature." msgstr "" -#: ../../Zotlabs/Module/Import.php:515 +#: ../../Zotlabs/Module/Import.php:546 msgid "Import Channel" msgstr "" -#: ../../Zotlabs/Module/Import.php:516 +#: ../../Zotlabs/Module/Import.php:547 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:518 +#: ../../Zotlabs/Module/Import.php:549 msgid "Or provide the old server/hub details" msgstr "" -#: ../../Zotlabs/Module/Import.php:519 +#: ../../Zotlabs/Module/Import.php:551 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../Zotlabs/Module/Import.php:520 +#: ../../Zotlabs/Module/Import.php:552 msgid "Your old login email address" msgstr "" -#: ../../Zotlabs/Module/Import.php:521 +#: ../../Zotlabs/Module/Import.php:553 msgid "Your old login password" msgstr "" -#: ../../Zotlabs/Module/Import.php:522 +#: ../../Zotlabs/Module/Import.php:554 +msgid "Import a few months of posts if possible (limited by available memory" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:556 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 " @@ -4377,19 +4470,25 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../Zotlabs/Module/Import.php:523 +#: ../../Zotlabs/Module/Import.php:558 msgid "Make this hub my primary location" msgstr "" -#: ../../Zotlabs/Module/Import.php:524 +#: ../../Zotlabs/Module/Import.php:559 msgid "Move this channel (disable all previous locations)" msgstr "" -#: ../../Zotlabs/Module/Import.php:525 -msgid "Import a few months of posts if possible (limited by available memory" +#: ../../Zotlabs/Module/Import.php:560 +msgid "Use this channel nickname instead of the one provided" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:560 +msgid "" +"Leave blank to keep your existing channel nickname. You will be randomly " +"assigned a similar nickname if either name is already allocated on this site." msgstr "" -#: ../../Zotlabs/Module/Import.php:526 +#: ../../Zotlabs/Module/Import.php:562 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -4399,16 +4498,16 @@ msgstr "" msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1590 -#: ../../include/channel.php:2318 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1614 +#: ../../include/channel.php:2334 msgid "Remote Authentication" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2319 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2335 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2320 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2336 msgid "Authenticate" msgstr "" @@ -4416,7 +4515,7 @@ msgstr "" msgid "Permissions denied." msgstr "" -#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2446 +#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2482 msgid "Import" msgstr "" @@ -4450,15 +4549,15 @@ msgstr "" msgid "vcard" msgstr "" -#: ../../Zotlabs/Module/Apps.php:48 ../../Zotlabs/Lib/Apps.php:228 +#: ../../Zotlabs/Module/Apps.php:50 ../../Zotlabs/Lib/Apps.php:291 msgid "Apps" msgstr "" -#: ../../Zotlabs/Module/Apps.php:51 +#: ../../Zotlabs/Module/Apps.php:53 msgid "Manage apps" msgstr "" -#: ../../Zotlabs/Module/Apps.php:52 +#: ../../Zotlabs/Module/Apps.php:54 msgid "Create new app" msgstr "" @@ -4468,7 +4567,7 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:253 +#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:315 msgid "Mood" msgstr "" @@ -4506,9 +4605,9 @@ msgid "Archived/Unreachable" msgstr "" #: ../../Zotlabs/Module/Connections.php:80 -#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:116 -#: ../../Zotlabs/Module/Notifications.php:52 -#: ../../include/conversation.php:1717 +#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:179 +#: ../../Zotlabs/Module/Notifications.php:50 +#: ../../include/conversation.php:1726 msgid "New" msgstr "" @@ -4617,8 +4716,8 @@ msgstr "" msgid "Recent activity" msgstr "" -#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:235 -#: ../../include/text.php:973 +#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:298 +#: ../../include/text.php:975 msgid "Connections" msgstr "" @@ -4640,10 +4739,6 @@ msgstr "" msgid "item" msgstr "" -#: ../../Zotlabs/Module/Viewsrc.php:55 -msgid "Source of Item" -msgstr "" - #: ../../Zotlabs/Module/Bookmarks.php:56 msgid "Bookmark added" msgstr "" @@ -4688,7 +4783,7 @@ msgstr "" msgid "Page owner information could not be retrieved." msgstr "" -#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120 +#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:113 msgid "Album not found." msgstr "" @@ -4696,190 +4791,190 @@ msgstr "" msgid "Delete Album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1083 +#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1088 msgid "Delete Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:551 +#: ../../Zotlabs/Module/Photos.php:556 msgid "No photos selected" msgstr "" -#: ../../Zotlabs/Module/Photos.php:600 +#: ../../Zotlabs/Module/Photos.php:605 msgid "Access to this item is restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:646 +#: ../../Zotlabs/Module/Photos.php:651 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:649 +#: ../../Zotlabs/Module/Photos.php:654 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:691 +#: ../../Zotlabs/Module/Photos.php:696 msgid "Upload Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:695 +#: ../../Zotlabs/Module/Photos.php:700 msgid "Enter an album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:696 +#: ../../Zotlabs/Module/Photos.php:701 msgid "or select an existing album (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:697 +#: ../../Zotlabs/Module/Photos.php:702 msgid "Create a status post for this upload" msgstr "" -#: ../../Zotlabs/Module/Photos.php:699 +#: ../../Zotlabs/Module/Photos.php:704 msgid "Description (optional)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:785 +#: ../../Zotlabs/Module/Photos.php:790 msgid "Show Newest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:787 +#: ../../Zotlabs/Module/Photos.php:792 msgid "Show Oldest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381 +#: ../../Zotlabs/Module/Photos.php:849 ../../Zotlabs/Module/Photos.php:1386 msgid "Add Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:892 +#: ../../Zotlabs/Module/Photos.php:897 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:894 +#: ../../Zotlabs/Module/Photos.php:899 msgid "Photo not available" msgstr "" -#: ../../Zotlabs/Module/Photos.php:952 +#: ../../Zotlabs/Module/Photos.php:957 msgid "Use as profile photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:953 +#: ../../Zotlabs/Module/Photos.php:958 msgid "Use as cover photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:960 +#: ../../Zotlabs/Module/Photos.php:965 msgid "Private Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:975 +#: ../../Zotlabs/Module/Photos.php:980 msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1057 +#: ../../Zotlabs/Module/Photos.php:1062 msgid "Edit photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1059 +#: ../../Zotlabs/Module/Photos.php:1064 msgid "Rotate CW (right)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1060 +#: ../../Zotlabs/Module/Photos.php:1065 msgid "Rotate CCW (left)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1063 +#: ../../Zotlabs/Module/Photos.php:1068 msgid "Move photo to album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1064 +#: ../../Zotlabs/Module/Photos.php:1069 msgid "Enter a new album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1065 +#: ../../Zotlabs/Module/Photos.php:1070 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1070 +#: ../../Zotlabs/Module/Photos.php:1075 msgid "Add a Tag" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1078 +#: ../../Zotlabs/Module/Photos.php:1083 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1081 +#: ../../Zotlabs/Module/Photos.php:1086 msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:281 +#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:285 msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Lib/ThreadItem.php:282 +#: ../../Zotlabs/Module/Photos.php:1106 ../../Zotlabs/Lib/ThreadItem.php:286 msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Lib/ThreadItem.php:427 -#: ../../include/conversation.php:785 +#: ../../Zotlabs/Module/Photos.php:1108 ../../Zotlabs/Lib/ThreadItem.php:432 +#: ../../include/conversation.php:787 msgid "Please wait" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237 -#: ../../Zotlabs/Lib/ThreadItem.php:749 +#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1242 +#: ../../Zotlabs/Lib/ThreadItem.php:754 msgid "This is you" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239 -#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/js_strings.php:6 +#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1244 +#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/js_strings.php:6 msgid "Comment" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618 +#: ../../Zotlabs/Module/Photos.php:1142 ../../include/conversation.php:619 msgctxt "title" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618 +#: ../../Zotlabs/Module/Photos.php:1142 ../../include/conversation.php:619 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620 msgctxt "title" msgid "Agree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621 msgctxt "title" msgid "Attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1156 ../../Zotlabs/Module/Photos.php:1168 -#: ../../Zotlabs/Lib/ThreadItem.php:201 ../../Zotlabs/Lib/ThreadItem.php:213 +#: ../../Zotlabs/Module/Photos.php:1161 ../../Zotlabs/Module/Photos.php:1173 +#: ../../Zotlabs/Lib/ThreadItem.php:212 ../../Zotlabs/Lib/ThreadItem.php:224 msgid "View all" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205 -#: ../../include/conversation.php:1981 ../../include/channel.php:1539 +#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:216 +#: ../../include/conversation.php:1990 ../../include/channel.php:1539 #: ../../include/taxonomy.php:661 msgctxt "noun" msgid "Like" @@ -4887,56 +4982,58 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210 -#: ../../include/conversation.php:1984 +#: ../../Zotlabs/Module/Photos.php:1170 ../../Zotlabs/Lib/ThreadItem.php:221 +#: ../../include/conversation.php:1993 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1265 +#: ../../Zotlabs/Module/Photos.php:1270 msgid "Photo Tools" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1274 +#: ../../Zotlabs/Module/Photos.php:1279 msgid "In This Photo:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1279 +#: ../../Zotlabs/Module/Photos.php:1284 msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1287 ../../Zotlabs/Lib/ThreadItem.php:415 +#: ../../Zotlabs/Module/Photos.php:1292 ../../Zotlabs/Lib/ThreadItem.php:420 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1288 ../../Zotlabs/Lib/ThreadItem.php:416 +#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421 +#: ../../Zotlabs/Module/Photos.php:1298 ../../Zotlabs/Lib/ThreadItem.php:426 #: ../../include/acl_selectors.php:125 msgid "Close" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378 -#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:667 +#: ../../Zotlabs/Module/Photos.php:1370 ../../Zotlabs/Module/Photos.php:1383 +#: ../../Zotlabs/Module/Photos.php:1384 ../../include/photos.php:668 msgid "Recent Photos" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1135 +#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1293 msgid "Profile Unavailable." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:114 +#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:123 msgid "Not found" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:114 -#: ../../addon/cart/cart.php:1204 ../../addon/cart/manual_payments.php:58 +#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:51 +#: ../../addon/cart/cart.php:1420 +#: ../../addon/cart/submodules/paypalbutton.php:481 +#: ../../addon/cart/manual_payments.php:62 msgid "Invalid channel" msgstr "" @@ -4952,8 +5049,8 @@ msgstr "" msgid "Error downloading wiki: " msgstr "" -#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1928 -#: ../../include/nav.php:494 +#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1937 +#: ../../include/nav.php:486 msgid "Wikis" msgstr "" @@ -4977,22 +5074,22 @@ msgstr "" #: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 #: ../../Zotlabs/Widget/Wiki_pages.php:36 #: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40 -#: ../../include/text.php:1869 +#: ../../include/text.php:1886 msgid "Markdown" msgstr "" #: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 #: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1867 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1884 msgid "BBcode" msgstr "" #: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1870 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1887 msgid "Text" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:284 +#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:286 msgid "Type" msgstr "" @@ -5048,47 +5145,47 @@ msgstr "" msgid "New page name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:377 ../../include/conversation.php:1282 +#: ../../Zotlabs/Module/Wiki.php:377 msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1388 +#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1396 msgid "Embed an image from your albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:380 ../../Zotlabs/Module/Profile_photo.php:465 -#: ../../Zotlabs/Module/Cover_photo.php:367 ../../include/conversation.php:1390 -#: ../../include/conversation.php:1437 +#: ../../Zotlabs/Module/Wiki.php:380 ../../Zotlabs/Module/Profile_photo.php:466 +#: ../../Zotlabs/Module/Cover_photo.php:400 ../../include/conversation.php:1398 +#: ../../include/conversation.php:1445 msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:381 ../../Zotlabs/Module/Profile_photo.php:466 -#: ../../Zotlabs/Module/Cover_photo.php:368 ../../include/conversation.php:1320 +#: ../../Zotlabs/Module/Wiki.php:381 ../../Zotlabs/Module/Profile_photo.php:467 +#: ../../Zotlabs/Module/Cover_photo.php:401 ../../include/conversation.php:1327 msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:382 ../../Zotlabs/Module/Profile_photo.php:467 -#: ../../Zotlabs/Module/Cover_photo.php:369 ../../include/conversation.php:1321 +#: ../../Zotlabs/Module/Wiki.php:382 ../../Zotlabs/Module/Profile_photo.php:468 +#: ../../Zotlabs/Module/Cover_photo.php:402 ../../include/conversation.php:1328 msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:383 ../../Zotlabs/Module/Profile_photo.php:468 -#: ../../Zotlabs/Module/Cover_photo.php:370 +#: ../../Zotlabs/Module/Wiki.php:383 ../../Zotlabs/Module/Profile_photo.php:469 +#: ../../Zotlabs/Module/Cover_photo.php:403 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Profile_photo.php:469 -#: ../../Zotlabs/Module/Cover_photo.php:371 ../../include/conversation.php:1323 +#: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Profile_photo.php:470 +#: ../../Zotlabs/Module/Cover_photo.php:404 ../../include/conversation.php:1330 msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:385 ../../Zotlabs/Module/Profile_photo.php:470 -#: ../../Zotlabs/Module/Cover_photo.php:372 ../../include/conversation.php:1324 +#: ../../Zotlabs/Module/Wiki.php:385 ../../Zotlabs/Module/Profile_photo.php:471 +#: ../../Zotlabs/Module/Cover_photo.php:405 ../../include/conversation.php:1331 msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:386 ../../Zotlabs/Module/Profile_photo.php:471 -#: ../../Zotlabs/Module/Cover_photo.php:373 ../../include/conversation.php:1325 +#: ../../Zotlabs/Module/Wiki.php:386 ../../Zotlabs/Module/Profile_photo.php:472 +#: ../../Zotlabs/Module/Cover_photo.php:406 ../../include/conversation.php:1332 msgid "Error getting album" msgstr "" @@ -5188,8 +5285,8 @@ msgstr "" msgid "System layout" msgstr "" -#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:254 -#: ../../include/conversation.php:1092 +#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:316 +#: ../../include/conversation.php:1097 msgid "Poke" msgstr "" @@ -5218,7 +5315,7 @@ msgid "Make this post private" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:66 -#: ../../Zotlabs/Module/Cover_photo.php:56 +#: ../../Zotlabs/Module/Cover_photo.php:57 msgid "Image uploaded but image cropping failed." msgstr "" @@ -5229,7 +5326,7 @@ msgid "Profile Photos" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:142 -#: ../../Zotlabs/Module/Cover_photo.php:159 +#: ../../Zotlabs/Module/Cover_photo.php:191 msgid "Image resize failed." msgstr "" @@ -5241,73 +5338,85 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:225 -#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:195 +#: ../../Zotlabs/Module/Cover_photo.php:205 ../../include/photos.php:196 msgid "Unable to process image" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:260 -#: ../../Zotlabs/Module/Cover_photo.php:197 +#: ../../Zotlabs/Module/Cover_photo.php:229 msgid "Image upload failed." msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:279 -#: ../../Zotlabs/Module/Cover_photo.php:214 +#: ../../Zotlabs/Module/Cover_photo.php:246 msgid "Unable to process image." msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:343 #: ../../Zotlabs/Module/Profile_photo.php:390 -#: ../../Zotlabs/Module/Cover_photo.php:307 -#: ../../Zotlabs/Module/Cover_photo.php:322 +#: ../../Zotlabs/Module/Cover_photo.php:339 +#: ../../Zotlabs/Module/Cover_photo.php:354 msgid "Photo not available." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:455 -#: ../../Zotlabs/Module/Cover_photo.php:359 -msgid "Upload File:" +#: ../../Zotlabs/Module/Profile_photo.php:454 +msgid "" +"Your default profile photo is visible to anybody on the internet. Profile " +"photos for alternate profiles will inherit the permissions of the profile" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:454 +msgid "" +"Your profile photo is visible to anybody on the internet and may be " +"distributed to other websites." msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:456 -#: ../../Zotlabs/Module/Cover_photo.php:360 -msgid "Select a profile:" +#: ../../Zotlabs/Module/Cover_photo.php:392 +msgid "Upload File:" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:457 +#: ../../Zotlabs/Module/Cover_photo.php:393 +msgid "Select a profile:" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:458 msgid "Use Photo for Profile" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:457 +#: ../../Zotlabs/Module/Profile_photo.php:458 msgid "Change Profile Photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:458 +#: ../../Zotlabs/Module/Profile_photo.php:459 msgid "Use" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:462 #: ../../Zotlabs/Module/Profile_photo.php:463 -#: ../../Zotlabs/Module/Cover_photo.php:364 -#: ../../Zotlabs/Module/Cover_photo.php:365 +#: ../../Zotlabs/Module/Profile_photo.php:464 +#: ../../Zotlabs/Module/Cover_photo.php:397 +#: ../../Zotlabs/Module/Cover_photo.php:398 msgid "Use a photo from your albums" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:473 -#: ../../Zotlabs/Module/Cover_photo.php:376 +#: ../../Zotlabs/Module/Profile_photo.php:474 +#: ../../Zotlabs/Module/Cover_photo.php:409 msgid "Select existing photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:492 -#: ../../Zotlabs/Module/Cover_photo.php:393 +#: ../../Zotlabs/Module/Profile_photo.php:493 +#: ../../Zotlabs/Module/Cover_photo.php:426 msgid "Crop Image" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:493 -#: ../../Zotlabs/Module/Cover_photo.php:394 +#: ../../Zotlabs/Module/Profile_photo.php:494 +#: ../../Zotlabs/Module/Cover_photo.php:427 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:495 -#: ../../Zotlabs/Module/Cover_photo.php:396 +#: ../../Zotlabs/Module/Profile_photo.php:496 +#: ../../Zotlabs/Module/Cover_photo.php:429 msgid "Done Editing" msgstr "" @@ -5327,60 +5436,68 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:874 +#: ../../Zotlabs/Module/Item.php:864 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1019 +#: ../../Zotlabs/Module/Item.php:1009 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1055 +#: ../../Zotlabs/Module/Item.php:1045 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1160 +#: ../../Zotlabs/Module/Item.php:1162 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1189 +#: ../../Zotlabs/Module/Item.php:1191 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1196 +#: ../../Zotlabs/Module/Item.php:1198 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../Zotlabs/Module/Ping.php:330 +#: ../../Zotlabs/Module/Ping.php:332 msgid "sent you a private message" msgstr "" -#: ../../Zotlabs/Module/Ping.php:383 +#: ../../Zotlabs/Module/Ping.php:385 msgid "added your channel" msgstr "" -#: ../../Zotlabs/Module/Ping.php:407 +#: ../../Zotlabs/Module/Ping.php:409 msgid "requires approval" msgstr "" -#: ../../Zotlabs/Module/Ping.php:417 +#: ../../Zotlabs/Module/Ping.php:419 msgid "g A l F d" msgstr "" -#: ../../Zotlabs/Module/Ping.php:435 +#: ../../Zotlabs/Module/Ping.php:437 msgid "[today]" msgstr "" -#: ../../Zotlabs/Module/Ping.php:444 +#: ../../Zotlabs/Module/Ping.php:446 msgid "posted an event" msgstr "" -#: ../../Zotlabs/Module/Ping.php:477 +#: ../../Zotlabs/Module/Ping.php:479 msgid "shared a file with you" msgstr "" +#: ../../Zotlabs/Module/Ping.php:654 +msgid "Private forum" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:654 +msgid "Public forum" +msgstr "" + #: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29 msgid "Invalid item." msgstr "" @@ -5441,9 +5558,9 @@ msgstr "" msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:247 +#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:309 #: ../../addon/openclipatar/openclipatar.php:57 -#: ../../include/conversation.php:1032 ../../include/nav.php:114 +#: ../../include/conversation.php:1037 ../../include/nav.php:108 msgid "View Profile" msgstr "" @@ -5468,7 +5585,7 @@ msgstr "" msgid "Fetch updated photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1042 +#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1047 msgid "Recent Activity" msgstr "" @@ -5616,7 +5733,7 @@ msgstr "" msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4214 +#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4158 #, php-format msgid "Connection: %s" msgstr "" @@ -5633,11 +5750,6 @@ msgstr "" msgid "Permission role" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240 -#: ../../Zotlabs/Widget/Notifications.php:151 ../../include/nav.php:284 -msgid "Loading" -msgstr "" - #: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241 msgid "Add permission role" msgstr "" @@ -5685,12 +5797,6 @@ msgstr "" msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876 -msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" -msgstr "" - #: ../../Zotlabs/Module/Connedit.php:876 msgid "Do not import posts with this text" msgstr "" @@ -5751,13 +5857,13 @@ msgid "Bookmark this room" msgstr "" #: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 -#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1315 +#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1322 msgid "Please enter a link URL:" msgstr "" #: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294 -#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:766 -#: ../../include/conversation.php:1435 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:771 +#: ../../include/conversation.php:1443 msgid "Encrypt text" msgstr "" @@ -5790,111 +5896,111 @@ msgstr "" msgid "min" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:248 -#: ../../include/conversation.php:1834 ../../include/nav.php:401 +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:310 +#: ../../include/conversation.php:1843 ../../include/nav.php:393 msgid "Photos" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:243 -#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1842 -#: ../../include/nav.php:409 +#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:305 +#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1851 +#: ../../include/nav.php:401 msgid "Files" msgstr "" -#: ../../Zotlabs/Module/Menu.php:49 +#: ../../Zotlabs/Module/Menu.php:67 msgid "Unable to update menu." msgstr "" -#: ../../Zotlabs/Module/Menu.php:60 +#: ../../Zotlabs/Module/Menu.php:78 msgid "Unable to create menu." msgstr "" -#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 +#: ../../Zotlabs/Module/Menu.php:160 ../../Zotlabs/Module/Menu.php:173 msgid "Menu Name" msgstr "" -#: ../../Zotlabs/Module/Menu.php:98 +#: ../../Zotlabs/Module/Menu.php:160 msgid "Unique name (not visible on webpage) - required" msgstr "" -#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 +#: ../../Zotlabs/Module/Menu.php:161 ../../Zotlabs/Module/Menu.php:174 msgid "Menu Title" msgstr "" -#: ../../Zotlabs/Module/Menu.php:99 +#: ../../Zotlabs/Module/Menu.php:161 msgid "Visible on webpage - leave empty for no title" msgstr "" -#: ../../Zotlabs/Module/Menu.php:100 +#: ../../Zotlabs/Module/Menu.php:162 msgid "Allow Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221 msgid "Menu may be used to store saved bookmarks" msgstr "" -#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159 +#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:224 msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2423 +#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2459 msgid "Menus" msgstr "" -#: ../../Zotlabs/Module/Menu.php:117 +#: ../../Zotlabs/Module/Menu.php:180 msgid "Bookmarks allowed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:119 +#: ../../Zotlabs/Module/Menu.php:182 msgid "Delete this menu" msgstr "" -#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154 +#: ../../Zotlabs/Module/Menu.php:183 ../../Zotlabs/Module/Menu.php:218 msgid "Edit menu contents" msgstr "" -#: ../../Zotlabs/Module/Menu.php:121 +#: ../../Zotlabs/Module/Menu.php:184 msgid "Edit this menu" msgstr "" -#: ../../Zotlabs/Module/Menu.php:136 +#: ../../Zotlabs/Module/Menu.php:200 msgid "Menu could not be deleted." msgstr "" -#: ../../Zotlabs/Module/Menu.php:149 +#: ../../Zotlabs/Module/Menu.php:213 msgid "Edit Menu" msgstr "" -#: ../../Zotlabs/Module/Menu.php:153 +#: ../../Zotlabs/Module/Menu.php:217 msgid "Add or remove entries to this menu" msgstr "" -#: ../../Zotlabs/Module/Menu.php:155 +#: ../../Zotlabs/Module/Menu.php:219 msgid "Menu name" msgstr "" -#: ../../Zotlabs/Module/Menu.php:155 +#: ../../Zotlabs/Module/Menu.php:219 msgid "Must be unique, only seen by you" msgstr "" -#: ../../Zotlabs/Module/Menu.php:156 +#: ../../Zotlabs/Module/Menu.php:220 msgid "Menu title" msgstr "" -#: ../../Zotlabs/Module/Menu.php:156 +#: ../../Zotlabs/Module/Menu.php:220 msgid "Menu title as seen by others" msgstr "" -#: ../../Zotlabs/Module/Menu.php:157 +#: ../../Zotlabs/Module/Menu.php:221 msgid "Allow bookmarks" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2424 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2460 msgid "Layouts" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:251 -#: ../../include/nav.php:176 ../../include/nav.php:280 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:313 +#: ../../include/nav.php:170 ../../include/nav.php:272 #: ../../include/help.php:68 ../../include/help.php:74 msgid "Help" msgstr "" @@ -5911,11 +6017,11 @@ msgstr "" msgid "Download PDL file" msgstr "" -#: ../../Zotlabs/Module/Cloud.php:120 +#: ../../Zotlabs/Module/Cloud.php:129 msgid "Please refresh page" msgstr "" -#: ../../Zotlabs/Module/Cloud.php:123 +#: ../../Zotlabs/Module/Cloud.php:132 msgid "Unknown error" msgstr "" @@ -5949,12 +6055,12 @@ msgid "Post not found." msgstr "" #: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160 -#: ../../include/bbcode.php:352 +#: ../../include/bbcode.php:354 msgid "post" msgstr "" #: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146 -#: ../../include/text.php:2013 +#: ../../include/text.php:2030 msgid "comment" msgstr "" @@ -5978,11 +6084,6 @@ msgid "" "to correctly use this feature." msgstr "" -#: ../../Zotlabs/Module/Defperms.php:239 -msgid "" -"If enabled, connection requests will be approved without your interaction" -msgstr "" - #: ../../Zotlabs/Module/Defperms.php:246 msgid "Automatic approval settings" msgstr "" @@ -6010,57 +6111,76 @@ msgstr "" msgid "Allow" msgstr "" -#: ../../Zotlabs/Module/Group.php:24 +#: ../../Zotlabs/Module/Group.php:35 msgid "Privacy group created." msgstr "" -#: ../../Zotlabs/Module/Group.php:30 +#: ../../Zotlabs/Module/Group.php:38 msgid "Could not create privacy group." msgstr "" -#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143 -#: ../../include/items.php:4181 +#: ../../Zotlabs/Module/Group.php:51 ../../Zotlabs/Module/Group.php:181 +#: ../../include/items.php:4125 msgid "Privacy group not found." msgstr "" -#: ../../Zotlabs/Module/Group.php:58 +#: ../../Zotlabs/Module/Group.php:67 msgid "Privacy group updated." msgstr "" -#: ../../Zotlabs/Module/Group.php:92 -msgid "Create a group of channels." +#: ../../Zotlabs/Module/Group.php:113 ../../Zotlabs/Module/Group.php:124 +#: ../../Zotlabs/Widget/Activity_filter.php:68 ../../include/features.php:221 +#: ../../include/nav.php:97 ../../include/group.php:320 +msgid "Privacy Groups" msgstr "" -#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:186 -msgid "Privacy group name: " +#: ../../Zotlabs/Module/Group.php:114 +msgid "Add Group" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:118 +msgid "Privacy group name" msgstr "" -#: ../../Zotlabs/Module/Group.php:95 ../../Zotlabs/Module/Group.php:189 +#: ../../Zotlabs/Module/Group.php:119 ../../Zotlabs/Module/Group.php:220 msgid "Members are visible to other channels" msgstr "" -#: ../../Zotlabs/Module/Group.php:113 +#: ../../Zotlabs/Module/Group.php:126 ../../Zotlabs/Module/Help.php:81 +msgid "Members" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:151 msgid "Privacy group removed." msgstr "" -#: ../../Zotlabs/Module/Group.php:115 +#: ../../Zotlabs/Module/Group.php:153 msgid "Unable to remove privacy group." msgstr "" -#: ../../Zotlabs/Module/Group.php:185 -msgid "Privacy group editor" +#: ../../Zotlabs/Module/Group.php:215 +#, php-format +msgid "Privacy Group: %s" msgstr "" -#: ../../Zotlabs/Module/Group.php:199 ../../Zotlabs/Module/Help.php:81 -msgid "Members" +#: ../../Zotlabs/Module/Group.php:217 +msgid "Privacy group name: " +msgstr "" + +#: ../../Zotlabs/Module/Group.php:222 +msgid "Delete Group" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:232 +msgid "Group members" msgstr "" -#: ../../Zotlabs/Module/Group.php:201 -msgid "All Connected Channels" +#: ../../Zotlabs/Module/Group.php:234 +msgid "Not in this group" msgstr "" -#: ../../Zotlabs/Module/Group.php:233 -msgid "Click on a channel to add or remove." +#: ../../Zotlabs/Module/Group.php:266 +msgid "Click a channel to toggle membership" msgstr "" #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184 @@ -6186,7 +6306,7 @@ msgstr "" msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1708 +#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1717 msgid "Personal" msgstr "" @@ -6337,7 +6457,7 @@ msgid "Profile Image" msgstr "" #: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296 -#: ../../include/nav.php:117 +#: ../../include/nav.php:111 msgid "Edit Profiles" msgstr "" @@ -6416,8 +6536,8 @@ msgstr "" msgid "Create a new channel" msgstr "" -#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:240 -#: ../../include/nav.php:102 ../../include/nav.php:190 +#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:302 +#: ../../include/nav.php:94 msgid "Channel Manager" msgstr "" @@ -6452,8 +6572,8 @@ msgid "Delegated Channel" msgstr "" #: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194 -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1893 -#: ../../include/features.php:123 ../../include/nav.php:458 +#: ../../Zotlabs/Lib/Apps.php:293 ../../include/conversation.php:1902 +#: ../../include/features.php:123 ../../include/nav.php:450 msgid "Cards" msgstr "" @@ -6465,45 +6585,49 @@ msgstr "" msgid "This directory server requires an access token" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:18 +#: ../../Zotlabs/Module/Siteinfo.php:21 msgid "About this site" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:19 +#: ../../Zotlabs/Module/Siteinfo.php:22 msgid "Site Name" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:23 +#: ../../Zotlabs/Module/Siteinfo.php:26 msgid "Administrator" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:232 +#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:241 msgid "Terms of Service" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:26 +#: ../../Zotlabs/Module/Siteinfo.php:29 msgid "Software and Project information" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:27 +#: ../../Zotlabs/Module/Siteinfo.php:30 msgid "This site is powered by $Projectname" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:28 +#: ../../Zotlabs/Module/Siteinfo.php:31 msgid "" "Federated and decentralised networking and identity services provided by Zot" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:30 +#: ../../Zotlabs/Module/Siteinfo.php:34 +msgid "Additional federated transport protocols:" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:36 #, php-format msgid "Version %s" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:31 +#: ../../Zotlabs/Module/Siteinfo.php:37 msgid "Project homepage" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:32 +#: ../../Zotlabs/Module/Siteinfo.php:38 msgid "Developer homepage" msgstr "" @@ -6512,7 +6636,7 @@ msgid "No ratings" msgstr "" #: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35 -#: ../../include/conversation.php:1082 +#: ../../include/conversation.php:1087 msgid "Ratings" msgstr "" @@ -6544,8 +6668,8 @@ msgstr "" msgid "Export selected" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:244 -#: ../../include/conversation.php:1915 ../../include/nav.php:481 +#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:306 +#: ../../include/conversation.php:1924 ../../include/nav.php:473 msgid "Webpages" msgstr "" @@ -6688,76 +6812,84 @@ msgstr "" msgid "Redeliver" msgstr "" -#: ../../Zotlabs/Module/Sources.php:37 +#: ../../Zotlabs/Module/Sources.php:38 msgid "Failed to create source. No channel selected." msgstr "" -#: ../../Zotlabs/Module/Sources.php:51 +#: ../../Zotlabs/Module/Sources.php:54 msgid "Source created." msgstr "" -#: ../../Zotlabs/Module/Sources.php:64 +#: ../../Zotlabs/Module/Sources.php:67 msgid "Source updated." msgstr "" -#: ../../Zotlabs/Module/Sources.php:90 +#: ../../Zotlabs/Module/Sources.php:93 msgid "*" msgstr "" -#: ../../Zotlabs/Module/Sources.php:96 +#: ../../Zotlabs/Module/Sources.php:99 #: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292 msgid "Channel Sources" msgstr "" -#: ../../Zotlabs/Module/Sources.php:97 +#: ../../Zotlabs/Module/Sources.php:100 msgid "Manage remote sources of content for your channel." msgstr "" -#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108 +#: ../../Zotlabs/Module/Sources.php:101 ../../Zotlabs/Module/Sources.php:111 msgid "New Source" msgstr "" -#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143 +#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:146 msgid "" "Import all or selected content from the following channel into this channel " "and distribute it according to your channel settings." msgstr "" -#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 +#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147 msgid "Only import content with these words (one per line)" msgstr "" -#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 +#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147 msgid "Leave blank to import all public content" msgstr "" -#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148 +#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:153 msgid "Channel Name" msgstr "" -#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 +#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150 msgid "" "Add the following categories to posts imported from this source (comma " "separated)" msgstr "" -#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161 +#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +msgid "Resend posts with this channel as author" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +msgid "Copyrights may apply" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:136 ../../Zotlabs/Module/Sources.php:166 msgid "Source not found." msgstr "" -#: ../../Zotlabs/Module/Sources.php:140 +#: ../../Zotlabs/Module/Sources.php:143 msgid "Edit Source" msgstr "" -#: ../../Zotlabs/Module/Sources.php:141 +#: ../../Zotlabs/Module/Sources.php:144 msgid "Delete Source" msgstr "" -#: ../../Zotlabs/Module/Sources.php:169 +#: ../../Zotlabs/Module/Sources.php:174 msgid "Source removed" msgstr "" -#: ../../Zotlabs/Module/Sources.php:171 +#: ../../Zotlabs/Module/Sources.php:176 msgid "Unable to remove source." msgstr "" @@ -6796,13 +6928,13 @@ msgstr "" msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529 -#: ../../addon/pubcrawl/as.php:1440 ../../include/conversation.php:160 +#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1559 +#: ../../addon/pubcrawl/as.php:1544 ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442 +#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1546 #: ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" @@ -6823,17 +6955,17 @@ msgstr "" msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072 +#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2102 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074 +#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2104 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076 +#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2106 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" @@ -6892,7 +7024,7 @@ msgstr "" #: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/conversation.php:1052 ../../include/channel.php:1376 +#: ../../include/conversation.php:1057 ../../include/channel.php:1376 #: ../../include/connections.php:110 msgid "Connect" msgstr "" @@ -7041,7 +7173,6 @@ msgid "Subject:" msgstr "" #: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 -#: ../../include/conversation.php:1385 msgid "Attach file" msgstr "" @@ -7050,7 +7181,7 @@ msgid "Send" msgstr "" #: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 -#: ../../include/conversation.php:1430 +#: ../../include/conversation.php:1438 msgid "Set expiration date" msgstr "" @@ -7126,19 +7257,19 @@ msgstr "" msgid "Rate" msgstr "" -#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:267 +#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:269 msgid "webpage" msgstr "" -#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:273 +#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:275 msgid "block" msgstr "" -#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:270 +#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:272 msgid "layout" msgstr "" -#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:276 +#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:278 msgid "menu" msgstr "" @@ -7176,7 +7307,7 @@ msgstr "" msgid "or select an existing folder (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:151 +#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:162 msgid "Save to Folder" msgstr "" @@ -7223,98 +7354,123 @@ msgstr "" msgid "Registration on this hub is by approval only." msgstr "" -#: ../../Zotlabs/Module/Register.php:202 +#: ../../Zotlabs/Module/Register.php:202 ../../Zotlabs/Module/Register.php:211 msgid "Register at another affiliated hub." msgstr "" -#: ../../Zotlabs/Module/Register.php:212 +#: ../../Zotlabs/Module/Register.php:210 +msgid "Registration on this hub is by invitation only." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:221 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../Zotlabs/Module/Register.php:238 +#: ../../Zotlabs/Module/Register.php:247 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:245 +#: ../../Zotlabs/Module/Register.php:254 #, php-format msgid "I am over %s years of age and accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:250 +#: ../../Zotlabs/Module/Register.php:259 msgid "Your email address" msgstr "" -#: ../../Zotlabs/Module/Register.php:251 +#: ../../Zotlabs/Module/Register.php:260 msgid "Choose a password" msgstr "" -#: ../../Zotlabs/Module/Register.php:252 +#: ../../Zotlabs/Module/Register.php:261 msgid "Please re-enter your password" msgstr "" -#: ../../Zotlabs/Module/Register.php:253 +#: ../../Zotlabs/Module/Register.php:262 msgid "Please enter your invitation code" msgstr "" -#: ../../Zotlabs/Module/Register.php:258 -msgid "no" +#: ../../Zotlabs/Module/Register.php:263 +msgid "Your Name" msgstr "" -#: ../../Zotlabs/Module/Register.php:258 -msgid "yes" +#: ../../Zotlabs/Module/Register.php:263 +msgid "Real names are preferred." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:265 +#, php-format +msgid "" +"Your nickname will be used to create an easy to remember channel address e." +"g. nickname%s" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:266 +msgid "" +"Select a channel permission role for your usage needs and privacy " +"requirements." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:267 +msgid "no" msgstr "" -#: ../../Zotlabs/Module/Register.php:274 -msgid "Membership on this site is by invitation only." +#: ../../Zotlabs/Module/Register.php:267 +msgid "yes" msgstr "" -#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1570 -#: ../../include/nav.php:164 +#: ../../Zotlabs/Module/Register.php:294 ../../boot.php:1593 +#: ../../include/nav.php:158 msgid "Register" msgstr "" -#: ../../Zotlabs/Module/Register.php:287 +#: ../../Zotlabs/Module/Register.php:295 msgid "" "This site requires email verification. After completing this form, please " "check your email for further instructions." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:136 -#: ../../Zotlabs/Module/Cover_photo.php:186 +#: ../../Zotlabs/Module/Cover_photo.php:168 +#: ../../Zotlabs/Module/Cover_photo.php:218 msgid "Cover Photos" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4558 +#: ../../Zotlabs/Module/Cover_photo.php:269 ../../include/items.php:4502 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4559 +#: ../../Zotlabs/Module/Cover_photo.php:270 ../../include/items.php:4503 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4560 +#: ../../Zotlabs/Module/Cover_photo.php:271 ../../include/items.php:4504 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4561 +#: ../../Zotlabs/Module/Cover_photo.php:272 ../../include/items.php:4505 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4563 +#: ../../Zotlabs/Module/Cover_photo.php:274 ../../include/items.php:4507 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2070 +#: ../../Zotlabs/Module/Cover_photo.php:276 ../../include/channel.php:2081 msgid "cover photo" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:361 +#: ../../Zotlabs/Module/Cover_photo.php:390 +msgid "Your cover photo may be visible to anybody on the internet" +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:394 msgid "Change Cover Photo" msgstr "" @@ -7322,8 +7478,8 @@ msgstr "" msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1824 -#: ../../include/nav.php:391 +#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1833 +#: ../../include/nav.php:383 msgid "About" msgstr "" @@ -7367,39 +7523,27 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../Zotlabs/Module/Network.php:100 +#: ../../Zotlabs/Module/Network.php:116 msgid "No such group" msgstr "" -#: ../../Zotlabs/Module/Network.php:142 +#: ../../Zotlabs/Module/Network.php:157 msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Network.php:147 -msgid "forum" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:159 -msgid "Search Results For:" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:229 +#: ../../Zotlabs/Module/Network.php:242 msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Network.php:238 +#: ../../Zotlabs/Module/Network.php:253 msgid "Privacy group: " msgstr "" -#: ../../Zotlabs/Module/Network.php:265 -msgid "Invalid connection." -msgstr "" - -#: ../../Zotlabs/Module/Network.php:285 ../../addon/redred/redred.php:65 +#: ../../Zotlabs/Module/Network.php:304 ../../addon/redred/redred.php:65 msgid "Invalid channel." msgstr "" -#: ../../Zotlabs/Module/Acl.php:361 +#: ../../Zotlabs/Module/Acl.php:359 msgid "network" msgstr "" @@ -7417,44 +7561,44 @@ msgstr "" msgid "Permission Denied." msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:95 +#: ../../Zotlabs/Module/Filestorage.php:112 msgid "File not found." msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:142 +#: ../../Zotlabs/Module/Filestorage.php:165 msgid "Edit file permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:154 +#: ../../Zotlabs/Module/Filestorage.php:177 msgid "Set/edit permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:155 +#: ../../Zotlabs/Module/Filestorage.php:178 msgid "Include all files and sub folders" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:156 +#: ../../Zotlabs/Module/Filestorage.php:179 msgid "Return to file list" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:158 +#: ../../Zotlabs/Module/Filestorage.php:181 msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:159 +#: ../../Zotlabs/Module/Filestorage.php:182 msgid "Copy/paste this URL to link file from a web page" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:161 +#: ../../Zotlabs/Module/Filestorage.php:184 msgid "Share this file" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:162 +#: ../../Zotlabs/Module/Filestorage.php:185 msgid "Show URL to this file" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 +#: ../../Zotlabs/Module/Filestorage.php:186 +#: ../../Zotlabs/Storage/Browser.php:405 msgid "Show in your contacts shared folder" msgstr "" @@ -7503,47 +7647,47 @@ msgstr "" msgid "Expiring accounts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:112 +#: ../../Zotlabs/Module/Admin.php:116 msgid "Clones" msgstr "" -#: ../../Zotlabs/Module/Admin.php:118 +#: ../../Zotlabs/Module/Admin.php:122 msgid "Message queues" msgstr "" -#: ../../Zotlabs/Module/Admin.php:132 +#: ../../Zotlabs/Module/Admin.php:136 msgid "Your software should be updated" msgstr "" -#: ../../Zotlabs/Module/Admin.php:137 +#: ../../Zotlabs/Module/Admin.php:141 msgid "Summary" msgstr "" -#: ../../Zotlabs/Module/Admin.php:140 +#: ../../Zotlabs/Module/Admin.php:144 msgid "Registered accounts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:141 +#: ../../Zotlabs/Module/Admin.php:145 msgid "Pending registrations" msgstr "" -#: ../../Zotlabs/Module/Admin.php:142 +#: ../../Zotlabs/Module/Admin.php:146 msgid "Registered channels" msgstr "" -#: ../../Zotlabs/Module/Admin.php:143 -msgid "Active plugins" +#: ../../Zotlabs/Module/Admin.php:147 +msgid "Active addons" msgstr "" -#: ../../Zotlabs/Module/Admin.php:144 +#: ../../Zotlabs/Module/Admin.php:148 msgid "Version" msgstr "" -#: ../../Zotlabs/Module/Admin.php:145 +#: ../../Zotlabs/Module/Admin.php:149 msgid "Repository version (master)" msgstr "" -#: ../../Zotlabs/Module/Admin.php:146 +#: ../../Zotlabs/Module/Admin.php:150 msgid "Repository version (dev)" msgstr "" @@ -7596,7 +7740,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1598 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1622 msgid "Password Reset" msgstr "" @@ -7641,8 +7785,8 @@ msgstr "" msgid "Email Address" msgstr "" -#: ../../Zotlabs/Module/Notifications.php:62 -#: ../../Zotlabs/Lib/ThreadItem.php:408 +#: ../../Zotlabs/Module/Notifications.php:60 +#: ../../Zotlabs/Lib/ThreadItem.php:413 msgid "Mark all seen" msgstr "" @@ -7670,124 +7814,120 @@ msgstr "" msgid "5. Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:231 +#: ../../Zotlabs/Lib/Apps.php:294 msgid "Site Admin" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:232 ../../addon/buglink/buglink.php:16 +#: ../../Zotlabs/Lib/Apps.php:295 ../../addon/buglink/buglink.php:16 msgid "Report Bug" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:233 +#: ../../Zotlabs/Lib/Apps.php:296 msgid "View Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:234 +#: ../../Zotlabs/Lib/Apps.php:297 msgid "My Chatrooms" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:236 -msgid "Firefox Share" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:237 +#: ../../Zotlabs/Lib/Apps.php:299 msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:417 +#: ../../Zotlabs/Lib/Apps.php:300 ../../include/features.php:435 msgid "Suggest Channels" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1589 ../../include/nav.php:126 -#: ../../include/nav.php:130 +#: ../../Zotlabs/Lib/Apps.php:301 ../../boot.php:1613 ../../include/nav.php:120 +#: ../../include/nav.php:124 msgid "Login" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:241 +#: ../../Zotlabs/Lib/Apps.php:303 msgid "Activity" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1931 -#: ../../include/features.php:96 ../../include/nav.php:497 +#: ../../Zotlabs/Lib/Apps.php:307 ../../include/conversation.php:1940 +#: ../../include/features.php:96 ../../include/nav.php:489 msgid "Wiki" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:246 +#: ../../Zotlabs/Lib/Apps.php:308 msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1853 -#: ../../include/conversation.php:1856 +#: ../../Zotlabs/Lib/Apps.php:311 ../../include/conversation.php:1862 +#: ../../include/conversation.php:1865 msgid "Events" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:250 +#: ../../Zotlabs/Lib/Apps.php:312 msgid "Directory" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:252 +#: ../../Zotlabs/Lib/Apps.php:314 msgid "Mail" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:255 +#: ../../Zotlabs/Lib/Apps.php:317 msgid "Chat" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:257 +#: ../../Zotlabs/Lib/Apps.php:319 msgid "Probe" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:258 +#: ../../Zotlabs/Lib/Apps.php:320 msgid "Suggest" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:259 +#: ../../Zotlabs/Lib/Apps.php:321 msgid "Random Channel" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:260 +#: ../../Zotlabs/Lib/Apps.php:322 msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:261 ../../Zotlabs/Widget/Admin.php:26 +#: ../../Zotlabs/Lib/Apps.php:323 ../../Zotlabs/Widget/Admin.php:26 msgid "Features" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:262 ../../addon/openid/MysqlProvider.php:69 +#: ../../Zotlabs/Lib/Apps.php:324 ../../addon/openid/MysqlProvider.php:69 msgid "Language" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:263 +#: ../../Zotlabs/Lib/Apps.php:325 msgid "Post" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:264 ../../addon/openid/MysqlProvider.php:58 +#: ../../Zotlabs/Lib/Apps.php:326 ../../addon/openid/MysqlProvider.php:58 #: ../../addon/openid/MysqlProvider.php:59 #: ../../addon/openid/MysqlProvider.php:60 msgid "Profile Photo" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:407 +#: ../../Zotlabs/Lib/Apps.php:473 msgid "Purchase" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:411 +#: ../../Zotlabs/Lib/Apps.php:477 msgid "Undelete" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:419 +#: ../../Zotlabs/Lib/Apps.php:485 msgid "Add to app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:420 +#: ../../Zotlabs/Lib/Apps.php:486 msgid "Remove from app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:421 +#: ../../Zotlabs/Lib/Apps.php:487 msgid "Pin to navbar" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:422 +#: ../../Zotlabs/Lib/Apps.php:488 msgid "Unpin from navbar" msgstr "" @@ -7874,8 +8014,8 @@ msgctxt "wiki_history" msgid "Message" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:744 -#: ../../include/bbcode.php:914 +#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:746 +#: ../../include/bbcode.php:916 msgid "Different viewers will see this text differently" msgstr "" @@ -8247,208 +8387,200 @@ msgstr "" msgid "Update %s failed. See error logs." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:697 +#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:700 msgid "Private Message" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:147 ../../include/conversation.php:689 +#: ../../Zotlabs/Lib/ThreadItem.php:152 ../../Zotlabs/Storage/Browser.php:280 +msgid "Admin Delete" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:158 ../../include/conversation.php:690 msgid "Select" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:183 msgid "I will attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:183 msgid "I will not attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:183 msgid "I might attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:182 +#: ../../Zotlabs/Lib/ThreadItem.php:193 msgid "I agree" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:182 +#: ../../Zotlabs/Lib/ThreadItem.php:193 msgid "I disagree" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:182 +#: ../../Zotlabs/Lib/ThreadItem.php:193 msgid "I abstain" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:238 -msgid "Add Star" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:239 -msgid "Remove Star" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:240 +#: ../../Zotlabs/Lib/ThreadItem.php:247 ../../include/conversation.php:695 msgid "Toggle Star Status" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:244 -msgid "starred" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:254 ../../include/conversation.php:704 +#: ../../Zotlabs/Lib/ThreadItem.php:258 ../../include/conversation.php:707 msgid "Message signature validated" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:255 ../../include/conversation.php:705 +#: ../../Zotlabs/Lib/ThreadItem.php:259 ../../include/conversation.php:708 msgid "Message signature incorrect" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:263 +#: ../../Zotlabs/Lib/ThreadItem.php:267 msgid "Add Tag" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575 +#: ../../Zotlabs/Lib/ThreadItem.php:285 ../../include/taxonomy.php:575 msgid "like" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576 +#: ../../Zotlabs/Lib/ThreadItem.php:286 ../../include/taxonomy.php:576 msgid "dislike" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:286 +#: ../../Zotlabs/Lib/ThreadItem.php:290 msgid "Share This" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:286 +#: ../../Zotlabs/Lib/ThreadItem.php:290 msgid "share" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:295 +#: ../../Zotlabs/Lib/ThreadItem.php:299 msgid "Delivery Report" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:313 +#: ../../Zotlabs/Lib/ThreadItem.php:317 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Lib/ThreadItem.php:343 ../../Zotlabs/Lib/ThreadItem.php:344 +#: ../../Zotlabs/Lib/ThreadItem.php:347 ../../Zotlabs/Lib/ThreadItem.php:348 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:347 +#: ../../Zotlabs/Lib/ThreadItem.php:351 msgid "to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:348 +#: ../../Zotlabs/Lib/ThreadItem.php:352 msgid "via" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:349 +#: ../../Zotlabs/Lib/ThreadItem.php:353 msgid "Wall-to-Wall" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:350 +#: ../../Zotlabs/Lib/ThreadItem.php:354 msgid "via Wall-To-Wall:" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:363 ../../include/conversation.php:763 +#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:766 #, php-format msgid "from %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:366 ../../include/conversation.php:766 +#: ../../Zotlabs/Lib/ThreadItem.php:370 ../../include/conversation.php:769 #, php-format msgid "last edited: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:767 +#: ../../Zotlabs/Lib/ThreadItem.php:371 ../../include/conversation.php:770 #, php-format msgid "Expires: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:374 +#: ../../Zotlabs/Lib/ThreadItem.php:379 msgid "Attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:375 +#: ../../Zotlabs/Lib/ThreadItem.php:380 msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:376 +#: ../../Zotlabs/Lib/ThreadItem.php:381 msgid "Vote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:377 +#: ../../Zotlabs/Lib/ThreadItem.php:382 msgid "Voting Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:398 +#: ../../Zotlabs/Lib/ThreadItem.php:403 #: ../../addon/bookmarker/bookmarker.php:38 msgid "Save Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:399 +#: ../../Zotlabs/Lib/ThreadItem.php:404 msgid "Add to Calendar" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:426 ../../include/conversation.php:483 +#: ../../Zotlabs/Lib/ThreadItem.php:431 ../../include/conversation.php:483 msgid "This is an unsaved preview" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:458 ../../include/js_strings.php:7 +#: ../../Zotlabs/Lib/ThreadItem.php:463 ../../include/js_strings.php:7 #, php-format msgid "%s show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1380 +#: ../../Zotlabs/Lib/ThreadItem.php:758 ../../include/conversation.php:1388 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1381 +#: ../../Zotlabs/Lib/ThreadItem.php:759 ../../include/conversation.php:1389 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1382 +#: ../../Zotlabs/Lib/ThreadItem.php:760 ../../include/conversation.php:1390 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1383 +#: ../../Zotlabs/Lib/ThreadItem.php:761 ../../include/conversation.php:1391 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1384 +#: ../../Zotlabs/Lib/ThreadItem.php:762 ../../include/conversation.php:1392 msgid "Code" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:758 +#: ../../Zotlabs/Lib/ThreadItem.php:763 msgid "Image" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:759 -msgid "Attach File" +#: ../../Zotlabs/Lib/ThreadItem.php:764 ../../include/conversation.php:1393 +msgid "Attach/Upload file" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:760 +#: ../../Zotlabs/Lib/ThreadItem.php:765 msgid "Insert Link" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:761 +#: ../../Zotlabs/Lib/ThreadItem.php:766 msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:771 +#: ../../Zotlabs/Lib/ThreadItem.php:776 msgid "Your full name (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:772 +#: ../../Zotlabs/Lib/ThreadItem.php:777 msgid "Your email address (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:773 +#: ../../Zotlabs/Lib/ThreadItem.php:778 msgid "Your website URL (optional)" msgstr "" @@ -8464,11 +8596,11 @@ msgstr "" msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:287 +#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:289 msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2845 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2817 msgid "Collection" msgstr "" @@ -8480,8 +8612,8 @@ msgstr "" msgid "Addressbook" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:420 -#: ../../include/nav.php:423 +#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:412 +#: ../../include/nav.php:415 msgid "Calendar" msgstr "" @@ -8505,33 +8637,36 @@ msgstr "" msgid "Add Files" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:353 +#: ../../Zotlabs/Storage/Browser.php:361 #, php-format msgid "You are using %1$s of your available file storage." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:358 +#: ../../Zotlabs/Storage/Browser.php:366 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:369 +#: ../../Zotlabs/Storage/Browser.php:377 msgid "WARNING:" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:381 +#: ../../Zotlabs/Storage/Browser.php:389 msgid "Create new folder" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:383 +#: ../../Zotlabs/Storage/Browser.php:391 msgid "Upload file" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:396 +#: ../../Zotlabs/Storage/Browser.php:404 msgid "Drop files here to immediately upload" msgstr "" #: ../../Zotlabs/Widget/Forums.php:100 +#: ../../Zotlabs/Widget/Activity_filter.php:100 +#: ../../Zotlabs/Widget/Notifications.php:119 +#: ../../Zotlabs/Widget/Notifications.php:120 msgid "Forums" msgstr "" @@ -8611,7 +8746,7 @@ msgstr "" msgid "Select an addressbook to import to" msgstr "" -#: ../../Zotlabs/Widget/Appcategories.php:40 +#: ../../Zotlabs/Widget/Appcategories.php:43 #: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141 #: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:409 #: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 @@ -8619,7 +8754,8 @@ msgstr "" msgid "Categories" msgstr "" -#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Widget/Filer.php:31 +#: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31 +#: ../../widgets/Netselect/Netselect.php:26 #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100 #: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189 msgid "Everything" @@ -8670,8 +8806,8 @@ msgid "New Message" msgstr "" #: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1867 ../../include/conversation.php:1870 -#: ../../include/nav.php:434 ../../include/nav.php:437 +#: ../../include/conversation.php:1876 ../../include/conversation.php:1879 +#: ../../include/nav.php:426 ../../include/nav.php:429 msgid "Chatrooms" msgstr "" @@ -8696,6 +8832,74 @@ msgctxt "widget" msgid "Activity" msgstr "" +#: ../../Zotlabs/Widget/Activity_filter.php:24 +msgid "Personal Posts" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:28 +msgid "Show posts that mention or involve me" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:39 +msgid "Starred Posts" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:43 +msgid "Show posts that I have starred" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:63 +#, php-format +msgid "Show posts related to the %s privacy group" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:72 +msgid "Show my privacy groups" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:93 +msgid "Show posts to this forum" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:104 +msgid "Show forums" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:128 +#, php-format +msgid "Show posts that I have filed to %s" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:134 +#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 +#: ../../include/features.php:488 +msgid "Saved Folders" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:138 +msgid "Show filed post categories" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:152 +msgid "Panel search" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:162 +#: ../../Zotlabs/Widget/Notifications.php:27 +#: ../../Zotlabs/Widget/Notifications.php:46 +#: ../../Zotlabs/Widget/Notifications.php:122 +#: ../../Zotlabs/Widget/Notifications.php:153 +msgid "Filter by name" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:177 +msgid "Remove active filter" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:193 +msgid "Activity Filters" +msgstr "" + #: ../../Zotlabs/Widget/Follow.php:22 #, php-format msgid "You have %1$.0f of %2$.0f allowed connections." @@ -8757,7 +8961,7 @@ msgstr "" msgid "Saved Searches" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:333 +#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:325 msgid "add" msgstr "" @@ -8794,9 +8998,32 @@ msgstr "" msgid "See more..." msgstr "" -#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:470 -msgid "Saved Folders" +#: ../../Zotlabs/Widget/Activity_order.php:86 +msgid "Commented Date" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_order.php:90 +msgid "Order by last commented date" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_order.php:93 +msgid "Posted Date" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_order.php:97 +msgid "Order by last posted date" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_order.php:100 +msgid "Date Unthreaded" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_order.php:104 +msgid "Order unthreaded by date" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_order.php:119 +msgid "Activity Order" msgstr "" #: ../../Zotlabs/Widget/Cover_photo.php:54 @@ -8808,6 +9035,18 @@ msgstr "" msgid "Tags" msgstr "" +#: ../../Zotlabs/Widget/Appstore.php:11 +msgid "App Collections" +msgstr "" + +#: ../../Zotlabs/Widget/Appstore.php:13 +msgid "Available Apps" +msgstr "" + +#: ../../Zotlabs/Widget/Appstore.php:14 +msgid "Installed apps" +msgstr "" + #: ../../Zotlabs/Widget/Newmember.php:24 msgid "Profile Creation" msgstr "" @@ -8820,7 +9059,7 @@ msgstr "" msgid "Upload cover photo" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:119 +#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:113 msgid "Edit your profile" msgstr "" @@ -8872,12 +9111,12 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:199 +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:191 msgid "Admin" msgstr "" #: ../../Zotlabs/Widget/Admin.php:56 -msgid "Plugin Features" +msgid "Addon Features" msgstr "" #: ../../Zotlabs/Widget/Settings_menu.php:35 @@ -8916,10 +9155,6 @@ msgstr "" msgid "OAuth2 apps" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240 -msgid "Permission Groups" -msgstr "" - #: ../../Zotlabs/Widget/Settings_menu.php:125 msgid "Premium Channel Settings" msgstr "" @@ -8946,16 +9181,10 @@ msgstr "" #: ../../Zotlabs/Widget/Notifications.php:26 #: ../../Zotlabs/Widget/Notifications.php:45 -#: ../../Zotlabs/Widget/Notifications.php:141 +#: ../../Zotlabs/Widget/Notifications.php:152 msgid "Show new posts only" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:27 -#: ../../Zotlabs/Widget/Notifications.php:46 -#: ../../Zotlabs/Widget/Notifications.php:142 -msgid "Filter by name" -msgstr "" - #: ../../Zotlabs/Widget/Notifications.php:35 msgid "New Home Activity" msgstr "" @@ -8969,7 +9198,7 @@ msgid "View your home activity" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:42 -#: ../../Zotlabs/Widget/Notifications.php:138 +#: ../../Zotlabs/Widget/Notifications.php:149 msgid "Mark all notifications seen" msgstr "" @@ -9034,23 +9263,23 @@ msgstr "" msgid "Mark all notices seen" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:121 +#: ../../Zotlabs/Widget/Notifications.php:132 msgid "New Registrations" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:122 +#: ../../Zotlabs/Widget/Notifications.php:133 msgid "New Registrations Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:132 +#: ../../Zotlabs/Widget/Notifications.php:143 msgid "Public Stream Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:135 +#: ../../Zotlabs/Widget/Notifications.php:146 msgid "View the public stream" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:150 +#: ../../Zotlabs/Widget/Notifications.php:161 msgid "Sorry, you have got no notifications at the moment" msgstr "" @@ -9058,57 +9287,53 @@ msgstr "" msgid "Source channel not found." msgstr "" -#: ../../boot.php:1569 +#: ../../boot.php:1592 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1588 ../../include/nav.php:111 ../../include/nav.php:140 -#: ../../include/nav.php:159 +#: ../../boot.php:1612 ../../include/nav.php:105 ../../include/nav.php:134 +#: ../../include/nav.php:153 msgid "Logout" msgstr "" -#: ../../boot.php:1592 +#: ../../boot.php:1616 msgid "Login/Email" msgstr "" -#: ../../boot.php:1593 +#: ../../boot.php:1617 msgid "Password" msgstr "" -#: ../../boot.php:1594 +#: ../../boot.php:1618 msgid "Remember me" msgstr "" -#: ../../boot.php:1597 +#: ../../boot.php:1621 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2354 +#: ../../boot.php:2405 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2359 +#: ../../boot.php:2410 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2475 +#: ../../boot.php:2526 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2480 +#: ../../boot.php:2531 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2481 ../../include/datetime.php:238 +#: ../../boot.php:2532 ../../include/datetime.php:238 msgid "never" msgstr "" -#: ../../store/[data]/smarty3/compiled/a0a1289f91f53b2c12e4e0b45ffe8291540ba895_0.file.cover_photo.tpl.php:123 -msgid "Cover Photo" -msgstr "" - #: ../../view/theme/redbasic_c/php/config.php:16 #: ../../view/theme/redbasic_c/php/config.php:19 #: ../../view/theme/redbasic/php/config.php:16 @@ -9225,6 +9450,33 @@ msgstr "" msgid "Set size of followup author photos" msgstr "" +#: ../../widgets/Netselect/Netselect.php:24 +msgid "Network/Protocol" +msgstr "" + +#: ../../widgets/Netselect/Netselect.php:28 ../../include/network.php:1772 +msgid "Zot" +msgstr "" + +#: ../../widgets/Netselect/Netselect.php:31 ../../include/network.php:1770 +msgid "Diaspora" +msgstr "" + +#: ../../widgets/Netselect/Netselect.php:33 ../../include/network.php:1763 +#: ../../include/network.php:1764 +msgid "Friendica" +msgstr "" + +#: ../../widgets/Netselect/Netselect.php:38 ../../include/network.php:1765 +msgid "OStatus" +msgstr "" + +#: ../../widgets/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1219 +#: ../../addon/pubcrawl/as.php:1374 ../../addon/pubcrawl/as.php:1553 +#: ../../include/network.php:1768 +msgid "ActivityPub" +msgstr "" + #: ../../addon/rendezvous/rendezvous.php:57 msgid "Errors encountered deleting database table " msgstr "" @@ -9366,30 +9618,30 @@ msgstr "" msgid "Skeleton Settings" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:249 +#: ../../addon/gnusoc/gnusoc.php:258 msgid "GNU-Social Protocol Settings updated." msgstr "" -#: ../../addon/gnusoc/gnusoc.php:268 +#: ../../addon/gnusoc/gnusoc.php:277 msgid "" "The GNU-Social protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/gnusoc/gnusoc.php:271 +#: ../../addon/gnusoc/gnusoc.php:280 msgid "Enable the GNU-Social protocol for this channel" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:275 +#: ../../addon/gnusoc/gnusoc.php:284 msgid "GNU-Social Protocol Settings" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:471 +#: ../../addon/gnusoc/gnusoc.php:480 msgid "Follow" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:474 +#: ../../addon/gnusoc/gnusoc.php:483 #, php-format msgid "%1$s is now following %2$s" msgstr "" @@ -9436,7 +9688,7 @@ msgid "Page to load after image selection." msgstr "" #: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1300 -#: ../../include/nav.php:119 +#: ../../include/nav.php:113 msgid "Edit Profile" msgstr "" @@ -9822,6 +10074,14 @@ msgstr "" msgid "IRC Chatroom" msgstr "" +#: ../../addon/gallery/gallery.php:42 ../../addon/gallery/Mod_Gallery.php:111 +msgid "Gallery" +msgstr "" + +#: ../../addon/gallery/gallery.php:45 +msgid "Photo Gallery" +msgstr "" + #: ../../addon/ljpost/ljpost.php:42 msgid "Post to LiveJournal" msgstr "" @@ -9924,7 +10184,7 @@ msgstr "" msgid "OpenID protocol error. No ID returned." msgstr "" -#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:300 +#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:317 msgid "Login failed." msgstr "" @@ -10121,38 +10381,38 @@ msgstr "" msgid "declared undying love for" msgstr "" -#: ../../addon/diaspora/diaspora.php:781 +#: ../../addon/diaspora/diaspora.php:786 msgid "Diaspora Protocol Settings updated." msgstr "" -#: ../../addon/diaspora/diaspora.php:800 +#: ../../addon/diaspora/diaspora.php:805 msgid "" "The Diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/diaspora/diaspora.php:803 +#: ../../addon/diaspora/diaspora.php:808 msgid "Enable the Diaspora protocol for this channel" msgstr "" -#: ../../addon/diaspora/diaspora.php:807 +#: ../../addon/diaspora/diaspora.php:812 msgid "Allow any Diaspora member to comment on your public posts" msgstr "" -#: ../../addon/diaspora/diaspora.php:811 +#: ../../addon/diaspora/diaspora.php:816 msgid "Prevent your hashtags from being redirected to other sites" msgstr "" -#: ../../addon/diaspora/diaspora.php:815 +#: ../../addon/diaspora/diaspora.php:820 msgid "Sign and forward posts and comments with no existing Diaspora signature" msgstr "" -#: ../../addon/diaspora/diaspora.php:820 +#: ../../addon/diaspora/diaspora.php:825 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "" -#: ../../addon/diaspora/diaspora.php:825 +#: ../../addon/diaspora/diaspora.php:830 msgid "Diaspora Protocol Settings" msgstr "" @@ -10160,7 +10420,7 @@ msgstr "" msgid "No username found in import file." msgstr "" -#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:67 +#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:72 msgid "Unable to create a unique channel address. Import failed." msgstr "" @@ -10623,35 +10883,40 @@ msgstr "" msgid "Friendica Login Password" msgstr "" -#: ../../addon/pubcrawl/as.php:1146 ../../addon/pubcrawl/as.php:1273 -#: ../../addon/pubcrawl/as.php:1449 ../../include/network.php:1769 -msgid "ActivityPub" -msgstr "" - -#: ../../addon/pubcrawl/pubcrawl.php:1053 +#: ../../addon/pubcrawl/pubcrawl.php:1136 msgid "ActivityPub Protocol Settings updated." msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1062 +#: ../../addon/pubcrawl/pubcrawl.php:1145 msgid "" "The ActivityPub protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1065 +#: ../../addon/pubcrawl/pubcrawl.php:1148 msgid "Enable the ActivityPub protocol for this channel" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1068 +#: ../../addon/pubcrawl/pubcrawl.php:1151 +msgid "Deliver to ActivityPub recipients in privacy groups" +msgstr "" + +#: ../../addon/pubcrawl/pubcrawl.php:1151 +msgid "" +"May result in a large number of mentions and expose all the members of your " +"privacy group" +msgstr "" + +#: ../../addon/pubcrawl/pubcrawl.php:1155 msgid "Send multi-media HTML articles" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1068 +#: ../../addon/pubcrawl/pubcrawl.php:1155 msgid "Not supported by some microblog services such as Mastodon" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1072 +#: ../../addon/pubcrawl/pubcrawl.php:1159 msgid "ActivityPub Protocol Settings" msgstr "" @@ -11135,75 +11400,206 @@ msgstr "" msgid "Smileybutton Settings" msgstr "" -#: ../../addon/cart/myshop.php:138 +#: ../../addon/cart/myshop.php:44 +msgid "Access Denied." +msgstr "" + +#: ../../addon/cart/myshop.php:125 ../../addon/cart/cart.php:1324 msgid "Order Not Found" msgstr "" -#: ../../addon/cart/cart.php:810 -msgid "Order cannot be checked out." +#: ../../addon/cart/myshop.php:155 ../../addon/cart/myshop.php:191 +#: ../../addon/cart/myshop.php:225 ../../addon/cart/myshop.php:273 +#: ../../addon/cart/myshop.php:308 ../../addon/cart/myshop.php:331 +msgid "Access Denied" +msgstr "" + +#: ../../addon/cart/myshop.php:200 ../../addon/cart/myshop.php:234 +#: ../../addon/cart/myshop.php:283 ../../addon/cart/myshop.php:341 +msgid "Invalid Item" +msgstr "" + +#: ../../addon/cart/cart.php:467 +msgid "[cart] Item Added" +msgstr "" + +#: ../../addon/cart/cart.php:851 +msgid "Order already checked out." msgstr "" -#: ../../addon/cart/cart.php:1073 +#: ../../addon/cart/cart.php:1204 msgid "Enable Shopping Cart" msgstr "" -#: ../../addon/cart/cart.php:1080 +#: ../../addon/cart/cart.php:1211 msgid "Enable Test Catalog" msgstr "" -#: ../../addon/cart/cart.php:1088 +#: ../../addon/cart/cart.php:1219 msgid "Enable Manual Payments" msgstr "" -#: ../../addon/cart/cart.php:1103 -msgid "Base Cart Settings" +#: ../../addon/cart/cart.php:1238 +msgid "Base Merchant Currency" +msgstr "" + +#: ../../addon/cart/cart.php:1250 +msgid "Cart - Base Settings" msgstr "" -#: ../../addon/cart/cart.php:1151 -msgid "Add Item" +#: ../../addon/cart/cart.php:1271 ../../addon/cart/cart.php:1274 +msgid "Shop" msgstr "" -#: ../../addon/cart/cart.php:1165 -msgid "Call cart_post_" +#: ../../addon/cart/cart.php:1401 +msgid "You must be logged into the Grid to shop." msgstr "" -#: ../../addon/cart/cart.php:1195 +#: ../../addon/cart/cart.php:1411 msgid "Cart Not Enabled (profile: " msgstr "" -#: ../../addon/cart/cart.php:1226 ../../addon/cart/manual_payments.php:36 +#: ../../addon/cart/cart.php:1442 +#: ../../addon/cart/submodules/paypalbutton.php:417 +#: ../../addon/cart/manual_payments.php:37 msgid "Order not found." msgstr "" -#: ../../addon/cart/cart.php:1262 ../../addon/cart/cart.php:1389 -msgid "No Order Found" +#: ../../addon/cart/cart.php:1451 +msgid "Access denied." msgstr "" -#: ../../addon/cart/cart.php:1270 -msgid "call: " +#: ../../addon/cart/cart.php:1503 ../../addon/cart/cart.php:1647 +msgid "No Order Found" msgstr "" -#: ../../addon/cart/cart.php:1273 +#: ../../addon/cart/cart.php:1512 msgid "An unknown error has occurred Please start again." msgstr "" -#: ../../addon/cart/cart.php:1414 +#: ../../addon/cart/cart.php:1680 msgid "Invalid Payment Type. Please start again." msgstr "" -#: ../../addon/cart/cart.php:1421 +#: ../../addon/cart/cart.php:1687 msgid "Order not found" msgstr "" -#: ../../addon/cart/manual_payments.php:9 +#: ../../addon/cart/submodules/paypalbutton.php:97 +msgid "Enable Paypal Button Module" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:102 +msgid "Use Production Key" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:109 +msgid "Paypal Sandbox Client Key" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:116 +msgid "Paypal Sandbox Secret Key" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:122 +msgid "Paypal Production Client Key" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:129 +msgid "Paypal Production Secret Key" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:143 +msgid "Cart - Paypal Addon" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:277 +msgid "Paypal button payments are not enabled." +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:295 +msgid "" +"Paypal button payments are not properly configured. Please choose another " +"payment option." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:71 +msgid "Enable Hubzilla Services Module" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:77 +msgid "Cart - Hubzilla Services Addon" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:169 +msgid "New Sku" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:204 +msgid "Cannot save edits to locked item." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:252 +#: ../../addon/cart/submodules/hzservices.php:339 +msgid "SKU not found." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:305 +#: ../../addon/cart/submodules/hzservices.php:309 +msgid "Invalid Activation Directive." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:380 +#: ../../addon/cart/submodules/hzservices.php:384 +msgid "Invalid Deactivation Directive." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:570 +msgid "Add to this privacy group" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:586 +msgid "Set user service class" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:613 +msgid "You must be using a local account to purchase this service." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:651 +msgid "Changes Locked" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:655 +msgid "Item available for purchase." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:662 +msgid "Price" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:665 +msgid "Add buyer to privacy group" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:670 +msgid "Add buyer as connection" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:677 +#: ../../addon/cart/submodules/hzservices.php:718 +msgid "Set Service Class" +msgstr "" + +#: ../../addon/cart/manual_payments.php:7 msgid "Error: order mismatch. Please try again." msgstr "" -#: ../../addon/cart/manual_payments.php:29 +#: ../../addon/cart/manual_payments.php:30 msgid "Manual payments are not enabled." msgstr "" -#: ../../addon/cart/manual_payments.php:44 +#: ../../addon/cart/manual_payments.php:46 msgid "Finished" msgstr "" @@ -11688,11 +12084,11 @@ msgstr "" msgid "PumpIO Settings saved." msgstr "" -#: ../../addon/ldapauth/ldapauth.php:61 +#: ../../addon/ldapauth/ldapauth.php:70 msgid "An account has been created for you." msgstr "" -#: ../../addon/ldapauth/ldapauth.php:68 +#: ../../addon/ldapauth/ldapauth.php:77 msgid "Authentication successful but rejected: account creation is disabled." msgstr "" @@ -12004,282 +12400,286 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:251 ../../include/text.php:1129 -#: ../../include/text.php:1133 +#: ../../include/conversation.php:251 ../../include/text.php:1140 +#: ../../include/text.php:1144 msgid "poked" msgstr "" -#: ../../include/conversation.php:736 +#: ../../include/conversation.php:739 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:756 +#: ../../include/conversation.php:759 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:757 +#: ../../include/conversation.php:760 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:785 msgid "View in context" msgstr "" -#: ../../include/conversation.php:884 +#: ../../include/conversation.php:886 msgid "remove" msgstr "" -#: ../../include/conversation.php:888 +#: ../../include/conversation.php:890 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:889 +#: ../../include/conversation.php:891 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:932 +#: ../../include/conversation.php:934 msgid "View Source" msgstr "" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:944 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:951 +#: ../../include/conversation.php:953 msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:1062 +#: ../../include/conversation.php:1067 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:1072 +#: ../../include/conversation.php:1077 msgid "Message" msgstr "" -#: ../../include/conversation.php:1206 +#: ../../include/conversation.php:1211 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1206 +#: ../../include/conversation.php:1211 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1210 +#: ../../include/conversation.php:1215 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1212 +#: ../../include/conversation.php:1217 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1218 +#: ../../include/conversation.php:1223 msgid "and" msgstr "" -#: ../../include/conversation.php:1221 +#: ../../include/conversation.php:1226 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1222 +#: ../../include/conversation.php:1227 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1222 +#: ../../include/conversation.php:1227 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1270 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1266 +#: ../../include/conversation.php:1271 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1316 +#: ../../include/conversation.php:1287 +msgid "Embed (existing) photo from your photo albums" +msgstr "" + +#: ../../include/conversation.php:1323 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1317 +#: ../../include/conversation.php:1324 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1322 +#: ../../include/conversation.php:1329 msgid "Choose a different album..." msgstr "" -#: ../../include/conversation.php:1326 +#: ../../include/conversation.php:1333 msgid "Comments enabled" msgstr "" -#: ../../include/conversation.php:1327 +#: ../../include/conversation.php:1334 msgid "Comments disabled" msgstr "" -#: ../../include/conversation.php:1375 +#: ../../include/conversation.php:1383 msgid "Page link name" msgstr "" -#: ../../include/conversation.php:1378 +#: ../../include/conversation.php:1386 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1392 +#: ../../include/conversation.php:1400 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1395 +#: ../../include/conversation.php:1403 msgid "Disable comments" msgstr "" -#: ../../include/conversation.php:1396 +#: ../../include/conversation.php:1404 msgid "Toggle comments" msgstr "" -#: ../../include/conversation.php:1404 +#: ../../include/conversation.php:1412 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/conversation.php:1427 +#: ../../include/conversation.php:1435 msgid "Other networks and post services" msgstr "" -#: ../../include/conversation.php:1433 +#: ../../include/conversation.php:1441 msgid "Set publish date" msgstr "" -#: ../../include/conversation.php:1693 +#: ../../include/conversation.php:1702 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1696 +#: ../../include/conversation.php:1705 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1700 +#: ../../include/conversation.php:1709 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1703 +#: ../../include/conversation.php:1712 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1711 +#: ../../include/conversation.php:1720 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1720 +#: ../../include/conversation.php:1729 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1726 +#: ../../include/conversation.php:1735 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1729 +#: ../../include/conversation.php:1738 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1736 +#: ../../include/conversation.php:1745 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1739 +#: ../../include/conversation.php:1748 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1814 ../../include/nav.php:381 +#: ../../include/conversation.php:1823 ../../include/nav.php:373 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1827 ../../include/nav.php:394 +#: ../../include/conversation.php:1836 ../../include/nav.php:386 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1837 ../../include/nav.php:404 -#: ../../include/photos.php:666 +#: ../../include/conversation.php:1846 ../../include/nav.php:396 +#: ../../include/photos.php:667 msgid "Photo Albums" msgstr "" -#: ../../include/conversation.php:1845 ../../include/nav.php:412 +#: ../../include/conversation.php:1854 ../../include/nav.php:404 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1882 ../../include/nav.php:447 +#: ../../include/conversation.php:1891 ../../include/nav.php:439 msgid "Bookmarks" msgstr "" -#: ../../include/conversation.php:1885 ../../include/nav.php:450 +#: ../../include/conversation.php:1894 ../../include/nav.php:442 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1896 ../../include/nav.php:461 +#: ../../include/conversation.php:1905 ../../include/nav.php:453 msgid "View Cards" msgstr "" -#: ../../include/conversation.php:1904 +#: ../../include/conversation.php:1913 msgid "articles" msgstr "" -#: ../../include/conversation.php:1907 ../../include/nav.php:472 +#: ../../include/conversation.php:1916 ../../include/nav.php:464 msgid "View Articles" msgstr "" -#: ../../include/conversation.php:1918 ../../include/nav.php:484 +#: ../../include/conversation.php:1927 ../../include/nav.php:476 msgid "View Webpages" msgstr "" -#: ../../include/conversation.php:1987 +#: ../../include/conversation.php:1996 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1990 +#: ../../include/conversation.php:1999 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1993 +#: ../../include/conversation.php:2002 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1996 +#: ../../include/conversation.php:2005 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1999 +#: ../../include/conversation.php:2008 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:2002 +#: ../../include/conversation.php:2011 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -12311,12 +12711,12 @@ msgstr "" msgid "Unable to import a removed channel." msgstr "" -#: ../../include/import.php:46 +#: ../../include/import.php:51 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/import.php:111 +#: ../../include/import.php:116 msgid "Cloned channel not found. Import failed." msgstr "" @@ -12344,340 +12744,345 @@ msgstr "" msgid "newer" msgstr "" -#: ../../include/text.php:961 +#: ../../include/text.php:963 msgid "No connections" msgstr "" -#: ../../include/text.php:993 +#: ../../include/text.php:995 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1129 ../../include/text.php:1133 +#: ../../include/text.php:1051 +#, php-format +msgid "Network: %s" +msgstr "" + +#: ../../include/text.php:1140 ../../include/text.php:1144 msgid "poke" msgstr "" -#: ../../include/text.php:1134 +#: ../../include/text.php:1145 msgid "ping" msgstr "" -#: ../../include/text.php:1134 +#: ../../include/text.php:1145 msgid "pinged" msgstr "" -#: ../../include/text.php:1135 +#: ../../include/text.php:1146 msgid "prod" msgstr "" -#: ../../include/text.php:1135 +#: ../../include/text.php:1146 msgid "prodded" msgstr "" -#: ../../include/text.php:1136 +#: ../../include/text.php:1147 msgid "slap" msgstr "" -#: ../../include/text.php:1136 +#: ../../include/text.php:1147 msgid "slapped" msgstr "" -#: ../../include/text.php:1137 +#: ../../include/text.php:1148 msgid "finger" msgstr "" -#: ../../include/text.php:1137 +#: ../../include/text.php:1148 msgid "fingered" msgstr "" -#: ../../include/text.php:1138 +#: ../../include/text.php:1149 msgid "rebuff" msgstr "" -#: ../../include/text.php:1138 +#: ../../include/text.php:1149 msgid "rebuffed" msgstr "" -#: ../../include/text.php:1161 +#: ../../include/text.php:1172 msgid "happy" msgstr "" -#: ../../include/text.php:1162 +#: ../../include/text.php:1173 msgid "sad" msgstr "" -#: ../../include/text.php:1163 +#: ../../include/text.php:1174 msgid "mellow" msgstr "" -#: ../../include/text.php:1164 +#: ../../include/text.php:1175 msgid "tired" msgstr "" -#: ../../include/text.php:1165 +#: ../../include/text.php:1176 msgid "perky" msgstr "" -#: ../../include/text.php:1166 +#: ../../include/text.php:1177 msgid "angry" msgstr "" -#: ../../include/text.php:1167 +#: ../../include/text.php:1178 msgid "stupefied" msgstr "" -#: ../../include/text.php:1168 +#: ../../include/text.php:1179 msgid "puzzled" msgstr "" -#: ../../include/text.php:1169 +#: ../../include/text.php:1180 msgid "interested" msgstr "" -#: ../../include/text.php:1170 +#: ../../include/text.php:1181 msgid "bitter" msgstr "" -#: ../../include/text.php:1171 +#: ../../include/text.php:1182 msgid "cheerful" msgstr "" -#: ../../include/text.php:1172 +#: ../../include/text.php:1183 msgid "alive" msgstr "" -#: ../../include/text.php:1173 +#: ../../include/text.php:1184 msgid "annoyed" msgstr "" -#: ../../include/text.php:1174 +#: ../../include/text.php:1185 msgid "anxious" msgstr "" -#: ../../include/text.php:1175 +#: ../../include/text.php:1186 msgid "cranky" msgstr "" -#: ../../include/text.php:1176 +#: ../../include/text.php:1187 msgid "disturbed" msgstr "" -#: ../../include/text.php:1177 +#: ../../include/text.php:1188 msgid "frustrated" msgstr "" -#: ../../include/text.php:1178 +#: ../../include/text.php:1189 msgid "depressed" msgstr "" -#: ../../include/text.php:1179 +#: ../../include/text.php:1190 msgid "motivated" msgstr "" -#: ../../include/text.php:1180 +#: ../../include/text.php:1191 msgid "relaxed" msgstr "" -#: ../../include/text.php:1181 +#: ../../include/text.php:1192 msgid "surprised" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:76 +#: ../../include/text.php:1371 ../../include/js_strings.php:86 msgid "Monday" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:77 +#: ../../include/text.php:1371 ../../include/js_strings.php:87 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:78 +#: ../../include/text.php:1371 ../../include/js_strings.php:88 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:79 +#: ../../include/text.php:1371 ../../include/js_strings.php:89 msgid "Thursday" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:80 +#: ../../include/text.php:1371 ../../include/js_strings.php:90 msgid "Friday" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:81 +#: ../../include/text.php:1371 ../../include/js_strings.php:91 msgid "Saturday" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:75 +#: ../../include/text.php:1371 ../../include/js_strings.php:85 msgid "Sunday" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:51 +#: ../../include/text.php:1375 ../../include/js_strings.php:61 msgid "January" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:52 +#: ../../include/text.php:1375 ../../include/js_strings.php:62 msgid "February" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:53 +#: ../../include/text.php:1375 ../../include/js_strings.php:63 msgid "March" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:54 +#: ../../include/text.php:1375 ../../include/js_strings.php:64 msgid "April" msgstr "" -#: ../../include/text.php:1364 +#: ../../include/text.php:1375 msgid "May" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:56 +#: ../../include/text.php:1375 ../../include/js_strings.php:66 msgid "June" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:57 +#: ../../include/text.php:1375 ../../include/js_strings.php:67 msgid "July" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:58 +#: ../../include/text.php:1375 ../../include/js_strings.php:68 msgid "August" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:59 +#: ../../include/text.php:1375 ../../include/js_strings.php:69 msgid "September" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:60 +#: ../../include/text.php:1375 ../../include/js_strings.php:70 msgid "October" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:61 +#: ../../include/text.php:1375 ../../include/js_strings.php:71 msgid "November" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:62 +#: ../../include/text.php:1375 ../../include/js_strings.php:72 msgid "December" msgstr "" -#: ../../include/text.php:1428 ../../include/text.php:1432 +#: ../../include/text.php:1449 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1434 ../../include/feedutils.php:860 +#: ../../include/text.php:1451 ../../include/feedutils.php:860 msgid "unknown" msgstr "" -#: ../../include/text.php:1470 +#: ../../include/text.php:1487 msgid "remove category" msgstr "" -#: ../../include/text.php:1544 +#: ../../include/text.php:1561 msgid "remove from file" msgstr "" -#: ../../include/text.php:1686 ../../include/message.php:12 +#: ../../include/text.php:1703 ../../include/message.php:12 msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1849 ../../include/language.php:397 +#: ../../include/text.php:1866 ../../include/language.php:397 msgid "default" msgstr "" -#: ../../include/text.php:1857 +#: ../../include/text.php:1874 msgid "Page layout" msgstr "" -#: ../../include/text.php:1857 +#: ../../include/text.php:1874 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1868 +#: ../../include/text.php:1885 msgid "HTML" msgstr "" -#: ../../include/text.php:1871 +#: ../../include/text.php:1888 msgid "Comanche Layout" msgstr "" -#: ../../include/text.php:1876 +#: ../../include/text.php:1893 msgid "PHP" msgstr "" -#: ../../include/text.php:1885 +#: ../../include/text.php:1902 msgid "Page content type" msgstr "" -#: ../../include/text.php:2018 +#: ../../include/text.php:2035 msgid "activity" msgstr "" -#: ../../include/text.php:2100 +#: ../../include/text.php:2135 msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2419 +#: ../../include/text.php:2455 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2425 +#: ../../include/text.php:2461 msgid "Pages" msgstr "" -#: ../../include/text.php:2447 +#: ../../include/text.php:2483 msgid "Import website..." msgstr "" -#: ../../include/text.php:2448 +#: ../../include/text.php:2484 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2449 +#: ../../include/text.php:2485 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2450 +#: ../../include/text.php:2486 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2451 +#: ../../include/text.php:2487 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2452 +#: ../../include/text.php:2488 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2453 +#: ../../include/text.php:2489 msgid "Select folder" msgstr "" -#: ../../include/text.php:2454 +#: ../../include/text.php:2490 msgid "Export website..." msgstr "" -#: ../../include/text.php:2455 +#: ../../include/text.php:2491 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2456 +#: ../../include/text.php:2492 msgid "website.zip" msgstr "" -#: ../../include/text.php:2457 +#: ../../include/text.php:2493 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2458 +#: ../../include/text.php:2494 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2459 +#: ../../include/text.php:2495 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2460 +#: ../../include/text.php:2496 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2461 +#: ../../include/text.php:2497 msgid "Specify folder" msgstr "" @@ -12725,7 +13130,7 @@ msgstr "" msgid "View all %d common connections" msgstr "" -#: ../../include/markdown.php:158 ../../include/bbcode.php:356 +#: ../../include/markdown.php:158 ../../include/bbcode.php:358 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" @@ -12833,182 +13238,224 @@ msgstr "" msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "" +#: ../../include/js_strings.php:26 +msgid "lovely" +msgstr "" + +#: ../../include/js_strings.php:27 +msgid "wonderful" +msgstr "" + +#: ../../include/js_strings.php:28 +msgid "fantastic" +msgstr "" + +#: ../../include/js_strings.php:29 +msgid "great" +msgstr "" + +#: ../../include/js_strings.php:30 +msgid "" +"Your chosen nickname was either already taken or not valid. Please use our " +"suggestion (" +msgstr "" + #: ../../include/js_strings.php:31 -msgid "timeago.prefixAgo" +msgid ") or enter a new one." msgstr "" #: ../../include/js_strings.php:32 -msgid "timeago.prefixFromNow" +msgid "Thank you, this nickname is valid." msgstr "" #: ../../include/js_strings.php:33 -msgid "timeago.suffixAgo" +msgid "A channel name is required." msgstr "" #: ../../include/js_strings.php:34 +msgid "This is a " +msgstr "" + +#: ../../include/js_strings.php:35 +msgid " channel name" +msgstr "" + +#: ../../include/js_strings.php:41 +msgid "timeago.prefixAgo" +msgstr "" + +#: ../../include/js_strings.php:42 +msgid "timeago.prefixFromNow" +msgstr "" + +#: ../../include/js_strings.php:43 +msgid "timeago.suffixAgo" +msgstr "" + +#: ../../include/js_strings.php:44 msgid "timeago.suffixFromNow" msgstr "" -#: ../../include/js_strings.php:37 +#: ../../include/js_strings.php:47 msgid "less than a minute" msgstr "" -#: ../../include/js_strings.php:38 +#: ../../include/js_strings.php:48 msgid "about a minute" msgstr "" -#: ../../include/js_strings.php:39 +#: ../../include/js_strings.php:49 #, php-format msgid "%d minutes" msgstr "" -#: ../../include/js_strings.php:40 +#: ../../include/js_strings.php:50 msgid "about an hour" msgstr "" -#: ../../include/js_strings.php:41 +#: ../../include/js_strings.php:51 #, php-format msgid "about %d hours" msgstr "" -#: ../../include/js_strings.php:42 +#: ../../include/js_strings.php:52 msgid "a day" msgstr "" -#: ../../include/js_strings.php:43 +#: ../../include/js_strings.php:53 #, php-format msgid "%d days" msgstr "" -#: ../../include/js_strings.php:44 +#: ../../include/js_strings.php:54 msgid "about a month" msgstr "" -#: ../../include/js_strings.php:45 +#: ../../include/js_strings.php:55 #, php-format msgid "%d months" msgstr "" -#: ../../include/js_strings.php:46 +#: ../../include/js_strings.php:56 msgid "about a year" msgstr "" -#: ../../include/js_strings.php:47 +#: ../../include/js_strings.php:57 #, php-format msgid "%d years" msgstr "" -#: ../../include/js_strings.php:48 +#: ../../include/js_strings.php:58 msgid " " msgstr "" -#: ../../include/js_strings.php:49 +#: ../../include/js_strings.php:59 msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:55 +#: ../../include/js_strings.php:65 msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:63 +#: ../../include/js_strings.php:73 msgid "Jan" msgstr "" -#: ../../include/js_strings.php:64 +#: ../../include/js_strings.php:74 msgid "Feb" msgstr "" -#: ../../include/js_strings.php:65 +#: ../../include/js_strings.php:75 msgid "Mar" msgstr "" -#: ../../include/js_strings.php:66 +#: ../../include/js_strings.php:76 msgid "Apr" msgstr "" -#: ../../include/js_strings.php:67 +#: ../../include/js_strings.php:77 msgctxt "short" msgid "May" msgstr "" -#: ../../include/js_strings.php:68 +#: ../../include/js_strings.php:78 msgid "Jun" msgstr "" -#: ../../include/js_strings.php:69 +#: ../../include/js_strings.php:79 msgid "Jul" msgstr "" -#: ../../include/js_strings.php:70 +#: ../../include/js_strings.php:80 msgid "Aug" msgstr "" -#: ../../include/js_strings.php:71 +#: ../../include/js_strings.php:81 msgid "Sep" msgstr "" -#: ../../include/js_strings.php:72 +#: ../../include/js_strings.php:82 msgid "Oct" msgstr "" -#: ../../include/js_strings.php:73 +#: ../../include/js_strings.php:83 msgid "Nov" msgstr "" -#: ../../include/js_strings.php:74 +#: ../../include/js_strings.php:84 msgid "Dec" msgstr "" -#: ../../include/js_strings.php:82 +#: ../../include/js_strings.php:92 msgid "Sun" msgstr "" -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:93 msgid "Mon" msgstr "" -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:94 msgid "Tue" msgstr "" -#: ../../include/js_strings.php:85 +#: ../../include/js_strings.php:95 msgid "Wed" msgstr "" -#: ../../include/js_strings.php:86 +#: ../../include/js_strings.php:96 msgid "Thu" msgstr "" -#: ../../include/js_strings.php:87 +#: ../../include/js_strings.php:97 msgid "Fri" msgstr "" -#: ../../include/js_strings.php:88 +#: ../../include/js_strings.php:98 msgid "Sat" msgstr "" -#: ../../include/js_strings.php:89 +#: ../../include/js_strings.php:99 msgctxt "calendar" msgid "today" msgstr "" -#: ../../include/js_strings.php:90 +#: ../../include/js_strings.php:100 msgctxt "calendar" msgid "month" msgstr "" -#: ../../include/js_strings.php:91 +#: ../../include/js_strings.php:101 msgctxt "calendar" msgid "week" msgstr "" -#: ../../include/js_strings.php:92 +#: ../../include/js_strings.php:102 msgctxt "calendar" msgid "day" msgstr "" -#: ../../include/js_strings.php:93 +#: ../../include/js_strings.php:103 msgctxt "calendar" msgid "All day" msgstr "" @@ -13052,65 +13499,69 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/attach.php:265 ../../include/attach.php:361 +#: ../../include/attach.php:265 ../../include/attach.php:374 msgid "Item was not found." msgstr "" -#: ../../include/attach.php:554 +#: ../../include/attach.php:282 +msgid "Unknown error." +msgstr "" + +#: ../../include/attach.php:567 msgid "No source file." msgstr "" -#: ../../include/attach.php:576 +#: ../../include/attach.php:589 msgid "Cannot locate file to replace" msgstr "" -#: ../../include/attach.php:595 +#: ../../include/attach.php:608 msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/attach.php:737 +#: ../../include/attach.php:750 #, php-format msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/attach.php:758 +#: ../../include/attach.php:771 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/attach.php:940 +#: ../../include/attach.php:953 msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/attach.php:969 +#: ../../include/attach.php:982 msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/attach.php:1043 ../../include/attach.php:1059 +#: ../../include/attach.php:1056 ../../include/attach.php:1072 msgid "Path not available." msgstr "" -#: ../../include/attach.php:1108 ../../include/attach.php:1273 +#: ../../include/attach.php:1121 ../../include/attach.php:1286 msgid "Empty pathname" msgstr "" -#: ../../include/attach.php:1134 +#: ../../include/attach.php:1147 msgid "duplicate filename or path" msgstr "" -#: ../../include/attach.php:1159 +#: ../../include/attach.php:1172 msgid "Path not found." msgstr "" -#: ../../include/attach.php:1227 +#: ../../include/attach.php:1240 msgid "mkdir failed." msgstr "" -#: ../../include/attach.php:1231 +#: ../../include/attach.php:1244 msgid "database storage failed." msgstr "" -#: ../../include/attach.php:1279 +#: ../../include/attach.php:1292 msgid "Empty path" msgstr "" @@ -13120,71 +13571,71 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/items.php:885 ../../include/items.php:945 +#: ../../include/items.php:891 ../../include/items.php:951 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1133 +#: ../../include/items.php:1137 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1135 +#: ../../include/items.php:1139 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1137 +#: ../../include/items.php:1141 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1139 +#: ../../include/items.php:1143 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1141 +#: ../../include/items.php:1145 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1143 +#: ../../include/items.php:1147 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1145 +#: ../../include/items.php:1149 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1147 +#: ../../include/items.php:1151 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4197 +#: ../../include/items.php:4141 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:4204 +#: ../../include/items.php:4148 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:4216 +#: ../../include/items.php:4160 msgid "Connection not found." msgstr "" -#: ../../include/items.php:4565 +#: ../../include/items.php:4509 msgid "profile photo" msgstr "" -#: ../../include/items.php:4756 +#: ../../include/items.php:4700 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:4756 +#: ../../include/items.php:4700 msgctxt "edit_activity" msgid "Post" msgstr "" -#: ../../include/items.php:4756 +#: ../../include/items.php:4700 msgctxt "edit_activity" msgid "Comment" msgstr "" @@ -13374,63 +13825,47 @@ msgstr "" msgid "Cancelled" msgstr "" -#: ../../include/event.php:1310 ../../include/connections.php:692 +#: ../../include/event.php:1310 ../../include/connections.php:698 msgid "Home, Voice" msgstr "" -#: ../../include/event.php:1311 ../../include/connections.php:693 +#: ../../include/event.php:1311 ../../include/connections.php:699 msgid "Home, Fax" msgstr "" -#: ../../include/event.php:1313 ../../include/connections.php:695 +#: ../../include/event.php:1313 ../../include/connections.php:701 msgid "Work, Voice" msgstr "" -#: ../../include/event.php:1314 ../../include/connections.php:696 +#: ../../include/event.php:1314 ../../include/connections.php:702 msgid "Work, Fax" msgstr "" -#: ../../include/network.php:762 +#: ../../include/network.php:760 msgid "view full size" msgstr "" -#: ../../include/network.php:1764 ../../include/network.php:1765 -msgid "Friendica" -msgstr "" - #: ../../include/network.php:1766 -msgid "OStatus" -msgstr "" - -#: ../../include/network.php:1767 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1768 +#: ../../include/network.php:1767 msgid "RSS/Atom" msgstr "" #: ../../include/network.php:1771 -msgid "Diaspora" -msgstr "" - -#: ../../include/network.php:1772 msgid "Facebook" msgstr "" #: ../../include/network.php:1773 -msgid "Zot" -msgstr "" - -#: ../../include/network.php:1774 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1775 +#: ../../include/network.php:1774 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1776 +#: ../../include/network.php:1775 msgid "MySpace" msgstr "" @@ -13472,77 +13907,81 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/bbcode.php:198 ../../include/bbcode.php:1200 -#: ../../include/bbcode.php:1203 ../../include/bbcode.php:1208 -#: ../../include/bbcode.php:1211 ../../include/bbcode.php:1214 -#: ../../include/bbcode.php:1217 ../../include/bbcode.php:1222 -#: ../../include/bbcode.php:1225 ../../include/bbcode.php:1230 -#: ../../include/bbcode.php:1233 ../../include/bbcode.php:1236 -#: ../../include/bbcode.php:1239 +#: ../../include/bbcode.php:200 ../../include/bbcode.php:1202 +#: ../../include/bbcode.php:1205 ../../include/bbcode.php:1210 +#: ../../include/bbcode.php:1213 ../../include/bbcode.php:1216 +#: ../../include/bbcode.php:1219 ../../include/bbcode.php:1224 +#: ../../include/bbcode.php:1227 ../../include/bbcode.php:1232 +#: ../../include/bbcode.php:1235 ../../include/bbcode.php:1238 +#: ../../include/bbcode.php:1241 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:237 ../../include/bbcode.php:1250 +#: ../../include/bbcode.php:239 ../../include/bbcode.php:1252 msgid "Encrypted content" msgstr "" -#: ../../include/bbcode.php:253 +#: ../../include/bbcode.php:255 #, php-format msgid "Install %1$s element %2$s" msgstr "" -#: ../../include/bbcode.php:257 +#: ../../include/bbcode.php:259 #, php-format msgid "" "This post contains an installable %s element, however you lack permissions " "to install it on this site." msgstr "" -#: ../../include/bbcode.php:348 +#: ../../include/bbcode.php:350 msgid "card" msgstr "" -#: ../../include/bbcode.php:350 +#: ../../include/bbcode.php:352 msgid "article" msgstr "" -#: ../../include/bbcode.php:433 ../../include/bbcode.php:441 +#: ../../include/bbcode.php:435 ../../include/bbcode.php:443 msgid "Click to open/close" msgstr "" -#: ../../include/bbcode.php:441 +#: ../../include/bbcode.php:443 msgid "spoiler" msgstr "" -#: ../../include/bbcode.php:454 +#: ../../include/bbcode.php:456 msgid "View article" msgstr "" -#: ../../include/bbcode.php:454 +#: ../../include/bbcode.php:456 msgid "View summary" msgstr "" -#: ../../include/bbcode.php:1188 +#: ../../include/bbcode.php:1190 msgid "$1 wrote:" msgstr "" -#: ../../include/oembed.php:329 +#: ../../include/oembed.php:224 +msgid "View PDF" +msgstr "" + +#: ../../include/oembed.php:347 msgid " by " msgstr "" -#: ../../include/oembed.php:330 +#: ../../include/oembed.php:348 msgid " on " msgstr "" -#: ../../include/oembed.php:359 +#: ../../include/oembed.php:377 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:368 +#: ../../include/oembed.php:386 msgid "Embedding disabled" msgstr "" -#: ../../include/zid.php:347 +#: ../../include/zid.php:351 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" @@ -13671,10 +14110,6 @@ msgstr "" msgid "Access Control and Permissions" msgstr "" -#: ../../include/features.php:221 ../../include/group.php:328 -msgid "Privacy Groups" -msgstr "" - #: ../../include/features.php:222 msgid "Enable management and selection of privacy groups" msgstr "" @@ -13688,7 +14123,7 @@ msgid "Ability to create multiple profiles" msgstr "" #: ../../include/features.php:241 -msgid "Provide alternate connection permission roles." +msgid "Create custom connection permission limits" msgstr "" #: ../../include/features.php:249 @@ -13811,94 +14246,112 @@ msgid "Save search terms for re-use" msgstr "" #: ../../include/features.php:390 -msgid "Network Personal Tab" +msgid "Alternate Stream Order" msgstr "" #: ../../include/features.php:391 -msgid "Enable tab to display only Network posts that you've interacted on" +msgid "" +"Ability to order the stream by last post date, last comment date or " +"unthreaded activities" msgstr "" #: ../../include/features.php:399 -msgid "Network New Tab" +msgid "Contact Filter" msgstr "" #: ../../include/features.php:400 -msgid "Enable tab to display all new Network activity" +msgid "Ability to display only posts of a selected contact" msgstr "" #: ../../include/features.php:408 -msgid "Affinity Tool" +msgid "Forum Filter" msgstr "" #: ../../include/features.php:409 -msgid "Filter stream activity by depth of relationships" +msgid "Ability to display only posts of a specific forum" +msgstr "" + +#: ../../include/features.php:417 +msgid "Personal Posts Filter" msgstr "" #: ../../include/features.php:418 -msgid "Show friend and connection suggestions" +msgid "Ability to display only posts that you've interacted on" msgstr "" #: ../../include/features.php:426 -msgid "Connection Filtering" +msgid "Affinity Tool" msgstr "" #: ../../include/features.php:427 +msgid "Filter stream activity by depth of relationships" +msgstr "" + +#: ../../include/features.php:436 +msgid "Show friend and connection suggestions" +msgstr "" + +#: ../../include/features.php:444 +msgid "Connection Filtering" +msgstr "" + +#: ../../include/features.php:445 msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/features.php:439 +#: ../../include/features.php:457 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:443 +#: ../../include/features.php:461 msgid "Community Tagging" msgstr "" -#: ../../include/features.php:444 +#: ../../include/features.php:462 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:452 +#: ../../include/features.php:470 msgid "Post Categories" msgstr "" -#: ../../include/features.php:453 +#: ../../include/features.php:471 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:461 +#: ../../include/features.php:479 msgid "Emoji Reactions" msgstr "" -#: ../../include/features.php:462 +#: ../../include/features.php:480 msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/features.php:471 +#: ../../include/features.php:489 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:479 +#: ../../include/features.php:497 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:480 +#: ../../include/features.php:498 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:488 +#: ../../include/features.php:506 msgid "Star Posts" msgstr "" -#: ../../include/features.php:489 +#: ../../include/features.php:507 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:497 +#: ../../include/features.php:515 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:498 +#: ../../include/features.php:516 msgid "Provide a personal tag cloud on your channel page" msgstr "" @@ -13967,38 +14420,38 @@ msgstr "" msgid "Registration confirmation for %s" msgstr "" -#: ../../include/account.php:383 +#: ../../include/account.php:385 #, php-format msgid "Registration request at %s" msgstr "" -#: ../../include/account.php:405 +#: ../../include/account.php:407 msgid "your registration password" msgstr "" -#: ../../include/account.php:411 ../../include/account.php:473 +#: ../../include/account.php:413 ../../include/account.php:475 #, php-format msgid "Registration details for %s" msgstr "" -#: ../../include/account.php:484 +#: ../../include/account.php:486 msgid "Account approved." msgstr "" -#: ../../include/account.php:524 +#: ../../include/account.php:526 #, php-format msgid "Registration revoked for %s" msgstr "" -#: ../../include/account.php:803 ../../include/account.php:805 +#: ../../include/account.php:805 ../../include/account.php:807 msgid "Click here to upgrade." msgstr "" -#: ../../include/account.php:811 +#: ../../include/account.php:813 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/account.php:816 +#: ../../include/account.php:818 msgid "This action is not available under your subscription plan." msgstr "" @@ -14083,106 +14536,110 @@ msgstr "" msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/nav.php:96 +#: ../../include/nav.php:88 msgid "Remote authentication" msgstr "" -#: ../../include/nav.php:96 +#: ../../include/nav.php:88 msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/nav.php:102 ../../include/nav.php:190 -msgid "Manage Your Channels" +#: ../../include/nav.php:94 +msgid "Manage your channels" +msgstr "" + +#: ../../include/nav.php:97 +msgid "Manage your privacy groups" msgstr "" -#: ../../include/nav.php:105 ../../include/nav.php:192 +#: ../../include/nav.php:99 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:111 ../../include/nav.php:140 +#: ../../include/nav.php:105 ../../include/nav.php:134 msgid "End this session" msgstr "" -#: ../../include/nav.php:114 +#: ../../include/nav.php:108 msgid "Your profile page" msgstr "" -#: ../../include/nav.php:117 +#: ../../include/nav.php:111 msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:126 ../../include/nav.php:130 +#: ../../include/nav.php:120 ../../include/nav.php:124 msgid "Sign in" msgstr "" -#: ../../include/nav.php:157 +#: ../../include/nav.php:151 msgid "Take me home" msgstr "" -#: ../../include/nav.php:159 +#: ../../include/nav.php:153 msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:164 +#: ../../include/nav.php:158 msgid "Create an account" msgstr "" -#: ../../include/nav.php:176 +#: ../../include/nav.php:170 msgid "Help and documentation" msgstr "" -#: ../../include/nav.php:179 +#: ../../include/nav.php:185 msgid "Search site @name, !forum, #tag, ?docs, content" msgstr "" -#: ../../include/nav.php:199 +#: ../../include/nav.php:191 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:290 +#: ../../include/nav.php:282 msgid "@name, !forum, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:291 +#: ../../include/nav.php:283 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:297 +#: ../../include/nav.php:289 msgid "Add Apps" msgstr "" -#: ../../include/nav.php:298 +#: ../../include/nav.php:290 msgid "Arrange Apps" msgstr "" -#: ../../include/nav.php:299 +#: ../../include/nav.php:291 msgid "Toggle System Apps" msgstr "" -#: ../../include/photos.php:150 +#: ../../include/photos.php:151 #, php-format msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/photos.php:161 +#: ../../include/photos.php:162 msgid "Image file is empty." msgstr "" -#: ../../include/photos.php:326 +#: ../../include/photos.php:327 msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:375 +#: ../../include/photos.php:376 msgid "a new photo" msgstr "" -#: ../../include/photos.php:379 +#: ../../include/photos.php:380 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/photos.php:671 +#: ../../include/photos.php:672 msgid "Upload New Photos" msgstr "" @@ -14194,12 +14651,12 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2552 +#: ../../include/zot.php:2557 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/zot.php:4219 +#: ../../include/zot.php:4221 msgid "invalid target signature" msgstr "" @@ -14214,19 +14671,19 @@ msgstr "" msgid "Add new connections to this privacy group" msgstr "" -#: ../../include/group.php:306 +#: ../../include/group.php:298 msgid "edit" msgstr "" -#: ../../include/group.php:329 +#: ../../include/group.php:321 msgid "Edit group" msgstr "" -#: ../../include/group.php:330 +#: ../../include/group.php:322 msgid "Add privacy group" msgstr "" -#: ../../include/group.php:331 +#: ../../include/group.php:323 msgid "Channels not in any privacy group" msgstr "" @@ -14238,19 +14695,19 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/auth.php:152 +#: ../../include/auth.php:192 msgid "Delegation session ended." msgstr "" -#: ../../include/auth.php:156 +#: ../../include/auth.php:196 msgid "Logged out." msgstr "" -#: ../../include/auth.php:273 +#: ../../include/auth.php:291 msgid "Email validation is incomplete. Please check your email." msgstr "" -#: ../../include/auth.php:289 +#: ../../include/auth.php:307 msgid "Failed authentication" msgstr "" -- cgit v1.2.3 From 896d29d0c0426de5327020332f558cfe9390aeec Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 18 Jul 2018 11:52:42 +0200 Subject: update composer autoload cache --- vendor/composer/autoload_classmap.php | 10 +++++++++- vendor/composer/autoload_static.php | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index e7e1de1d0..dca528ad4 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -807,6 +807,7 @@ return array( 'Zotlabs\\Lib\\JSalmon' => $baseDir . '/Zotlabs/Lib/JSalmon.php', 'Zotlabs\\Lib\\LDSignatures' => $baseDir . '/Zotlabs/Lib/LDSignatures.php', 'Zotlabs\\Lib\\MarkdownSoap' => $baseDir . '/Zotlabs/Lib/MarkdownSoap.php', + 'Zotlabs\\Lib\\MessageFilter' => $baseDir . '/Zotlabs/Lib/MessageFilter.php', 'Zotlabs\\Lib\\NativeWiki' => $baseDir . '/Zotlabs/Lib/NativeWiki.php', 'Zotlabs\\Lib\\NativeWikiPage' => $baseDir . '/Zotlabs/Lib/NativeWikiPage.php', 'Zotlabs\\Lib\\PConfig' => $baseDir . '/Zotlabs/Lib/PConfig.php', @@ -826,11 +827,11 @@ return array( 'Zotlabs\\Module\\Admin' => $baseDir . '/Zotlabs/Module/Admin.php', 'Zotlabs\\Module\\Admin\\Account_edit' => $baseDir . '/Zotlabs/Module/Admin/Account_edit.php', 'Zotlabs\\Module\\Admin\\Accounts' => $baseDir . '/Zotlabs/Module/Admin/Accounts.php', + 'Zotlabs\\Module\\Admin\\Addons' => $baseDir . '/Zotlabs/Module/Admin/Addons.php', 'Zotlabs\\Module\\Admin\\Channels' => $baseDir . '/Zotlabs/Module/Admin/Channels.php', 'Zotlabs\\Module\\Admin\\Dbsync' => $baseDir . '/Zotlabs/Module/Admin/Dbsync.php', 'Zotlabs\\Module\\Admin\\Features' => $baseDir . '/Zotlabs/Module/Admin/Features.php', 'Zotlabs\\Module\\Admin\\Logs' => $baseDir . '/Zotlabs/Module/Admin/Logs.php', - 'Zotlabs\\Module\\Admin\\Plugins' => $baseDir . '/Zotlabs/Module/Admin/Plugins.php', 'Zotlabs\\Module\\Admin\\Profs' => $baseDir . '/Zotlabs/Module/Admin/Profs.php', 'Zotlabs\\Module\\Admin\\Queue' => $baseDir . '/Zotlabs/Module/Admin/Queue.php', 'Zotlabs\\Module\\Admin\\Security' => $baseDir . '/Zotlabs/Module/Admin/Security.php', @@ -926,6 +927,7 @@ return array( 'Zotlabs\\Module\\Notifications' => $baseDir . '/Zotlabs/Module/Notifications.php', 'Zotlabs\\Module\\Notify' => $baseDir . '/Zotlabs/Module/Notify.php', 'Zotlabs\\Module\\OAuth2TestVehicle' => $baseDir . '/Zotlabs/Module/Oauth2testvehicle.php', + 'Zotlabs\\Module\\Oauthinfo' => $baseDir . '/Zotlabs/Module/Oauthinfo.php', 'Zotlabs\\Module\\Ochannel' => $baseDir . '/Zotlabs/Module/Ochannel.php', 'Zotlabs\\Module\\Oembed' => $baseDir . '/Zotlabs/Module/Oembed.php', 'Zotlabs\\Module\\Oep' => $baseDir . '/Zotlabs/Module/Oep.php', @@ -1250,6 +1252,9 @@ return array( 'Zotlabs\\Update\\_1210' => $baseDir . '/Zotlabs/Update/_1210.php', 'Zotlabs\\Update\\_1211' => $baseDir . '/Zotlabs/Update/_1211.php', 'Zotlabs\\Update\\_1212' => $baseDir . '/Zotlabs/Update/_1212.php', + 'Zotlabs\\Update\\_1213' => $baseDir . '/Zotlabs/Update/_1213.php', + 'Zotlabs\\Update\\_1214' => $baseDir . '/Zotlabs/Update/_1214.php', + 'Zotlabs\\Update\\_1215' => $baseDir . '/Zotlabs/Update/_1215.php', 'Zotlabs\\Web\\CheckJS' => $baseDir . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php', @@ -1261,11 +1266,14 @@ return array( 'Zotlabs\\Web\\SubModule' => $baseDir . '/Zotlabs/Web/SubModule.php', 'Zotlabs\\Web\\WebServer' => $baseDir . '/Zotlabs/Web/WebServer.php', 'Zotlabs\\Widget\\Activity' => $baseDir . '/Zotlabs/Widget/Activity.php', + 'Zotlabs\\Widget\\Activity_filter' => $baseDir . '/Zotlabs/Widget/Activity_filter.php', + 'Zotlabs\\Widget\\Activity_order' => $baseDir . '/Zotlabs/Widget/Activity_order.php', 'Zotlabs\\Widget\\Admin' => $baseDir . '/Zotlabs/Widget/Admin.php', 'Zotlabs\\Widget\\Affinity' => $baseDir . '/Zotlabs/Widget/Affinity.php', 'Zotlabs\\Widget\\Album' => $baseDir . '/Zotlabs/Widget/Album.php', 'Zotlabs\\Widget\\Appcategories' => $baseDir . '/Zotlabs/Widget/Appcategories.php', 'Zotlabs\\Widget\\Appcloud' => $baseDir . '/Zotlabs/Widget/Appcloud.php', + 'Zotlabs\\Widget\\Appstore' => $baseDir . '/Zotlabs/Widget/Appstore.php', 'Zotlabs\\Widget\\Archive' => $baseDir . '/Zotlabs/Widget/Archive.php', 'Zotlabs\\Widget\\Bookmarkedchats' => $baseDir . '/Zotlabs/Widget/Bookmarkedchats.php', 'Zotlabs\\Widget\\Catcloud' => $baseDir . '/Zotlabs/Widget/Catcloud.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 11f2c01d6..cd4782104 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -961,6 +961,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Lib\\JSalmon' => __DIR__ . '/../..' . '/Zotlabs/Lib/JSalmon.php', 'Zotlabs\\Lib\\LDSignatures' => __DIR__ . '/../..' . '/Zotlabs/Lib/LDSignatures.php', 'Zotlabs\\Lib\\MarkdownSoap' => __DIR__ . '/../..' . '/Zotlabs/Lib/MarkdownSoap.php', + 'Zotlabs\\Lib\\MessageFilter' => __DIR__ . '/../..' . '/Zotlabs/Lib/MessageFilter.php', 'Zotlabs\\Lib\\NativeWiki' => __DIR__ . '/../..' . '/Zotlabs/Lib/NativeWiki.php', 'Zotlabs\\Lib\\NativeWikiPage' => __DIR__ . '/../..' . '/Zotlabs/Lib/NativeWikiPage.php', 'Zotlabs\\Lib\\PConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/PConfig.php', @@ -980,11 +981,11 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Admin' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin.php', 'Zotlabs\\Module\\Admin\\Account_edit' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Account_edit.php', 'Zotlabs\\Module\\Admin\\Accounts' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Accounts.php', + 'Zotlabs\\Module\\Admin\\Addons' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Addons.php', 'Zotlabs\\Module\\Admin\\Channels' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Channels.php', 'Zotlabs\\Module\\Admin\\Dbsync' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Dbsync.php', 'Zotlabs\\Module\\Admin\\Features' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Features.php', 'Zotlabs\\Module\\Admin\\Logs' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Logs.php', - 'Zotlabs\\Module\\Admin\\Plugins' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Plugins.php', 'Zotlabs\\Module\\Admin\\Profs' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Profs.php', 'Zotlabs\\Module\\Admin\\Queue' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Queue.php', 'Zotlabs\\Module\\Admin\\Security' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Security.php', @@ -1080,6 +1081,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Notifications' => __DIR__ . '/../..' . '/Zotlabs/Module/Notifications.php', 'Zotlabs\\Module\\Notify' => __DIR__ . '/../..' . '/Zotlabs/Module/Notify.php', 'Zotlabs\\Module\\OAuth2TestVehicle' => __DIR__ . '/../..' . '/Zotlabs/Module/Oauth2testvehicle.php', + 'Zotlabs\\Module\\Oauthinfo' => __DIR__ . '/../..' . '/Zotlabs/Module/Oauthinfo.php', 'Zotlabs\\Module\\Ochannel' => __DIR__ . '/../..' . '/Zotlabs/Module/Ochannel.php', 'Zotlabs\\Module\\Oembed' => __DIR__ . '/../..' . '/Zotlabs/Module/Oembed.php', 'Zotlabs\\Module\\Oep' => __DIR__ . '/../..' . '/Zotlabs/Module/Oep.php', @@ -1404,6 +1406,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Update\\_1210' => __DIR__ . '/../..' . '/Zotlabs/Update/_1210.php', 'Zotlabs\\Update\\_1211' => __DIR__ . '/../..' . '/Zotlabs/Update/_1211.php', 'Zotlabs\\Update\\_1212' => __DIR__ . '/../..' . '/Zotlabs/Update/_1212.php', + 'Zotlabs\\Update\\_1213' => __DIR__ . '/../..' . '/Zotlabs/Update/_1213.php', + 'Zotlabs\\Update\\_1214' => __DIR__ . '/../..' . '/Zotlabs/Update/_1214.php', + 'Zotlabs\\Update\\_1215' => __DIR__ . '/../..' . '/Zotlabs/Update/_1215.php', 'Zotlabs\\Web\\CheckJS' => __DIR__ . '/../..' . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php', @@ -1415,11 +1420,14 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Web\\SubModule' => __DIR__ . '/../..' . '/Zotlabs/Web/SubModule.php', 'Zotlabs\\Web\\WebServer' => __DIR__ . '/../..' . '/Zotlabs/Web/WebServer.php', 'Zotlabs\\Widget\\Activity' => __DIR__ . '/../..' . '/Zotlabs/Widget/Activity.php', + 'Zotlabs\\Widget\\Activity_filter' => __DIR__ . '/../..' . '/Zotlabs/Widget/Activity_filter.php', + 'Zotlabs\\Widget\\Activity_order' => __DIR__ . '/../..' . '/Zotlabs/Widget/Activity_order.php', 'Zotlabs\\Widget\\Admin' => __DIR__ . '/../..' . '/Zotlabs/Widget/Admin.php', 'Zotlabs\\Widget\\Affinity' => __DIR__ . '/../..' . '/Zotlabs/Widget/Affinity.php', 'Zotlabs\\Widget\\Album' => __DIR__ . '/../..' . '/Zotlabs/Widget/Album.php', 'Zotlabs\\Widget\\Appcategories' => __DIR__ . '/../..' . '/Zotlabs/Widget/Appcategories.php', 'Zotlabs\\Widget\\Appcloud' => __DIR__ . '/../..' . '/Zotlabs/Widget/Appcloud.php', + 'Zotlabs\\Widget\\Appstore' => __DIR__ . '/../..' . '/Zotlabs/Widget/Appstore.php', 'Zotlabs\\Widget\\Archive' => __DIR__ . '/../..' . '/Zotlabs/Widget/Archive.php', 'Zotlabs\\Widget\\Bookmarkedchats' => __DIR__ . '/../..' . '/Zotlabs/Widget/Bookmarkedchats.php', 'Zotlabs\\Widget\\Catcloud' => __DIR__ . '/../..' . '/Zotlabs/Widget/Catcloud.php', -- cgit v1.2.3 From 4a6f775334fbf3af2e8e6c781a9a44192a6526d0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 18 Jul 2018 13:18:37 +0200 Subject: set the correct album name when moving photos (cherry picked from commit eb322e831297ee8fd773049c1a00c915c49dc93e) --- include/attach.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/attach.php b/include/attach.php index 2a9badaac..202412263 100644 --- a/include/attach.php +++ b/include/attach.php @@ -2325,6 +2325,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { return false; $newdirname = $n[0]['filename']; + $newalbumname = $n[0]['display_path']; $newstorepath = dbunescbin($n[0]['content']) . '/' . $resource_id; } else { @@ -2332,6 +2333,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { // root directory $newdirname = EMPTY_STR; + $newalbumname = EMPTY_STR; $newstorepath = 'store/' . $c['channel_address'] . '/' . $resource_id; } @@ -2419,7 +2421,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { if($r[0]['is_photo']) { $t = q("update photo set album = '%s', filename = '%s', os_path = '%s', display_path = '%s' where resource_id = '%s' and uid = %d", - dbesc($newdirname), + dbesc($newalbumname), dbesc($filename), dbesc($x['os_path']), dbesc($x['path']), -- cgit v1.2.3 From 931afe98b13399342d5abb4cb13cb09efc09ecad Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 18 Jul 2018 17:05:38 -0700 Subject: mangled urls on redirects (cherry picked from commit 5ce50d0a2e15ae66765a68ba2785a87ecda57f6a) --- Zotlabs/Module/Magic.php | 7 ++++--- Zotlabs/Module/Manage.php | 2 +- Zotlabs/Module/Nojs.php | 4 ++-- Zotlabs/Module/Rmagic.php | 10 +++++----- Zotlabs/Web/CheckJS.php | 2 +- include/channel.php | 2 +- include/connections.php | 2 +- include/text.php | 4 ++-- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index 25c318f30..e034f1cdf 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -14,15 +14,16 @@ class Magic extends \Zotlabs\Web\Controller { logger('mod_magic: args: ' . print_r($_REQUEST,true),LOGGER_DATA); $addr = ((x($_REQUEST,'addr')) ? $_REQUEST['addr'] : ''); + $bdest = ((x($_REQUEST,'bdest')) ? $_REQUEST['bdest'] : ''); $dest = ((x($_REQUEST,'dest')) ? $_REQUEST['dest'] : ''); $test = ((x($_REQUEST,'test')) ? intval($_REQUEST['test']) : 0); $rev = ((x($_REQUEST,'rev')) ? intval($_REQUEST['rev']) : 0); $owa = ((x($_REQUEST,'owa')) ? intval($_REQUEST['owa']) : 0); $delegate = ((x($_REQUEST,'delegate')) ? $_REQUEST['delegate'] : ''); - // Apache(?) appears to perform an htmlentities() operation on this variable - - $dest = html_entity_decode($dest); + + if($bdest) + $dest = hex2bin($bdest); $parsed = parse_url($dest); if(! $parsed) { diff --git a/Zotlabs/Module/Manage.php b/Zotlabs/Module/Manage.php index 9c5c32294..2c88a4df0 100644 --- a/Zotlabs/Module/Manage.php +++ b/Zotlabs/Module/Manage.php @@ -156,7 +156,7 @@ class Manage extends \Zotlabs\Web\Controller { if($delegates) { for($x = 0; $x < count($delegates); $x ++) { - $delegates[$x]['link'] = 'magic?f=&dest=' . urlencode($delegates[$x]['xchan_url']) + $delegates[$x]['link'] = 'magic?f=&bdest=' . bin2hex($delegates[$x]['xchan_url']) . '&delegate=' . urlencode($delegates[$x]['xchan_addr']); $delegates[$x]['channel_name'] = $delegates[$x]['xchan_name']; $delegates[$x]['delegate'] = 1; diff --git a/Zotlabs/Module/Nojs.php b/Zotlabs/Module/Nojs.php index 6fd6d8106..5f3d80ecd 100644 --- a/Zotlabs/Module/Nojs.php +++ b/Zotlabs/Module/Nojs.php @@ -7,8 +7,8 @@ class Nojs extends \Zotlabs\Web\Controller { function init() { $n = ((argc() > 1) ? intval(argv(1)) : 1); setcookie('jsdisabled', $n, 0, '/'); - $p = $_GET['redir']; - $hasq = strpos($p,'?'); + $p = hex2bin($_GET['redir']); + $hasq = strpbrk($p,'?&'); goaway(z_root() . (($p) ? '/' . $p : '') . (($hasq) ? '' : '?f=' ) . '&jsdisabled=' . $n); } diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php index bfc03f6ec..33a6689ca 100644 --- a/Zotlabs/Module/Rmagic.php +++ b/Zotlabs/Module/Rmagic.php @@ -17,8 +17,8 @@ class Rmagic extends \Zotlabs\Web\Controller { if($r) { if($r[0]['hubloc_url'] === z_root()) goaway(z_root() . '/login'); - $dest = z_root() . '/' . str_replace(['rmagic','zid='],['','zid_='],\App::$query_string); - goaway($r[0]['hubloc_url'] . '/magic' . '?f=&owa=1&dest=' . $dest); + $dest = bin2hex(z_root() . '/' . str_replace(['rmagic','zid='],['','zid_='],\App::$query_string)); + goaway($r[0]['hubloc_url'] . '/magic' . '?f=&owa=1&bdest=' . $dest); } } } @@ -59,11 +59,11 @@ class Rmagic extends \Zotlabs\Web\Controller { if($url) { if($_SESSION['return_url']) - $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url'])); + $dest = bin2hex(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url'])); else - $dest = urlencode(z_root() . '/' . str_replace([ 'rmagic', 'zid=' ] ,[ '', 'zid_='],\App::$query_string)); + $dest = bin2hex(z_root() . '/' . str_replace([ 'rmagic', 'zid=' ] ,[ '', 'zid_='],\App::$query_string)); - goaway($url . '/magic' . '?f=&owa=1&dest=' . $dest); + goaway($url . '/magic' . '?f=&owa=1&bdest=' . $dest); } } } diff --git a/Zotlabs/Web/CheckJS.php b/Zotlabs/Web/CheckJS.php index 8179ceb15..c8547b6dd 100644 --- a/Zotlabs/Web/CheckJS.php +++ b/Zotlabs/Web/CheckJS.php @@ -18,7 +18,7 @@ class CheckJS { $this->jsdisabled = 0; if(! $this->jsdisabled) { - $page = urlencode(\App::$query_string); + $page = bin2hex(\App::$query_string); if($test) { $this->jsdisabled = 1; diff --git a/include/channel.php b/include/channel.php index d26056171..59dd60ea2 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1712,7 +1712,7 @@ function zid_init() { $query = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$query); $dest = '/' . urlencode($query); if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) { - goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&owa=1&dest=' . z_root() . $dest); + goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&owa=1&bdest=' . bin2hex(z_root() . $dest)); } else logger('No hubloc found.'); diff --git a/include/connections.php b/include/connections.php index 20f7c24ff..807d07220 100644 --- a/include/connections.php +++ b/include/connections.php @@ -120,7 +120,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { App::$profile_uid = $xchan['channel_id']; $url = (($observer) - ? z_root() . '/magic?f=&owa=1&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr'] + ? z_root() . '/magic?f=&owa=1&bdest=' . bin2hex($xchan['xchan_url']) . '&addr=' . $xchan['xchan_addr'] : $xchan['xchan_url'] ); diff --git a/include/text.php b/include/text.php index 122605443..e894c5ce5 100644 --- a/include/text.php +++ b/include/text.php @@ -1018,7 +1018,7 @@ function chanlink_cid($d) { function magiclink_url($observer,$myaddr,$url) { return (($observer) - ? z_root() . '/magic?f=&owa=1&dest=' . $url . '&addr=' . $myaddr + ? z_root() . '/magic?f=&owa=1&bdest=' . bin2hex($url) . '&addr=' . $myaddr : $url ); } @@ -1454,7 +1454,7 @@ function theme_attachments(&$item) { if(is_foreigner($item['author_xchan'])) $url = $r['href']; else - $url = z_root() . '/magic?f=&owa=1&hash=' . $item['author_xchan'] . '&dest=' . $r['href'] . '/' . $r['revision']; + $url = z_root() . '/magic?f=&owa=1&hash=' . $item['author_xchan'] . '&bdest=' . bin2hex($r['href'] . '/' . $r['revision']); //$s .= '' . $icon . ''; $attaches[] = array('label' => $label, 'url' => $url, 'icon' => $icon, 'title' => $title); -- cgit v1.2.3 From 67848c03edf02b8a6d3c2010f08d50d823685e27 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 18 Jul 2018 17:48:23 -0700 Subject: query filter was a bit greedy (cherry picked from commit a05c8ff66bd8d09f69f6c59bc49b7627792f4109) --- Zotlabs/Module/Magic.php | 1 - boot.php | 3 ++- include/channel.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index e034f1cdf..be6866592 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -21,7 +21,6 @@ class Magic extends \Zotlabs\Web\Controller { $owa = ((x($_REQUEST,'owa')) ? intval($_REQUEST['owa']) : 0); $delegate = ((x($_REQUEST,'delegate')) ? $_REQUEST['delegate'] : ''); - if($bdest) $dest = hex2bin($bdest); diff --git a/boot.php b/boot.php index 04cb7c24c..e4ef33be6 100755 --- a/boot.php +++ b/boot.php @@ -874,11 +874,12 @@ class App { } if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 2) === "q=") { - self::$query_string = escape_tags(substr($_SERVER['QUERY_STRING'], 2)); + self::$query_string = str_replace(['<','>'],['<','>'],substr($_SERVER['QUERY_STRING'], 2); // removing trailing / - maybe a nginx problem if (substr(self::$query_string, 0, 1) == "/") self::$query_string = substr(self::$query_string, 1); } + if(x($_GET,'q')) self::$cmd = escape_tags(trim($_GET['q'],'/\\')); diff --git a/include/channel.php b/include/channel.php index 59dd60ea2..d7c5a2511 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1710,7 +1710,7 @@ function zid_init() { // try to avoid recursion - but send them home to do a proper magic auth $query = App::$query_string; $query = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$query); - $dest = '/' . urlencode($query); + $dest = '/' . $query; if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) { goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&owa=1&bdest=' . bin2hex(z_root() . $dest)); } -- cgit v1.2.3 From 36220fdde8b28e8c6efc451d1fa88568638d1071 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 18 Jul 2018 17:51:10 -0700 Subject: typo (cherry picked from commit ec852b0c8d6c8e566b2a5fb279ed359630afb5ee) --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index e4ef33be6..b47dc6870 100755 --- a/boot.php +++ b/boot.php @@ -874,7 +874,7 @@ class App { } if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 2) === "q=") { - self::$query_string = str_replace(['<','>'],['<','>'],substr($_SERVER['QUERY_STRING'], 2); + self::$query_string = str_replace(['<','>'],['<','>'],substr($_SERVER['QUERY_STRING'], 2)); // removing trailing / - maybe a nginx problem if (substr(self::$query_string, 0, 1) == "/") self::$query_string = substr(self::$query_string, 1); -- cgit v1.2.3 From 7e2635adfe2d20545d3a699c6fc14552c01a35a9 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 19 Jul 2018 12:27:43 +0200 Subject: RC1 --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index b47dc6870..58c8ae137 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.6RC' ); +define ( 'STD_VERSION', '3.6RC1' ); define ( 'ZOT_REVISION', '6.0a' ); -- cgit v1.2.3 From 157a9e895ccdb6f6f4ff68e3bfff698a7ea7d369 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 19 Jul 2018 13:42:57 -0700 Subject: fix the filtered query string so it can potentially be re-used as is. (cherry picked from commit 6adbb93f0a4990a93c759b0fee580db6891527e2) --- boot.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot.php b/boot.php index b47dc6870..e602e44d6 100755 --- a/boot.php +++ b/boot.php @@ -878,6 +878,8 @@ class App { // removing trailing / - maybe a nginx problem if (substr(self::$query_string, 0, 1) == "/") self::$query_string = substr(self::$query_string, 1); + // change the first & to ? + self::$query_string = preg_replace('/&/','?',self::$query_string,1); } if(x($_GET,'q')) -- cgit v1.2.3 From 85e21ce61731f1fac331becc0977b0f0d83e346e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 19 Jul 2018 17:19:19 -0700 Subject: checkjs fix ($page not bin-hex in all cases) (cherry picked from commit a94c9d270906136f69156c0e7c0bd2c8a2e63d1a) --- Zotlabs/Web/CheckJS.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Web/CheckJS.php b/Zotlabs/Web/CheckJS.php index c8547b6dd..e83ccf27b 100644 --- a/Zotlabs/Web/CheckJS.php +++ b/Zotlabs/Web/CheckJS.php @@ -17,9 +17,9 @@ class CheckJS { else $this->jsdisabled = 0; - if(! $this->jsdisabled) { - $page = bin2hex(\App::$query_string); + $page = bin2hex(\App::$query_string); + if(! $this->jsdisabled) { if($test) { $this->jsdisabled = 1; if(array_key_exists('jsdisabled',$_COOKIE)) -- cgit v1.2.3 From 0cde7f98975f5cbbc612d2fa3e4e2aa0849eea98 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 20 Jul 2018 10:42:16 +0200 Subject: fix jot drag and drop (cherry picked from commit c72f6e6ea8d363c43de27760a2374230ce521606) --- view/tpl/jot-header.tpl | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 365a922f9..cd8e3e97c 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -482,10 +482,13 @@ var activeCommentText = ''; } - // file drag hover - function DragDropUploadFileHover(e) { - e.target.className = (e.type == "dragover" ? "hover" : ""); - } + // file drag hover + function DragDropUploadFileHover(e) { + if(e.type == 'dragover') + $(e.target).addClass('hover'); + else + $(e.target).removeClass('hover'); + } // file selection function DragDropUploadFileSelectHandler(e) { @@ -494,7 +497,7 @@ var activeCommentText = ''; DragDropUploadFileHover(e); // open editor if it isn't yet initialised if (!editor) { - initEditor(); + enableOnUser(); } linkdrop(e); @@ -586,7 +589,7 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del openEditor = true; } if(openEditor) { - initEditor(); + enableOnUser(); } } else { postSaveChanges('clean'); -- cgit v1.2.3 From ed79bef51b726899cd200cd306871f92d6d08190 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 20 Jul 2018 16:44:43 +0200 Subject: prevent double file uploads when dropping files into jot (cherry picked from commit f6de91bf0fe1abf41d9b15a553ba378e42a956d1) --- view/tpl/jot-header.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index cd8e3e97c..dd64c3454 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -97,6 +97,7 @@ var activeCommentText = ''; $('#invisible-comment-upload').fileupload({ url: 'wall_attach/{{$nickname}}', dataType: 'json', + dropZone: $(), maxChunkSize: 4 * 1024 * 1024, add: function(e,data) { -- cgit v1.2.3 From f40406514c801453f8b3fc87efe1649d1286a5b1 Mon Sep 17 00:00:00 2001 From: kostikov Date: Fri, 20 Jul 2018 10:24:23 +0200 Subject: Update hmessages.po (cherry picked from commit f141b845fd96ebcd6b893b1289f2693f9f77dfbd) --- view/ru/hmessages.po | 18990 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 13023 insertions(+), 5967 deletions(-) diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index 023e2674f..365251f15 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -1,7842 +1,14898 @@ -# Hubzilla Project -# Copyright (C) 2012-2014 the Hubzilla Project -# This file is distributed under the same license as the Red package. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# # Translators: -# Alex , 2013-2014 -# vislav , 2014 -# puser, 2014 +# Alex , 2016-2017 +# Max Kostikov , 2018 +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Hubzilla\n" +"Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-27 00:02-0700\n" -"PO-Revision-Date: 2014-06-30 12:10+0000\n" -"Last-Translator: Alex \n" -"Language-Team: Russian (http://www.transifex.com/projects/p/red-matrix/language/ru/)\n" +"POT-Creation-Date: 2018-04-23 11:34+0200\n" +"PO-Revision-Date: 2018-06-13 19:32+0000\n" +"Last-Translator: Max Kostikov \n" +"Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))\n +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))\n" -#: ../../include/dba/dba_driver.php:50 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "" +#: ../../util/nconfig.php:34 +msgid "Source channel not found." +msgstr "Канал-источник не найден." -#: ../../include/photo/photo_driver.php:643 ../../include/photos.php:51 -#: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301 -#: ../../mod/profile_photo.php:421 ../../mod/photos.php:91 -#: ../../mod/photos.php:653 ../../mod/photos.php:675 -msgid "Profile Photos" -msgstr "Фотографии профиля" +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:19 +msgid "lonely" +msgstr "одинокий" -#: ../../include/bbcode.php:128 ../../include/bbcode.php:648 -#: ../../include/bbcode.php:651 ../../include/bbcode.php:656 -#: ../../include/bbcode.php:659 ../../include/bbcode.php:662 -#: ../../include/bbcode.php:665 ../../include/bbcode.php:670 -#: ../../include/bbcode.php:673 ../../include/bbcode.php:678 -#: ../../include/bbcode.php:681 ../../include/bbcode.php:684 -#: ../../include/bbcode.php:687 -msgid "Image/photo" -msgstr "Изображение / фото" +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:20 +msgid "drunk" +msgstr "пьяный" -#: ../../include/bbcode.php:163 ../../include/bbcode.php:698 -msgid "Encrypted content" -msgstr "Зашифрованное содержание" +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:21 +msgid "horny" +msgstr "возбуждённый" -#: ../../include/bbcode.php:179 -msgid "QR code" -msgstr "QR код" +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:22 +msgid "stoned" +msgstr "под кайфом" -#: ../../include/bbcode.php:228 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "%1$s написал следующее %2$s %3$s" +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:23 +msgid "fucked up" +msgstr "облажался" -#: ../../include/bbcode.php:230 -msgid "post" -msgstr "сообщение" +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:24 +msgid "clusterfucked" +msgstr "в полной заднице" -#: ../../include/bbcode.php:616 ../../include/bbcode.php:636 -msgid "$1 wrote:" -msgstr "$1 писал:" +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:25 +msgid "crazy" +msgstr "сумасшедший" -#: ../../include/oembed.php:171 -msgid "Embedded content" -msgstr "Внедренное содержание" +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:26 +msgid "hurt" +msgstr "обиженный" -#: ../../include/oembed.php:180 -msgid "Embedding disabled" -msgstr "Внедрение отключенно" +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:27 +msgid "sleepy" +msgstr "сонный" -#: ../../include/notify.php:23 -msgid "created a new post" -msgstr "создал новое сообщение" +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:28 +msgid "grumpy" +msgstr "сердитый" -#: ../../include/notify.php:24 -#, php-format -msgid "commented on %s's post" -msgstr "прокомментировал %s's сообщение" +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:29 +msgid "high" +msgstr "кайфует" + +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:30 +msgid "semi-conscious" +msgstr "в полубезсознании" + +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:31 +msgid "in love" +msgstr "влюблённый" + +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:32 +msgid "in lust" +msgstr "похотливый" + +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:33 +msgid "naked" +msgstr "обнажённый" + +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:34 +msgid "stinky" +msgstr "вонючий" + +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:35 +msgid "sweaty" +msgstr "потный" + +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:36 +msgid "bleeding out" +msgstr "истекающий кровью" + +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:37 +msgid "victorious" +msgstr "победивший" + +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:38 +msgid "defeated" +msgstr "проигравший" + +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:39 +msgid "envious" +msgstr "завидует" + +#: ../../extend/addon/hzaddons/moremoods/moremoods.php:40 +msgid "jealous" +msgstr "ревнует" + +#: ../../extend/addon/hzaddons/dwpost/dwpost.php:42 +msgid "Post to Dreamwidth" +msgstr "Публиковать в Dreamwidth" + +#: ../../extend/addon/hzaddons/dwpost/dwpost.php:73 +msgid "Enable Dreamwidth Post Plugin" +msgstr "Включить плагин публикаций Dreamwidth" + +#: ../../extend/addon/hzaddons/dwpost/dwpost.php:73 +#: ../../extend/addon/hzaddons/dwpost/dwpost.php:85 +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:53 +#: ../../extend/addon/hzaddons/ijpost/ijpost.php:73 +#: ../../extend/addon/hzaddons/ijpost/ijpost.php:85 +#: ../../extend/addon/hzaddons/planets/planets.php:149 +#: ../../extend/addon/hzaddons/libertree/libertree.php:69 +#: ../../extend/addon/hzaddons/libertree/libertree.php:81 +#: ../../extend/addon/hzaddons/authchoose/authchoose.php:67 +#: ../../extend/addon/hzaddons/smileybutton/smileybutton.php:211 +#: ../../extend/addon/hzaddons/smileybutton/smileybutton.php:215 +#: ../../extend/addon/hzaddons/nsfw/nsfw.php:84 +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:120 +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:219 +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:223 +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:227 +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:231 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:309 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:313 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:343 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:351 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:355 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:359 +#: ../../extend/addon/hzaddons/ljpost/ljpost.php:70 +#: ../../extend/addon/hzaddons/ljpost/ljpost.php:82 +#: ../../extend/addon/hzaddons/twitter/twitter.php:243 +#: ../../extend/addon/hzaddons/twitter/twitter.php:252 +#: ../../extend/addon/hzaddons/twitter/twitter.php:261 +#: ../../extend/addon/hzaddons/fuzzloc/fuzzloc.php:178 +#: ../../extend/addon/hzaddons/rtof/rtof.php:81 +#: ../../extend/addon/hzaddons/rtof/rtof.php:85 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:389 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:411 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:415 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:424 +#: ../../extend/addon/hzaddons/rainbowtag/rainbowtag.php:81 +#: ../../extend/addon/hzaddons/visage/visage.php:166 +#: ../../extend/addon/hzaddons/cart/cart.php:1206 +#: ../../extend/addon/hzaddons/cart/cart.php:1213 +#: ../../extend/addon/hzaddons/cart/cart.php:1221 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:99 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:104 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:73 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:653 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:657 +#: ../../extend/addon/hzaddons/nsabait/nsabait.php:157 +#: ../../extend/addon/hzaddons/nofed/nofed.php:72 +#: ../../extend/addon/hzaddons/nofed/nofed.php:76 +#: ../../extend/addon/hzaddons/redred/redred.php:95 +#: ../../extend/addon/hzaddons/redred/redred.php:99 +#: ../../extend/addon/hzaddons/wppost/wppost.php:82 +#: ../../extend/addon/hzaddons/wppost/wppost.php:105 +#: ../../extend/addon/hzaddons/wppost/wppost.php:109 ../../boot.php:1618 +#: ../../view/theme/redbasic/php/config.php:98 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 +#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Events.php:470 +#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Sources.php:116 +#: ../../Zotlabs/Module/Sources.php:151 +#: ../../Zotlabs/Module/Filestorage.php:178 +#: ../../Zotlabs/Module/Filestorage.php:186 +#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Connedit.php:779 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 +#: ../../Zotlabs/Module/Admin/Site.php:266 +#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Menu.php:162 +#: ../../Zotlabs/Module/Menu.php:221 +#: ../../Zotlabs/Module/Settings/Channel.php:315 +#: ../../Zotlabs/Module/Settings/Display.php:100 +#: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 +#: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Wiki.php:218 +#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Storage/Browser.php:405 +msgid "No" +msgstr "Нет" -#: ../../include/conversation.php:120 ../../include/text.php:1705 -#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -#: ../../mod/tagger.php:45 ../../mod/like.php:254 -msgid "photo" -msgstr "фото" +#: ../../extend/addon/hzaddons/dwpost/dwpost.php:73 +#: ../../extend/addon/hzaddons/dwpost/dwpost.php:85 +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:53 +#: ../../extend/addon/hzaddons/ijpost/ijpost.php:73 +#: ../../extend/addon/hzaddons/ijpost/ijpost.php:85 +#: ../../extend/addon/hzaddons/planets/planets.php:149 +#: ../../extend/addon/hzaddons/libertree/libertree.php:69 +#: ../../extend/addon/hzaddons/libertree/libertree.php:81 +#: ../../extend/addon/hzaddons/authchoose/authchoose.php:67 +#: ../../extend/addon/hzaddons/smileybutton/smileybutton.php:211 +#: ../../extend/addon/hzaddons/smileybutton/smileybutton.php:215 +#: ../../extend/addon/hzaddons/nsfw/nsfw.php:84 +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:120 +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:219 +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:223 +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:227 +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:231 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:309 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:313 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:343 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:351 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:355 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:359 +#: ../../extend/addon/hzaddons/ljpost/ljpost.php:70 +#: ../../extend/addon/hzaddons/ljpost/ljpost.php:82 +#: ../../extend/addon/hzaddons/twitter/twitter.php:243 +#: ../../extend/addon/hzaddons/twitter/twitter.php:252 +#: ../../extend/addon/hzaddons/twitter/twitter.php:261 +#: ../../extend/addon/hzaddons/fuzzloc/fuzzloc.php:178 +#: ../../extend/addon/hzaddons/rtof/rtof.php:81 +#: ../../extend/addon/hzaddons/rtof/rtof.php:85 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:389 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:411 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:415 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:424 +#: ../../extend/addon/hzaddons/rainbowtag/rainbowtag.php:81 +#: ../../extend/addon/hzaddons/visage/visage.php:166 +#: ../../extend/addon/hzaddons/cart/cart.php:1206 +#: ../../extend/addon/hzaddons/cart/cart.php:1213 +#: ../../extend/addon/hzaddons/cart/cart.php:1221 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:99 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:104 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:73 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:653 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:657 +#: ../../extend/addon/hzaddons/nsabait/nsabait.php:157 +#: ../../extend/addon/hzaddons/nofed/nofed.php:72 +#: ../../extend/addon/hzaddons/nofed/nofed.php:76 +#: ../../extend/addon/hzaddons/redred/redred.php:95 +#: ../../extend/addon/hzaddons/redred/redred.php:99 +#: ../../extend/addon/hzaddons/wppost/wppost.php:82 +#: ../../extend/addon/hzaddons/wppost/wppost.php:105 +#: ../../extend/addon/hzaddons/wppost/wppost.php:109 ../../boot.php:1618 +#: ../../view/theme/redbasic/php/config.php:98 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 +#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Events.php:470 +#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Sources.php:116 +#: ../../Zotlabs/Module/Sources.php:151 +#: ../../Zotlabs/Module/Filestorage.php:178 +#: ../../Zotlabs/Module/Filestorage.php:186 +#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Mitem.php:176 +#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 +#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Admin/Site.php:268 +#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Menu.php:162 +#: ../../Zotlabs/Module/Menu.php:221 +#: ../../Zotlabs/Module/Settings/Channel.php:315 +#: ../../Zotlabs/Module/Settings/Display.php:100 +#: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 +#: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Wiki.php:218 +#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Storage/Browser.php:405 +msgid "Yes" +msgstr "Да" -#: ../../include/conversation.php:123 ../../include/text.php:1708 -#: ../../mod/tagger.php:49 -msgid "event" -msgstr "мероприятие" +#: ../../extend/addon/hzaddons/dwpost/dwpost.php:77 +msgid "Dreamwidth username" +msgstr "Имя пользователя Dreamwidth" + +#: ../../extend/addon/hzaddons/dwpost/dwpost.php:81 +msgid "Dreamwidth password" +msgstr "Пароль Dreamwidth" + +#: ../../extend/addon/hzaddons/dwpost/dwpost.php:85 +msgid "Post to Dreamwidth by default" +msgstr "Публиковать в Dreamwidth по умолчанию" + +#: ../../extend/addon/hzaddons/dwpost/dwpost.php:89 +msgid "Dreamwidth Post Settings" +msgstr "Настройки публикаций в Dreamwidth" + +#: ../../extend/addon/hzaddons/dwpost/dwpost.php:89 +#: ../../extend/addon/hzaddons/mailtest/mailtest.php:100 +#: ../../extend/addon/hzaddons/superblock/superblock.php:120 +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:69 +#: ../../extend/addon/hzaddons/hubwall/hubwall.php:95 +#: ../../extend/addon/hzaddons/ijpost/ijpost.php:89 +#: ../../extend/addon/hzaddons/planets/planets.php:153 +#: ../../extend/addon/hzaddons/libertree/libertree.php:85 +#: ../../extend/addon/hzaddons/authchoose/authchoose.php:71 +#: ../../extend/addon/hzaddons/logrot/logrot.php:35 +#: ../../extend/addon/hzaddons/redfiles/redfiles.php:124 +#: ../../extend/addon/hzaddons/smileybutton/smileybutton.php:219 +#: ../../extend/addon/hzaddons/nsfw/nsfw.php:92 +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:124 +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:237 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:371 +#: ../../extend/addon/hzaddons/ljpost/ljpost.php:86 +#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:168 +#: ../../extend/addon/hzaddons/likebanner/likebanner.php:57 +#: ../../extend/addon/hzaddons/twitter/twitter.php:218 +#: ../../extend/addon/hzaddons/twitter/twitter.php:265 +#: ../../extend/addon/hzaddons/pubcrawl/pubcrawl.php:1159 +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:830 +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:53 +#: ../../extend/addon/hzaddons/skeleton/skeleton.php:65 +#: ../../extend/addon/hzaddons/gnusoc/gnusoc.php:284 +#: ../../extend/addon/hzaddons/startpage/startpage.php:113 +#: ../../extend/addon/hzaddons/pageheader/pageheader.php:48 +#: ../../extend/addon/hzaddons/fuzzloc/fuzzloc.php:191 +#: ../../extend/addon/hzaddons/rtof/rtof.php:101 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:322 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:380 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:432 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:900 +#: ../../extend/addon/hzaddons/rainbowtag/rainbowtag.php:85 +#: ../../extend/addon/hzaddons/frphotos/frphotos.php:97 +#: ../../extend/addon/hzaddons/piwik/piwik.php:95 +#: ../../extend/addon/hzaddons/redphotos/redphotos.php:136 +#: ../../extend/addon/hzaddons/visage/visage.php:170 +#: ../../extend/addon/hzaddons/cart/cart.php:1251 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:144 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:78 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:647 +#: ../../extend/addon/hzaddons/nsabait/nsabait.php:161 +#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:84 +#: ../../extend/addon/hzaddons/nofed/nofed.php:80 +#: ../../extend/addon/hzaddons/redred/redred.php:119 +#: ../../extend/addon/hzaddons/chords/Mod_Chords.php:60 +#: ../../extend/addon/hzaddons/irc/irc.php:53 +#: ../../extend/addon/hzaddons/wppost/wppost.php:113 +#: ../../view/theme/redbasic/php/config.php:93 ../../include/js_strings.php:22 +#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../Zotlabs/Widget/Wiki_pages.php:40 +#: ../../Zotlabs/Widget/Wiki_pages.php:97 +#: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Module/Appman.php:153 +#: ../../Zotlabs/Module/Photos.php:1087 ../../Zotlabs/Module/Photos.php:1127 +#: ../../Zotlabs/Module/Photos.php:1245 ../../Zotlabs/Module/Connect.php:98 +#: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Events.php:493 +#: ../../Zotlabs/Module/Pdledit.php:98 ../../Zotlabs/Module/Mail.php:431 +#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Sources.php:117 +#: ../../Zotlabs/Module/Sources.php:154 +#: ../../Zotlabs/Module/Filestorage.php:183 +#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Connedit.php:887 +#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Setup.php:308 +#: ../../Zotlabs/Module/Setup.php:349 ../../Zotlabs/Module/Mitem.php:259 +#: ../../Zotlabs/Module/Admin/Addons.php:438 +#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Logs.php:84 +#: ../../Zotlabs/Module/Admin/Accounts.php:168 +#: ../../Zotlabs/Module/Admin/Security.php:112 +#: ../../Zotlabs/Module/Admin/Profs.php:178 +#: ../../Zotlabs/Module/Admin/Themes.php:158 +#: ../../Zotlabs/Module/Admin/Features.php:66 +#: ../../Zotlabs/Module/Admin/Account_edit.php:74 +#: ../../Zotlabs/Module/Admin/Channels.php:147 +#: ../../Zotlabs/Module/Email_validation.php:40 +#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Defperms.php:249 +#: ../../Zotlabs/Module/Settings/Features.php:79 +#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Featured.php:54 +#: ../../Zotlabs/Module/Settings/Account.php:118 +#: ../../Zotlabs/Module/Settings/Display.php:192 +#: ../../Zotlabs/Module/Settings/Permcats.php:115 +#: ../../Zotlabs/Module/Settings/Oauth2.php:85 +#: ../../Zotlabs/Module/Settings/Oauth.php:88 +#: ../../Zotlabs/Module/Settings/Tokens.php:168 +#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242 +#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Locs.php:121 +#: ../../Zotlabs/Module/Import.php:565 ../../Zotlabs/Module/Pconfig.php:107 +#: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Group.php:121 +#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Profiles.php:723 +#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379 +#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Import_items.php:129 +msgid "Submit" +msgstr "Отправить" -#: ../../include/conversation.php:126 ../../mod/like.php:72 -msgid "channel" -msgstr "канал" +#: ../../extend/addon/hzaddons/mdpost/mdpost.php:40 ../../include/text.php:1886 +#: ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../Zotlabs/Module/Wiki.php:208 +#: ../../Zotlabs/Module/Wiki.php:350 +msgid "Markdown" +msgstr "Разметка" -#: ../../include/conversation.php:148 ../../include/text.php:1711 -#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -#: ../../mod/tagger.php:53 ../../mod/like.php:254 -msgid "status" -msgstr "статус" +#: ../../extend/addon/hzaddons/mdpost/mdpost.php:41 +msgid "Use markdown for editing posts" +msgstr "Использовать язык разметки для редактирования публикаций" -#: ../../include/conversation.php:150 ../../include/text.php:1713 -#: ../../mod/tagger.php:55 -msgid "comment" -msgstr "комментарий" +#: ../../extend/addon/hzaddons/randpost/randpost.php:97 +msgid "You're welcome." +msgstr "Пожалуйста." -#: ../../include/conversation.php:164 ../../mod/like.php:291 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "%1$s нравится %2$s's %3$s" +#: ../../extend/addon/hzaddons/randpost/randpost.php:98 +msgid "Ah shucks..." +msgstr "О, чёрт..." -#: ../../include/conversation.php:167 ../../mod/like.php:293 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "%1$s не нравится %2$s's %3$s" +#: ../../extend/addon/hzaddons/randpost/randpost.php:99 +msgid "Don't mention it." +msgstr "Не стоит благодарности." -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "%1$s теперь соединен с %2$s" +#: ../../extend/addon/hzaddons/randpost/randpost.php:100 +msgid "<blush>" +msgstr "<краснею>" -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" -msgstr "%1$s подпихнул %2$s" +#: ../../extend/addon/hzaddons/mailtest/mailtest.php:19 +msgid "Send test email" +msgstr "Отправить тестовый email" -#: ../../include/conversation.php:243 ../../include/text.php:895 -msgid "poked" -msgstr "подпихнул" +#: ../../extend/addon/hzaddons/mailtest/mailtest.php:50 +#: ../../extend/addon/hzaddons/hubwall/hubwall.php:50 +msgid "No recipients found." +msgstr "Получателей не найдено." -#: ../../include/conversation.php:261 ../../mod/mood.php:63 -#, php-format -msgctxt "mood" -msgid "%1$s is %2$s" -msgstr "" +#: ../../extend/addon/hzaddons/mailtest/mailtest.php:66 +msgid "Mail sent." +msgstr "Сообщение отправлено" -#: ../../include/conversation.php:634 ../../include/ItemObject.php:114 -msgid "Select" -msgstr "Выбрать" +#: ../../extend/addon/hzaddons/mailtest/mailtest.php:68 +msgid "Sending of mail failed." +msgstr "Не удалось отправить сообщение." -#: ../../include/conversation.php:635 ../../include/apps.php:232 -#: ../../include/ItemObject.php:108 ../../mod/settings.php:578 -#: ../../mod/connedit.php:398 ../../mod/photos.php:1046 -#: ../../mod/group.php:176 ../../mod/admin.php:758 ../../mod/admin.php:888 -#: ../../mod/thing.php:236 -#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:84 -msgid "Delete" -msgstr "Удалить" +#: ../../extend/addon/hzaddons/mailtest/mailtest.php:77 +msgid "Mail Test" +msgstr "Тестовое сообщение" -#: ../../include/conversation.php:642 ../../include/ItemObject.php:89 -#: ../../mod/photos.php:844 -msgid "Private Message" -msgstr "Личное сообщение" +#: ../../extend/addon/hzaddons/mailtest/mailtest.php:96 +#: ../../extend/addon/hzaddons/hubwall/hubwall.php:92 +msgid "Message subject" +msgstr "Тема сообщения" -#: ../../include/conversation.php:649 ../../include/ItemObject.php:182 -msgid "Message is verified" -msgstr "Сообщение проверено" +#: ../../extend/addon/hzaddons/donate/donate.php:21 +msgid "Project Servers and Resources" +msgstr "Серверы и ресурсы проекта" -#: ../../include/conversation.php:669 -#, php-format -msgid "View %s's profile @ %s" -msgstr "Просмотр %s's профиля @ %s" +#: ../../extend/addon/hzaddons/donate/donate.php:22 +msgid "Project Creator and Tech Lead" +msgstr "Создатель проекта и технический руководитель" -#: ../../include/conversation.php:683 -msgid "Categories:" -msgstr "Категории:" +#: ../../extend/addon/hzaddons/donate/donate.php:23 +msgid "Admin, developer, directorymin, support bloke" +msgstr "Администратор, разработчик, администратор каталога, поддержка" -#: ../../include/conversation.php:684 -msgid "Filed under:" -msgstr "Хранить под:" +#: ../../extend/addon/hzaddons/donate/donate.php:50 +msgid "" +"And the hundreds of other people and organisations who helped make the " +"Hubzilla possible." +msgstr "И сотни других людей и организаций которые помогали в создании Hubzilla." -#: ../../include/conversation.php:693 ../../include/ItemObject.php:250 -#, php-format -msgid " from %s" -msgstr " от %s" +#: ../../extend/addon/hzaddons/donate/donate.php:53 +msgid "" +"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving " +"their time and expertise - and often paying out of pocket for services they " +"share with others." +msgstr "Проекты Redmatrix / Hubzilla предоставляются, в основном, добровольцами, которые предоставляют свое время и опыт и, часто, оплачивают из своего кармана услуги, которыми они делятся с другими." -#: ../../include/conversation.php:696 ../../include/ItemObject.php:253 -#, php-format -msgid "last edited: %s" -msgstr "" +#: ../../extend/addon/hzaddons/donate/donate.php:54 +msgid "" +"There is no corporate funding and no ads, and we do not collect and sell " +"your personal information. (We don't control your personal information - " +"you do.)" +msgstr "Здесь нет корпоративного финансирования и рекламы, мы не собираем и не продаем вашу личную информацию. (Мы не контролируем вашу личную информацию - это делаете вы.)" -#: ../../include/conversation.php:697 ../../include/ItemObject.php:254 -#, php-format -msgid "Expires: %s" -msgstr "" +#: ../../extend/addon/hzaddons/donate/donate.php:55 +msgid "" +"Help support our ground-breaking work in decentralisation, web identity, and " +"privacy." +msgstr "Помогите поддержать нашу новаторскую работу в областях децентрализации, веб-идентификации и конфиденциальности." -#: ../../include/conversation.php:712 -msgid "View in context" -msgstr "Показать в контексте" +#: ../../extend/addon/hzaddons/donate/donate.php:57 +msgid "" +"Your donations keep servers and services running and also helps us to " +"provide innovative new features and continued development." +msgstr "В ваших пожертвованиях поддерживают серверы и службы, а также помогают нам предоставлять новые возможности и продолжать развитие." -#: ../../include/conversation.php:714 ../../include/conversation.php:1130 -#: ../../include/ItemObject.php:294 ../../mod/editblock.php:120 -#: ../../mod/editlayout.php:115 ../../mod/editpost.php:121 -#: ../../mod/editwebpage.php:152 ../../mod/photos.php:977 -#: ../../mod/mail.php:222 ../../mod/mail.php:336 -msgid "Please wait" -msgstr "Подождите пожалуйста" +#: ../../extend/addon/hzaddons/donate/donate.php:60 +msgid "Donate" +msgstr "Пожертвовать" -#: ../../include/conversation.php:841 -msgid "remove" -msgstr "удалить" +#: ../../extend/addon/hzaddons/donate/donate.php:62 +msgid "" +"Choose a project, developer, or public hub to support with a one-time " +"donation" +msgstr "Выберите проект, разработчика или общедоступный узел для поддержки в форме единоразового пожертвования" -#: ../../include/conversation.php:845 -msgid "Loading..." -msgstr "Загрузка..." +#: ../../extend/addon/hzaddons/donate/donate.php:63 +msgid "Donate Now" +msgstr "Пожертвовать сейчас" -#: ../../include/conversation.php:846 -msgid "Delete Selected Items" -msgstr "Удалить выбранные элементы" +#: ../../extend/addon/hzaddons/donate/donate.php:64 +msgid "" +"Or become a project sponsor (Hubzilla Project only)" +msgstr "или станьте спонсором проекта (только для Hubzilla)" -#: ../../include/conversation.php:937 -msgid "View Source" -msgstr "Просмотр источника" +#: ../../extend/addon/hzaddons/donate/donate.php:65 +msgid "" +"Please indicate if you would like your first name or full name (or nothing) " +"to appear in our sponsor listing" +msgstr "Пожалуйста, если желаете, укажите ваше имя для отображения в списке спонсоров." -#: ../../include/conversation.php:938 -msgid "Follow Thread" -msgstr "Следовать теме" +#: ../../extend/addon/hzaddons/donate/donate.php:66 +msgid "Sponsor" +msgstr "Спонсор" -#: ../../include/conversation.php:939 -msgid "View Status" -msgstr "Просмотр состояния" +#: ../../extend/addon/hzaddons/donate/donate.php:69 +msgid "Special thanks to: " +msgstr "Особые благодарности:" -#: ../../include/conversation.php:940 ../../include/nav.php:81 -#: ../../mod/connedit.php:351 ../../mod/connedit.php:465 -msgid "View Profile" -msgstr "Просмотр профиля" +#: ../../extend/addon/hzaddons/superblock/superblock.php:112 +msgid "Currently blocked" +msgstr "В настоящее время заблокирован" -#: ../../include/conversation.php:941 -msgid "View Photos" -msgstr "Просмотр фотографий" +#: ../../extend/addon/hzaddons/superblock/superblock.php:114 +msgid "No channels currently blocked" +msgstr "В настоящее время никакие каналы не блокируются" -#: ../../include/conversation.php:942 -msgid "Matrix Activity" -msgstr "Активность матрицы" +#: ../../extend/addon/hzaddons/superblock/superblock.php:116 +#: ../../Zotlabs/Module/Photos.php:1025 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../Zotlabs/Module/Admin/Addons.php:455 +msgid "Remove" +msgstr "Удалить" -#: ../../include/conversation.php:943 -msgid "Edit Contact" -msgstr "Редактировать контакт" +#: ../../extend/addon/hzaddons/superblock/superblock.php:120 +msgid "Superblock Settings" +msgstr "Настройки Superblock" -#: ../../include/conversation.php:944 -msgid "Send PM" -msgstr "Отправить личное сообщение" +#: ../../extend/addon/hzaddons/superblock/superblock.php:345 +msgid "Block Completely" +msgstr "Заблокировать полностью" -#: ../../include/conversation.php:945 ../../include/apps.php:135 -msgid "Poke" -msgstr "Подпихнуть" +#: ../../extend/addon/hzaddons/superblock/superblock.php:394 +msgid "superblock settings updated" +msgstr "Настройки Superblock обновлены." -#: ../../include/conversation.php:1001 -#, php-format -msgid "%s likes this." -msgstr "%s нравится это." +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:31 +msgid "XMPP settings updated." +msgstr "Настройки XMPP обновлены." -#: ../../include/conversation.php:1001 -#, php-format -msgid "%s doesn't like this." -msgstr "%s не нравится это." +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:53 +msgid "Enable Chat" +msgstr "Включить чат" -#: ../../include/conversation.php:1005 -#, php-format -msgid "%2$d people like this." -msgid_plural "%2$d people like this." -msgstr[0] "%2$d чел. нравится это." -msgstr[1] "%2$d чел. нравится это." -msgstr[2] "%2$d чел. нравится это." +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:58 +msgid "Individual credentials" +msgstr "Индивидуальные разрешения" -#: ../../include/conversation.php:1007 -#, php-format -msgid "%2$d people don't like this." -msgid_plural "%2$d people don't like this." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "%2$d чел. не нравится это." +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:64 +msgid "Jabber BOSH server" +msgstr "Сервер Jabber BOSH" -#: ../../include/conversation.php:1013 -msgid "and" -msgstr "и" +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:69 +msgid "XMPP Settings" +msgstr "Настройки XMPP" -#: ../../include/conversation.php:1016 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" -msgstr[2] ", и %d другие люди" +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:91 +#: ../../extend/addon/hzaddons/msgfooter/msgfooter.php:46 +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:150 +msgid "Save Settings" +msgstr "Сохранить настройки" + +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:92 +msgid "Jabber BOSH host" +msgstr "Узел Jabber BOSH" -#: ../../include/conversation.php:1017 +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:93 +msgid "Use central userbase" +msgstr "Использовать центральную базу данных" + +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:93 +msgid "" +"If enabled, members will automatically login to an ejabberd server that has " +"to be installed on this machine with synchronized credentials via the " +"\"auth_ejabberd.php\" script." +msgstr "" +"Если включено, участники автоматически войдут на сервер ejabberd, который должен быть установлен на этом компьютере с синхронизированными учетными данными через скрипт" +"\"auth_ejabberd.php\"." + +#: ../../extend/addon/hzaddons/xmpp/xmpp.php:102 +#: ../../extend/addon/hzaddons/logrot/logrot.php:54 +#: ../../extend/addon/hzaddons/msgfooter/msgfooter.php:54 +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:82 +#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:184 +#: ../../extend/addon/hzaddons/twitter/twitter.php:772 +#: ../../extend/addon/hzaddons/piwik/piwik.php:116 +#: ../../Zotlabs/Module/Defperms.php:103 +#: ../../Zotlabs/Module/Settings/Channel.php:272 +msgid "Settings updated." +msgstr "Настройки обновлены." + +#: ../../extend/addon/hzaddons/hubwall/hubwall.php:19 +msgid "Send email to all members" +msgstr "Отправить email всем участникам" + +#: ../../extend/addon/hzaddons/hubwall/hubwall.php:33 +#: ../../Zotlabs/Lib/Enotify.php:65 #, php-format -msgid "%s like this." -msgstr "%s нравится это." +msgid "%s Administrator" +msgstr "администратор %s" -#: ../../include/conversation.php:1017 +#: ../../extend/addon/hzaddons/hubwall/hubwall.php:73 #, php-format -msgid "%s don't like this." -msgstr "%s не нравится это." +msgid "%1$d of %2$d messages sent." +msgstr "%1$dиз %2$d сообщений отправлено." -#: ../../include/conversation.php:1074 -msgid "Visible to everybody" -msgstr "Видно для всех" +#: ../../extend/addon/hzaddons/hubwall/hubwall.php:81 +msgid "Send email to all hub members." +msgstr "Отправить email всем участникам узла." -#: ../../include/conversation.php:1075 ../../mod/mail.php:171 -#: ../../mod/mail.php:269 -msgid "Please enter a link URL:" -msgstr "Пожалуйста, введите URL ссылки:" +#: ../../extend/addon/hzaddons/hubwall/hubwall.php:93 +msgid "Sender Email address" +msgstr "Адрес электронной почты отправителя" -#: ../../include/conversation.php:1076 -msgid "Please enter a video link/URL:" -msgstr "Пожалуйста, введите URL видео-ссылки:" +#: ../../extend/addon/hzaddons/hubwall/hubwall.php:94 +msgid "Test mode (only send to hub administrator)" +msgstr "Тестовый режим (отправка только администратору узла)" -#: ../../include/conversation.php:1077 -msgid "Please enter an audio link/URL:" -msgstr "Пожалуйста, введите URL аудио-ссылки:" +#: ../../extend/addon/hzaddons/buglink/buglink.php:16 +#: ../../Zotlabs/Lib/Apps.php:295 +msgid "Report Bug" +msgstr "Сообщить об ошибке" -#: ../../include/conversation.php:1078 -msgid "Tag term:" -msgstr "Теги:" +#: ../../extend/addon/hzaddons/ijpost/ijpost.php:42 +msgid "Post to Insanejournal" +msgstr "Опубликовать в InsaneJournal" -#: ../../include/conversation.php:1079 ../../mod/filer.php:49 -msgid "Save to Folder:" -msgstr "Сохранить в папку:" +#: ../../extend/addon/hzaddons/ijpost/ijpost.php:73 +msgid "Enable InsaneJournal Post Plugin" +msgstr "Включить плагин публикаций InsaneJournal" -#: ../../include/conversation.php:1080 -msgid "Where are you right now?" -msgstr "Где вы сейчас?" +#: ../../extend/addon/hzaddons/ijpost/ijpost.php:77 +msgid "InsaneJournal username" +msgstr "Имя пользователя InsaneJournal" -#: ../../include/conversation.php:1081 ../../mod/editpost.php:52 -#: ../../mod/mail.php:172 ../../mod/mail.php:270 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "" +#: ../../extend/addon/hzaddons/ijpost/ijpost.php:81 +msgid "InsaneJournal password" +msgstr "Пароль InsaneJournal" -#: ../../include/conversation.php:1091 ../../include/page_widgets.php:40 -#: ../../include/ItemObject.php:592 ../../mod/editblock.php:141 -#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 -#: ../../mod/editwebpage.php:174 ../../mod/photos.php:997 -#: ../../mod/webpages.php:124 -msgid "Preview" -msgstr "Предварительный просмотр" +#: ../../extend/addon/hzaddons/ijpost/ijpost.php:85 +msgid "Post to InsaneJournal by default" +msgstr "Публиковать в InsaneJournal по умолчанию" -#: ../../include/conversation.php:1105 ../../mod/photos.php:976 -#: ../../mod/layouts.php:113 -msgid "Share" -msgstr "Поделиться" +#: ../../extend/addon/hzaddons/ijpost/ijpost.php:89 +msgid "InsaneJournal Post Settings" +msgstr "Настройки публикаций в InsaneJournal" -#: ../../include/conversation.php:1107 ../../mod/editwebpage.php:139 -msgid "Page link title" -msgstr "Ссылка заголовока страницы" +#: ../../extend/addon/hzaddons/ijpost/ijpost.php:104 +msgid "Insane Journal Settings saved." +msgstr "Настройки InsaneJournal сохранены." -#: ../../include/conversation.php:1110 -msgid "Post as" -msgstr "" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:94 +msgid "Hubzilla Directory Stats" +msgstr "Каталог статистики Hubzilla" -#: ../../include/conversation.php:1111 ../../mod/editblock.php:112 -#: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 -#: ../../mod/editwebpage.php:144 ../../mod/mail.php:219 ../../mod/mail.php:332 -msgid "Upload photo" -msgstr "Загрузить фотографию" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:95 +msgid "Total Hubs" +msgstr "Всего хабов" -#: ../../include/conversation.php:1112 -msgid "upload photo" -msgstr "загрузить фотографию" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:97 +msgid "Hubzilla Hubs" +msgstr "Хабы Hubzilla" -#: ../../include/conversation.php:1113 ../../mod/editblock.php:113 -#: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 -#: ../../mod/editwebpage.php:145 ../../mod/mail.php:220 ../../mod/mail.php:333 -msgid "Attach file" -msgstr "Прикрепить файл" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:99 +msgid "Friendica Hubs" +msgstr "Хабы Friendica" -#: ../../include/conversation.php:1114 -msgid "attach file" -msgstr "прикрепить файл" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:101 +msgid "Diaspora Pods" +msgstr "Стручки Diaspora" -#: ../../include/conversation.php:1115 ../../mod/editblock.php:114 -#: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 -#: ../../mod/editwebpage.php:146 ../../mod/mail.php:221 ../../mod/mail.php:334 -msgid "Insert web link" -msgstr "Вставить веб-ссылку" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:103 +msgid "Hubzilla Channels" +msgstr "Каналы Hubzilla" -#: ../../include/conversation.php:1116 -msgid "web link" -msgstr "веб-ссылка" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:105 +msgid "Friendica Channels" +msgstr "Каналы Friendica" -#: ../../include/conversation.php:1117 -msgid "Insert video link" -msgstr "Вставить видео-ссылку" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:107 +msgid "Diaspora Channels" +msgstr "Каналы Diaspora" -#: ../../include/conversation.php:1118 -msgid "video link" -msgstr "видео-ссылка" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:109 +msgid "Aged 35 and above" +msgstr "Возраст 35 и выше" -#: ../../include/conversation.php:1119 -msgid "Insert audio link" -msgstr "Вставить аудио-ссылку" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:111 +msgid "Aged 34 and under" +msgstr "Возраст 34 и ниже" -#: ../../include/conversation.php:1120 -msgid "audio link" -msgstr "аудио-ссылка" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:113 +msgid "Average Age" +msgstr "Средний возраст" -#: ../../include/conversation.php:1121 ../../mod/editblock.php:118 -#: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 -#: ../../mod/editwebpage.php:150 -msgid "Set your location" -msgstr "Указание своего расположения" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:115 +msgid "Known Chatrooms" +msgstr "Известные чаты" -#: ../../include/conversation.php:1122 -msgid "set location" -msgstr "указание расположения" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:117 +msgid "Known Tags" +msgstr "Известные теги" -#: ../../include/conversation.php:1123 ../../mod/editblock.php:119 -#: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 -#: ../../mod/editwebpage.php:151 -msgid "Clear browser location" -msgstr "Стереть указание расположения" +#: ../../extend/addon/hzaddons/dirstats/dirstats.php:119 +msgid "" +"Please note Diaspora and Friendica statistics are merely those **this " +"directory** is aware of, and not all those known in the network. This also " +"applies to chatrooms," +msgstr "" +"Обратите внимание, что статистика Diaspora и Friendica это только те, " +"о которых **этот каталог** знает, а не все известные в сети. Это также " +"относится и к чатам." + +#: ../../extend/addon/hzaddons/chess/chess.php:353 +#: ../../extend/addon/hzaddons/chess/chess.php:542 +msgid "Invalid game." +msgstr "Недействительная игра" + +#: ../../extend/addon/hzaddons/chess/chess.php:359 +#: ../../extend/addon/hzaddons/chess/chess.php:582 +msgid "You are not a player in this game." +msgstr "Вы не играете в эту игру." + +#: ../../extend/addon/hzaddons/chess/chess.php:415 +msgid "You must be a local channel to create a game." +msgstr "Ваш канал должен быть локальным чтобы создать игру." + +#: ../../extend/addon/hzaddons/chess/chess.php:433 +msgid "You must select one opponent that is not yourself." +msgstr "Вы должны выбрать противника который не является вами." + +#: ../../extend/addon/hzaddons/chess/chess.php:444 +msgid "Random color chosen." +msgstr "Выбран случайный цвет." + +#: ../../extend/addon/hzaddons/chess/chess.php:452 +msgid "Error creating new game." +msgstr "Ошибка создания новой игры." + +#: ../../extend/addon/hzaddons/chess/chess.php:486 +#: ../../include/channel.php:1151 +msgid "Requested channel is not available." +msgstr "Запрошенный канал не доступен." -#: ../../include/conversation.php:1124 -msgid "clear location" -msgstr "стереть указание расположения" +#: ../../extend/addon/hzaddons/chess/chess.php:500 +msgid "You must select a local channel /chess/channelname" +msgstr "Вы должны выбрать локальный канал /chess/channelname" -#: ../../include/conversation.php:1126 ../../mod/editblock.php:132 -#: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 -#: ../../mod/editwebpage.php:167 -msgid "Set title" -msgstr "Заголовок" +#: ../../extend/addon/hzaddons/chess/chess.php:508 +#: ../../Zotlabs/Module/Channel.php:35 ../../Zotlabs/Module/Ochannel.php:32 +#: ../../Zotlabs/Module/Chat.php:25 +msgid "You must be logged in to see this page." +msgstr "Вы должны авторизоваться, чтобы увидеть эту страницу." -#: ../../include/conversation.php:1129 ../../mod/editblock.php:135 -#: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 -#: ../../mod/editwebpage.php:169 -msgid "Categories (comma-separated list)" -msgstr "Категории (список через запятую)" +#: ../../extend/addon/hzaddons/chess/chess.php:1066 +msgid "Enable notifications" +msgstr "Включить оповещения" -#: ../../include/conversation.php:1131 ../../mod/editblock.php:121 -#: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 -#: ../../mod/editwebpage.php:153 -msgid "Permission settings" -msgstr "Настройки разрешений" +#: ../../extend/addon/hzaddons/planets/planets.php:121 +msgid "Planets Settings updated." +msgstr "Настройки Planets обновлены." -#: ../../include/conversation.php:1132 -msgid "permissions" -msgstr "разрешения" - -#: ../../include/conversation.php:1139 ../../mod/editblock.php:129 -#: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 -#: ../../mod/editwebpage.php:162 -msgid "Public post" -msgstr "Публичное сообщение" - -#: ../../include/conversation.php:1141 ../../mod/editblock.php:136 -#: ../../mod/editlayout.php:130 ../../mod/editpost.php:135 -#: ../../mod/editwebpage.php:170 -msgid "Example: bob@example.com, mary@example.com" -msgstr "Пример: bob@example.com, mary@example.com" - -#: ../../include/conversation.php:1154 ../../mod/editblock.php:146 -#: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 -#: ../../mod/editwebpage.php:179 ../../mod/mail.php:226 ../../mod/mail.php:339 -msgid "Set expiration date" -msgstr "" +#: ../../extend/addon/hzaddons/planets/planets.php:149 +msgid "Enable Planets Plugin" +msgstr "Включить плагин Planets" -#: ../../include/conversation.php:1156 ../../include/ItemObject.php:595 -#: ../../mod/editpost.php:148 ../../mod/mail.php:228 ../../mod/mail.php:341 -msgid "Encrypt text" -msgstr "" +#: ../../extend/addon/hzaddons/planets/planets.php:153 +msgid "Planets Settings" +msgstr "Настройки Planets" -#: ../../include/conversation.php:1158 ../../mod/editpost.php:150 -msgid "OK" -msgstr "OK" +#: ../../extend/addon/hzaddons/libertree/libertree.php:38 +msgid "Post to Libertree" +msgstr "Опубликовать в Libertree" -#: ../../include/conversation.php:1159 ../../mod/settings.php:516 -#: ../../mod/settings.php:542 ../../mod/editpost.php:151 -#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 -#: ../../mod/tagrm.php:94 -msgid "Cancel" -msgstr "Отменить" +#: ../../extend/addon/hzaddons/libertree/libertree.php:69 +msgid "Enable Libertree Post Plugin" +msgstr "Включить плагин публикаций Libertree" -#: ../../include/conversation.php:1401 -msgid "Discover" -msgstr "Обнаруженные" +#: ../../extend/addon/hzaddons/libertree/libertree.php:73 +msgid "Libertree API token" +msgstr "Токен Libertree API" -#: ../../include/conversation.php:1404 -msgid "Imported public streams" -msgstr "" +#: ../../extend/addon/hzaddons/libertree/libertree.php:77 +msgid "Libertree site URL" +msgstr "URL сайта Libertree" -#: ../../include/conversation.php:1409 -msgid "Commented Order" -msgstr "По комментариям" +#: ../../extend/addon/hzaddons/libertree/libertree.php:81 +msgid "Post to Libertree by default" +msgstr "Публиковать в Libertree по умолчанию" -#: ../../include/conversation.php:1412 -msgid "Sort by Comment Date" -msgstr "Сортировка по дате создания комментариев" +#: ../../extend/addon/hzaddons/libertree/libertree.php:85 +msgid "Libertree Post Settings" +msgstr "Настройки публикаций в Libertree" -#: ../../include/conversation.php:1416 -msgid "Posted Order" -msgstr "По добавлениям" +#: ../../extend/addon/hzaddons/libertree/libertree.php:99 +msgid "Libertree Settings saved." +msgstr "Настройки Libertree сохранены." -#: ../../include/conversation.php:1419 -msgid "Sort by Post Date" -msgstr "Сортировка по дате создания сообщения" +#: ../../extend/addon/hzaddons/authchoose/authchoose.php:67 +msgid "Only authenticate automatically to sites of your friends" +msgstr "Автоматически аутентифицироватся только на сайтах ваших друзей" -#: ../../include/conversation.php:1424 ../../include/widgets.php:82 -msgid "Personal" -msgstr "Личные" +#: ../../extend/addon/hzaddons/authchoose/authchoose.php:67 +msgid "By default you are automatically authenticated anywhere in the network" +msgstr "По умолчанию вы автоматически аутентифицируетесь во всей сети" -#: ../../include/conversation.php:1427 -msgid "Posts that mention or involve you" -msgstr "Сообщения, в которых упоминули или вовлекли вас" +#: ../../extend/addon/hzaddons/authchoose/authchoose.php:71 +msgid "Authchoose Settings" +msgstr "Настройки выбора аутентификации" -#: ../../include/conversation.php:1433 ../../mod/connections.php:211 -#: ../../mod/connections.php:224 ../../mod/menu.php:61 -msgid "New" -msgstr "Новые" +#: ../../extend/addon/hzaddons/authchoose/authchoose.php:85 +msgid "Atuhchoose Settings updated." +msgstr "Настройки выбора аутентификации обновлены." -#: ../../include/conversation.php:1436 -msgid "Activity Stream - by date" -msgstr "Лента активности - по дате" +#: ../../extend/addon/hzaddons/logrot/logrot.php:36 +msgid "Logfile archive directory" +msgstr "Каталог архивирования журнала" -#: ../../include/conversation.php:1442 -msgid "Starred" -msgstr "Помеченные" +#: ../../extend/addon/hzaddons/logrot/logrot.php:36 +msgid "Directory to store rotated logs" +msgstr "Каталог для хранения заархивированных журналов" -#: ../../include/conversation.php:1445 -msgid "Favourite Posts" -msgstr "Фаворит-сообщения" +#: ../../extend/addon/hzaddons/logrot/logrot.php:37 +msgid "Logfile size in bytes before rotating" +msgstr "Размер файла журнала в байтах для архивирования" -#: ../../include/conversation.php:1452 -msgid "Spam" -msgstr "Спам" +#: ../../extend/addon/hzaddons/logrot/logrot.php:38 +msgid "Number of logfiles to retain" +msgstr "Количество сохраняемых файлов журналов" -#: ../../include/conversation.php:1455 -msgid "Posts flagged as SPAM" -msgstr "Как СПАМ помеченные сообщения" +#: ../../extend/addon/hzaddons/qrator/qrator.php:48 +msgid "QR code" +msgstr "QR-код" + +#: ../../extend/addon/hzaddons/qrator/qrator.php:63 +msgid "QR Generator" +msgstr "Генератор QR-кодов" + +#: ../../extend/addon/hzaddons/qrator/qrator.php:64 +msgid "Enter some text" +msgstr "Введите любой текст" + +#: ../../extend/addon/hzaddons/msgfooter/msgfooter.php:47 +msgid "text to include in all outgoing posts from this site" +msgstr "текст, который будет добавлен во все исходящие публикации с этого сайта" + +#: ../../extend/addon/hzaddons/redfiles/redfilehelper.php:64 +msgid "file" +msgstr "файл" + +#: ../../extend/addon/hzaddons/redfiles/redfiles.php:109 +#: ../../extend/addon/hzaddons/frphotos/frphotos.php:82 +#: ../../extend/addon/hzaddons/redphotos/redphotos.php:119 +#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:73 +#: ../../include/items.php:364 ../../Zotlabs/Web/WebServer.php:122 +#: ../../Zotlabs/Module/Subthread.php:86 ../../Zotlabs/Module/Like.php:296 +#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68 +#: ../../Zotlabs/Module/Group.php:83 ../../Zotlabs/Module/Profperm.php:28 +#: ../../Zotlabs/Module/Cloud.php:126 ../../Zotlabs/Module/Import_items.php:120 +msgid "Permission denied" +msgstr "Доступ запрещен" -#: ../../include/conversation.php:1488 ../../mod/admin.php:892 -msgid "Channel" -msgstr "Канал" +#: ../../extend/addon/hzaddons/redfiles/redfiles.php:119 +msgid "Redmatrix File Storage Import" +msgstr "Импорт файлового хранилища Redmatrix" -#: ../../include/conversation.php:1491 -msgid "Status Messages and Posts" -msgstr "" +#: ../../extend/addon/hzaddons/redfiles/redfiles.php:120 +msgid "This will import all your Redmatrix cloud files to this channel." +msgstr "Это позволит импортировать все ваши файлы в Redmatrix в этот канал." -#: ../../include/conversation.php:1500 -msgid "About" -msgstr "О себе" +#: ../../extend/addon/hzaddons/redfiles/redfiles.php:121 +#: ../../extend/addon/hzaddons/redphotos/redphotos.php:131 +msgid "Redmatrix Server base URL" +msgstr "Базовый URL сервера Redmatrix" -#: ../../include/conversation.php:1503 -msgid "Profile Details" -msgstr "Сведения о профиле" +#: ../../extend/addon/hzaddons/redfiles/redfiles.php:122 +#: ../../extend/addon/hzaddons/redphotos/redphotos.php:132 +msgid "Redmatrix Login Username" +msgstr "Имя пользователя Redmatrix" -#: ../../include/conversation.php:1509 ../../include/nav.php:84 -#: ../../include/apps.php:129 ../../mod/fbrowser.php:25 -msgid "Photos" -msgstr "Фотографии" +#: ../../extend/addon/hzaddons/redfiles/redfiles.php:123 +#: ../../extend/addon/hzaddons/redphotos/redphotos.php:133 +msgid "Redmatrix Login Password" +msgstr "Пароль Redmatrix" -#: ../../include/conversation.php:1512 ../../include/photos.php:313 -msgid "Photo Albums" -msgstr "Фотоальбомы" +#: ../../extend/addon/hzaddons/smileybutton/smileybutton.php:211 +msgid "Deactivate the feature" +msgstr "Деактивировать функцию" -#: ../../include/conversation.php:1518 ../../include/nav.php:85 -#: ../../include/reddav.php:1051 ../../include/apps.php:125 -#: ../../mod/fbrowser.php:114 -msgid "Files" -msgstr "Файлы" +#: ../../extend/addon/hzaddons/smileybutton/smileybutton.php:215 +msgid "Hide the button and show the smilies directly." +msgstr "Скрыть кнопку и сразу показывать смайлики." -#: ../../include/conversation.php:1521 -msgid "Files and Storage" -msgstr "" +#: ../../extend/addon/hzaddons/smileybutton/smileybutton.php:219 +msgid "Smileybutton Settings" +msgstr "Настройки кнопки смайликов" -#: ../../include/conversation.php:1530 ../../include/conversation.php:1533 -msgid "Chatrooms" -msgstr "Чаты" +#: ../../extend/addon/hzaddons/nsfw/nsfw.php:80 +msgid "" +"This plugin looks in posts for the words/text you specify below, and " +"collapses any content containing those keywords so it is not displayed at " +"inappropriate times, such as sexual innuendo that may be improper in a work " +"setting. It is polite and recommended to tag any content containing nudity " +"with #NSFW. This filter can also match any other word/text you specify, and " +"can thereby be used as a general purpose content filter." +msgstr "Этот плагин просматривает публикации для слов / текста, которые вы указываете ниже, и сворачивает любой контент, содержащий эти ключевые слова, поэтому он не отображается в неподходящее время, например, сексуальные инсинуации, которые могут быть неправильными в настройке работы. Например, мы рекомендуем отмечать любой контент, содержащий наготу, тегом #NSFW. Этот фильтр также способен реагировать на любое другое указанное вами слово / текст и может использоваться в качестве фильтра содержимого общего назначения." + +#: ../../extend/addon/hzaddons/nsfw/nsfw.php:84 +msgid "Enable Content filter" +msgstr "Включить фильтрацию содержимого" + +#: ../../extend/addon/hzaddons/nsfw/nsfw.php:88 +msgid "Comma separated list of keywords to hide" +msgstr "Список ключевых слов для скрытия, через запятую" + +#: ../../extend/addon/hzaddons/nsfw/nsfw.php:88 +msgid "Word, /regular-expression/, lang=xx, lang!=xx" +msgstr "слово, /регулярное_выражение/, lang=xx, lang!=xx" + +#: ../../extend/addon/hzaddons/nsfw/nsfw.php:92 +msgid "Not Safe For Work Settings" +msgstr "Настройка \"Not Safe For Work\"" + +#: ../../extend/addon/hzaddons/nsfw/nsfw.php:92 +msgid "General Purpose Content Filter" +msgstr "Фильтр содержимого общего назначения" + +#: ../../extend/addon/hzaddons/nsfw/nsfw.php:110 +msgid "NSFW Settings saved." +msgstr "Настройки NSFW сохранены." + +#: ../../extend/addon/hzaddons/nsfw/nsfw.php:207 +msgid "Possible adult content" +msgstr "Возможно содержимое для взрослых" + +#: ../../extend/addon/hzaddons/nsfw/nsfw.php:222 +#, php-format +msgid "%s - view" +msgstr "%s - просмотр" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:45 +msgid "Flattr this!" +msgstr "" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:83 +msgid "Flattr widget settings updated." +msgstr "Настройки виджета Flattr обновлены." + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:100 +msgid "Flattr user" +msgstr "Пользователь Flattr" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:104 +msgid "URL of the Thing to flattr" +msgstr "URL ccылки на Flattr" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:104 +msgid "If empty channel URL is used" +msgstr "Если пусто, то используется URL канала" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:108 +msgid "Title of the Thing to flattr" +msgstr "Заголовок вещи на Flattr" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:108 +msgid "If empty \"channel name on The Hubzilla\" will be used" +msgstr "Если пусто, то будет использовано \"Название канала Hubzilla\"" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:112 +msgid "Static or dynamic flattr button" +msgstr "Статическая или динамическая кнопка Flattr" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:112 +msgid "static" +msgstr "статическая" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:112 +msgid "dynamic" +msgstr "динамическая" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:116 +msgid "Alignment of the widget" +msgstr "Выравнивание виджета" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:116 +msgid "left" +msgstr "слева" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:116 +msgid "right" +msgstr "справа" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:120 +msgid "Enable Flattr widget" +msgstr "Включить виджет Flattr" + +#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:124 +msgid "Flattr Widget Settings" +msgstr "Настройки виджета Flattr" + +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:40 +#: ../../extend/addon/hzaddons/openid/Mod_Id.php:53 +#: ../../extend/addon/hzaddons/keepout/keepout.php:36 +#: ../../include/attach.php:150 ../../include/attach.php:197 +#: ../../include/attach.php:270 ../../include/attach.php:379 +#: ../../include/attach.php:393 ../../include/attach.php:400 +#: ../../include/attach.php:482 ../../include/attach.php:1042 +#: ../../include/attach.php:1116 ../../include/attach.php:1281 +#: ../../include/items.php:3653 ../../include/photos.php:27 +#: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:123 +#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Photos.php:69 +#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Poke.php:149 +#: ../../Zotlabs/Module/Achievements.php:34 +#: ../../Zotlabs/Module/Connections.php:29 ../../Zotlabs/Module/Item.php:229 +#: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256 +#: ../../Zotlabs/Module/Item.php:1108 ../../Zotlabs/Module/Events.php:271 +#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 +#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Settings.php:59 +#: ../../Zotlabs/Module/Notifications.php:11 +#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Mail.php:146 +#: ../../Zotlabs/Module/Card_edit.php:51 ../../Zotlabs/Module/Suggest.php:28 +#: ../../Zotlabs/Module/Channel.php:115 ../../Zotlabs/Module/Channel.php:281 +#: ../../Zotlabs/Module/Channel.php:320 ../../Zotlabs/Module/Block.php:24 +#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Api.php:24 +#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Sources.php:77 +#: ../../Zotlabs/Module/Profile_photo.php:302 +#: ../../Zotlabs/Module/Profile_photo.php:315 +#: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/Message.php:18 +#: ../../Zotlabs/Module/Filestorage.php:15 +#: ../../Zotlabs/Module/Filestorage.php:70 +#: ../../Zotlabs/Module/Filestorage.php:96 +#: ../../Zotlabs/Module/Filestorage.php:140 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Editblock.php:67 +#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Connedit.php:389 +#: ../../Zotlabs/Module/Webpages.php:118 +#: ../../Zotlabs/Module/Editwebpage.php:68 +#: ../../Zotlabs/Module/Editwebpage.php:89 +#: ../../Zotlabs/Module/Editwebpage.php:107 +#: ../../Zotlabs/Module/Editwebpage.php:121 +#: ../../Zotlabs/Module/Editlayout.php:67 +#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Moderate.php:13 +#: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Bookmarks.php:64 +#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 +#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Invite.php:17 +#: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/Blocks.php:73 +#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Cover_photo.php:313 +#: ../../Zotlabs/Module/Cover_photo.php:326 ../../Zotlabs/Module/Like.php:185 +#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Menu.php:129 +#: ../../Zotlabs/Module/Menu.php:140 ../../Zotlabs/Module/Manage.php:10 +#: ../../Zotlabs/Module/Settings/Features.php:38 +#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 +#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Locs.php:87 +#: ../../Zotlabs/Module/Viewconnections.php:28 +#: ../../Zotlabs/Module/Viewconnections.php:33 +#: ../../Zotlabs/Module/New_channel.php:105 +#: ../../Zotlabs/Module/New_channel.php:130 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Regmod.php:20 +#: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Cards.php:72 +#: ../../Zotlabs/Module/Register.php:77 +#: ../../Zotlabs/Module/Article_edit.php:51 ../../Zotlabs/Module/Wiki.php:50 +#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404 +#: ../../Zotlabs/Module/Group.php:12 ../../Zotlabs/Module/Group.php:24 +#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 +#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101 +#: ../../Zotlabs/Module/Thing.php:280 ../../Zotlabs/Module/Thing.php:300 +#: ../../Zotlabs/Module/Thing.php:341 ../../Zotlabs/Module/Display.php:449 +#: ../../Zotlabs/Module/Cloud.php:40 ../../Zotlabs/Module/Mood.php:116 +msgid "Permission denied." +msgstr "Доступ запрещен." -#: ../../include/conversation.php:1540 ../../include/nav.php:93 -#: ../../include/apps.php:119 -msgid "Bookmarks" -msgstr "Закладки" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:148 +msgid "You are now authenticated to pumpio." +msgstr "Вы аутентифицированы в Pump.io" -#: ../../include/conversation.php:1543 -msgid "Saved Bookmarks" -msgstr "Сохранённые закладки" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:149 +msgid "return to the featured settings page" +msgstr "Вернутся к странице настроек" -#: ../../include/conversation.php:1551 ../../include/nav.php:95 -#: ../../include/apps.php:126 ../../mod/webpages.php:79 -msgid "Webpages" -msgstr "Веб-страницы" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:163 +msgid "Post to Pump.io" +msgstr "Опубликовать в Pump.io" -#: ../../include/conversation.php:1554 -msgid "Manage Webpages" -msgstr "Управление веб-страниц" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:198 +msgid "Pump.io servername" +msgstr "Имя сервера Pump.io" -#: ../../include/page_widgets.php:6 -msgid "New Page" -msgstr "Новая страница" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:198 +msgid "Without \"http://\" or \"https://\"" +msgstr "Без \"http://\" или \"https://\"" -#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36 -#: ../../include/apps.php:231 ../../include/menu.php:42 -#: ../../include/ItemObject.php:96 ../../mod/settings.php:577 -#: ../../mod/blocks.php:94 ../../mod/connections.php:393 -#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106 -#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143 -#: ../../mod/thing.php:235 ../../mod/layouts.php:112 ../../mod/menu.php:59 -#: ../../mod/webpages.php:120 -#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:80 -msgid "Edit" -msgstr "Редактировать" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:202 +msgid "Pump.io username" +msgstr "Имя пользователя Pump.io" -#: ../../include/page_widgets.php:39 ../../mod/blocks.php:97 -#: ../../mod/layouts.php:116 ../../mod/webpages.php:123 -msgid "View" -msgstr "Просмотр" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:202 +msgid "Without the servername" +msgstr "без имени сервера" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:125 -msgid "Actions" -msgstr "" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:213 +msgid "You are not authenticated to pumpio" +msgstr "Вы не аутентифицированы на Pump.io" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:126 -msgid "Page Link" -msgstr "Ссылка страницы" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:215 +msgid "(Re-)Authenticate your pump.io connection" +msgstr "Аутентифицировать (повторно) ваше соединение с Pump.io" -#: ../../include/page_widgets.php:43 ../../mod/webpages.php:127 -msgid "Title" -msgstr "Заголовок" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:219 +msgid "Enable pump.io Post Plugin" +msgstr "Включить плагин публикаций Pump.io" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:128 -msgid "Created" -msgstr "Создано" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:223 +msgid "Post to pump.io by default" +msgstr "Публиковать в Pump.io по умолчанию" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:129 -msgid "Edited" -msgstr "Отредактирован" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:227 +msgid "Should posts be public" +msgstr "Публикации должны быть общедоступными" -#: ../../include/security.php:301 -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 "" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:231 +msgid "Mirror all public posts" +msgstr "Отображать все общедоступные публикации" -#: ../../include/account.php:23 -msgid "Not a valid email address" -msgstr "Не действительный адрес электронной почты" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:237 +msgid "Pump.io Post Settings" +msgstr "Настройки публикаций в Pump.io" -#: ../../include/account.php:25 -msgid "Your email domain is not among those allowed on this site" -msgstr "Домен электронной почты не входит в число тех, которые разрешены на этом сайте" +#: ../../extend/addon/hzaddons/pumpio/pumpio.php:266 +msgid "PumpIO Settings saved." +msgstr "Настройки публикаций в Pump.io сохранены." -#: ../../include/account.php:31 -msgid "Your email address is already registered at this site." -msgstr "Ваш адрес электронной почты уже зарегистрирован на этом сайте." +#: ../../extend/addon/hzaddons/bookmarker/bookmarker.php:38 +#: ../../Zotlabs/Lib/ThreadItem.php:403 +msgid "Save Bookmarks" +msgstr "Сохранить закладки" -#: ../../include/account.php:64 -msgid "An invitation is required." -msgstr "Требуется приглашение." +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:305 +#: ../../include/channel.php:1396 ../../include/channel.php:1567 +msgid "Status:" +msgstr "Статус:" -#: ../../include/account.php:68 -msgid "Invitation could not be verified." -msgstr "Не удалось проверить приглашение." +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:309 +msgid "Activate addon" +msgstr "Активировать расширение" + +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:313 +msgid "Hide Jappixmini Chat-Widget from the webinterface" +msgstr "Скрыть виджет чата Jappixmini из веб-интерфейса" + +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:318 +msgid "Jabber username" +msgstr "Имя пользователя Jabber" + +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:324 +msgid "Jabber server" +msgstr "Сервер Jabber" + +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:330 +msgid "Jabber BOSH host URL" +msgstr "URL узла Jabber BOSH" + +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:337 +msgid "Jabber password" +msgstr "Пароль Jabber" + +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:343 +msgid "Encrypt Jabber password with Hubzilla password" +msgstr "Зашифровать пароль Jabber с помощью пароля Hubzilla" + +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:343 +#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:598 +#: ../../Zotlabs/Module/Settings/Channel.php:599 +msgid "Recommended" +msgstr "рекомендовано" + +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:347 +#: ../../extend/addon/hzaddons/redred/redred.php:115 +msgid "Hubzilla password" +msgstr "Пароль Hubzilla" + +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:351 +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:355 +msgid "Approve subscription requests from Hubzilla contacts automatically" +msgstr "Утверждать запросы на подписку от контактов Hubzilla автоматически" + +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:359 +msgid "Purge internal list of jabber addresses of contacts" +msgstr "Очистить внутренний список адресов контактов Jabber" + +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:364 +msgid "Configuration Help" +msgstr "Помощь по конфигурации" + +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:368 +#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919 +#: ../../Zotlabs/Module/Profiles.php:796 +msgid "Add Contact" +msgstr "Добавить контакт" -#: ../../include/account.php:119 -msgid "Please enter the required information." -msgstr "Пожалуйста, введите необходимую информацию." +#: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:371 +msgid "Jappix Mini Settings" +msgstr "Настройки Jappix Mini" -#: ../../include/account.php:187 -msgid "Failed to store account information." -msgstr "Не удалось сохранить информацию аккаунта." +#: ../../extend/addon/hzaddons/ljpost/ljpost.php:42 +msgid "Post to LiveJournal" +msgstr "Опубликовать в LiveJournal" -#: ../../include/account.php:273 -#, php-format -msgid "Registration request at %s" -msgstr "Требуется регистрация на %s" +#: ../../extend/addon/hzaddons/ljpost/ljpost.php:70 +msgid "Enable LiveJournal Post Plugin" +msgstr "Включить плагин публикаций LiveJournal" -#: ../../include/account.php:275 ../../include/account.php:302 -#: ../../include/account.php:359 -msgid "Administrator" -msgstr "Администратор" +#: ../../extend/addon/hzaddons/ljpost/ljpost.php:74 +msgid "LiveJournal username" +msgstr "Имя пользователя LiveJournal" -#: ../../include/account.php:297 -msgid "your registration password" -msgstr "Ваш пароль регистрации" +#: ../../extend/addon/hzaddons/ljpost/ljpost.php:78 +msgid "LiveJournal password" +msgstr "Пароль LiveJournal" -#: ../../include/account.php:300 ../../include/account.php:357 -#, php-format -msgid "Registration details for %s" -msgstr "Регистрационные данные для %s" +#: ../../extend/addon/hzaddons/ljpost/ljpost.php:82 +msgid "Post to LiveJournal by default" +msgstr "Публиковать в LiveJournal по умолчанию" -#: ../../include/account.php:366 -msgid "Account approved." -msgstr "Аккаунт утвержден." +#: ../../extend/addon/hzaddons/ljpost/ljpost.php:86 +msgid "LiveJournal Post Settings" +msgstr "Настройки публикаций в LiveJournal" -#: ../../include/account.php:400 -#, php-format -msgid "Registration revoked for %s" -msgstr "Регистрация отозвана для %s" +#: ../../extend/addon/hzaddons/ljpost/ljpost.php:101 +msgid "LiveJournal Settings saved." +msgstr "Настройки LiveJournal сохранены." -#: ../../include/photos.php:15 ../../include/attach.php:119 -#: ../../include/attach.php:166 ../../include/attach.php:229 -#: ../../include/attach.php:243 ../../include/attach.php:283 -#: ../../include/attach.php:297 ../../include/attach.php:322 -#: ../../include/attach.php:513 ../../include/attach.php:585 -#: ../../include/chat.php:116 ../../include/items.php:3680 -#: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:27 -#: ../../mod/settings.php:492 ../../mod/poke.php:128 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 -#: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72 -#: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276 -#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:152 -#: ../../mod/profiles.php:462 ../../mod/bookmarks.php:46 -#: ../../mod/channel.php:89 ../../mod/channel.php:193 -#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 -#: ../../mod/register.php:68 ../../mod/regmod.php:18 ../../mod/common.php:35 -#: ../../mod/network.php:12 ../../mod/connections.php:169 -#: ../../mod/connedit.php:221 ../../mod/delegate.php:6 ../../mod/page.php:30 -#: ../../mod/page.php:80 ../../mod/setup.php:203 ../../mod/editblock.php:34 -#: ../../mod/pdledit.php:21 ../../mod/editlayout.php:48 -#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:44 -#: ../../mod/editwebpage.php:83 ../../mod/photos.php:68 -#: ../../mod/photos.php:526 ../../mod/sources.php:66 ../../mod/events.php:141 -#: ../../mod/filestorage.php:10 ../../mod/filestorage.php:59 -#: ../../mod/filestorage.php:75 ../../mod/filestorage.php:98 -#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 -#: ../../mod/thing.php:249 ../../mod/thing.php:266 ../../mod/thing.php:301 -#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:179 -#: ../../mod/item.php:187 ../../mod/item.php:898 ../../mod/layouts.php:27 -#: ../../mod/layouts.php:39 ../../mod/viewconnections.php:22 -#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:12 -#: ../../mod/mail.php:108 ../../mod/manage.php:6 ../../mod/menu.php:44 -#: ../../mod/webpages.php:40 ../../mod/message.php:16 -#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 -#: ../../mod/notifications.php:66 ../../mod/appman.php:66 ../../index.php:186 -#: ../../index.php:361 -msgid "Permission denied." -msgstr "Доступ запрещен." +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:57 +msgid "Errors encountered deleting database table " +msgstr "Возникшие при удалении таблицы базы данных ошибки" -#: ../../include/photos.php:89 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:95 +#: ../../extend/addon/hzaddons/twitter/twitter.php:779 +msgid "Submit Settings" +msgstr "Отправить настройки" -#: ../../include/photos.php:96 -msgid "Image file is empty." -msgstr "файл пуст." +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:96 +msgid "Drop tables when uninstalling?" +msgstr "Удалить таблицы при деинсталляции?" -#: ../../include/photos.php:123 ../../mod/profile_photo.php:216 -msgid "Unable to process image" -msgstr "Не удается обработать изображение" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:96 +msgid "" +"If checked, the Rendezvous database tables will be deleted when the plugin " +"is uninstalled." +msgstr "Если включено, то таблицы базы данных Rendezvous будут удалены при удалении плагина." -#: ../../include/photos.php:186 -msgid "Photo storage failed." -msgstr "Ошибка в банке фотографий" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:97 +msgid "Mapbox Access Token" +msgstr "Токен доступа к Mapbox" -#: ../../include/photos.php:317 ../../mod/photos.php:691 -#: ../../mod/photos.php:1193 -msgid "Upload New Photos" -msgstr "Загрузить новые фотографии" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:97 +msgid "" +"If you enter a Mapbox access token, it will be used to retrieve map tiles " +"from Mapbox instead of the default OpenStreetMap tile server." +msgstr "Если вы введете токен доступа к Mapbox, он будет использоваться для извлечения фрагментов карты из Mapbox вместо стандартного сервера OpenStreetMap." -#: ../../include/acl_selectors.php:240 -msgid "Visible to everybody" -msgstr "Видно всем" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:162 +msgid "Rendezvous" +msgstr "" -#: ../../include/acl_selectors.php:241 -msgid "Show" -msgstr "Показывать" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:167 +msgid "" +"This identity has been deleted by another member due to inactivity. Please " +"press the \"New identity\" button or refresh the page to register a new " +"identity. You may use the same name." +msgstr "" +"Этот идентификатор был удалён другим участником из-за неактивности. " +"Пожалуйста нажмите кнопку \"Новый идентификатор\" для обновления страницы и " +"получения нового идентификатора. Вы можете использовать то же имя." -#: ../../include/acl_selectors.php:242 -msgid "Don't show" -msgstr "Не показывать" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:168 +msgid "Welcome to Rendezvous!" +msgstr "Добро пожаловать в Rendezvous!" -#: ../../include/acl_selectors.php:248 ../../mod/chat.php:209 -#: ../../mod/photos.php:604 ../../mod/photos.php:952 -#: ../../mod/filestorage.php:128 -msgid "Permissions" -msgstr "Разрешения" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:169 +msgid "" +"Enter your name to join this rendezvous. To begin sharing your location with " +"the other members, tap the GPS control. When your location is discovered, a " +"red dot will appear and others will be able to see you on the map." +msgstr "" +"Введите ваше имя для вступления в это Rendezvous. Для того, чтобы делиться вашим " +"положением с другими участниками, нажмите \"GPS control\". Когда ваше местоположение " +"определно, красная точка появится и остальные смогут увидеть вас на карте." + +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:171 +msgid "Let's meet here" +msgstr "Давайте встретимся здесь" + +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:172 +#: ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Widget/Wiki_page_history.php:22 +#: ../../Zotlabs/Module/Cdav.php:1170 ../../Zotlabs/Module/Connedit.php:906 +#: ../../Zotlabs/Module/Sharedwithme.php:105 +#: ../../Zotlabs/Module/Admin/Channels.php:159 +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth.php:90 +#: ../../Zotlabs/Module/Settings/Oauth.php:116 +#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Module/Wiki.php:209 +#: ../../Zotlabs/Module/Group.php:125 ../../Zotlabs/Storage/Browser.php:285 +msgid "Name" +msgstr "Имя" -#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:289 -msgid "Close" -msgstr "Закрыть" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:173 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:659 +#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Cdav.php:871 +#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Rbmark.php:101 +msgid "Description" +msgstr "Описание" -#: ../../include/activities.php:39 -msgid " and " -msgstr "и" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:174 +msgid "New marker" +msgstr "Новый маркер" -#: ../../include/activities.php:47 -msgid "public profile" -msgstr "Публичный профиль" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:175 +msgid "Edit marker" +msgstr "Редактировать маркер" -#: ../../include/activities.php:52 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s изменил %2$s на “%3$s”" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:176 +msgid "New identity" +msgstr "Новый идентификатор" -#: ../../include/activities.php:53 -#, php-format -msgid "Visit %1$s's %2$s" -msgstr "Посетить %1$s's %2$s" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:177 +msgid "Delete marker" +msgstr "Удалить маркер" -#: ../../include/activities.php:56 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:178 +msgid "Delete member" +msgstr "Удалить участника" -#: ../../include/api.php:1016 -msgid "Public Timeline" -msgstr "Публичная шкала времени" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:179 +msgid "Edit proximity alert" +msgstr "Изменить оповещение о близости" -#: ../../include/attach.php:224 ../../include/attach.php:278 -msgid "Item was not found." -msgstr "Элемент не найден." +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:180 +msgid "" +"A proximity alert will be issued when this member is within a certain radius " +"of you.

      Enter a radius in meters (0 to disable):" +msgstr "Оповещение о близости будет произведено, если этот участник находится на определённом расстоянии от вас.

      Введите радиус в метрах (0 для отключения):" -#: ../../include/attach.php:335 -msgid "No source file." -msgstr "Нет исходного файла." +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:180 +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:185 +msgid "distance" +msgstr "расстояние" -#: ../../include/attach.php:352 -msgid "Cannot locate file to replace" -msgstr "Не удается найти файл, чтобы заменить" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:181 +msgid "Proximity alert distance (meters)" +msgstr "Расстояние для уведомления о близости (метров)" -#: ../../include/attach.php:370 -msgid "Cannot locate file to revise/update" -msgstr "Не удается найти файл для пересмотра / обновления" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:182 +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:184 +msgid "" +"A proximity alert will be issued when you are within a certain radius of the " +"marker location.

      Enter a radius in meters (0 to disable):" +msgstr "Оповещение о близости будет произведено, если вы находитесь на определённом расстоянии местоположения маркера.

      Введите радиус в метрах (0 для отключения):" -#: ../../include/attach.php:381 -#, php-format -msgid "File exceeds size limit of %d" -msgstr "Файл превышает предельный размер %d" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:183 +msgid "Marker proximity alert" +msgstr "Маркер уведомления о близости" -#: ../../include/attach.php:393 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "" +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:186 +msgid "Reminder note" +msgstr "Напоминание" -#: ../../include/attach.php:475 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "Загрузка файла не удалась. Возможно система перегружена или попытка прекращена." +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:187 +msgid "" +"Enter a note to be displayed when you are within the specified proximity..." +msgstr "Введите сообщение для отображения когда вы находитесь рядом" -#: ../../include/attach.php:487 -msgid "Stored file could not be verified. Upload failed." -msgstr "Файл для сохранения не проверен. Загрузка не удалась." +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:199 +msgid "Add new rendezvous" +msgstr "Добавить новое Rendezvous." -#: ../../include/attach.php:528 ../../include/attach.php:545 -msgid "Path not available." -msgstr "Путь недоступен." +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:200 +msgid "" +"Create a new rendezvous and share the access link with those you wish to " +"invite to the group. Those who open the link become members of the " +"rendezvous. They can view other member locations, add markers to the map, or " +"share their own locations with the group." +msgstr "Создайте новое Rendezvous и поделитесь ссылкой доступа с теми, кого вы хотите пригласить в группу. Тот, кто откроет эту ссылку, станет её участником. Участники могут видеть местоположение, добавлять маркеры на карту или делится своим собственным местоположением с группой." + +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:232 +msgid "You have no rendezvous. Press the button above to create a rendezvous!" +msgstr "У вас нет Rendezvous. Нажмите на кнопку ниже чтобы создать его!" + +#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:401 +#: ../../Zotlabs/Module/Setup.php:707 +msgid "Errors encountered creating database tables." +msgstr "При создании базы данных возникли ошибки." -#: ../../include/attach.php:590 -msgid "Empty pathname" -msgstr "" +#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:146 +msgid "View Larger" +msgstr "Увеличить" -#: ../../include/attach.php:606 -msgid "duplicate filename or path" -msgstr "" +#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:169 +msgid "Tile Server URL" +msgstr "URL сервера Tile" -#: ../../include/attach.php:630 -msgid "Path not found." -msgstr "Путь не найден." +#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:169 +msgid "" +"A list of public tile servers" +msgstr "" +"Список общедоступных серверов" -#: ../../include/attach.php:674 -msgid "mkdir failed." -msgstr "mkdir безуспешно." +#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:170 +msgid "Nominatim (reverse geocoding) Server URL" +msgstr "URL сервера Nominatim (обратное геокодирование)" -#: ../../include/attach.php:678 -msgid "database storage failed." +#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:170 +msgid "" +"A list of Nominatim servers" msgstr "" +"Список серверов Nominatim" -#: ../../include/bb2diaspora.php:441 ../../include/event.php:11 -msgid "l F d, Y \\@ g:i A" -msgstr "l F d, Y \\@ g:i A" +#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:171 +msgid "Default zoom" +msgstr "Масштаб по умолчанию" -#: ../../include/bb2diaspora.php:447 ../../include/event.php:20 -msgid "Starts:" -msgstr "Начало:" +#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:171 +msgid "" +"The default zoom level. (1:world, 18:highest, also depends on tile server)" +msgstr "Уровень размера по умолчанию (1 - весь мир, 18 - максимальный; зависит от сервера)." -#: ../../include/bb2diaspora.php:455 ../../include/event.php:30 -msgid "Finishes:" -msgstr "\t\nКонец:" +#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:172 +msgid "Include marker on map" +msgstr "Включите маркер на карте" -#: ../../include/bb2diaspora.php:463 ../../include/event.php:40 -#: ../../include/identity.php:726 ../../mod/directory.php:156 -#: ../../mod/dirprofile.php:105 ../../mod/events.php:485 -msgid "Location:" -msgstr "Откуда:" +#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:172 +msgid "Include a marker on the map." +msgstr "Включить маркер на карте" -#: ../../include/nav.php:77 ../../include/nav.php:101 ../../boot.php:1464 -msgid "Logout" -msgstr "Выход" +#: ../../extend/addon/hzaddons/openid/openid.php:49 +msgid "" +"We encountered a problem while logging in with the OpenID you provided. " +"Please check the correct spelling of the ID." +msgstr "Мы столкнулись с проблемой входа с предоставленным вами OpenID. Пожалуйста, проверьте корректность его написания." -#: ../../include/nav.php:77 ../../include/nav.php:101 -msgid "End this session" -msgstr "Закончить эту сессию" +#: ../../extend/addon/hzaddons/openid/openid.php:49 +msgid "The error message was:" +msgstr "Сообщение об ошибке было:" -#: ../../include/nav.php:80 ../../include/nav.php:135 -msgid "Home" -msgstr "Мой канал" +#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:30 +msgid "OpenID protocol error. No ID returned." +msgstr "Ошибка протокола OpenID. Идентификатор не возвращён." -#: ../../include/nav.php:80 -msgid "Your posts and conversations" -msgstr "Ваши сообщения и разговоры" +#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:76 +#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:178 +#: ../../Zotlabs/Zot/Auth.php:264 +#, php-format +msgid "Welcome %s. Remote authentication successful." +msgstr "Добро пожаловать %s. Удаленная аутентификация успешно завершена." -#: ../../include/nav.php:81 -msgid "Your profile page" -msgstr "Страницa вашего профиля" +#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:188 +#: ../../include/auth.php:317 +msgid "Login failed." +msgstr "Не удалось войти." -#: ../../include/nav.php:83 -msgid "Edit Profiles" -msgstr "Редактирование профилей" +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:52 +msgid "First Name" +msgstr "Имя" -#: ../../include/nav.php:83 -msgid "Manage/Edit profiles" -msgstr "Управление / Редактирование профилей" +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:53 +msgid "Last Name" +msgstr "Фамилия" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:54 +#: ../../extend/addon/hzaddons/redred/redred.php:111 +msgid "Nickname" +msgstr "Псевдоним" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:55 +msgid "Full Name" +msgstr "Полное имя" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:56 +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:57 +#: ../../extend/addon/hzaddons/rtof/rtof.php:93 +#: ../../extend/addon/hzaddons/redred/redred.php:107 +#: ../../include/network.php:1769 ../../Zotlabs/Module/Cdav.php:1174 +#: ../../Zotlabs/Module/Connedit.php:910 +#: ../../Zotlabs/Module/Admin/Accounts.php:171 +#: ../../Zotlabs/Module/Admin/Accounts.php:183 +#: ../../Zotlabs/Module/Profiles.php:787 +msgid "Email" +msgstr "Электронная почта" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:58 +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:59 +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:60 +#: ../../Zotlabs/Lib/Apps.php:326 +msgid "Profile Photo" +msgstr "Фотография профиля" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:61 +msgid "Profile Photo 16px" +msgstr "Фотография профиля 16px" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:62 +msgid "Profile Photo 32px" +msgstr "Фотография профиля 32px" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:63 +msgid "Profile Photo 48px" +msgstr "Фотография профиля 48px" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:64 +msgid "Profile Photo 64px" +msgstr "Фотография профиля 64px" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:65 +msgid "Profile Photo 80px" +msgstr "Фотография профиля 80px" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:66 +msgid "Profile Photo 128px" +msgstr "Фотография профиля 128px" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:67 +msgid "Timezone" +msgstr "Часовой пояс" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:68 +#: ../../Zotlabs/Module/Profiles.php:767 +msgid "Homepage URL" +msgstr "URL домашней страницы" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:69 +#: ../../Zotlabs/Lib/Apps.php:324 +msgid "Language" +msgstr "Язык" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:70 +msgid "Birth Year" +msgstr "Год рождения" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:71 +msgid "Birth Month" +msgstr "Месяц рождения" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:72 +msgid "Birth Day" +msgstr "День рождения" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:73 +msgid "Birthdate" +msgstr "Дата рождения" + +#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:74 +#: ../../Zotlabs/Module/Profiles.php:486 +msgid "Gender" +msgstr "Гендер" -#: ../../include/nav.php:84 -msgid "Your photos" -msgstr "Ваши фотографии" +#: ../../extend/addon/hzaddons/openid/Mod_Id.php:85 +#: ../../include/channel.php:1480 ../../include/selectors.php:49 +#: ../../include/selectors.php:66 +msgid "Male" +msgstr "Мужчина" -#: ../../include/nav.php:85 -msgid "Your files" -msgstr "Ваши файлы" +#: ../../extend/addon/hzaddons/openid/Mod_Id.php:87 +#: ../../include/channel.php:1478 ../../include/selectors.php:49 +#: ../../include/selectors.php:66 +msgid "Female" +msgstr "Женщина" -#: ../../include/nav.php:90 ../../include/apps.php:136 -msgid "Chat" -msgstr "Чат" +#: ../../extend/addon/hzaddons/likebanner/likebanner.php:51 +msgid "Your Webbie:" +msgstr "Ваш Webbie:" -#: ../../include/nav.php:90 -msgid "Your chatrooms" -msgstr "Ваши чаты" +#: ../../extend/addon/hzaddons/likebanner/likebanner.php:54 +msgid "Fontsize (px):" +msgstr "Размер шрифта (px):" -#: ../../include/nav.php:93 -msgid "Your bookmarks" -msgstr "Ваши закладки" +#: ../../extend/addon/hzaddons/likebanner/likebanner.php:68 +msgid "Link:" +msgstr "Ссылка:" -#: ../../include/nav.php:95 -msgid "Your webpages" -msgstr "Ваши веб-страницы" +#: ../../extend/addon/hzaddons/likebanner/likebanner.php:70 +msgid "Like us on Hubzilla" +msgstr "Нравится на Hubzilla" -#: ../../include/nav.php:99 ../../include/apps.php:121 ../../boot.php:1465 -msgid "Login" -msgstr "Войти" +#: ../../extend/addon/hzaddons/likebanner/likebanner.php:72 +msgid "Embed:" +msgstr "Встроить:" -#: ../../include/nav.php:99 -msgid "Sign in" -msgstr "Войти" +#: ../../extend/addon/hzaddons/sendzid/sendzid.php:25 +msgid "Extended Identity Sharing" +msgstr "Расширенный обмен идентификацией" -#: ../../include/nav.php:116 -#, php-format -msgid "%s - click to logout" -msgstr "%s - нажмите чтобы выйти" +#: ../../extend/addon/hzaddons/sendzid/sendzid.php:26 +msgid "" +"Share your identity with all websites on the internet. When disabled, " +"identity is only shared with $Projectname sites." +msgstr "Поделиться вашим идентификатором на всех веб-сайтах в Интернет. Если выключено, то идентификатор доступен только для сайтов $Projectname." -#: ../../include/nav.php:121 -msgid "Click to authenticate to your home hub" -msgstr "" +#: ../../extend/addon/hzaddons/ldapauth/ldapauth.php:70 +msgid "An account has been created for you." +msgstr "Учётная запись, которая была для вас создана." -#: ../../include/nav.php:135 -msgid "Home Page" -msgstr "Моя страница" +#: ../../extend/addon/hzaddons/ldapauth/ldapauth.php:77 +msgid "Authentication successful but rejected: account creation is disabled." +msgstr "Аутентификация выполнена успешно, но отклонена: создание учетной записи отключено." -#: ../../include/nav.php:139 ../../mod/register.php:206 ../../boot.php:1441 -msgid "Register" -msgstr "Регистрация" +#: ../../extend/addon/hzaddons/twitter/twitter.php:99 +msgid "Post to Twitter" +msgstr "Опубликовать в Twitter" -#: ../../include/nav.php:139 -msgid "Create an account" -msgstr "Создать аккаунт" +#: ../../extend/addon/hzaddons/twitter/twitter.php:155 +msgid "Twitter settings updated." +msgstr "Настройки Twitter обновлены" -#: ../../include/nav.php:144 ../../include/apps.php:132 ../../mod/help.php:60 -#: ../../mod/help.php:65 -msgid "Help" -msgstr "Помощь" +#: ../../extend/addon/hzaddons/twitter/twitter.php:184 +msgid "" +"No consumer key pair for Twitter found. Please contact your site " +"administrator." +msgstr "Не найдено пары ключей для Twitter. Пожалуйста, свяжитесь с администратором сайта." -#: ../../include/nav.php:144 -msgid "Help and documentation" -msgstr "Справочная информация и документация" +#: ../../extend/addon/hzaddons/twitter/twitter.php:206 +msgid "" +"At this Hubzilla instance the Twitter plugin was enabled but you have not " +"yet connected your account to your Twitter account. To do so click the " +"button below to get a PIN from Twitter which you have to copy into the input " +"box below and submit the form. Only your public posts will " +"be posted to Twitter." +msgstr "В этой установке Hubzilla плагин Twitter был включён, однако пока он не подключён к вашему аккаунту в Twitter. Для этого нажмите на кнопку ниже для получения PIN-кода от Twitter который нужно скопировать в поле ввода и отправить форму. Только ваши общедоступные публикации будут опубликованы в Twitter." + +#: ../../extend/addon/hzaddons/twitter/twitter.php:208 +msgid "Log in with Twitter" +msgstr "Войти в Twitter" + +#: ../../extend/addon/hzaddons/twitter/twitter.php:211 +msgid "Copy the PIN from Twitter here" +msgstr "Скопируйте PIN-код из Twitter здесь" + +#: ../../extend/addon/hzaddons/twitter/twitter.php:233 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:401 +msgid "Currently connected to: " +msgstr "В настоящее время подключён к:" + +#: ../../extend/addon/hzaddons/twitter/twitter.php:238 +msgid "" +"Note: Due your privacy settings (Hide your profile " +"details from unknown viewers?) the link potentially included in public " +"postings relayed to Twitter will lead the visitor to a blank page informing " +"the visitor that the access to your profile has been restricted." +msgstr "Замечание: Из-за настроек конфиденциальности (скрыть данные своего профиля от неизвестных зрителей?) cсылка, потенциально включенная в общедоступные публикации, переданные в Twitter, приведет посетителя к пустой странице, информирующей его о том, что доступ к вашему профилю был ограничен." -#: ../../include/nav.php:147 ../../include/widgets.php:79 -#: ../../mod/apps.php:33 -msgid "Apps" -msgstr "Приложения" +#: ../../extend/addon/hzaddons/twitter/twitter.php:243 +msgid "Allow posting to Twitter" +msgstr "Разрешить публиковать в Twitter" -#: ../../include/nav.php:147 -msgid "Applications, utilities, links, games" -msgstr "" +#: ../../extend/addon/hzaddons/twitter/twitter.php:243 +msgid "" +"If enabled your public postings can be posted to the associated Twitter " +"account" +msgstr "Если включено, ваши общедоступные публикации будут опубликованы в связанной учётной записи Twitter" -#: ../../include/nav.php:149 ../../include/text.php:813 -#: ../../include/text.php:827 ../../include/apps.php:137 -#: ../../mod/search.php:29 -msgid "Search" -msgstr "Поиск" +#: ../../extend/addon/hzaddons/twitter/twitter.php:247 +msgid "Twitter post length" +msgstr "Длина публикации Twitter" -#: ../../include/nav.php:149 -msgid "Search site content" -msgstr "Поиск по содержанию сайту" +#: ../../extend/addon/hzaddons/twitter/twitter.php:247 +msgid "Maximum tweet length" +msgstr "Максимальная длина твита" -#: ../../include/nav.php:152 ../../include/apps.php:131 -#: ../../mod/directory.php:210 -msgid "Directory" -msgstr "Каталог" +#: ../../extend/addon/hzaddons/twitter/twitter.php:252 +msgid "Send public postings to Twitter by default" +msgstr "Отправлять общедоступные публикации в Twitter по умолчанию" -#: ../../include/nav.php:152 -msgid "Channel Locator" -msgstr "Локатор каналов" +#: ../../extend/addon/hzaddons/twitter/twitter.php:252 +msgid "" +"If enabled your public postings will be posted to the associated Twitter " +"account by default" +msgstr "Если включено, ваши общедоступные публикации будут опубликованы в связанной учётной записи Twitter по умолчанию" + +#: ../../extend/addon/hzaddons/twitter/twitter.php:261 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:424 +msgid "Clear OAuth configuration" +msgstr "Очистить конфигурацию OAuth" + +#: ../../extend/addon/hzaddons/twitter/twitter.php:270 +msgid "Twitter Post Settings" +msgstr "Настройки публикаций в Twitter" + +#: ../../extend/addon/hzaddons/twitter/twitter.php:781 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:894 +#: ../../Zotlabs/Module/Settings/Oauth.php:91 +#: ../../Zotlabs/Module/Settings/Oauth.php:117 +msgid "Consumer Key" +msgstr "Ключ клиента" -#: ../../include/nav.php:163 ../../include/apps.php:123 -msgid "Matrix" -msgstr "Матрица" +#: ../../extend/addon/hzaddons/twitter/twitter.php:782 +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:893 +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth.php:92 +#: ../../Zotlabs/Module/Settings/Oauth.php:118 +msgid "Consumer Secret" +msgstr "Код клиента" -#: ../../include/nav.php:163 -msgid "Your matrix" -msgstr "Собственная матрица" +#: ../../extend/addon/hzaddons/adultphotoflag/adultphotoflag.php:24 +msgid "Flag Adult Photos" +msgstr "Пометка фотографий для взрослых" -#: ../../include/nav.php:164 -msgid "Mark all matrix notifications seen" -msgstr "Пометить все оповещения матрицы как прочитанное" +#: ../../extend/addon/hzaddons/adultphotoflag/adultphotoflag.php:25 +msgid "" +"Provide photo edit option to hide inappropriate photos from default album " +"view" +msgstr "Предоставьте возможность редактирования фотографий, чтобы скрыть неприемлемые фотографии из альбома по умолчанию" + +#: ../../extend/addon/hzaddons/pubcrawl/as.php:961 +#: ../../include/conversation.php:1165 ../../Zotlabs/Lib/Apps.php:819 +#: ../../Zotlabs/Lib/Apps.php:898 ../../Zotlabs/Widget/Album.php:84 +#: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Module/Cdav.php:786 +#: ../../Zotlabs/Module/Cdav.php:787 ../../Zotlabs/Module/Cdav.php:794 +#: ../../Zotlabs/Module/Photos.php:822 ../../Zotlabs/Module/Photos.php:1278 +#: ../../Zotlabs/Module/Embedphotos.php:146 +#: ../../Zotlabs/Storage/Browser.php:164 +msgid "Unknown" +msgstr "Неизвестный" -#: ../../include/nav.php:166 ../../include/apps.php:127 -msgid "Channel Home" -msgstr "Главная канала" +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1219 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1374 +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1553 +#: ../../include/network.php:1768 +msgid "ActivityPub" +msgstr "" -#: ../../include/nav.php:166 -msgid "Channel home" -msgstr "Главная канала" +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1509 +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1530 +#: ../../extend/addon/hzaddons/redphotos/redphotohelper.php:71 +#: ../../include/conversation.php:116 ../../include/text.php:2022 +#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 +#: ../../Zotlabs/Module/Like.php:384 +msgid "photo" +msgstr "фото" -#: ../../include/nav.php:167 -msgid "Mark all channel notifications seen" -msgstr "Пометить все оповещения канала как прочитанное" +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1509 +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1530 +#: ../../include/conversation.php:144 ../../include/text.php:2028 +#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 +msgid "status" +msgstr "статус" -#: ../../include/nav.php:170 ../../mod/connections.php:386 -msgid "Connections" -msgstr "Контакты" +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1544 +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1559 +#: ../../include/conversation.php:160 ../../Zotlabs/Module/Like.php:438 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "%1$s нравится %2$s %3$s" -#: ../../include/nav.php:173 -msgid "Notices" -msgstr "Оповещения" +#: ../../extend/addon/hzaddons/pubcrawl/as.php:1546 +#: ../../include/conversation.php:163 ../../Zotlabs/Module/Like.php:440 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "%1$s не нравится %2$s %3$s" -#: ../../include/nav.php:173 -msgid "Notifications" -msgstr "Оповещения" +#: ../../extend/addon/hzaddons/pubcrawl/pubcrawl.php:1136 +msgid "ActivityPub Protocol Settings updated." +msgstr "Настройки протокола ActivityPub обновлены." -#: ../../include/nav.php:174 -msgid "See all notifications" -msgstr "Просмотреть все оповещения" +#: ../../extend/addon/hzaddons/pubcrawl/pubcrawl.php:1145 +msgid "" +"The ActivityPub protocol does not support location independence. Connections " +"you make within that network may be unreachable from alternate channel " +"locations." +msgstr "Протокол ActivityPub не поддерживает независимость от расположения. Ваши контакты установленные в этой сети могут быть недоступны из альтернативных мест размещения канала. " -#: ../../include/nav.php:175 ../../mod/notifications.php:99 -msgid "Mark all system notifications seen" -msgstr "Пометить все оповещения как прочитанное" +#: ../../extend/addon/hzaddons/pubcrawl/pubcrawl.php:1148 +msgid "Enable the ActivityPub protocol for this channel" +msgstr "Включить протокол ActivityPub для этого канала" -#: ../../include/nav.php:177 ../../include/apps.php:133 -msgid "Mail" -msgstr "Переписка" +#: ../../extend/addon/hzaddons/pubcrawl/pubcrawl.php:1151 +msgid "Deliver to ActivityPub recipients in privacy groups" +msgstr "Доставить получателям ActivityPub в группах безопасности" -#: ../../include/nav.php:177 -msgid "Private mail" -msgstr "Ваша личная переписка" +#: ../../extend/addon/hzaddons/pubcrawl/pubcrawl.php:1151 +msgid "" +"May result in a large number of mentions and expose all the members of your " +"privacy group" +msgstr "" +"Может привести к большому количеству упоминаний и раскрытию участников " +"группы безопасности" -#: ../../include/nav.php:178 -msgid "See all private messages" -msgstr "Просмотреть все личные сообщения" +#: ../../extend/addon/hzaddons/pubcrawl/pubcrawl.php:1155 +msgid "Send multi-media HTML articles" +msgstr "Отправить HTML статьи с мультимедиа" -#: ../../include/nav.php:179 -msgid "Mark all private messages seen" -msgstr "Пометить все личные сообщения как прочитанное" +#: ../../extend/addon/hzaddons/pubcrawl/pubcrawl.php:1155 +msgid "Not supported by some microblog services such as Mastodon" +msgstr "Не поддерживается некоторыми микроблогами, например Mastodon" -#: ../../include/nav.php:180 -msgid "Inbox" -msgstr "Входящие" +#: ../../extend/addon/hzaddons/pubcrawl/pubcrawl.php:1159 +msgid "ActivityPub Protocol Settings" +msgstr "Настройки протокола ActivityPub" -#: ../../include/nav.php:181 -msgid "Outbox" -msgstr "Исходящие" +#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:16 +msgid "No username found in import file." +msgstr "Имя пользователя не найдено в файле для импорта." -#: ../../include/nav.php:182 ../../include/widgets.php:536 -msgid "New Message" -msgstr "Новое личное сообщение" +#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:41 +#: ../../include/import.php:72 +msgid "Unable to create a unique channel address. Import failed." +msgstr "Не удалось создать уникальный адрес канала. Импорт не завершен." -#: ../../include/nav.php:185 ../../include/apps.php:130 -#: ../../mod/events.php:377 -msgid "Events" -msgstr "Мероприятия" +#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:139 +#: ../../Zotlabs/Module/Import.php:513 +msgid "Import completed." +msgstr "Импорт завершен." -#: ../../include/nav.php:185 -msgid "Event Calendar" -msgstr "Календарь мероприятий" +#: ../../extend/addon/hzaddons/diaspora/util.php:308 +#: ../../extend/addon/hzaddons/diaspora/util.php:321 +#: ../../extend/addon/hzaddons/diaspora/p.php:48 +#: ../../Zotlabs/Lib/Enotify.php:61 +msgid "$projectname" +msgstr "" -#: ../../include/nav.php:186 -msgid "See all events" -msgstr "Показать все мероприятия" +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:786 +msgid "Diaspora Protocol Settings updated." +msgstr "Настройки протокола Diaspora обновлены." -#: ../../include/nav.php:187 -msgid "Mark all events seen" -msgstr "Пометить все мероприятия как прочитанное" +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:805 +msgid "" +"The Diaspora protocol does not support location independence. Connections " +"you make within that network may be unreachable from alternate channel " +"locations." +msgstr "Прокол Diaspora не поддерживает независимость от расположения. Ваши контакты установленные в этой сети могут быть недоступны из альтернативных мест размещения канала." -#: ../../include/nav.php:189 ../../include/apps.php:122 -msgid "Channel Select" -msgstr "Выбор каналов" +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:808 +msgid "Enable the Diaspora protocol for this channel" +msgstr "Включить протокол Diaspora для этого канала" -#: ../../include/nav.php:189 -msgid "Manage Your Channels" -msgstr "Управление каналов" +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:812 +msgid "Allow any Diaspora member to comment on your public posts" +msgstr "Разрешить любому участнику Diaspora комментировать ваши общедоступные публикации" -#: ../../include/nav.php:191 ../../include/apps.php:124 -#: ../../include/widgets.php:514 ../../mod/admin.php:978 -#: ../../mod/admin.php:1183 -msgid "Settings" -msgstr "Настройки" +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:816 +msgid "Prevent your hashtags from being redirected to other sites" +msgstr "Предотвратить перенаправление тегов на другие сайты" -#: ../../include/nav.php:191 -msgid "Account/Channel Settings" -msgstr "Настройки аккаунта/канала" +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:820 +msgid "Sign and forward posts and comments with no existing Diaspora signature" +msgstr "Подписывать и отправлять публикации и комментарии с несуществующей подписью Diaspora" -#: ../../include/nav.php:199 ../../mod/admin.php:117 -msgid "Admin" -msgstr "Администрация" +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:825 +msgid "Followed hashtags (comma separated, do not include the #)" +msgstr "Отслеживаемые теги (через запятую, исключая #)" -#: ../../include/nav.php:199 -msgid "Site Setup and Configuration" -msgstr "Установка и конфигурация сайта" +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:830 +msgid "Diaspora Protocol Settings" +msgstr "Настройки протокола Diaspora" -#: ../../include/nav.php:224 -msgid "Nothing new here" -msgstr "Ничего нового здесь" +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2102 +#: ../../Zotlabs/Module/Like.php:448 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "%1$s посещает %2$s%3$s" -#: ../../include/nav.php:228 -msgid "Please wait..." -msgstr "Подождите пожалуйста ..." +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2104 +#: ../../Zotlabs/Module/Like.php:450 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "%1$s не посещает %2$s%3$s" -#: ../../include/bookmarks.php:42 +#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2106 +#: ../../Zotlabs/Module/Like.php:452 #, php-format -msgid "%1$s's bookmarks" -msgstr "Закладки пользователя %1$s" +msgid "%1$s may attend %2$s's %3$s" +msgstr "%1$s может посетить %2$s%3$s" -#: ../../include/chat.php:10 -msgid "Missing room name" -msgstr "" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:50 +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:128 +msgid "System defaults:" +msgstr "Системные по умолчанию:" -#: ../../include/chat.php:19 -msgid "Duplicate room name" -msgstr "" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:54 +msgid "Preferred Clipart IDs" +msgstr "Предпочитаемый Clipart ID" -#: ../../include/chat.php:68 ../../include/chat.php:76 -msgid "Invalid room specifier." -msgstr "" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:54 +msgid "List of preferred clipart ids. These will be shown first." +msgstr "Список предпочитаемых Clipart ID. Эти будут показаны первыми." -#: ../../include/chat.php:105 -msgid "Room not found." -msgstr "" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:55 +msgid "Default Search Term" +msgstr "Условие поиска по умолчанию" -#: ../../include/chat.php:126 -msgid "Room is full" -msgstr "" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:55 +msgid "The default search term. These will be shown second." +msgstr "Условие поиска по умолчанию. Показываются во вторую очередь." -#: ../../include/taxonomy.php:210 -msgid "Tags" -msgstr "Тэги" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:56 +msgid "Return After" +msgstr "Вернуться после" -#: ../../include/taxonomy.php:227 -msgid "Keywords" -msgstr "Ключевые слова" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:56 +msgid "Page to load after image selection." +msgstr "Страница для загрузки после выбора изображения." -#: ../../include/taxonomy.php:252 -msgid "have" -msgstr "иметь" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:57 +#: ../../include/conversation.php:1037 ../../include/nav.php:108 +#: ../../Zotlabs/Lib/Apps.php:309 ../../Zotlabs/Module/Connedit.php:594 +msgid "View Profile" +msgstr "Просмотреть профиль" -#: ../../include/taxonomy.php:252 -msgid "has" -msgstr "есть" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:58 +#: ../../include/nav.php:113 ../../include/channel.php:1300 +msgid "Edit Profile" +msgstr "Редактировать профиль" -#: ../../include/taxonomy.php:253 -msgid "want" -msgstr "хотеть" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:59 +msgid "Profile List" +msgstr "Список профилей" -#: ../../include/taxonomy.php:253 -msgid "wants" -msgstr "хочет" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:61 +msgid "Order of Preferred" +msgstr "Порядок предпочтения" -#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:208 -msgid "like" -msgstr "нравится" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:61 +msgid "Sort order of preferred clipart ids." +msgstr "Порядок сортировки предпочитаемых Clipart ID. " -#: ../../include/taxonomy.php:254 -msgid "likes" -msgstr "нравится" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:62 +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:68 +msgid "Newest first" +msgstr "Новое первым" -#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:209 -msgid "dislike" -msgstr "не-нравится" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:65 +msgid "As entered" +msgstr "По мере ввода" -#: ../../include/taxonomy.php:255 -msgid "dislikes" -msgstr "не-нравится" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:67 +msgid "Order of other" +msgstr "Порядок других" -#: ../../include/taxonomy.php:338 ../../include/identity.php:968 -#: ../../include/ItemObject.php:134 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "нравится" -msgstr[1] "нравится" -msgstr[2] "нравится" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:67 +msgid "Sort order of other clipart ids." +msgstr "Порядок сортировки остальных Clipart ID." -#: ../../include/comanche.php:35 ../../view/theme/apw/php/config.php:185 -#: ../../view/theme/redbasic/php/config.php:84 -msgid "Default" -msgstr "По умолчанию" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:69 +msgid "Most downloaded first" +msgstr "Самое загружаемое первым" -#: ../../include/contact_selectors.php:30 -msgid "Unknown | Not categorised" -msgstr "Неизвестные | Без категории" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:70 +msgid "Most liked first" +msgstr "Самое нравящееся первым" -#: ../../include/contact_selectors.php:31 -msgid "Block immediately" -msgstr "Немедленно заблокировать" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:72 +msgid "Preferred IDs Message" +msgstr "Сообщение от предпочитаемых ID" -#: ../../include/contact_selectors.php:32 -msgid "Shady, spammer, self-marketer" -msgstr "" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:72 +msgid "Message to display above preferred results." +msgstr "Отображаемое сообщение над предпочитаемыми результатами." -#: ../../include/contact_selectors.php:33 -msgid "Known to me, but no opinion" -msgstr "Известныo мне, но нет своего мнения" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:78 +msgid "Uploaded by: " +msgstr "Загружено:" -#: ../../include/contact_selectors.php:34 -msgid "OK, probably harmless" -msgstr "OK, наверное безвредно" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:78 +msgid "Drawn by: " +msgstr "Нарисовано:" -#: ../../include/contact_selectors.php:35 -msgid "Reputable, has my trust" -msgstr "Авторитетно, имеет мое доверие" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:182 +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:194 +msgid "Use this image" +msgstr "Использовать это изображение" -#: ../../include/contact_selectors.php:54 -msgid "Frequently" -msgstr "Часто" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:192 +msgid "Or select from a free OpenClipart.org image:" +msgstr "Или выберите из бесплатных изображений на OpenClipart.org" -#: ../../include/contact_selectors.php:55 -msgid "Hourly" -msgstr "Ежечасно" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:195 +msgid "Search Term" +msgstr "Условие поиска" -#: ../../include/contact_selectors.php:56 -msgid "Twice daily" -msgstr "Два раза в день" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:232 +msgid "Unknown error. Please try again later." +msgstr "Неизвестная ошибка. Пожалуйста, повторите попытку позже." -#: ../../include/contact_selectors.php:57 -msgid "Daily" -msgstr "Ежедневно" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:298 +#: ../../Zotlabs/Module/Profile_photo.php:218 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "" +"Если новая фотография не отображается немедленно то нажмите Shift + \"Обновить\" для очистки кэша браузера" -#: ../../include/contact_selectors.php:58 -msgid "Weekly" -msgstr "Еженедельно" +#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:308 +msgid "Profile photo updated successfully." +msgstr "Фотография профиля обновлена успешно." -#: ../../include/contact_selectors.php:59 -msgid "Monthly" -msgstr "Ежемесячно" +#: ../../extend/addon/hzaddons/tour/tour.php:76 +msgid "Edit your profile and change settings." +msgstr "Отредактировать ваш профиль и изменить настройки." -#: ../../include/contact_selectors.php:74 -msgid "Friendica" -msgstr "Friendica" +#: ../../extend/addon/hzaddons/tour/tour.php:77 +msgid "Click here to see activity from your connections." +msgstr "Нажмите сюда для отображения активности ваши контактов." -#: ../../include/contact_selectors.php:75 -msgid "OStatus" -msgstr "OStatus" +#: ../../extend/addon/hzaddons/tour/tour.php:78 +msgid "Click here to see your channel home." +msgstr "Нажмите сюда чтобы увидеть главную страницу вашего канала." -#: ../../include/contact_selectors.php:76 -msgid "RSS/Atom" -msgstr "RSS/Atom" +#: ../../extend/addon/hzaddons/tour/tour.php:79 +msgid "You can access your private messages from here." +msgstr "Вы можете получить доступ с личной переписке здесь." -#: ../../include/contact_selectors.php:77 ../../mod/admin.php:754 -#: ../../mod/admin.php:763 ../../boot.php:1467 -msgid "Email" -msgstr "E-mail" +#: ../../extend/addon/hzaddons/tour/tour.php:80 +msgid "Create new events here." +msgstr "Создать новое событие здесь." -#: ../../include/contact_selectors.php:78 -msgid "Diaspora" -msgstr "Diaspora" +#: ../../extend/addon/hzaddons/tour/tour.php:81 +msgid "" +"You can accept new connections and change permissions for existing ones " +"here. You can also e.g. create groups of contacts." +msgstr "Вы можете подключать новые контакты и менять разрешения для существующих здесь. Также вы можете создавать их группы." -#: ../../include/contact_selectors.php:79 -msgid "Facebook" -msgstr "Facebook" +#: ../../extend/addon/hzaddons/tour/tour.php:82 +msgid "System notifications will arrive here" +msgstr "Системные оповещения будут показываться здесь" -#: ../../include/contact_selectors.php:80 -msgid "Zot!" -msgstr "Zot!" +#: ../../extend/addon/hzaddons/tour/tour.php:83 +msgid "Search for content and users" +msgstr "Поиск пользователей и содержимого" -#: ../../include/contact_selectors.php:81 -msgid "LinkedIn" -msgstr "LinkedIn" +#: ../../extend/addon/hzaddons/tour/tour.php:84 +msgid "Browse for new contacts" +msgstr "Поиск новых контактов" -#: ../../include/contact_selectors.php:82 -msgid "XMPP/IM" -msgstr "XMPP/IM" +#: ../../extend/addon/hzaddons/tour/tour.php:85 +msgid "Launch installed apps" +msgstr "Запустить установленные приложения" -#: ../../include/contact_selectors.php:83 -msgid "MySpace" -msgstr "MySpace" +#: ../../extend/addon/hzaddons/tour/tour.php:86 +msgid "Looking for help? Click here." +msgstr "Нужна помощь? Нажмите сюда." -#: ../../include/contact_widgets.php:14 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "имеется %d приглашение" -msgstr[1] "имеются %d приглашения" -msgstr[2] "имеется %d приглашений" +#: ../../extend/addon/hzaddons/tour/tour.php:87 +msgid "" +"New events have occurred in your network. Click here to see what has " +"happened!" +msgstr "Новые события произошли в вашей сети. Нажмите здесь для того, чтобы знать что случилось!" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:446 -msgid "Advanced" -msgstr "Дополнительно" +#: ../../extend/addon/hzaddons/tour/tour.php:88 +msgid "You have received a new private message. Click here to see from who!" +msgstr "Вы получили новое личное сообщение. Нажмите чтобы увидеть от кого!" -#: ../../include/contact_widgets.php:22 -msgid "Find Channels" -msgstr "Поиск контактов" +#: ../../extend/addon/hzaddons/tour/tour.php:89 +msgid "There are events this week. Click here too see which!" +msgstr "На этой неделе есть события. Нажмите здесь чтобы увидеть какие!" -#: ../../include/contact_widgets.php:23 -msgid "Enter name or interest" -msgstr "Впишите имя или интерес" +#: ../../extend/addon/hzaddons/tour/tour.php:90 +msgid "You have received a new introduction. Click here to see who!" +msgstr "Вы были представлены. Нажмите чтобы увидеть кому!" -#: ../../include/contact_widgets.php:24 -msgid "Connect/Follow" -msgstr "Подключить/следовать" +#: ../../extend/addon/hzaddons/tour/tour.php:91 +msgid "" +"There is a new system notification. Click here to see what has happened!" +msgstr "Это новое системное уведомление. Нажмите чтобы посмотреть что случилось!" -#: ../../include/contact_widgets.php:25 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "Примеры: Владимир Ильич, Революционер" +#: ../../extend/addon/hzaddons/tour/tour.php:94 +msgid "Click here to share text, images, videos and sound." +msgstr "Нажмите сюда чтобы поделиться текстом, изображениями, видео или треком." -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:392 -#: ../../mod/directory.php:206 ../../mod/directory.php:211 -msgid "Find" -msgstr "Поиск" +#: ../../extend/addon/hzaddons/tour/tour.php:95 +msgid "You can write an optional title for your update (good for long posts)." +msgstr "Вы можете написать необязательный заголовок для вашей публикации (желательно для больших постов)." -#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59 -msgid "Channel Suggestions" -msgstr "Рекомендации каналов" +#: ../../extend/addon/hzaddons/tour/tour.php:96 +msgid "Entering some categories here makes it easier to find your post later." +msgstr "Введите категории здесь чтобы было проще найти вашу публикацию позднее." -#: ../../include/contact_widgets.php:29 -msgid "Random Profile" -msgstr "Случайные" +#: ../../extend/addon/hzaddons/tour/tour.php:97 +msgid "Share photos, links, location, etc." +msgstr "Поделиться фотографией, ссылками, местоположение и т.п." -#: ../../include/contact_widgets.php:30 -msgid "Invite Friends" -msgstr "Пригласить друзей" +#: ../../extend/addon/hzaddons/tour/tour.php:98 +msgid "" +"Only want to share content for a while? Make it expire at a certain date." +msgstr "Хотите только поделиться временным содержимым? Установите срок его действия." -#: ../../include/contact_widgets.php:32 -msgid "Exammple: name=fred and country=iceland" -msgstr "" +#: ../../extend/addon/hzaddons/tour/tour.php:99 +msgid "You can password protect content." +msgstr "Вы можете защитить содержимое паролем." -#: ../../include/contact_widgets.php:33 -msgid "Advanced Find" -msgstr "Расширенный поиск" +#: ../../extend/addon/hzaddons/tour/tour.php:100 +msgid "Choose who you share with." +msgstr "Выбрать с кем поделиться." -#: ../../include/contact_widgets.php:58 ../../include/features.php:66 -#: ../../include/widgets.php:296 -msgid "Saved Folders" -msgstr "Запомненные папки" +#: ../../extend/addon/hzaddons/tour/tour.php:102 +msgid "Click here when you are done." +msgstr "Нажмите здесь когда закончите." -#: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:95 -#: ../../include/widgets.php:299 -msgid "Everything" -msgstr "Все" +#: ../../extend/addon/hzaddons/tour/tour.php:105 +msgid "Adjust from which channels posts should be displayed." +msgstr "Настройте из каких каналов должны отображаться публикации." -#: ../../include/contact_widgets.php:92 ../../include/widgets.php:29 -msgid "Categories" -msgstr "Категории" +#: ../../extend/addon/hzaddons/tour/tour.php:106 +msgid "Only show posts from channels in the specified privacy group." +msgstr "Показывать только публикации из определённой группы безопасности." -#: ../../include/contact_widgets.php:125 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "%d совместный контакт" -msgstr[1] "%d совместных контакта" -msgstr[2] "%d совместных контактов" +#: ../../extend/addon/hzaddons/tour/tour.php:110 +msgid "" +"Easily find posts containing tags (keywords preceded by the \"#\" symbol)." +msgstr "Лёгкий поиск сообщения, содержащего теги (ключевые слова, которым предшествует символ \"#\")." -#: ../../include/contact_widgets.php:130 -msgid "show more" -msgstr "показать все" +#: ../../extend/addon/hzaddons/tour/tour.php:111 +msgid "Easily find posts in given category." +msgstr "Лёгкий поиск публикаций в данной категории." -#: ../../include/event.php:326 -msgid "This event has been added to your calendar." -msgstr "Это событие было добавлено в календарь." +#: ../../extend/addon/hzaddons/tour/tour.php:112 +msgid "Easily find posts by date." +msgstr "Лёгкий поиск публикаций по дате." -#: ../../include/datetime.php:43 ../../include/datetime.php:45 -msgid "Miscellaneous" -msgstr "Прочее" +#: ../../extend/addon/hzaddons/tour/tour.php:113 +msgid "" +"Suggested users who have volounteered to be shown as suggestions, and who we " +"think you might find interesting." +msgstr "Рекомендуемые пользователи, которые были представлены в качестве предложений, и которые, по нашему мнению, могут оказаться интересными." -#: ../../include/datetime.php:152 ../../include/datetime.php:284 -msgid "year" -msgstr "год" +#: ../../extend/addon/hzaddons/tour/tour.php:114 +msgid "Here you see channels you have connected to." +msgstr "Здесь вы видите каналы, к которым вы подключились." -#: ../../include/datetime.php:157 ../../include/datetime.php:285 -msgid "month" -msgstr "месяц" +#: ../../extend/addon/hzaddons/tour/tour.php:115 +msgid "Save your search so you can repeat it at a later date." +msgstr "Сохраните ваш поиск с тем, чтобы повторить его позже." -#: ../../include/datetime.php:162 ../../include/datetime.php:287 -msgid "day" -msgstr "день" +#: ../../extend/addon/hzaddons/tour/tour.php:118 +msgid "" +"If you see this icon you can be sure that the sender is who it say it is. It " +"is normal that it is not always possible to verify the sender, so the icon " +"will be missing sometimes. There is usually no need to worry about that." +msgstr "Если вы видите этот значок, вы можете быть уверены, что отправитель - это тот, кто это говорит. Это нормально, что не всегда можно проверить отправителя, поэтому значок иногда будет отсутствовать. Обычно об этом не нужно беспокоиться." -#: ../../include/datetime.php:275 -msgid "never" -msgstr "никогда" +#: ../../extend/addon/hzaddons/tour/tour.php:119 +msgid "" +"Danger! It seems someone tried to forge a message! This message is not " +"necessarily from who it says it is from!" +msgstr "Опасность! Кажется, кто-то пытался подделать сообщение! Это сообщение не обязательно от того, от кого оно значится!" -#: ../../include/datetime.php:281 -msgid "less than a second ago" -msgstr "менее чем одну секунду назад" +#: ../../extend/addon/hzaddons/tour/tour.php:126 +msgid "" +"Welcome to Hubzilla! Would you like to see a tour of the UI?

      You can " +"pause it at any time and continue where you left off by reloading the page, " +"or navigting to another page.

      You can also advance by pressing the " +"return key" +msgstr "Добро пожаловать в Hubzilla! Желаете получить обзор пользовательского интерфейса?

      Вы можете его приостановаить и в любое время перезагрузив страницу или перейдя на другую.

      Также вы можете нажать клавишу \"Назад\"" -#: ../../include/datetime.php:284 -msgid "years" -msgstr "лет" +#: ../../extend/addon/hzaddons/skeleton/skeleton.php:59 +msgid "Some setting" +msgstr "Некоторые настройки" -#: ../../include/datetime.php:285 -msgid "months" -msgstr "мес." +#: ../../extend/addon/hzaddons/skeleton/skeleton.php:61 +msgid "A setting" +msgstr "Настройка" -#: ../../include/datetime.php:286 -msgid "week" -msgstr "неделя" +#: ../../extend/addon/hzaddons/skeleton/skeleton.php:64 +msgid "Skeleton Settings" +msgstr "Настройки скелета" -#: ../../include/datetime.php:286 -msgid "weeks" -msgstr "недель" +#: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:25 +msgid "Show Upload Limits" +msgstr "Показать ограничения на загрузку" -#: ../../include/datetime.php:287 -msgid "days" -msgstr "дней" +#: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:27 +msgid "Hubzilla configured maximum size: " +msgstr "Максимальный размер настроенный в Hubzilla:" -#: ../../include/datetime.php:288 -msgid "hour" -msgstr "час" +#: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:28 +msgid "PHP upload_max_filesize: " +msgstr "" -#: ../../include/datetime.php:288 -msgid "hours" -msgstr "часов" +#: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:29 +msgid "PHP post_max_size (must be larger than upload_max_filesize): " +msgstr "" -#: ../../include/datetime.php:289 -msgid "minute" -msgstr "минута" +#: ../../extend/addon/hzaddons/gnusoc/gnusoc.php:258 +msgid "GNU-Social Protocol Settings updated." +msgstr "Настройки протокола GNU Social обновлены." -#: ../../include/datetime.php:289 -msgid "minutes" -msgstr "мин." +#: ../../extend/addon/hzaddons/gnusoc/gnusoc.php:277 +msgid "" +"The GNU-Social protocol does not support location independence. Connections " +"you make within that network may be unreachable from alternate channel " +"locations." +msgstr "Прокол GNU Social не поддерживает независимость от расположения. Ваши контакты установленные в этой сети могут быть недоступны из альтернативных мест размещения канала." -#: ../../include/datetime.php:290 -msgid "second" -msgstr "секунда" +#: ../../extend/addon/hzaddons/gnusoc/gnusoc.php:280 +msgid "Enable the GNU-Social protocol for this channel" +msgstr "Включить протокол GNU Social для этого канала" -#: ../../include/datetime.php:290 -msgid "seconds" -msgstr "секунд" +#: ../../extend/addon/hzaddons/gnusoc/gnusoc.php:284 +msgid "GNU-Social Protocol Settings" +msgstr "Настройки протокола GNU Social" -#: ../../include/datetime.php:299 -#, php-format -msgid "%1$d %2$s ago" -msgstr "%1$d %2$s назад" +#: ../../extend/addon/hzaddons/gnusoc/gnusoc.php:480 +msgid "Follow" +msgstr "Отслеживать" -#: ../../include/datetime.php:504 +#: ../../extend/addon/hzaddons/gnusoc/gnusoc.php:483 #, php-format -msgid "%1$s's birthday" -msgstr "%1$s's День Рождения" +msgid "%1$s is now following %2$s" +msgstr "%1$s сейчас отслеживает %2$s" -#: ../../include/datetime.php:505 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "С Днем Рождения %1$s" +#: ../../extend/addon/hzaddons/gallery/gallery.php:42 +#: ../../extend/addon/hzaddons/gallery/Mod_Gallery.php:111 +msgid "Gallery" +msgstr "Галерея" -#: ../../include/dir_fns.php:36 -msgid "Sort Options" -msgstr "Параметры сортировки" +#: ../../extend/addon/hzaddons/gallery/gallery.php:45 +msgid "Photo Gallery" +msgstr "Фотогалерея" -#: ../../include/dir_fns.php:37 -msgid "Alphabetic" -msgstr "По алфавиту" +#: ../../extend/addon/hzaddons/startpage/startpage.php:109 +msgid "Page to load after login" +msgstr "Страница для загрузки после входа" -#: ../../include/dir_fns.php:38 -msgid "Reverse Alphabetic" -msgstr "По обратному алфавиту" +#: ../../extend/addon/hzaddons/startpage/startpage.php:109 +msgid "" +"Examples: "apps", "network?f=&gid=37" (privacy " +"collection), "channel" or "notifications/system" (leave " +"blank for default network page (grid)." +msgstr "Примеры: "apps", "network?f=&gid=37" (privacy collection), "channel" or "notifications/system" (оставьте пустым для для страницы сети по умолчанию)." -#: ../../include/dir_fns.php:39 -msgid "Newest to Oldest" -msgstr "От новых к старым" +#: ../../extend/addon/hzaddons/startpage/startpage.php:113 +msgid "Startpage Settings" +msgstr "Настройки стартовой страницы" -#: ../../include/dir_fns.php:51 -msgid "Enable Safe Search" -msgstr "" +#: ../../extend/addon/hzaddons/pageheader/pageheader.php:43 +msgid "Message to display on every page on this server" +msgstr "Отображаемое сообщение на каждой странице на этом сервере." + +#: ../../extend/addon/hzaddons/pageheader/pageheader.php:48 +msgid "Pageheader Settings" +msgstr "Настройки шапки страницы" -#: ../../include/dir_fns.php:53 -msgid "Disable Safe Search" +#: ../../extend/addon/hzaddons/pageheader/pageheader.php:64 +msgid "pageheader Settings saved." +msgstr "Настройки шапки страницы сохранены." + +#: ../../extend/addon/hzaddons/tictac/tictac.php:21 +msgid "Three Dimensional Tic-Tac-Toe" +msgstr "Tic-Tac-Toe в трёх измерениях" + +#: ../../extend/addon/hzaddons/tictac/tictac.php:54 +msgid "3D Tic-Tac-Toe" msgstr "" -#: ../../include/dir_fns.php:55 -msgid "Safe Mode" -msgstr "Безопасный режим" +#: ../../extend/addon/hzaddons/tictac/tictac.php:59 +msgid "New game" +msgstr "Новая игра" -#: ../../include/enotify.php:41 -msgid "Hubzilla Notification" -msgstr "Оповещения Red матрицы" +#: ../../extend/addon/hzaddons/tictac/tictac.php:60 +msgid "New game with handicap" +msgstr "Новая игра с форой" -#: ../../include/enotify.php:42 -msgid "hubzilla" -msgstr "hubzilla" +#: ../../extend/addon/hzaddons/tictac/tictac.php:61 +msgid "" +"Three dimensional tic-tac-toe is just like the traditional game except that " +"it is played on multiple levels simultaneously. " +msgstr "Трехмерный Tic-Tac-Toe похож на традиционную игру, за исключением того, что игра идёт на нескольких уровнях одновременно." -#: ../../include/enotify.php:44 -msgid "Thank You," -msgstr "Спасибо," +#: ../../extend/addon/hzaddons/tictac/tictac.php:62 +msgid "" +"In this case there are three levels. You win by getting three in a row on " +"any level, as well as up, down, and diagonally across the different levels." +msgstr "Имеется три уровня. Вы выигрываете, получая три подряд на любом уровне, а также вверх, вниз и по диагонали на разных уровнях." -#: ../../include/enotify.php:46 -#, php-format -msgid "%s Administrator" -msgstr "%s администратор" +#: ../../extend/addon/hzaddons/tictac/tictac.php:64 +msgid "" +"The handicap game disables the center position on the middle level because " +"the player claiming this square often has an unfair advantage." +msgstr "Игра с форой отключает центральную позицию на среднем уровне, потому что игрок, претендующий на этот квадрат, часто имеет несправедливое преимущество." -#: ../../include/enotify.php:81 -#, php-format -msgid "%s " -msgstr "%s " +#: ../../extend/addon/hzaddons/tictac/tictac.php:183 +msgid "You go first..." +msgstr "Вы начинаете..." -#: ../../include/enotify.php:85 -#, php-format -msgid "[Red:Notify] New mail received at %s" -msgstr "[Red:Уведомление] Получено новое сообщение в %s" +#: ../../extend/addon/hzaddons/tictac/tictac.php:188 +msgid "I'm going first this time..." +msgstr "На этот раз начинаю я..." -#: ../../include/enotify.php:87 -#, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." -msgstr "" +#: ../../extend/addon/hzaddons/tictac/tictac.php:194 +msgid "You won!" +msgstr "Вы выиграли!" -#: ../../include/enotify.php:88 -#, php-format -msgid "%1$s sent you %2$s." -msgstr "%1$s послал вам %2$s." +#: ../../extend/addon/hzaddons/tictac/tictac.php:200 +#: ../../extend/addon/hzaddons/tictac/tictac.php:225 +msgid "\"Cat\" game!" +msgstr "Ничья!" -#: ../../include/enotify.php:88 -msgid "a private message" -msgstr "личное сообщение" +#: ../../extend/addon/hzaddons/tictac/tictac.php:223 +msgid "I won!" +msgstr "Я выиграл!" -#: ../../include/enotify.php:89 -#, php-format -msgid "Please visit %s to view and/or reply to your private messages." -msgstr "Пожалуйста, посетите %s для просмотра и/или ответа на ваши личные сообщения." +#: ../../extend/addon/hzaddons/fuzzloc/fuzzloc.php:148 +msgid "Fuzzloc Settings updated." +msgstr "Настройки Fuzzloc обновлены." -#: ../../include/enotify.php:144 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" -msgstr "" +#: ../../extend/addon/hzaddons/fuzzloc/fuzzloc.php:175 +msgid "" +"Fuzzloc allows you to blur your precise location if your channel uses " +"browser location mapping." +msgstr "Fuzzloc позволяет размыть ваше точное местоположение, если ваш канал использует сопоставление местоположений браузера." -#: ../../include/enotify.php:152 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" -msgstr "" +#: ../../extend/addon/hzaddons/fuzzloc/fuzzloc.php:178 +msgid "Enable Fuzzloc Plugin" +msgstr "Включить плагин Fuzzloc" -#: ../../include/enotify.php:161 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" -msgstr "" +#: ../../extend/addon/hzaddons/fuzzloc/fuzzloc.php:182 +msgid "Minimum offset in meters" +msgstr "Минимальное смещение в метрах" -#: ../../include/enotify.php:172 -#, php-format -msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" -msgstr "[Red:Уведомление] Комментарий к разговору #%1$d по %2$s" +#: ../../extend/addon/hzaddons/fuzzloc/fuzzloc.php:186 +msgid "Maximum offset in meters" +msgstr "Максимальное смещение в метрах" -#: ../../include/enotify.php:173 -#, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." -msgstr "" +#: ../../extend/addon/hzaddons/fuzzloc/fuzzloc.php:191 +msgid "Fuzzloc Settings" +msgstr "Настройки Fuzzloc" -#: ../../include/enotify.php:176 ../../include/enotify.php:191 -#: ../../include/enotify.php:217 ../../include/enotify.php:236 -#: ../../include/enotify.php:250 -#, php-format -msgid "Please visit %s to view and/or reply to the conversation." -msgstr "Пожалуйста, посетите %s для просмотра и/или ответа разговора." +#: ../../extend/addon/hzaddons/rtof/rtof.php:45 +msgid "Post to Friendica" +msgstr "Опубликовать в Friendica" -#: ../../include/enotify.php:182 -#, php-format -msgid "[Red:Notify] %s posted to your profile wall" -msgstr "[Red:Уведомление] %s добавил сообщениe на стену вашего профиля" +#: ../../extend/addon/hzaddons/rtof/rtof.php:62 +msgid "rtof Settings saved." +msgstr "Настройки rtof сохранены." -#: ../../include/enotify.php:184 -#, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" -msgstr "" +#: ../../extend/addon/hzaddons/rtof/rtof.php:81 +msgid "Allow posting to Friendica" +msgstr "Разрешить публиковать в Friendica" -#: ../../include/enotify.php:186 -#, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" -msgstr "" +#: ../../extend/addon/hzaddons/rtof/rtof.php:85 +msgid "Send public postings to Friendica by default" +msgstr "Отправлять общедоступные публикации во Friendica по умолчанию" -#: ../../include/enotify.php:210 -#, php-format -msgid "[Red:Notify] %s tagged you" -msgstr "[Red:Уведомление] %s добавил у вас тег" +#: ../../extend/addon/hzaddons/rtof/rtof.php:89 +msgid "Friendica API Path" +msgstr "Путь к Friendica API" -#: ../../include/enotify.php:211 -#, php-format -msgid "%1$s, %2$s tagged you at %3$s" +#: ../../extend/addon/hzaddons/rtof/rtof.php:89 +#: ../../extend/addon/hzaddons/redred/redred.php:103 +msgid "https://{sitename}/api" msgstr "" -#: ../../include/enotify.php:212 -#, php-format -msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." -msgstr "" +#: ../../extend/addon/hzaddons/rtof/rtof.php:93 +msgid "Friendica login name" +msgstr "Имя входа Friendica" -#: ../../include/enotify.php:225 -#, php-format -msgid "[Red:Notify] %1$s poked you" -msgstr "[Red:Уведомление] %1$s подпихнул вас" +#: ../../extend/addon/hzaddons/rtof/rtof.php:97 +msgid "Friendica password" +msgstr "Пароль Friendica" -#: ../../include/enotify.php:226 -#, php-format -msgid "%1$s, %2$s poked you at %3$s" -msgstr "" +#: ../../extend/addon/hzaddons/rtof/rtof.php:101 +msgid "Hubzilla to Friendica Post Settings" +msgstr "Настройки публикаций Hubzilla для Friendica" -#: ../../include/enotify.php:227 -#, php-format -msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." -msgstr "" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:143 +msgid "Post to GNU social" +msgstr "Опубликовать в GNU Social" -#: ../../include/enotify.php:243 -#, php-format -msgid "[Red:Notify] %s tagged your post" -msgstr "[Red:Уведомление] %s добавил у вас в сообщении тег" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:195 +msgid "" +"Please contact your site administrator.
      The provided API URL is not " +"valid." +msgstr "Пожалуйста свяжитесь с администратором сайта.
      Предоставленный URL API недействителен." -#: ../../include/enotify.php:244 -#, php-format -msgid "%1$s, %2$s tagged your post at %3$s" -msgstr "" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:232 +msgid "We could not contact the GNU social API with the Path you entered." +msgstr "Нам не удалось установить контакт с GNU Social API по введённому вами пути" -#: ../../include/enotify.php:245 -#, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" -msgstr "" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:266 +msgid "GNU social settings updated." +msgstr "Настройки GNU Social обновлены." -#: ../../include/enotify.php:257 -msgid "[Red:Notify] Introduction received" -msgstr "[Red:Уведомление] введение получено" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:310 +msgid "Globally Available GNU social OAuthKeys" +msgstr "Глобально доступные ключи OAuthKeys GNU Social" -#: ../../include/enotify.php:258 -#, php-format -msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" -msgstr "" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:312 +msgid "" +"There are preconfigured OAuth key pairs for some GNU social servers " +"available. If you are using one of them, please use these credentials.
      If not feel free to connect to any other GNU social instance (see below)." +msgstr "Существуют предварительно настроенные пары ключей OAuth для некоторых доступных серверов GNU social. Если вы используете один из них, используйте эти учетные данные.
      Если вы не хотите подключаться к какому-либо другому серверу GNU social (см. ниже)." -#: ../../include/enotify.php:259 -#, php-format +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:327 +msgid "Provide your own OAuth Credentials" +msgstr "Предоставьте ваши собственные регистрационные данные OAuth" + +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:329 msgid "" -"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." -msgstr "" +"No consumer key pair for GNU social found. Register your Hubzilla Account as " +"an desktop client on your GNU social account, copy the consumer key pair " +"here and enter the API base root.
      Before you register your own OAuth " +"key pair ask the administrator if there is already a key pair for this " +"Hubzilla installation at your favourite GNU social installation." +msgstr "Не найдена пользовательская пара ключей для GNU social. Зарегистрируйте свою учетную запись Hubzilla в качестве настольного клиента в своей учетной записи GNU social, скопируйте cюда пару ключей пользователя и введите корневой каталог базы API.
      Прежде чем регистрировать свою собственную пару ключей OAuth, спросите администратора, если ли уже пара ключей для этой установки Hubzilla в вашем GNU social." + +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:333 +msgid "OAuth Consumer Key" +msgstr "Ключ клиента OAuth" + +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:337 +msgid "OAuth Consumer Secret" +msgstr "Пароль клиента OAuth" + +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:341 +msgid "Base API Path" +msgstr "Основной путь к API" + +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:341 +msgid "Remember the trailing /" +msgstr "Запомнить закрывающий /" + +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:345 +msgid "GNU social application name" +msgstr "Имя приложения GNU social" + +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:368 +msgid "" +"To connect to your GNU social account click the button below to get a " +"security code from GNU social which you have to copy into the input box " +"below and submit the form. Only your public posts will be " +"posted to GNU social." +msgstr "Чтобы подключиться к вашей учетной записи GNU social нажмите кнопку ниже для получения кода безопасности из GNU social, который вы должны скопировать в поле ввода ниже и отправить форму. Только ваши общедоступные сообщения будут опубликованы в GNU social." -#: ../../include/enotify.php:263 ../../include/enotify.php:282 -#, php-format -msgid "You may visit their profile at %s" -msgstr "Вы можете посетить ​​профиль в %s" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:370 +msgid "Log in with GNU social" +msgstr "Войти с GNU social" -#: ../../include/enotify.php:265 -#, php-format -msgid "Please visit %s to approve or reject the connection request." -msgstr "" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:373 +msgid "Copy the security code from GNU social here" +msgstr "Скопируйте код безопасности GNU social здесь" -#: ../../include/enotify.php:272 -msgid "[Red:Notify] Friend suggestion received" -msgstr "[Red:Уведомление] Получено предложение дружить" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:383 +msgid "Cancel Connection Process" +msgstr "Отменить процесс подключения" -#: ../../include/enotify.php:273 -#, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" -msgstr "" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:385 +msgid "Current GNU social API is" +msgstr "Текущий GNU social API" -#: ../../include/enotify.php:274 -#, php-format +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:389 +msgid "Cancel GNU social Connection" +msgstr "Отменить подключение с GNU social" + +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:406 msgid "" -"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from " -"%4$s." -msgstr "" +"Note: Due your privacy settings (Hide your profile " +"details from unknown viewers?) the link potentially included in public " +"postings relayed to GNU social will lead the visitor to a blank page " +"informing the visitor that the access to your profile has been restricted." +msgstr "Замечание: Из-за настроек конфиденциальности (скрыть данные своего профиля от неизвестных зрителей?) cсылка, потенциально включенная в общедоступные публикации, переданные в GNU social, приведет посетителя к пустой странице, информирующей его о том, что доступ к вашему профилю был ограничен." -#: ../../include/enotify.php:280 -msgid "Name:" -msgstr "Имя:" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:411 +msgid "Allow posting to GNU social" +msgstr "Разрешить публиковать в GNU social" -#: ../../include/enotify.php:281 -msgid "Photo:" -msgstr "Фото:" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:411 +msgid "" +"If enabled your public postings can be posted to the associated GNU-social " +"account" +msgstr "Если включено, ваши общедоступные публикации будут опубликованы в связанной учётной записи GNU social" -#: ../../include/enotify.php:284 -#, php-format -msgid "Please visit %s to approve or reject the suggestion." -msgstr "" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:415 +msgid "Post to GNU social by default" +msgstr "Публиковать в GNU social по умолчанию" -#: ../../include/reddav.php:915 -#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:52 -#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:55 -msgid "parent" -msgstr "" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:415 +msgid "" +"If enabled your public postings will be posted to the associated GNU-social " +"account by default" +msgstr "Если включено, ваши общедоступные публикации будут опубликованы в связанной учётной записи GNU social по умолчанию" -#: ../../include/reddav.php:940 -msgid "Collection" -msgstr "Коллекция" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:432 +msgid "GNU social Post Settings" +msgstr "Настройки публикаций GNU social" -#: ../../include/reddav.php:943 -msgid "Principal" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:891 +#: ../../Zotlabs/Module/Admin/Site.php:317 +msgid "Site name" +msgstr "Название сайта" + +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:892 +msgid "API URL" msgstr "" -#: ../../include/reddav.php:946 -msgid "Addressbook" -msgstr "Адресная книга" +#: ../../extend/addon/hzaddons/statusnet/statusnet.php:895 +msgid "Application name" +msgstr "Название приложения" -#: ../../include/reddav.php:949 -msgid "Calendar" -msgstr "Календарь" +#: ../../extend/addon/hzaddons/rainbowtag/rainbowtag.php:81 +msgid "Enable Rainbowtag" +msgstr "Включить Rainbowtag" -#: ../../include/reddav.php:952 -msgid "Schedule Inbox" -msgstr "" +#: ../../extend/addon/hzaddons/rainbowtag/rainbowtag.php:85 +msgid "Rainbowtag Settings" +msgstr "Настройки Rainbowtag" -#: ../../include/reddav.php:955 -msgid "Schedule Outbox" -msgstr "" +#: ../../extend/addon/hzaddons/rainbowtag/rainbowtag.php:101 +msgid "Rainbowtag Settings saved." +msgstr "Настройки Rainbowtag сохранены." -#: ../../include/reddav.php:1033 -#, php-format -msgid "%1$s used" -msgstr "" +#: ../../extend/addon/hzaddons/frphotos/frphotos.php:92 +msgid "Friendica Photo Album Import" +msgstr "Импортировать альбом фотографий Friendica" -#: ../../include/reddav.php:1038 -#, php-format -msgid "%1$s used of %2$s (%3$s%)" -msgstr "" +#: ../../extend/addon/hzaddons/frphotos/frphotos.php:93 +msgid "This will import all your Friendica photo albums to this Red channel." +msgstr "Это позволит импортировать все ваши альбомы фотографий Friendica в этот канал." -#: ../../include/reddav.php:1104 -msgid "Create new folder" -msgstr "Создать новую папку" +#: ../../extend/addon/hzaddons/frphotos/frphotos.php:94 +msgid "Friendica Server base URL" +msgstr "Базовый URL сервера Friendica" -#: ../../include/reddav.php:1107 ../../mod/mitem.php:142 ../../mod/menu.php:84 -#: ../../mod/new_channel.php:117 -msgid "Create" -msgstr "Создать" +#: ../../extend/addon/hzaddons/frphotos/frphotos.php:95 +msgid "Friendica Login Username" +msgstr "Имя пользователя для входа Friendica" -#: ../../include/reddav.php:1111 -msgid "Upload file" -msgstr "Загрузить файл" +#: ../../extend/addon/hzaddons/frphotos/frphotos.php:96 +msgid "Friendica Login Password" +msgstr "Пароль для входа Firendica" -#: ../../include/reddav.php:1114 ../../mod/profile_photo.php:361 -msgid "Upload" -msgstr "Загрузка" +#: ../../extend/addon/hzaddons/piwik/piwik.php:85 +msgid "" +"This website is tracked using the Piwik " +"analytics tool." +msgstr "Этот сайт отслеживается с помощью инструментов аналитики Piwik." -#: ../../include/features.php:23 -msgid "General Features" -msgstr "Главные функции" +#: ../../extend/addon/hzaddons/piwik/piwik.php:88 +#, php-format +msgid "" +"If you do not want that your visits are logged this way you can " +"set a cookie to prevent Piwik from tracking further visits of the site " +"(opt-out)." +msgstr "Если вы не хотите, чтобы ваши визиты регистрировались таким образом, вы можете отключить cookie с тем, чтобы Piwik не отслеживал дальнейшие посещения сайта." -#: ../../include/features.php:25 -msgid "Content Expiration" -msgstr "" +#: ../../extend/addon/hzaddons/piwik/piwik.php:96 +msgid "Piwik Base URL" +msgstr "Базовый URL Piwik" -#: ../../include/features.php:25 -msgid "Remove posts/comments and/or private messages at a future time" -msgstr "Удалять посты/комментарии и/или личные сообщения" +#: ../../extend/addon/hzaddons/piwik/piwik.php:96 +msgid "" +"Absolute path to your Piwik installation. (without protocol (http/s), with " +"trailing slash)" +msgstr "Абсолютный путь к вашей установке Piwik (без типа протокола, с начальным слэшем)" -#: ../../include/features.php:26 -msgid "Multiple Profiles" -msgstr "Несколько профилей" +#: ../../extend/addon/hzaddons/piwik/piwik.php:97 +msgid "Site ID" +msgstr "ID сайта" -#: ../../include/features.php:26 -msgid "Ability to create multiple profiles" -msgstr "Возможность создания нескольких профилей" +#: ../../extend/addon/hzaddons/piwik/piwik.php:98 +msgid "Show opt-out cookie link?" +msgstr "Показывать ссылку на отказ от использования cookies?" -#: ../../include/features.php:27 -msgid "Web Pages" -msgstr "Веб-страницы" +#: ../../extend/addon/hzaddons/piwik/piwik.php:99 +msgid "Asynchronous tracking" +msgstr "Асинхронное отслеживание" -#: ../../include/features.php:27 -msgid "Provide managed web pages on your channel" -msgstr "" +#: ../../extend/addon/hzaddons/piwik/piwik.php:100 +msgid "Enable frontend JavaScript error tracking" +msgstr "Включить отслеживание ошибок JavaScript на фронтенде." -#: ../../include/features.php:28 -msgid "Private Notes" -msgstr "Личные заметки" +#: ../../extend/addon/hzaddons/piwik/piwik.php:100 +msgid "This feature requires Piwik >= 2.2.0" +msgstr "Эта функция требует версию Piwik >= 2.2.0" -#: ../../include/features.php:28 -msgid "Enables a tool to store notes and reminders" -msgstr "" +#: ../../extend/addon/hzaddons/redphotos/redphotos.php:106 +msgid "Photos imported" +msgstr "Фотографии импортированы" -#: ../../include/features.php:33 -msgid "Extended Identity Sharing" -msgstr "Расширенный обмен идентичности" +#: ../../extend/addon/hzaddons/redphotos/redphotos.php:129 +msgid "Redmatrix Photo Album Import" +msgstr "Импортировать альбом фотографий Redmatrix" -#: ../../include/features.php:33 -msgid "" -"Share your identity with all websites on the internet. When disabled, " -"identity is only shared with sites in the matrix." -msgstr "" +#: ../../extend/addon/hzaddons/redphotos/redphotos.php:130 +msgid "This will import all your Redmatrix photo albums to this channel." +msgstr "Это позволит импортировать все ваши альбомы фотографий Redmatrix в этот канал." -#: ../../include/features.php:34 -msgid "Expert Mode" -msgstr "Экспертный режим" +#: ../../extend/addon/hzaddons/redphotos/redphotos.php:134 +msgid "Import just this album" +msgstr "Импортировать только этот альбом" -#: ../../include/features.php:34 -msgid "Enable Expert Mode to provide advanced configuration options" -msgstr "" +#: ../../extend/addon/hzaddons/redphotos/redphotos.php:134 +msgid "Leave blank to import all albums" +msgstr "Оставьте пустым для импорта всех альбомов" -#: ../../include/features.php:35 -msgid "Premium Channel" -msgstr "Премиум канал" +#: ../../extend/addon/hzaddons/redphotos/redphotos.php:135 +msgid "Maximum count to import" +msgstr "Максимальное количество для импорта" -#: ../../include/features.php:35 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" +#: ../../extend/addon/hzaddons/redphotos/redphotos.php:135 +msgid "0 or blank to import all available" +msgstr "0 или пусто для импорта всех доступных" + +#: ../../extend/addon/hzaddons/opensearch/opensearch.php:26 +#, php-format +msgctxt "opensearch" +msgid "Search %1$s (%2$s)" +msgstr "Искать %1$s (%2$s)" + +#: ../../extend/addon/hzaddons/opensearch/opensearch.php:28 +msgctxt "opensearch" +msgid "$Projectname" msgstr "" -#: ../../include/features.php:40 -msgid "Post Composition Features" +#: ../../extend/addon/hzaddons/opensearch/opensearch.php:42 +#: ../../Zotlabs/Lib/Enotify.php:66 ../../Zotlabs/Module/Home.php:74 +#: ../../Zotlabs/Module/Home.php:82 +msgid "$Projectname" msgstr "" -#: ../../include/features.php:41 -msgid "Richtext Editor" -msgstr "Редактор RichText" +#: ../../extend/addon/hzaddons/opensearch/opensearch.php:43 +msgid "Search $Projectname" +msgstr "Поиск $Projectname" -#: ../../include/features.php:41 -msgid "Enable richtext editor" -msgstr "Включить редактор RichText" +#: ../../extend/addon/hzaddons/visage/visage.php:93 +msgid "Recent Channel/Profile Viewers" +msgstr "Последние просмотры канала / профиля" -#: ../../include/features.php:42 -msgid "Post Preview" -msgstr "Предварительный просмотр сообщения" +#: ../../extend/addon/hzaddons/visage/visage.php:98 +msgid "This plugin/addon has not been configured." +msgstr "Это расширение не было настроено." -#: ../../include/features.php:42 -msgid "Allow previewing posts and comments before publishing them" -msgstr "Разрешить предварительный просмотр сообщений и комментариев перед их публикацией" +#: ../../extend/addon/hzaddons/visage/visage.php:99 +#, php-format +msgid "Please visit the Visage settings on %s" +msgstr "Пожалуйста, посетите настройки Visage на %s" -#: ../../include/features.php:43 ../../include/widgets.php:503 -#: ../../mod/sources.php:88 -msgid "Channel Sources" -msgstr "Источники канала" +#: ../../extend/addon/hzaddons/visage/visage.php:99 +msgid "your feature settings page" +msgstr "страница ваших установочных параметров" -#: ../../include/features.php:43 -msgid "Automatically import channel content from other channels or feeds" -msgstr "" +#: ../../extend/addon/hzaddons/visage/visage.php:112 +msgid "No entries." +msgstr "Нет записей." -#: ../../include/features.php:44 -msgid "Even More Encryption" -msgstr "Еще больше шифрования" +#: ../../extend/addon/hzaddons/visage/visage.php:166 +msgid "Enable Visage Visitor Logging" +msgstr "Включить журналирование посетителей Visage" + +#: ../../extend/addon/hzaddons/visage/visage.php:170 +msgid "Visage Settings" +msgstr "Настройки Visage" + +#: ../../extend/addon/hzaddons/cart/manual_payments.php:7 +msgid "Error: order mismatch. Please try again." +msgstr "Ошибка: несоответствие заказа. Пожалуйста, попробуйте ещё раз" + +#: ../../extend/addon/hzaddons/cart/manual_payments.php:30 +msgid "Manual payments are not enabled." +msgstr "Ручные платежи не подключены." + +#: ../../extend/addon/hzaddons/cart/manual_payments.php:37 +#: ../../extend/addon/hzaddons/cart/cart.php:1442 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:417 +msgid "Order not found." +msgstr "Заказ не найден." + +#: ../../extend/addon/hzaddons/cart/manual_payments.php:46 +msgid "Finished" +msgstr "Завершено" + +#: ../../extend/addon/hzaddons/cart/manual_payments.php:62 +#: ../../extend/addon/hzaddons/cart/cart.php:1420 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:481 +#: ../../extend/addon/hzaddons/cart/myshop.php:51 +#: ../../Zotlabs/Module/Wiki.php:68 +msgid "Invalid channel" +msgstr "Недействительный канал" + +#: ../../extend/addon/hzaddons/cart/cart.php:467 +msgid "[cart] Item Added" +msgstr "[cart] Элемент добавлен" + +#: ../../extend/addon/hzaddons/cart/cart.php:851 +msgid "Order already checked out." +msgstr "Заказ уже проверен." + +#: ../../extend/addon/hzaddons/cart/cart.php:1204 +msgid "Enable Shopping Cart" +msgstr "Включить корзину" + +#: ../../extend/addon/hzaddons/cart/cart.php:1211 +msgid "Enable Test Catalog" +msgstr "Включить тестовый каталог" + +#: ../../extend/addon/hzaddons/cart/cart.php:1219 +msgid "Enable Manual Payments" +msgstr "Включить ручные платежи" + +#: ../../extend/addon/hzaddons/cart/cart.php:1238 +msgid "Base Merchant Currency" +msgstr "Основная торговая валюта" + +#: ../../extend/addon/hzaddons/cart/cart.php:1250 +msgid "Cart - Base Settings" +msgstr "Корзина - Основные настройки" + +#: ../../extend/addon/hzaddons/cart/cart.php:1271 +#: ../../extend/addon/hzaddons/cart/cart.php:1274 +msgid "Shop" +msgstr "Магазин" + +#: ../../extend/addon/hzaddons/cart/cart.php:1293 +#: ../../Zotlabs/Module/Wiki.php:30 +msgid "Profile Unavailable." +msgstr "Профиль недоступен." + +#: ../../extend/addon/hzaddons/cart/cart.php:1324 +#: ../../extend/addon/hzaddons/cart/myshop.php:125 +msgid "Order Not Found" +msgstr "Заказ не найден" + +#: ../../extend/addon/hzaddons/cart/cart.php:1401 +msgid "You must be logged into the Grid to shop." +msgstr "Вы должны быть в сети для доступа к магазину" + +#: ../../extend/addon/hzaddons/cart/cart.php:1411 +msgid "Cart Not Enabled (profile: " +msgstr "Корзина не подключена (профиль:" + +#: ../../extend/addon/hzaddons/cart/cart.php:1451 +msgid "Access denied." +msgstr "Доступ запрещён." + +#: ../../extend/addon/hzaddons/cart/cart.php:1503 +#: ../../extend/addon/hzaddons/cart/cart.php:1647 +msgid "No Order Found" +msgstr "Нет найденных заказов" + +#: ../../extend/addon/hzaddons/cart/cart.php:1512 +msgid "An unknown error has occurred Please start again." +msgstr "Произошла неизвестная ошибка. Пожалуйста, начните снова." + +#: ../../extend/addon/hzaddons/cart/cart.php:1680 +msgid "Invalid Payment Type. Please start again." +msgstr "Недействительный тип платежа. Пожалуйста, начните снова." + +#: ../../extend/addon/hzaddons/cart/cart.php:1687 +msgid "Order not found" +msgstr "Заказ не найден" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:97 +msgid "Enable Paypal Button Module" +msgstr "Включить модуль кнопки Paypal" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:102 +msgid "Use Production Key" +msgstr "Использовать ключ Production" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:109 +msgid "Paypal Sandbox Client Key" +msgstr "Ключ клиента Paypal Sandbox" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:116 +msgid "Paypal Sandbox Secret Key" +msgstr "Секретный ключ Paypal Sandbox" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:122 +msgid "Paypal Production Client Key" +msgstr "Ключ клиента Paypal Production" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:129 +msgid "Paypal Production Secret Key" +msgstr "Секретный ключ Paypal Production" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:143 +msgid "Cart - Paypal Addon" +msgstr "Корзина - Paypal плагин" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:277 +msgid "Paypal button payments are not enabled." +msgstr "Кнопка Paypal для платежей не включена." -#: ../../include/features.php:44 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:295 msgid "" -"Allow optional encryption of content end-to-end with a shared secret key" -msgstr "" +"Paypal button payments are not properly configured. Please choose another " +"payment option." +msgstr "" +"Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте " +"другой вариант оплаты." + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:71 +msgid "Enable Hubzilla Services Module" +msgstr "Включить модуль сервиса Hubzilla" + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:77 +msgid "Cart - Hubzilla Services Addon" +msgstr "Корзина - плагин сервиса Hubzilla" + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:169 +msgid "New SKU" +msgstr "Новый код" + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:204 +msgid "Cannot save edits to locked item." +msgstr "Невозможно сохранить изменения заблокированной позиции." + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:252 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:339 +msgid "SKU not found." +msgstr "Код не найден." + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:305 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:309 +msgid "Invalid Activation Directive." +msgstr "Недействительная директива активации." + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:380 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:384 +msgid "Invalid Deactivation Directive." +msgstr "Недействительная директива деактивации" + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:570 +msgid "Add to this privacy group" +msgstr "Добавить в эту группу безопасности" + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:586 +msgid "Set user service class" +msgstr "Установить класс обслуживания пользователя" + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:613 +msgid "You must be using a local account to purchase this service." +msgstr "Вы должны использовать локальную учётноую запись для покупки этого сервиса." + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:651 +msgid "Changes Locked" +msgstr "Изменения заблокированы" + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:655 +msgid "Item available for purchase." +msgstr "Позиция доступна для приобретения." + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:662 +msgid "Price" +msgstr "Цена" + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:665 +msgid "Add buyer to privacy group" +msgstr "Добавить покупателя в группу безопасности" + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:670 +msgid "Add buyer as connection" +msgstr "Добавить покупателя как контакт" + +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:677 +#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:718 +msgid "Set Service Class" +msgstr "Установить класс обслуживания" + +#: ../../extend/addon/hzaddons/cart/myshop.php:44 +msgid "Access Denied." +msgstr "Доступ запрещён." + +#: ../../extend/addon/hzaddons/cart/myshop.php:155 +#: ../../extend/addon/hzaddons/cart/myshop.php:191 +#: ../../extend/addon/hzaddons/cart/myshop.php:225 +#: ../../extend/addon/hzaddons/cart/myshop.php:273 +#: ../../extend/addon/hzaddons/cart/myshop.php:308 +#: ../../extend/addon/hzaddons/cart/myshop.php:331 +msgid "Access Denied" +msgstr "Доступ запрещён" + +#: ../../extend/addon/hzaddons/cart/myshop.php:200 +#: ../../extend/addon/hzaddons/cart/myshop.php:234 +#: ../../extend/addon/hzaddons/cart/myshop.php:283 +#: ../../extend/addon/hzaddons/cart/myshop.php:341 +msgid "Invalid Item" +msgstr "Недействительный элемент" + +#: ../../extend/addon/hzaddons/nsabait/nsabait.php:125 +msgid "Nsabait Settings updated." +msgstr "Настройки Nsabait обновлены" + +#: ../../extend/addon/hzaddons/nsabait/nsabait.php:157 +msgid "Enable NSAbait Plugin" +msgstr "Включить плагин NSAbait" + +#: ../../extend/addon/hzaddons/nsabait/nsabait.php:161 +msgid "NSAbait Settings" +msgstr "Настройки Nsabait" + +#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:79 +msgid "Hubzilla File Storage Import" +msgstr "Импорт файлового хранилища Hubzilla" + +#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:80 +msgid "This will import all your cloud files from another server." +msgstr "Это позволит импортировать все ваши файлы с другого сервера." + +#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:81 +msgid "Hubzilla Server base URL" +msgstr "Базовый URL сервера Hubzilla" + +#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:82 +msgid "Since modified date yyyy-mm-dd" +msgstr "Начиная с даты изменений yyyy-mm-dd" + +#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:83 +msgid "Until modified date yyyy-mm-dd" +msgstr "Заканчивая датой изменений yyyy-mm-dd" + +#: ../../extend/addon/hzaddons/nofed/nofed.php:42 +msgid "Federate" +msgstr "" + +#: ../../extend/addon/hzaddons/nofed/nofed.php:56 +msgid "nofed Settings saved." +msgstr "Настройки nofed сохранены." + +#: ../../extend/addon/hzaddons/nofed/nofed.php:72 +msgid "Allow Federation Toggle" +msgstr "Разрешить переключение федерации" + +#: ../../extend/addon/hzaddons/nofed/nofed.php:76 +msgid "Federate posts by default" +msgstr "Разрешить федерацию публикаций по умолчанию" + +#: ../../extend/addon/hzaddons/nofed/nofed.php:80 +msgid "NoFed Settings" +msgstr "Настройки NoFed" + +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:123 +msgid "generic profile image" +msgstr "Стандартное изображение профиля" + +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:124 +msgid "random geometric pattern" +msgstr "Случайный геометрический рисунок" + +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:125 +msgid "monster face" +msgstr "Лицо чудовища" + +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:126 +msgid "computer generated face" +msgstr "Сгенерированное компьютером лицо" + +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:127 +msgid "retro arcade style face" +msgstr "Лицо в стиле старой аркадной игры" + +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:128 +msgid "Hub default profile photo" +msgstr "Фотография профиля по умолчанию" + +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:143 +msgid "Information" +msgstr "Информация" -#: ../../include/features.php:49 -msgid "Network and Stream Filtering" -msgstr "Фильтрация сети и потока" +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:143 +msgid "" +"Libravatar addon is installed, too. Please disable Libravatar addon or this " +"Gravatar addon.
      The Libravatar addon will fall back to Gravatar if " +"nothing was found at Libravatar." +msgstr "Плагин Libravatar также установлен. Пожалуйста, отключите плагин Libravatar или этот плагин Gravatar. Если Плагин Libravatar ничего не найдёт, он вернётся в Gravatar." -#: ../../include/features.php:50 -msgid "Search by Date" -msgstr "Поиск по дате" +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:151 +msgid "Default avatar image" +msgstr "Изображение аватара по умолчанию" -#: ../../include/features.php:50 -msgid "Ability to select posts by date ranges" -msgstr "Возможность выбора сообщений по датам" +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:151 +msgid "Select default avatar image if none was found at Gravatar. See README" +msgstr "Выберите изображения аватар по умолчанию если ничего не было найдено в Gravatar (см. README)." -#: ../../include/features.php:51 -msgid "Collections Filter" -msgstr "Фильтр коллекций" +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:152 +msgid "Rating of images" +msgstr "Оценки изображений" -#: ../../include/features.php:51 -msgid "Enable widget to display Network posts only from selected collections" -msgstr "" +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:152 +msgid "Select the appropriate avatar rating for your site. See README" +msgstr "Выберите подходящую оценку аватара для вашего сайта (см. README)." -#: ../../include/features.php:52 ../../include/widgets.php:265 -msgid "Saved Searches" -msgstr "Запомненные поиски" +#: ../../extend/addon/hzaddons/gravatar/gravatar.php:165 +msgid "Gravatar settings updated." +msgstr "Настройки Gravatar обновлены." -#: ../../include/features.php:52 -msgid "Save search terms for re-use" -msgstr "Сохранять результаты поиска для повторного использования" +#: ../../extend/addon/hzaddons/redred/redred.php:45 +msgid "Post to Red" +msgstr "Опубликовать в Red" -#: ../../include/features.php:53 -msgid "Network Personal Tab" -msgstr "Сеть - Личная вкладка" +#: ../../extend/addon/hzaddons/redred/redred.php:60 +msgid "Channel is required." +msgstr "Необходим канал." -#: ../../include/features.php:53 -msgid "Enable tab to display only Network posts that you've interacted on" -msgstr "" +#: ../../extend/addon/hzaddons/redred/redred.php:65 +#: ../../Zotlabs/Module/Network.php:304 +msgid "Invalid channel." +msgstr "Недействительный канал." -#: ../../include/features.php:54 -msgid "Network New Tab" -msgstr "Сеть - Новая вкладка" +#: ../../extend/addon/hzaddons/redred/redred.php:76 +msgid "redred Settings saved." +msgstr "Настройки RedRed сохранены." -#: ../../include/features.php:54 -msgid "Enable tab to display all new Network activity" -msgstr "" +#: ../../extend/addon/hzaddons/redred/redred.php:95 +msgid "Allow posting to another Hubzilla Channel" +msgstr "Разрешить публиковать в другой канал Hubzilla" -#: ../../include/features.php:55 -msgid "Affinity Tool" -msgstr "Инструмент сходства или соответствия" +#: ../../extend/addon/hzaddons/redred/redred.php:99 +msgid "Send public postings to Hubzilla channel by default" +msgstr "Отправлять общедоступные публикации в канал Hubzilla по умолчанию" -#: ../../include/features.php:55 -msgid "Filter stream activity by depth of relationships" -msgstr "" +#: ../../extend/addon/hzaddons/redred/redred.php:103 +msgid "Hubzilla API Path" +msgstr "Путь к Hubzilla API" -#: ../../include/features.php:56 -msgid "Suggest Channels" -msgstr "" +#: ../../extend/addon/hzaddons/redred/redred.php:107 +msgid "Hubzilla login name" +msgstr "Имя входа Hubzilla" -#: ../../include/features.php:56 -msgid "Show channel suggestions" -msgstr "" +#: ../../extend/addon/hzaddons/redred/redred.php:111 +msgid "Hubzilla channel name" +msgstr "Название канала Hubzilla" -#: ../../include/features.php:61 -msgid "Post/Comment Tools" -msgstr "Инструменты сообщений/комментарий " +#: ../../extend/addon/hzaddons/redred/redred.php:119 +msgid "Hubzilla Crosspost Settings" +msgstr "Настройки перекрёстных публикаций Hubzilla" -#: ../../include/features.php:63 -msgid "Edit Sent Posts" -msgstr "Редактировать отправленные сообщения" +#: ../../extend/addon/hzaddons/chords/Mod_Chords.php:44 +msgid "" +"This is a fairly comprehensive and complete guitar chord dictionary which " +"will list most of the available ways to play a certain chord, starting from " +"the base of the fingerboard up to a few frets beyond the twelfth fret " +"(beyond which everything repeats). A couple of non-standard tunings are " +"provided for the benefit of slide players, etc." +msgstr "" -#: ../../include/features.php:63 -msgid "Edit and correct posts and comments after sending" -msgstr "Редактировать и исправлять сообщения и комментарии после отправки" +#: ../../extend/addon/hzaddons/chords/Mod_Chords.php:46 +msgid "" +"Chord names start with a root note (A-G) and may include sharps (#) and " +"flats (b). This software will parse most of the standard naming conventions " +"such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements." +msgstr "" -#: ../../include/features.php:64 -msgid "Tagging" -msgstr "Пометка" +#: ../../extend/addon/hzaddons/chords/Mod_Chords.php:48 +msgid "" +"Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, " +"E7b13b11 ..." +msgstr "Примеры действительных включают A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..." -#: ../../include/features.php:64 -msgid "Ability to tag existing posts" -msgstr "Возможность использовать теги" +#: ../../extend/addon/hzaddons/chords/Mod_Chords.php:51 +msgid "Guitar Chords" +msgstr "Гитарные аккорды" -#: ../../include/features.php:65 -msgid "Post Categories" -msgstr "Категории сообщения" +#: ../../extend/addon/hzaddons/chords/Mod_Chords.php:52 +msgid "The complete online chord dictionary" +msgstr "Полный онлайн словарь аккордов" -#: ../../include/features.php:65 -msgid "Add categories to your posts" -msgstr "Добавить категории для ваших сообщений" +#: ../../extend/addon/hzaddons/chords/Mod_Chords.php:57 +msgid "Tuning" +msgstr "Настройка" -#: ../../include/features.php:66 -msgid "Ability to file posts under folders" -msgstr "" +#: ../../extend/addon/hzaddons/chords/Mod_Chords.php:58 +msgid "Chord name: example: Em7" +msgstr "Наименование аккорда - example: Em7" -#: ../../include/features.php:67 -msgid "Dislike Posts" -msgstr "Сообщение не нравится" +#: ../../extend/addon/hzaddons/chords/Mod_Chords.php:59 +msgid "Show for left handed stringing" +msgstr "Показывать струны для левшей" -#: ../../include/features.php:67 -msgid "Ability to dislike posts/comments" -msgstr "Возможность выбора нравится/не-нравится" +#: ../../extend/addon/hzaddons/chords/chords.php:33 +msgid "Quick Reference" +msgstr "Быстрая ссылка" -#: ../../include/features.php:68 -msgid "Star Posts" -msgstr "Помечать сообщения" +#: ../../extend/addon/hzaddons/notifyadmin/notifyadmin.php:34 +msgid "New registration" +msgstr "Новая регистрация" -#: ../../include/features.php:68 -msgid "Ability to mark special posts with a star indicator" -msgstr "" +#: ../../extend/addon/hzaddons/notifyadmin/notifyadmin.php:40 +#: ../../Zotlabs/Module/Invite.php:82 +#, php-format +msgid "%s : Message delivery failed." +msgstr "%s : Доставка сообщения не удалась." -#: ../../include/features.php:69 -msgid "Tag Cloud" -msgstr "Облако тегов" +#: ../../extend/addon/hzaddons/notifyadmin/notifyadmin.php:42 +#, php-format +msgid "Message sent to %s. New account registration: %s" +msgstr "Сообщение отправлено в %s. Регистрация нового аккаунта: %s" -#: ../../include/features.php:69 -msgid "Provide a personal tag cloud on your channel page" -msgstr "" +#: ../../extend/addon/hzaddons/irc/irc.php:45 +msgid "Channels to auto connect" +msgstr "Каналы для автоматического подключения" -#: ../../include/follow.php:23 -msgid "Channel is blocked on this site." -msgstr "Канал блокируется на этом сайте." +#: ../../extend/addon/hzaddons/irc/irc.php:45 +#: ../../extend/addon/hzaddons/irc/irc.php:49 +msgid "Comma separated list" +msgstr "Список, разделённый запятыми" -#: ../../include/follow.php:28 -msgid "Channel location missing." -msgstr "Местоположение канала отсутствует." +#: ../../extend/addon/hzaddons/irc/irc.php:49 +#: ../../extend/addon/hzaddons/irc/irc.php:96 +msgid "Popular Channels" +msgstr "Популярные каналы" -#: ../../include/follow.php:54 -msgid "Response from remote channel was incomplete." -msgstr "" +#: ../../extend/addon/hzaddons/irc/irc.php:53 +msgid "IRC Settings" +msgstr "Настройки IRC" -#: ../../include/follow.php:85 -msgid "Channel was deleted and no longer exists." -msgstr "" +#: ../../extend/addon/hzaddons/irc/irc.php:69 +msgid "IRC settings saved." +msgstr "Настройки IRC сохранены" -#: ../../include/follow.php:132 -msgid "Channel discovery failed." -msgstr "Не удалось обнаружить канал." +#: ../../extend/addon/hzaddons/irc/irc.php:74 +msgid "IRC Chatroom" +msgstr "Чат IRC" -#: ../../include/follow.php:149 -msgid "local account not found." -msgstr "локальный аккаунт не найден." +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:19 +msgid "bitchslap" +msgstr "дать леща" -#: ../../include/follow.php:158 -msgid "Cannot connect to yourself." -msgstr "Нельзя подключиться к самому себе." +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:19 +msgid "bitchslapped" +msgstr "получил леща" -#: ../../include/group.php:25 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"may apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." -msgstr "" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:20 +msgid "shag" +msgstr "вздрючить" -#: ../../include/group.php:223 -msgid "Default privacy group for new contacts" -msgstr "Группа конфиденциальности по умолчанию для новых контактов" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:20 +msgid "shagged" +msgstr "вздрюченный" -#: ../../include/group.php:242 ../../mod/admin.php:763 -msgid "All Channels" -msgstr "Все каналы" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:21 +msgid "patent" +msgstr "" -#: ../../include/group.php:264 -msgid "edit" -msgstr "редактировать" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:21 +msgid "patented" +msgstr "" -#: ../../include/group.php:285 -msgid "Collections" -msgstr "Коллекции" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:22 +msgid "hug" +msgstr "обнять" -#: ../../include/group.php:286 -msgid "Edit collection" -msgstr "Редактировать коллекцию" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:22 +msgid "hugged" +msgstr "обнятый" -#: ../../include/group.php:287 -msgid "Create a new collection" -msgstr "Создать новую коллекцию" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:23 +msgid "murder" +msgstr "убить" -#: ../../include/group.php:288 -msgid "Channels not in any collection" -msgstr "Контакты не в какой коллекции" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:23 +msgid "murdered" +msgstr "убитый" -#: ../../include/group.php:290 ../../include/widgets.php:266 -msgid "add" -msgstr "добавить" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:24 +msgid "worship" +msgstr "почитать" -#: ../../include/identity.php:30 ../../mod/item.php:1270 -msgid "Unable to obtain identity information from database" -msgstr "Невозможно получить идентификационную информацию из базы данных" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:24 +msgid "worshipped" +msgstr "почитаемый" -#: ../../include/identity.php:63 -msgid "Empty name" -msgstr "Пустое имя" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:25 +msgid "kiss" +msgstr "целовать" -#: ../../include/identity.php:65 -msgid "Name too long" -msgstr "Слишком длинное имя" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:25 +msgid "kissed" +msgstr "поцелованный" -#: ../../include/identity.php:166 -msgid "No account identifier" -msgstr "идентификатор аккаунта отсутствует" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:26 +msgid "tempt" +msgstr "искушать" -#: ../../include/identity.php:176 -msgid "Nickname is required." -msgstr "Требуется псевдоним." +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:26 +msgid "tempted" +msgstr "искушённый" -#: ../../include/identity.php:190 -msgid "Reserved nickname. Please choose another." +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:27 +msgid "raise eyebrows at" msgstr "" -#: ../../include/identity.php:195 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "Псевдоним имеет недопустимые символы или уже используется на этом сайте." - -#: ../../include/identity.php:258 -msgid "Unable to retrieve created identity" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:27 +msgid "raised their eyebrows at" msgstr "" -#: ../../include/identity.php:317 -msgid "Default Profile" -msgstr "Профиль по умолчанию" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:28 +msgid "insult" +msgstr "оскорбить" -#: ../../include/identity.php:342 ../../include/widgets.php:400 -#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:431 -msgid "Friends" -msgstr "Друзья" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:28 +msgid "insulted" +msgstr "оскорблённый" -#: ../../include/identity.php:509 -msgid "Requested channel is not available." -msgstr "Запрашиваемый канал не доступен." +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:29 +msgid "praise" +msgstr "хвалить" -#: ../../include/identity.php:557 ../../mod/achievements.php:8 -#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 -#: ../../mod/filestorage.php:40 ../../mod/layouts.php:8 -#: ../../mod/webpages.php:8 -msgid "Requested profile is not available." -msgstr "Запрашиваемый профиль не доступен." +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:29 +msgid "praised" +msgstr "похваленный" -#: ../../include/identity.php:675 ../../include/widgets.php:128 -#: ../../include/widgets.php:168 ../../include/Contact.php:107 -#: ../../mod/directory.php:183 ../../mod/dirprofile.php:164 -#: ../../mod/suggest.php:51 ../../mod/match.php:62 -msgid "Connect" -msgstr "Подключить" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:30 +msgid "be dubious of" +msgstr "усомниться" -#: ../../include/identity.php:689 ../../mod/profiles.php:612 -msgid "Change profile photo" -msgstr "Изменить фотографию профиля" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:30 +msgid "was dubious of" +msgstr "усомнился" -#: ../../include/identity.php:695 -msgid "Profiles" -msgstr "Профили" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:31 +msgid "eat" +msgstr "есть" -#: ../../include/identity.php:695 -msgid "Manage/edit profiles" -msgstr "Управление / Редактирование профилей" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:31 +msgid "ate" +msgstr "съел" -#: ../../include/identity.php:696 ../../mod/profiles.php:613 -msgid "Create New Profile" -msgstr "Создать новый профиль" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:32 +msgid "giggle and fawn at" +msgstr "" -#: ../../include/identity.php:699 -msgid "Edit Profile" -msgstr "Редактировать профиль" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:32 +msgid "giggled and fawned at" +msgstr "" -#: ../../include/identity.php:710 ../../mod/profiles.php:624 -msgid "Profile Image" -msgstr "Изображение профиля" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:33 +msgid "doubt" +msgstr "сомневаться" -#: ../../include/identity.php:713 ../../mod/profiles.php:627 -msgid "visible to everybody" -msgstr "видно всем" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:33 +msgid "doubted" +msgstr "сомневался" -#: ../../include/identity.php:714 ../../mod/profiles.php:628 -msgid "Edit visibility" -msgstr "Редактировать видимость" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:34 +msgid "glare" +msgstr "" -#: ../../include/identity.php:728 ../../include/identity.php:952 -#: ../../mod/directory.php:158 -msgid "Gender:" -msgstr "Пол:" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:34 +msgid "glared at" +msgstr "" -#: ../../include/identity.php:729 ../../include/identity.php:996 -#: ../../mod/directory.php:160 -msgid "Status:" -msgstr "Статус:" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:35 +msgid "fuck" +msgstr "трахнуть" -#: ../../include/identity.php:730 ../../include/identity.php:1007 -#: ../../mod/directory.php:162 -msgid "Homepage:" -msgstr "Домашняя страница:" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:35 +msgid "fucked" +msgstr "трахнул" -#: ../../include/identity.php:731 ../../mod/dirprofile.php:151 -msgid "Online Now" -msgstr "Сейчас в сети" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:36 +msgid "bonk" +msgstr "" -#: ../../include/identity.php:796 ../../include/identity.php:876 -#: ../../mod/ping.php:262 -msgid "g A l F d" -msgstr "g A l F d" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:36 +msgid "bonked" +msgstr "" -#: ../../include/identity.php:797 ../../include/identity.php:877 -msgid "F d" -msgstr "F d" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:37 +msgid "declare undying love for" +msgstr "" -#: ../../include/identity.php:842 ../../include/identity.php:917 -#: ../../mod/ping.php:284 -msgid "[today]" -msgstr "[сегодня]" +#: ../../extend/addon/hzaddons/morepokes/morepokes.php:37 +msgid "declared undying love for" +msgstr "" -#: ../../include/identity.php:854 -msgid "Birthday Reminders" -msgstr "Напоминания о Днях Рождения" +#: ../../extend/addon/hzaddons/wppost/wppost.php:45 +msgid "Post to WordPress" +msgstr "Опубликовать в WordPress" -#: ../../include/identity.php:855 -msgid "Birthdays this week:" -msgstr "Дни Рождения на этой неделе:" +#: ../../extend/addon/hzaddons/wppost/wppost.php:82 +msgid "Enable WordPress Post Plugin" +msgstr "Включить плагин публикаций WordPress" -#: ../../include/identity.php:910 -msgid "[No description]" -msgstr "[без описания]" +#: ../../extend/addon/hzaddons/wppost/wppost.php:86 +msgid "WordPress username" +msgstr "Имя пользователя WordPress" -#: ../../include/identity.php:928 -msgid "Event Reminders" -msgstr "Напоминания мероприятий" +#: ../../extend/addon/hzaddons/wppost/wppost.php:90 +msgid "WordPress password" +msgstr "Пароль WordPress" -#: ../../include/identity.php:929 -msgid "Events this week:" -msgstr "Мероприятия на этой неделе:" +#: ../../extend/addon/hzaddons/wppost/wppost.php:94 +msgid "WordPress API URL" +msgstr "URL API WordPress" -#: ../../include/identity.php:942 ../../include/identity.php:1050 -#: ../../include/apps.php:128 ../../mod/profperm.php:112 -msgid "Profile" -msgstr "Профиль" +#: ../../extend/addon/hzaddons/wppost/wppost.php:95 +msgid "Typically https://your-blog.tld/xmlrpc.php" +msgstr "Обычно https://your-blog.tld/xmlrpc.php" -#: ../../include/identity.php:950 ../../mod/settings.php:935 -msgid "Full Name:" -msgstr "Полное имя:" +#: ../../extend/addon/hzaddons/wppost/wppost.php:98 +msgid "WordPress blogid" +msgstr "" -#: ../../include/identity.php:957 -msgid "Like this channel" -msgstr "нравиться этот канал" +#: ../../extend/addon/hzaddons/wppost/wppost.php:99 +msgid "For multi-user sites such as wordpress.com, otherwise leave blank" +msgstr "Для многопользовательских сайтов, таких, как wordpress.com. В противном случае оставьте пустым" -#: ../../include/identity.php:981 -msgid "j F, Y" -msgstr "j F, Y" +#: ../../extend/addon/hzaddons/wppost/wppost.php:105 +msgid "Post to WordPress by default" +msgstr "Публиковать в WordPress по умолчанию" -#: ../../include/identity.php:982 -msgid "j F" -msgstr "j F" +#: ../../extend/addon/hzaddons/wppost/wppost.php:109 +msgid "Forward comments (requires hubzilla_wp plugin)" +msgstr "Пересылать комментарии (требуется плагин hubzilla_wp)" -#: ../../include/identity.php:989 -msgid "Birthday:" -msgstr "День Рождения:" +#: ../../extend/addon/hzaddons/wppost/wppost.php:113 +msgid "WordPress Post Settings" +msgstr "Настройки публикации в WordPress" -#: ../../include/identity.php:993 -msgid "Age:" -msgstr "Возраст:" +#: ../../extend/addon/hzaddons/wppost/wppost.php:129 +msgid "Wordpress Settings saved." +msgstr "Настройки WordPress сохранены." -#: ../../include/identity.php:1002 -#, php-format -msgid "for %1$d %2$s" -msgstr "для %1$d %2$s" +#: ../../extend/addon/hzaddons/wholikesme/wholikesme.php:29 +msgid "Who likes me?" +msgstr "Кому я нравлюсь?" -#: ../../include/identity.php:1005 ../../mod/profiles.php:535 -msgid "Sexual Preference:" -msgstr "Сексуальная ориентация:" +#: ../../extend/addon/hzaddons/testdrive/testdrive.php:104 +#, php-format +msgid "Your account on %s will expire in a few days." +msgstr "Ваш аккаунт на %s перестанет работать через несколько дней." -#: ../../include/identity.php:1009 ../../mod/profiles.php:537 -msgid "Hometown:" -msgstr "Родной город:" +#: ../../extend/addon/hzaddons/testdrive/testdrive.php:105 +msgid "Your $Productname test account is about to expire." +msgstr "Тестовый период вашей учётной записи в $Productname истёк." -#: ../../include/identity.php:1011 -msgid "Tags:" -msgstr "Тэги:" +#: ../../boot.php:1592 +msgid "Create an account to access services and applications" +msgstr "Создайте аккаунт для доступа к службам и приложениям" -#: ../../include/identity.php:1013 ../../mod/profiles.php:538 -msgid "Political Views:" -msgstr "Политические взгляды:" +#: ../../boot.php:1593 ../../include/nav.php:158 +#: ../../Zotlabs/Module/Register.php:294 +msgid "Register" +msgstr "Регистрация" -#: ../../include/identity.php:1015 -msgid "Religion:" -msgstr "Религия:" +#: ../../boot.php:1612 ../../include/nav.php:105 ../../include/nav.php:134 +#: ../../include/nav.php:153 +msgid "Logout" +msgstr "Выход" -#: ../../include/identity.php:1017 ../../mod/directory.php:164 -msgid "About:" -msgstr "О себе:" +#: ../../boot.php:1613 ../../include/nav.php:120 ../../include/nav.php:124 +#: ../../Zotlabs/Lib/Apps.php:301 +msgid "Login" +msgstr "Войти" -#: ../../include/identity.php:1019 -msgid "Hobbies/Interests:" -msgstr "Хобби / интересы:" +#: ../../boot.php:1614 ../../include/channel.php:2334 +#: ../../Zotlabs/Module/Rmagic.php:75 +msgid "Remote Authentication" +msgstr "Удаленная аутентификация" -#: ../../include/identity.php:1021 ../../mod/profiles.php:541 -msgid "Likes:" -msgstr "Что вам нравится:" +#: ../../boot.php:1616 +msgid "Login/Email" +msgstr "Пользователь / email" -#: ../../include/identity.php:1023 ../../mod/profiles.php:542 -msgid "Dislikes:" -msgstr "Что вам не нравится:" +#: ../../boot.php:1617 +msgid "Password" +msgstr "Пароль" -#: ../../include/identity.php:1026 -msgid "Contact information and Social Networks:" -msgstr "Информация и социальные сети контакта:" +#: ../../boot.php:1618 +msgid "Remember me" +msgstr "Запомнить меня" -#: ../../include/identity.php:1028 -msgid "My other channels:" -msgstr "Мои другие каналы:" +#: ../../boot.php:1621 +msgid "Forgot your password?" +msgstr "Забыли пароль или логин?" -#: ../../include/identity.php:1030 -msgid "Musical interests:" -msgstr "Музыкальные интересы:" +#: ../../boot.php:1622 ../../Zotlabs/Module/Lostpass.php:91 +msgid "Password Reset" +msgstr "Сбросить пароль" -#: ../../include/identity.php:1032 -msgid "Books, literature:" -msgstr "Книги, литература:" +#: ../../boot.php:2405 +#, php-format +msgid "[$Projectname] Website SSL error for %s" +msgstr "[$Projectname] Ошибка SSL/TLS веб-сайта для %s" -#: ../../include/identity.php:1034 -msgid "Television:" -msgstr "Телевидение:" +#: ../../boot.php:2410 +msgid "Website SSL certificate is not valid. Please correct." +msgstr "SSL/TLS сертификат веб-сайт недействителен. Исправьте это." -#: ../../include/identity.php:1036 -msgid "Film/dance/culture/entertainment:" -msgstr "Кино / танцы / культура / развлечения:" +#: ../../boot.php:2526 +#, php-format +msgid "[$Projectname] Cron tasks not running on %s" +msgstr "[$Projectname] Задания Cron не запущены на %s" -#: ../../include/identity.php:1038 -msgid "Love/Romance:" -msgstr "Любовь / Романс:" +#: ../../boot.php:2531 +msgid "Cron/Scheduled tasks not running." +msgstr "Задания Cron / планировщика не запущены." -#: ../../include/identity.php:1040 -msgid "Work/employment:" -msgstr "Работа / Занятость:" +#: ../../boot.php:2532 ../../include/datetime.php:238 +msgid "never" +msgstr "никогд" -#: ../../include/identity.php:1042 -msgid "School/education:" -msgstr "Школа / образование:" +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3078 +#: ../../Zotlabs/Module/Admin/Site.php:198 +msgid "Default" +msgstr "По умолчанию" -#: ../../include/identity.php:1052 -msgid "Like this thing" -msgstr "нравится этo" +#: ../../view/theme/redbasic/php/config.php:16 +#: ../../view/theme/redbasic/php/config.php:19 +msgid "Focus (Hubzilla default)" +msgstr "Фокус (по умолчанию Hubzilla)" -#: ../../include/network.php:652 -msgid "view full size" -msgstr "посмотреть в полный размер" +#: ../../view/theme/redbasic/php/config.php:97 +msgid "Theme settings" +msgstr "Настройки темы" -#: ../../include/text.php:320 -msgid "prev" -msgstr "предыдущий" +#: ../../view/theme/redbasic/php/config.php:98 +msgid "Narrow navbar" +msgstr "Узкая панель навигации" -#: ../../include/text.php:322 -msgid "first" -msgstr "первый" +#: ../../view/theme/redbasic/php/config.php:99 +msgid "Navigation bar background color" +msgstr "Панель навигации, цвет фона" -#: ../../include/text.php:351 -msgid "last" -msgstr "последний" +#: ../../view/theme/redbasic/php/config.php:100 +msgid "Navigation bar icon color " +msgstr "Панель навигации, цвет значков" -#: ../../include/text.php:354 -msgid "next" -msgstr "следующий" +#: ../../view/theme/redbasic/php/config.php:101 +msgid "Navigation bar active icon color " +msgstr "Панель навигации, цвет активного значка" -#: ../../include/text.php:366 -msgid "older" -msgstr "старший" +#: ../../view/theme/redbasic/php/config.php:102 +msgid "Link color" +msgstr "цвет ссылок" -#: ../../include/text.php:368 -msgid "newer" -msgstr "новее" +#: ../../view/theme/redbasic/php/config.php:103 +msgid "Set font-color for banner" +msgstr "Цвет текста в шапке" -#: ../../include/text.php:729 -msgid "No connections" -msgstr "Нет контактов" +#: ../../view/theme/redbasic/php/config.php:104 +msgid "Set the background color" +msgstr "Цвет фона" -#: ../../include/text.php:742 -#, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "%d контакт" -msgstr[1] "%d контакта" -msgstr[2] "%d контактов" +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Set the background image" +msgstr "Фоновое изображение" -#: ../../include/text.php:754 -msgid "View Connections" -msgstr "Просмотр контактов" +#: ../../view/theme/redbasic/php/config.php:106 +msgid "Set the background color of items" +msgstr "Цвет фона элементов" -#: ../../include/text.php:815 ../../include/text.php:829 -#: ../../include/widgets.php:186 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 -msgid "Save" -msgstr "Запомнить" +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Set the background color of comments" +msgstr "Цвет фона комментариев" -#: ../../include/text.php:895 -msgid "poke" -msgstr "подпихнуть" +#: ../../view/theme/redbasic/php/config.php:108 +msgid "Set font-size for the entire application" +msgstr "Установить системный размер шрифта" -#: ../../include/text.php:896 -msgid "ping" -msgstr "пинг - проверка связи" +#: ../../view/theme/redbasic/php/config.php:108 +msgid "Examples: 1rem, 100%, 16px" +msgstr "Например: 1rem, 100%, 16px" -#: ../../include/text.php:896 -msgid "pinged" -msgstr "" +#: ../../view/theme/redbasic/php/config.php:109 +msgid "Set font-color for posts and comments" +msgstr "Цвет шрифта для постов и комментариев" -#: ../../include/text.php:897 -msgid "prod" -msgstr "" +#: ../../view/theme/redbasic/php/config.php:110 +msgid "Set radius of corners" +msgstr "Радиус скруглений" -#: ../../include/text.php:897 -msgid "prodded" -msgstr "" +#: ../../view/theme/redbasic/php/config.php:110 +msgid "Example: 4px" +msgstr "Например: 4px" -#: ../../include/text.php:898 -msgid "slap" -msgstr "" +#: ../../view/theme/redbasic/php/config.php:111 +msgid "Set shadow depth of photos" +msgstr "Глубина теней фотографий" -#: ../../include/text.php:898 -msgid "slapped" -msgstr "" +#: ../../view/theme/redbasic/php/config.php:112 +msgid "Set maximum width of content region in pixel" +msgstr "Максимальная ширина содержания региона (в пикселях)" -#: ../../include/text.php:899 -msgid "finger" -msgstr "" +#: ../../view/theme/redbasic/php/config.php:112 +msgid "Leave empty for default width" +msgstr "Оставьте пустым для ширины по умолчанию" -#: ../../include/text.php:899 -msgid "fingered" -msgstr "" +#: ../../view/theme/redbasic/php/config.php:113 +msgid "Set size of conversation author photo" +msgstr "Размер фотографии автора беседы" -#: ../../include/text.php:900 -msgid "rebuff" -msgstr "" +#: ../../view/theme/redbasic/php/config.php:114 +msgid "Set size of followup author photos" +msgstr "Размер фотографий подписчиков" + +#: ../../include/bbcode.php:200 ../../include/bbcode.php:1202 +#: ../../include/bbcode.php:1205 ../../include/bbcode.php:1210 +#: ../../include/bbcode.php:1213 ../../include/bbcode.php:1216 +#: ../../include/bbcode.php:1219 ../../include/bbcode.php:1224 +#: ../../include/bbcode.php:1227 ../../include/bbcode.php:1232 +#: ../../include/bbcode.php:1235 ../../include/bbcode.php:1238 +#: ../../include/bbcode.php:1241 +msgid "Image/photo" +msgstr "Изображение / фотография" -#: ../../include/text.php:900 -msgid "rebuffed" -msgstr "" +#: ../../include/bbcode.php:239 ../../include/bbcode.php:1252 +msgid "Encrypted content" +msgstr "Зашифрованное содержание" -#: ../../include/text.php:909 -msgid "happy" -msgstr "счастливый" +#: ../../include/bbcode.php:255 +#, php-format +msgid "Install %1$s element %2$s" +msgstr "Установить %1$s элемент %2$s" -#: ../../include/text.php:910 +#: ../../include/bbcode.php:259 +#, php-format +msgid "" +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." +msgstr "Эта публикация содержит устанавливаемый %s элемент, однако у вас нет разрешений для его установки на этом сайте." + +#: ../../include/bbcode.php:269 ../../Zotlabs/Module/Impel.php:43 +msgid "webpage" +msgstr "веб-страница" + +#: ../../include/bbcode.php:272 ../../Zotlabs/Module/Impel.php:53 +msgid "layout" +msgstr "шаблон" + +#: ../../include/bbcode.php:275 ../../Zotlabs/Module/Impel.php:48 +msgid "block" +msgstr "заблокировать" + +#: ../../include/bbcode.php:278 ../../Zotlabs/Module/Impel.php:60 +msgid "menu" +msgstr "меню" + +#: ../../include/bbcode.php:350 +msgid "card" +msgstr "карточка" + +#: ../../include/bbcode.php:352 +msgid "article" +msgstr "статья" + +#: ../../include/bbcode.php:354 ../../include/markdown.php:160 +#: ../../Zotlabs/Module/Tagger.php:77 +msgid "post" +msgstr "публикация" + +#: ../../include/bbcode.php:358 ../../include/markdown.php:158 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "%1$s была создана %2$s %3$s" + +#: ../../include/bbcode.php:435 ../../include/bbcode.php:443 +msgid "Click to open/close" +msgstr "Нажмите, чтобы открыть/закрыть" + +#: ../../include/bbcode.php:443 +msgid "spoiler" +msgstr "спойлер" + +#: ../../include/bbcode.php:456 +msgid "View article" +msgstr "Просмотр статей" + +#: ../../include/bbcode.php:456 +msgid "View summary" +msgstr "Просмотр резюме" + +#: ../../include/bbcode.php:746 ../../include/bbcode.php:916 +#: ../../Zotlabs/Lib/NativeWikiPage.php:597 +msgid "Different viewers will see this text differently" +msgstr "Различные зрители увидят этот текст по-разному" + +#: ../../include/bbcode.php:1190 +msgid "$1 wrote:" +msgstr "$1 писал:" + +#: ../../include/account.php:36 +msgid "Not a valid email address" +msgstr "Недействительный адрес электронной почты" + +#: ../../include/account.php:38 +msgid "Your email domain is not among those allowed on this site" +msgstr "Домен электронной почты не входит в число тех, которые разрешены на этом сайте" + +#: ../../include/account.php:44 +msgid "Your email address is already registered at this site." +msgstr "Ваш адрес электронной почты уже зарегистрирован на этом сайте." + +#: ../../include/account.php:76 +msgid "An invitation is required." +msgstr "Требуется приглашение." + +#: ../../include/account.php:80 +msgid "Invitation could not be verified." +msgstr "Не удалось проверить приглашение." + +#: ../../include/account.php:158 +msgid "Please enter the required information." +msgstr "Пожалуйста, введите необходимую информацию." + +#: ../../include/account.php:225 +msgid "Failed to store account information." +msgstr "Не удалось сохранить информацию аккаунта." + +#: ../../include/account.php:314 +#, php-format +msgid "Registration confirmation for %s" +msgstr "Подтверждение регистрации для %s" + +#: ../../include/account.php:385 +#, php-format +msgid "Registration request at %s" +msgstr "Запрос регистрации на %s" + +#: ../../include/account.php:407 +msgid "your registration password" +msgstr "ваш пароль регистрации" + +#: ../../include/account.php:413 ../../include/account.php:475 +#, php-format +msgid "Registration details for %s" +msgstr "Регистрационные данные для %s" + +#: ../../include/account.php:486 +msgid "Account approved." +msgstr "Аккаунт утвержден." + +#: ../../include/account.php:526 +#, php-format +msgid "Registration revoked for %s" +msgstr "Регистрация отозвана для %s" + +#: ../../include/account.php:805 ../../include/account.php:807 +msgid "Click here to upgrade." +msgstr "Нажмите здесь для обновления." + +#: ../../include/account.php:813 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "Это действие превышает ограничения, установленные в вашем плане." + +#: ../../include/account.php:818 +msgid "This action is not available under your subscription plan." +msgstr "Это действие невозможно из-за ограничений в вашем плане." + +#: ../../include/auth.php:192 +msgid "Delegation session ended." +msgstr "Делегированная сессия завершена." + +#: ../../include/auth.php:196 +msgid "Logged out." +msgstr "Вышел из системы." + +#: ../../include/auth.php:291 +msgid "Email validation is incomplete. Please check your email." +msgstr "Проверка email не завершена. Пожалуйста, проверьте вашу почту." + +#: ../../include/auth.php:307 +msgid "Failed authentication" +msgstr "Ошибка аутентификации" + +#: ../../include/conversation.php:119 ../../include/event.php:1153 +#: ../../include/text.php:2025 ../../Zotlabs/Module/Events.php:260 +#: ../../Zotlabs/Module/Tagger.php:73 ../../Zotlabs/Module/Like.php:386 +msgid "event" +msgstr "событие" + +#: ../../include/conversation.php:122 ../../Zotlabs/Module/Like.php:121 +msgid "channel" +msgstr "канал" + +#: ../../include/conversation.php:146 ../../include/text.php:2030 +#: ../../Zotlabs/Module/Tagger.php:79 +msgid "comment" +msgstr "комментарий" + +#: ../../include/conversation.php:169 +#, php-format +msgid "likes %1$s's %2$s" +msgstr "Нравится %1$s %2$s" + +#: ../../include/conversation.php:172 +#, php-format +msgid "doesn't like %1$s's %2$s" +msgstr "Не нравится %1$s %2$s" + +#: ../../include/conversation.php:212 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "%1$s теперь в контакте с %2$s" + +#: ../../include/conversation.php:247 +#, php-format +msgid "%1$s poked %2$s" +msgstr "%1$s ткнул %2$s" + +#: ../../include/conversation.php:251 ../../include/text.php:1140 +#: ../../include/text.php:1144 +msgid "poked" +msgstr "ткнут" + +#: ../../include/conversation.php:268 ../../Zotlabs/Module/Mood.php:67 +#, php-format +msgctxt "mood" +msgid "%1$s is %2$s" +msgstr "%1$s в %2$s" + +#: ../../include/conversation.php:483 ../../Zotlabs/Lib/ThreadItem.php:431 +msgid "This is an unsaved preview" +msgstr "Это несохранённый просмотр" + +#: ../../include/conversation.php:619 ../../Zotlabs/Module/Photos.php:1142 +msgctxt "title" +msgid "Likes" +msgstr "Нравится" + +#: ../../include/conversation.php:619 ../../Zotlabs/Module/Photos.php:1142 +msgctxt "title" +msgid "Dislikes" +msgstr "Не нравится" + +#: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1143 +msgctxt "title" +msgid "Agree" +msgstr "За" + +#: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1143 +msgctxt "title" +msgid "Disagree" +msgstr "Против" + +#: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1143 +msgctxt "title" +msgid "Abstain" +msgstr "Воздерживается" + +#: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1144 +msgctxt "title" +msgid "Attending" +msgstr "Посещает" + +#: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1144 +msgctxt "title" +msgid "Not attending" +msgstr "Не посещает" + +#: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1144 +msgctxt "title" +msgid "Might attend" +msgstr "Может присутствовать" + +#: ../../include/conversation.php:690 ../../Zotlabs/Lib/ThreadItem.php:158 +msgid "Select" +msgstr "Выбрать" + +#: ../../include/conversation.php:691 ../../include/conversation.php:736 +#: ../../Zotlabs/Lib/ThreadItem.php:148 ../../Zotlabs/Lib/Apps.php:476 +#: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187 +#: ../../Zotlabs/Module/Photos.php:1208 +#: ../../Zotlabs/Module/Connections.php:289 +#: ../../Zotlabs/Module/Card_edit.php:129 +#: ../../Zotlabs/Module/Editblock.php:139 ../../Zotlabs/Module/Connedit.php:654 +#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Webpages.php:242 +#: ../../Zotlabs/Module/Editwebpage.php:167 +#: ../../Zotlabs/Module/Editlayout.php:138 +#: ../../Zotlabs/Module/Admin/Accounts.php:175 +#: ../../Zotlabs/Module/Admin/Profs.php:176 +#: ../../Zotlabs/Module/Admin/Channels.php:149 +#: ../../Zotlabs/Module/Blocks.php:162 +#: ../../Zotlabs/Module/Settings/Oauth2.php:151 +#: ../../Zotlabs/Module/Settings/Oauth.php:151 +#: ../../Zotlabs/Module/Article_edit.php:129 +#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Thing.php:267 +#: ../../Zotlabs/Storage/Browser.php:291 +msgid "Delete" +msgstr "Удалить" + +#: ../../include/conversation.php:695 ../../Zotlabs/Lib/ThreadItem.php:247 +msgid "Toggle Star Status" +msgstr "Переключить статус пометки" + +#: ../../include/conversation.php:700 ../../Zotlabs/Lib/ThreadItem.php:97 +msgid "Private Message" +msgstr "Личное сообщение" + +#: ../../include/conversation.php:707 ../../Zotlabs/Lib/ThreadItem.php:258 +msgid "Message signature validated" +msgstr "Подпись сообщения проверена" + +#: ../../include/conversation.php:708 ../../Zotlabs/Lib/ThreadItem.php:259 +msgid "Message signature incorrect" +msgstr "Подпись сообщения неверная" + +#: ../../include/conversation.php:735 ../../Zotlabs/Module/Connections.php:303 +#: ../../Zotlabs/Module/Admin/Accounts.php:173 +msgid "Approve" +msgstr "Утвердить" + +#: ../../include/conversation.php:739 +#, php-format +msgid "View %s's profile @ %s" +msgstr "Просмотреть профиль %s @ %s" + +#: ../../include/conversation.php:759 +msgid "Categories:" +msgstr "Категории:" + +#: ../../include/conversation.php:760 +msgid "Filed under:" +msgstr "Хранить под:" + +#: ../../include/conversation.php:766 ../../Zotlabs/Lib/ThreadItem.php:367 +#, php-format +msgid "from %s" +msgstr "от %s" + +#: ../../include/conversation.php:769 ../../Zotlabs/Lib/ThreadItem.php:370 +#, php-format +msgid "last edited: %s" +msgstr "последнее редактирование: %s" + +#: ../../include/conversation.php:770 ../../Zotlabs/Lib/ThreadItem.php:371 +#, php-format +msgid "Expires: %s" +msgstr "Срок действия: %s" + +#: ../../include/conversation.php:785 +msgid "View in context" +msgstr "Показать в контексте" + +#: ../../include/conversation.php:787 ../../Zotlabs/Lib/ThreadItem.php:432 +#: ../../Zotlabs/Module/Photos.php:1108 +msgid "Please wait" +msgstr "Подождите пожалуйста" + +#: ../../include/conversation.php:886 +msgid "remove" +msgstr "удалить" + +#: ../../include/conversation.php:890 +msgid "Loading..." +msgstr "Загрузка..." + +#: ../../include/conversation.php:891 +msgid "Delete Selected Items" +msgstr "Удалить выбранные элементы" + +#: ../../include/conversation.php:934 +msgid "View Source" +msgstr "Просмотреть источник" + +#: ../../include/conversation.php:944 +msgid "Follow Thread" +msgstr "Следить за темой" + +#: ../../include/conversation.php:953 +msgid "Unfollow Thread" +msgstr "Прекратить отслеживать тему" + +#: ../../include/conversation.php:1047 ../../Zotlabs/Module/Connedit.php:615 +msgid "Recent Activity" +msgstr "Последние действия" + +#: ../../include/conversation.php:1057 ../../include/channel.php:1376 +#: ../../include/connections.php:110 ../../Zotlabs/Widget/Suggestions.php:44 +#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Suggest.php:56 +#: ../../Zotlabs/Module/Directory.php:338 +msgid "Connect" +msgstr "Подключить" + +#: ../../include/conversation.php:1067 +msgid "Edit Connection" +msgstr "Редактировать контакт" + +#: ../../include/conversation.php:1077 +msgid "Message" +msgstr "Сообщение" + +#: ../../include/conversation.php:1087 ../../Zotlabs/Module/Pubsites.php:35 +#: ../../Zotlabs/Module/Ratings.php:97 +msgid "Ratings" +msgstr "Оценки" + +#: ../../include/conversation.php:1097 ../../Zotlabs/Lib/Apps.php:316 +#: ../../Zotlabs/Module/Poke.php:182 +msgid "Poke" +msgstr "Ткнуть" + +#: ../../include/conversation.php:1211 +#, php-format +msgid "%s likes this." +msgstr "%s нравится это." + +#: ../../include/conversation.php:1211 +#, php-format +msgid "%s doesn't like this." +msgstr "%s не нравится это." + +#: ../../include/conversation.php:1215 +#, php-format +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1217 +#, php-format +msgid "%2$d people don't like this." +msgid_plural "%2$d people don't like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1223 +msgid "and" +msgstr "и" + +#: ../../include/conversation.php:1226 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1227 +#, php-format +msgid "%s like this." +msgstr "%s нравится это." + +#: ../../include/conversation.php:1227 +#, php-format +msgid "%s don't like this." +msgstr "%s не нравится это." + +#: ../../include/conversation.php:1270 +msgid "Set your location" +msgstr "Задать своё местоположение" + +#: ../../include/conversation.php:1271 +msgid "Clear browser location" +msgstr "Очистить местоположение из браузера" + +#: ../../include/conversation.php:1283 ../../Zotlabs/Module/Mail.php:288 +#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101 +#: ../../Zotlabs/Module/Editblock.php:116 +#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:207 +#: ../../Zotlabs/Module/Article_edit.php:101 +msgid "Insert web link" +msgstr "Вставить веб-ссылку" + +#: ../../include/conversation.php:1287 +msgid "Embed (existing) photo from your photo albums" +msgstr "Встроить (существующее) фото из вашего фотоальбома" + +#: ../../include/conversation.php:1322 ../../Zotlabs/Module/Mail.php:241 +#: ../../Zotlabs/Module/Mail.php:362 ../../Zotlabs/Module/Chat.php:205 +msgid "Please enter a link URL:" +msgstr "Пожалуйста введите URL ссылки:" + +#: ../../include/conversation.php:1323 +msgid "Tag term:" +msgstr "Теги:" + +#: ../../include/conversation.php:1324 +msgid "Where are you right now?" +msgstr "Где вы сейчас?" + +#: ../../include/conversation.php:1327 +#: ../../Zotlabs/Module/Profile_photo.php:467 +#: ../../Zotlabs/Module/Cover_photo.php:401 ../../Zotlabs/Module/Wiki.php:381 +msgid "Choose images to embed" +msgstr "Выбрать изображения для встраивания" + +#: ../../include/conversation.php:1328 +#: ../../Zotlabs/Module/Profile_photo.php:468 +#: ../../Zotlabs/Module/Cover_photo.php:402 ../../Zotlabs/Module/Wiki.php:382 +msgid "Choose an album" +msgstr "Выбрать альбом" + +#: ../../include/conversation.php:1329 +msgid "Choose a different album..." +msgstr "Выбрать другой альбом..." + +#: ../../include/conversation.php:1330 +#: ../../Zotlabs/Module/Profile_photo.php:470 +#: ../../Zotlabs/Module/Cover_photo.php:404 ../../Zotlabs/Module/Wiki.php:384 +msgid "Error getting album list" +msgstr "Ошибка получения списка альбомов" + +#: ../../include/conversation.php:1331 +#: ../../Zotlabs/Module/Profile_photo.php:471 +#: ../../Zotlabs/Module/Cover_photo.php:405 ../../Zotlabs/Module/Wiki.php:385 +msgid "Error getting photo link" +msgstr "Ошибка получения ссылки на фотографию" + +#: ../../include/conversation.php:1332 +#: ../../Zotlabs/Module/Profile_photo.php:472 +#: ../../Zotlabs/Module/Cover_photo.php:406 ../../Zotlabs/Module/Wiki.php:386 +msgid "Error getting album" +msgstr "Ошибка получения альбома" + +#: ../../include/conversation.php:1333 +msgid "Comments enabled" +msgstr "Комментарии включены" + +#: ../../include/conversation.php:1334 +msgid "Comments disabled" +msgstr "Комментарии отключены" + +#: ../../include/conversation.php:1341 ../../Zotlabs/Lib/ThreadItem.php:767 +#: ../../Zotlabs/Module/Photos.php:1128 ../../Zotlabs/Module/Events.php:478 +#: ../../Zotlabs/Module/Webpages.php:247 +msgid "Preview" +msgstr "Предварительный просмотр" + +#: ../../include/conversation.php:1374 ../../Zotlabs/Widget/Cdav.php:124 +#: ../../Zotlabs/Module/Photos.php:1107 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Module/Blocks.php:161 +#: ../../Zotlabs/Module/Wiki.php:287 +msgid "Share" +msgstr "Поделиться" + +#: ../../include/conversation.php:1383 +msgid "Page link name" +msgstr "Название ссылки на страницу " + +#: ../../include/conversation.php:1386 +msgid "Post as" +msgstr "Опубликовать как" + +#: ../../include/conversation.php:1388 ../../Zotlabs/Lib/ThreadItem.php:758 +msgid "Bold" +msgstr "Жирный" + +#: ../../include/conversation.php:1389 ../../Zotlabs/Lib/ThreadItem.php:759 +msgid "Italic" +msgstr "Курсив" + +#: ../../include/conversation.php:1390 ../../Zotlabs/Lib/ThreadItem.php:760 +msgid "Underline" +msgstr "Подчеркнутый" + +#: ../../include/conversation.php:1391 ../../Zotlabs/Lib/ThreadItem.php:761 +msgid "Quote" +msgstr "Цитата" + +#: ../../include/conversation.php:1392 ../../Zotlabs/Lib/ThreadItem.php:762 +msgid "Code" +msgstr "Код" + +#: ../../include/conversation.php:1393 ../../Zotlabs/Lib/ThreadItem.php:764 +msgid "Attach/Upload file" +msgstr "Прикрепить/загрузить файл" + +#: ../../include/conversation.php:1396 ../../Zotlabs/Module/Wiki.php:378 +msgid "Embed an image from your albums" +msgstr "Встроить изображение из ваших альбомов" + +#: ../../include/conversation.php:1397 ../../include/conversation.php:1446 +#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188 +#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 +#: ../../Zotlabs/Module/Card_edit.php:131 +#: ../../Zotlabs/Module/Profile_photo.php:465 +#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Editpost.php:109 +#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 +#: ../../Zotlabs/Module/Connedit.php:924 +#: ../../Zotlabs/Module/Editwebpage.php:169 +#: ../../Zotlabs/Module/Editlayout.php:140 +#: ../../Zotlabs/Module/Admin/Addons.php:423 +#: ../../Zotlabs/Module/Cover_photo.php:399 +#: ../../Zotlabs/Module/Settings/Oauth2.php:86 +#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth.php:89 +#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Article_edit.php:131 +#: ../../Zotlabs/Module/Wiki.php:347 ../../Zotlabs/Module/Wiki.php:379 +#: ../../Zotlabs/Module/Profiles.php:801 +msgid "Cancel" +msgstr "Отменить" + +#: ../../include/conversation.php:1398 ../../include/conversation.php:1445 +#: ../../Zotlabs/Module/Profile_photo.php:466 +#: ../../Zotlabs/Module/Cover_photo.php:400 ../../Zotlabs/Module/Wiki.php:380 +msgid "OK" +msgstr "" + +#: ../../include/conversation.php:1400 +msgid "Toggle voting" +msgstr "Подключить голосование" + +#: ../../include/conversation.php:1403 +msgid "Disable comments" +msgstr "Отключить комментарии" + +#: ../../include/conversation.php:1404 +msgid "Toggle comments" +msgstr "Переключить комментарии" + +#: ../../include/conversation.php:1409 ../../Zotlabs/Module/Photos.php:703 +#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Card_edit.php:117 +#: ../../Zotlabs/Module/Editblock.php:129 +#: ../../Zotlabs/Module/Article_edit.php:117 +msgid "Title (optional)" +msgstr "Заголовок (необязательно)" + +#: ../../include/conversation.php:1412 +msgid "Categories (optional, comma-separated list)" +msgstr "Категории (необязательно, список через запятую)" + +#: ../../include/conversation.php:1413 ../../Zotlabs/Module/Events.php:479 +msgid "Permission settings" +msgstr "Настройки разрешений" + +#: ../../include/conversation.php:1435 +msgid "Other networks and post services" +msgstr "Другие сети и службы публикаций" + +#: ../../include/conversation.php:1438 ../../Zotlabs/Module/Mail.php:292 +#: ../../Zotlabs/Module/Mail.php:434 +msgid "Set expiration date" +msgstr "Установить срок действия" + +#: ../../include/conversation.php:1441 +msgid "Set publish date" +msgstr "Установить дату публикации" + +#: ../../include/conversation.php:1443 ../../Zotlabs/Lib/ThreadItem.php:771 +#: ../../Zotlabs/Module/Mail.php:294 ../../Zotlabs/Module/Mail.php:436 +#: ../../Zotlabs/Module/Chat.php:206 +msgid "Encrypt text" +msgstr "Зашифровать текст" + +#: ../../include/conversation.php:1702 +msgid "Commented Order" +msgstr "По комментариям" + +#: ../../include/conversation.php:1705 +msgid "Sort by Comment Date" +msgstr "Сортировать по дате комментария" + +#: ../../include/conversation.php:1709 +msgid "Posted Order" +msgstr "По публикациям" + +#: ../../include/conversation.php:1712 +msgid "Sort by Post Date" +msgstr "Сортировать по дате публикации" + +#: ../../include/conversation.php:1717 ../../Zotlabs/Module/Profiles.php:733 +msgid "Personal" +msgstr "Личное" + +#: ../../include/conversation.php:1720 +msgid "Posts that mention or involve you" +msgstr "Публикации, где вы были упомянуты или участвовали" + +#: ../../include/conversation.php:1726 ../../Zotlabs/Module/Connections.php:80 +#: ../../Zotlabs/Module/Connections.php:89 +#: ../../Zotlabs/Module/Notifications.php:50 ../../Zotlabs/Module/Menu.php:179 +msgid "New" +msgstr "Новые" + +#: ../../include/conversation.php:1729 +msgid "Activity Stream - by date" +msgstr "Поток активности - по дате" + +#: ../../include/conversation.php:1735 +msgid "Starred" +msgstr "Отмеченые" + +#: ../../include/conversation.php:1738 +msgid "Favourite Posts" +msgstr "Любимые публикации" + +#: ../../include/conversation.php:1745 +msgid "Spam" +msgstr "Спам" + +#: ../../include/conversation.php:1748 +msgid "Posts flagged as SPAM" +msgstr "Публикация помечена как спам" + +#: ../../include/conversation.php:1820 ../../include/nav.php:370 +#: ../../Zotlabs/Module/Admin/Channels.php:154 +msgid "Channel" +msgstr "Канал" + +#: ../../include/conversation.php:1823 ../../include/nav.php:373 +msgid "Status Messages and Posts" +msgstr "Статусы и публикации" + +#: ../../include/conversation.php:1833 ../../include/nav.php:383 +#: ../../Zotlabs/Module/Help.php:80 +msgid "About" +msgstr "О себе" + +#: ../../include/conversation.php:1836 ../../include/nav.php:386 +msgid "Profile Details" +msgstr "Информация о профиле" + +#: ../../include/conversation.php:1843 ../../include/nav.php:393 +#: ../../Zotlabs/Lib/Apps.php:310 ../../Zotlabs/Module/Fbrowser.php:29 +msgid "Photos" +msgstr "Фотографии" + +#: ../../include/conversation.php:1846 ../../include/nav.php:396 +#: ../../include/photos.php:667 +msgid "Photo Albums" +msgstr "Фотоальбомы" + +#: ../../include/conversation.php:1851 ../../include/nav.php:401 +#: ../../Zotlabs/Lib/Apps.php:305 ../../Zotlabs/Module/Fbrowser.php:85 +#: ../../Zotlabs/Storage/Browser.php:272 +msgid "Files" +msgstr "Файлы" + +#: ../../include/conversation.php:1854 ../../include/nav.php:404 +msgid "Files and Storage" +msgstr "Файлы и хранилище" + +#: ../../include/conversation.php:1862 ../../include/conversation.php:1865 +#: ../../Zotlabs/Lib/Apps.php:311 +msgid "Events" +msgstr "События" + +#: ../../include/conversation.php:1876 ../../include/conversation.php:1879 +#: ../../include/nav.php:426 ../../include/nav.php:429 +#: ../../Zotlabs/Widget/Chatroom_list.php:16 +msgid "Chatrooms" +msgstr "Чаты" + +#: ../../include/conversation.php:1891 ../../include/nav.php:439 +msgid "Bookmarks" +msgstr "Закладки" + +#: ../../include/conversation.php:1894 ../../include/nav.php:442 +msgid "Saved Bookmarks" +msgstr "Сохранённые закладки" + +#: ../../include/conversation.php:1902 ../../include/nav.php:450 +#: ../../include/features.php:123 ../../Zotlabs/Lib/Apps.php:293 +#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194 +msgid "Cards" +msgstr "Карточки" + +#: ../../include/conversation.php:1905 ../../include/nav.php:453 +msgid "View Cards" +msgstr "Просмотреть карточки" + +#: ../../include/conversation.php:1913 +msgid "articles" +msgstr "статьи" + +#: ../../include/conversation.php:1916 ../../include/nav.php:464 +msgid "View Articles" +msgstr "Просмотр статей" + +#: ../../include/conversation.php:1924 ../../include/nav.php:473 +#: ../../Zotlabs/Lib/Apps.php:306 ../../Zotlabs/Module/Webpages.php:237 +msgid "Webpages" +msgstr "Веб-страницы" + +#: ../../include/conversation.php:1927 ../../include/nav.php:476 +msgid "View Webpages" +msgstr "Просмотр веб-страниц" + +#: ../../include/conversation.php:1937 ../../include/nav.php:486 +#: ../../Zotlabs/Module/Wiki.php:197 +msgid "Wikis" +msgstr "" + +#: ../../include/conversation.php:1940 ../../include/nav.php:489 +#: ../../include/features.php:96 ../../Zotlabs/Lib/Apps.php:307 +msgid "Wiki" +msgstr "" + +#: ../../include/conversation.php:1990 ../../include/taxonomy.php:661 +#: ../../include/channel.php:1539 ../../Zotlabs/Lib/ThreadItem.php:216 +#: ../../Zotlabs/Module/Photos.php:1165 +msgctxt "noun" +msgid "Like" +msgid_plural "Likes" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1993 ../../Zotlabs/Lib/ThreadItem.php:221 +#: ../../Zotlabs/Module/Photos.php:1170 +msgctxt "noun" +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1996 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1999 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:2002 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:2005 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:2008 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:2011 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/zot.php:772 +msgid "Invalid data packet" +msgstr "Неверный пакет данных" + +#: ../../include/zot.php:799 +msgid "Unable to verify channel signature" +msgstr "Невозможно проверить подпись канала" + +#: ../../include/zot.php:2557 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "Невозможно проверить подпись сайта %s" + +#: ../../include/zot.php:4221 +msgid "invalid target signature" +msgstr "недопустимая целевая подпись" + +#: ../../include/event.php:24 ../../include/event.php:71 +msgid "l F d, Y \\@ g:i A" +msgstr "" + +#: ../../include/event.php:32 ../../include/event.php:75 +msgid "Starts:" +msgstr "Начало:" + +#: ../../include/event.php:42 ../../include/event.php:79 +msgid "Finishes:" +msgstr "Окончание:" + +#: ../../include/event.php:54 ../../include/event.php:86 +#: ../../include/channel.php:1391 ../../Zotlabs/Module/Directory.php:324 +msgid "Location:" +msgstr "Откуда:" + +#: ../../include/event.php:1011 +msgid "This event has been added to your calendar." +msgstr "Это событие было добавлено в ваш календарь." + +#: ../../include/event.php:1227 +msgid "Not specified" +msgstr "Не указано" + +#: ../../include/event.php:1228 +msgid "Needs Action" +msgstr "Требует действия" + +#: ../../include/event.php:1229 +msgid "Completed" +msgstr "Завершено" + +#: ../../include/event.php:1230 +msgid "In Process" +msgstr "В процессе" + +#: ../../include/event.php:1231 +msgid "Cancelled" +msgstr "Отменено" + +#: ../../include/event.php:1308 ../../include/connections.php:696 +#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915 +#: ../../Zotlabs/Module/Profiles.php:792 +msgid "Mobile" +msgstr "Мобильный" + +#: ../../include/event.php:1309 ../../include/connections.php:697 +#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916 +#: ../../Zotlabs/Module/Profiles.php:793 +msgid "Home" +msgstr "Домашний" + +#: ../../include/event.php:1310 ../../include/connections.php:698 +msgid "Home, Voice" +msgstr "Дом, голос" + +#: ../../include/event.php:1311 ../../include/connections.php:699 +msgid "Home, Fax" +msgstr "Дом, факс" + +#: ../../include/event.php:1312 ../../include/connections.php:700 +#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917 +#: ../../Zotlabs/Module/Profiles.php:794 +msgid "Work" +msgstr "Рабочий" + +#: ../../include/event.php:1313 ../../include/connections.php:701 +msgid "Work, Voice" +msgstr "Работа, голос" + +#: ../../include/event.php:1314 ../../include/connections.php:702 +msgid "Work, Fax" +msgstr "Работа, факс" + +#: ../../include/event.php:1315 ../../include/event.php:1322 +#: ../../include/selectors.php:49 ../../include/selectors.php:66 +#: ../../include/selectors.php:104 ../../include/selectors.php:140 +#: ../../include/connections.php:703 ../../include/connections.php:710 +#: ../../Zotlabs/Access/PermissionRoles.php:306 +#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/Connedit.php:918 +#: ../../Zotlabs/Module/Settings/Channel.php:496 +#: ../../Zotlabs/Module/New_channel.php:172 +#: ../../Zotlabs/Module/Register.php:233 ../../Zotlabs/Module/Profiles.php:795 +msgid "Other" +msgstr "Другой" + +#: ../../include/attach.php:265 ../../include/attach.php:374 +msgid "Item was not found." +msgstr "Элемент не найден." + +#: ../../include/attach.php:282 +msgid "Unknown error." +msgstr "Неизвестная ошибка." + +#: ../../include/attach.php:567 +msgid "No source file." +msgstr "Нет исходного файла." + +#: ../../include/attach.php:589 +msgid "Cannot locate file to replace" +msgstr "Не удается найти файл для замены" + +#: ../../include/attach.php:608 +msgid "Cannot locate file to revise/update" +msgstr "Не удается найти файл для пересмотра / обновления" + +#: ../../include/attach.php:750 +#, php-format +msgid "File exceeds size limit of %d" +msgstr "Файл превышает предельный размер %d" + +#: ../../include/attach.php:771 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "Вы достигли предела %1$.0f Мбайт для хранения вложений." + +#: ../../include/attach.php:953 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "Загрузка файла не удалась. Возможно система перегружена или попытка прекращена." + +#: ../../include/attach.php:982 +msgid "Stored file could not be verified. Upload failed." +msgstr "Файл для сохранения не может быть проверен. Загрузка не удалась." + +#: ../../include/attach.php:1056 ../../include/attach.php:1072 +msgid "Path not available." +msgstr "Путь недоступен." + +#: ../../include/attach.php:1121 ../../include/attach.php:1286 +msgid "Empty pathname" +msgstr "Пустое имя пути" + +#: ../../include/attach.php:1147 +msgid "duplicate filename or path" +msgstr "дублирующееся имя файла или пути" + +#: ../../include/attach.php:1172 +msgid "Path not found." +msgstr "Путь не найден." + +#: ../../include/attach.php:1240 +msgid "mkdir failed." +msgstr "mkdir не удался" + +#: ../../include/attach.php:1244 +msgid "database storage failed." +msgstr "ошибка при записи базы данных." + +#: ../../include/attach.php:1292 +msgid "Empty path" +msgstr "Пустое имя пути" + +#: ../../include/feedutils.php:860 ../../include/text.php:1451 +msgid "unknown" +msgstr "неизвестный" + +#: ../../include/bookmarks.php:34 +#, php-format +msgid "%1$s's bookmarks" +msgstr "Закладки пользователя %1$s" + +#: ../../include/dir_fns.php:141 +msgid "Directory Options" +msgstr "Параметры каталога" + +#: ../../include/dir_fns.php:143 +msgid "Safe Mode" +msgstr "Безопасный режим" + +#: ../../include/dir_fns.php:144 +msgid "Public Forums Only" +msgstr "Только публичные форумы" + +#: ../../include/dir_fns.php:145 +msgid "This Website Only" +msgstr "Только этот веб-сайт" + +#: ../../include/network.php:760 +msgid "view full size" +msgstr "посмотреть в полный размер" + +#: ../../include/network.php:1763 ../../include/network.php:1764 +msgid "Friendica" +msgstr "" + +#: ../../include/network.php:1765 +msgid "OStatus" +msgstr "" + +#: ../../include/network.php:1766 +msgid "GNU-Social" +msgstr "GNU social" + +#: ../../include/network.php:1767 +msgid "RSS/Atom" +msgstr "" + +#: ../../include/network.php:1770 +msgid "Diaspora" +msgstr "" + +#: ../../include/network.php:1771 +msgid "Facebook" +msgstr "" + +#: ../../include/network.php:1772 +msgid "Zot" +msgstr "" + +#: ../../include/network.php:1773 +msgid "LinkedIn" +msgstr "" + +#: ../../include/network.php:1774 +msgid "XMPP/IM" +msgstr "" + +#: ../../include/network.php:1775 +msgid "MySpace" +msgstr "" + +#: ../../include/activities.php:41 +msgid " and " +msgstr " и " + +#: ../../include/activities.php:49 +msgid "public profile" +msgstr "общедоступный профиль" + +#: ../../include/activities.php:58 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s изменил %2$s на “%3$s”" + +#: ../../include/activities.php:59 +#, php-format +msgid "Visit %1$s's %2$s" +msgstr "Посетить %1$s %2$s" + +#: ../../include/activities.php:62 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s обновлено %2$s, изменено %3$s." + +#: ../../include/nav.php:88 +msgid "Remote authentication" +msgstr "Удаленная аутентификация" + +#: ../../include/nav.php:88 +msgid "Click to authenticate to your home hub" +msgstr "Нажмите, чтобы аутентифицировать себя на домашнем узле" + +#: ../../include/nav.php:94 ../../Zotlabs/Lib/Apps.php:302 +#: ../../Zotlabs/Module/Manage.php:170 +msgid "Channel Manager" +msgstr "Менеджер каналов" + +#: ../../include/nav.php:94 +msgid "Manage your channels" +msgstr "Управление вашими каналами" + +#: ../../include/nav.php:97 ../../include/group.php:320 +#: ../../include/features.php:221 ../../Zotlabs/Widget/Activity_filter.php:68 +#: ../../Zotlabs/Module/Group.php:113 ../../Zotlabs/Module/Group.php:124 +msgid "Privacy Groups" +msgstr "Группы безопасности" + +#: ../../include/nav.php:97 +msgid "Manage your privacy groups" +msgstr "Управление вашим группами безопасности" + +#: ../../include/nav.php:99 ../../Zotlabs/Lib/Apps.php:304 +#: ../../Zotlabs/Widget/Settings_menu.php:141 +#: ../../Zotlabs/Widget/Newmember.php:46 +#: ../../Zotlabs/Module/Admin/Addons.php:344 +#: ../../Zotlabs/Module/Admin/Themes.php:125 +msgid "Settings" +msgstr "Настройки" + +#: ../../include/nav.php:99 +msgid "Account/Channel Settings" +msgstr "Настройки аккаунта / канала" + +#: ../../include/nav.php:105 ../../include/nav.php:134 +msgid "End this session" +msgstr "Закончить эту сессию" + +#: ../../include/nav.php:108 +msgid "Your profile page" +msgstr "Страницa вашего профиля" + +#: ../../include/nav.php:111 ../../include/channel.php:1296 +#: ../../Zotlabs/Module/Profiles.php:830 +msgid "Edit Profiles" +msgstr "Редактирование профилей" + +#: ../../include/nav.php:111 +msgid "Manage/Edit profiles" +msgstr "Управление / редактирование профилей" + +#: ../../include/nav.php:113 ../../Zotlabs/Widget/Newmember.php:28 +msgid "Edit your profile" +msgstr "Редактировать профиль" + +#: ../../include/nav.php:120 ../../include/nav.php:124 +msgid "Sign in" +msgstr "Войти" + +#: ../../include/nav.php:151 +msgid "Take me home" +msgstr "Домой" + +#: ../../include/nav.php:153 +msgid "Log me out of this site" +msgstr "Выйти с этого сайта" + +#: ../../include/nav.php:158 +msgid "Create an account" +msgstr "Создать аккаунт" + +#: ../../include/nav.php:170 ../../include/nav.php:272 +#: ../../include/help.php:68 ../../include/help.php:74 +#: ../../Zotlabs/Lib/Apps.php:313 ../../Zotlabs/Module/Layouts.php:186 +msgid "Help" +msgstr "Помощь" + +#: ../../include/nav.php:170 +msgid "Help and documentation" +msgstr "Справочная информация и документация" + +#: ../../include/nav.php:185 ../../include/acl_selectors.php:118 +#: ../../include/text.php:1062 ../../include/text.php:1074 +#: ../../Zotlabs/Lib/Apps.php:318 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../Zotlabs/Widget/Activity_filter.php:148 +#: ../../Zotlabs/Module/Connections.php:335 ../../Zotlabs/Module/Search.php:44 +msgid "Search" +msgstr "Поиск" + +#: ../../include/nav.php:185 +msgid "Search site @name, !forum, #tag, ?docs, content" +msgstr "Искать на сайте @name, !forum, #tag, ?docs, содержимое" + +#: ../../include/nav.php:191 ../../Zotlabs/Widget/Admin.php:55 +msgid "Admin" +msgstr "Администрирование" + +#: ../../include/nav.php:191 +msgid "Site Setup and Configuration" +msgstr "Установка и конфигурация сайта" + +#: ../../include/nav.php:276 ../../Zotlabs/Widget/Notifications.php:162 +#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240 +#: ../../Zotlabs/Module/New_channel.php:154 +#: ../../Zotlabs/Module/New_channel.php:161 +msgid "Loading" +msgstr "Загрузка" + +#: ../../include/nav.php:282 +msgid "@name, !forum, #tag, ?doc, content" +msgstr "@name, !forum, #tag, ?docs, содержимое" + +#: ../../include/nav.php:283 +msgid "Please wait..." +msgstr "Подождите пожалуйста ..." + +#: ../../include/nav.php:289 +msgid "Add Apps" +msgstr "Добавить приложения" + +#: ../../include/nav.php:290 +msgid "Arrange Apps" +msgstr "Управление приложениями" + +#: ../../include/nav.php:291 +msgid "Toggle System Apps" +msgstr "Переключить системные приложения" + +#: ../../include/nav.php:412 ../../include/nav.php:415 +#: ../../Zotlabs/Storage/Browser.php:140 +msgid "Calendar" +msgstr "Календарь" + +#: ../../include/nav.php:461 ../../include/features.php:133 +#: ../../Zotlabs/Lib/Apps.php:292 ../../Zotlabs/Module/Articles.php:38 +#: ../../Zotlabs/Module/Articles.php:191 +msgid "Articles" +msgstr "Статьи" + +#: ../../include/help.php:34 +msgid "Help:" +msgstr "Помощь:" + +#: ../../include/help.php:78 +msgid "Not Found" +msgstr "Не найдено" + +#: ../../include/help.php:81 ../../Zotlabs/Lib/NativeWikiPage.php:519 +#: ../../Zotlabs/Web/Router.php:167 ../../Zotlabs/Module/Block.php:77 +#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Display.php:141 +#: ../../Zotlabs/Module/Display.php:158 ../../Zotlabs/Module/Display.php:175 +msgid "Page not found." +msgstr "Страница не найдена." + +#: ../../include/group.php:22 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"may 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:264 +msgid "Add new connections to this privacy group" +msgstr "Добавить новые контакты в группу безопасности" + +#: ../../include/group.php:298 +msgid "edit" +msgstr "редактировать" + +#: ../../include/group.php:321 +msgid "Edit group" +msgstr "Редактировать группу" + +#: ../../include/group.php:322 +msgid "Add privacy group" +msgstr "Добавить группу безопасности" + +#: ../../include/group.php:323 +msgid "Channels not in any privacy group" +msgstr "Каналы не включены ни в одну группу безопасности" + +#: ../../include/group.php:325 ../../Zotlabs/Widget/Savedsearch.php:84 +msgid "add" +msgstr "добавить" + +#: ../../include/import.php:25 +msgid "Unable to import a removed channel." +msgstr "Невозможно импортировать удалённый канал." + +#: ../../include/import.php:51 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "Не удалось создать дублирующийся идентификатор канала. Импорт невозможен." + +#: ../../include/import.php:116 +msgid "Cloned channel not found. Import failed." +msgstr "Клон канала не найден. Импорт невозможен." + +#: ../../include/photo/photo_driver.php:741 +#: ../../Zotlabs/Module/Profile_photo.php:120 +#: ../../Zotlabs/Module/Profile_photo.php:248 +msgid "Profile Photos" +msgstr "Фотографии профиля" + +#: ../../include/taxonomy.php:320 +msgid "Trending" +msgstr "В тренде" + +#: ../../include/taxonomy.php:320 ../../include/taxonomy.php:449 +#: ../../include/taxonomy.php:470 ../../Zotlabs/Widget/Tagcloud.php:22 +msgid "Tags" +msgstr "Теги" + +#: ../../include/taxonomy.php:409 ../../include/taxonomy.php:491 +#: ../../include/taxonomy.php:511 ../../include/taxonomy.php:532 +#: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141 +#: ../../include/contact_widgets.php:186 +#: ../../Zotlabs/Widget/Appcategories.php:43 +msgid "Categories" +msgstr "Категории" + +#: ../../include/taxonomy.php:552 +msgid "Keywords" +msgstr "Ключевые слова" + +#: ../../include/taxonomy.php:573 +msgid "have" +msgstr "иметь" + +#: ../../include/taxonomy.php:573 +msgid "has" +msgstr "есть" + +#: ../../include/taxonomy.php:574 +msgid "want" +msgstr "хотеть" + +#: ../../include/taxonomy.php:574 +msgid "wants" +msgstr "хотеть" + +#: ../../include/taxonomy.php:575 ../../Zotlabs/Lib/ThreadItem.php:285 +msgid "like" +msgstr "нравится" + +#: ../../include/taxonomy.php:575 +msgid "likes" +msgstr "нравится" + +#: ../../include/taxonomy.php:576 ../../Zotlabs/Lib/ThreadItem.php:286 +msgid "dislike" +msgstr "не нравится" + +#: ../../include/taxonomy.php:576 +msgid "dislikes" +msgstr "не нравится" + +#: ../../include/zid.php:351 +#, php-format +msgid "OpenWebAuth: %1$s welcomes %2$s" +msgstr "OpenWebAuth: %1$s приветствует %2$s" + +#: ../../include/language.php:397 ../../include/text.php:1866 +msgid "default" +msgstr "по умолчанию" + +#: ../../include/language.php:410 +msgid "Select an alternate language" +msgstr "Выбор дополнительного языка" + +#: ../../include/follow.php:37 +msgid "Channel is blocked on this site." +msgstr "Канал блокируется на этом сайте." + +#: ../../include/follow.php:42 +msgid "Channel location missing." +msgstr "Местоположение канала отсутствует." + +#: ../../include/follow.php:84 +msgid "Response from remote channel was incomplete." +msgstr "Ответ удаленного канала неполный." + +#: ../../include/follow.php:96 +msgid "Premium channel - please visit:" +msgstr "Премимум-канал - пожалуйста посетите:" + +#: ../../include/follow.php:110 +msgid "Channel was deleted and no longer exists." +msgstr "Канал удален и больше не существует." + +#: ../../include/follow.php:165 +msgid "Remote channel or protocol unavailable." +msgstr "Удалённый канал или протокол недоступен." + +#: ../../include/follow.php:188 +msgid "Channel discovery failed." +msgstr "Не удалось обнаружить канал." + +#: ../../include/follow.php:200 +msgid "Protocol disabled." +msgstr "Протокол отключен." + +#: ../../include/follow.php:211 +msgid "Cannot connect to yourself." +msgstr "Нельзя подключиться к самому себе." + +#: ../../include/acl_selectors.php:33 +#: ../../Zotlabs/Lib/PermissionDescription.php:34 +msgid "Visible to your default audience" +msgstr "Видно вашей аудитории по умолчанию." + +#: ../../include/acl_selectors.php:88 ../../Zotlabs/Module/Acl.php:120 +#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 +msgctxt "acl" +msgid "Profile" +msgstr "Профиль" + +#: ../../include/acl_selectors.php:106 +#: ../../Zotlabs/Lib/PermissionDescription.php:107 +msgid "Only me" +msgstr "Только мне" + +#: ../../include/acl_selectors.php:113 +msgid "Who can see this?" +msgstr "Кто может это видеть?" + +#: ../../include/acl_selectors.php:114 +msgid "Custom selection" +msgstr "Настраиваемый выбор" + +#: ../../include/acl_selectors.php:115 +msgid "" +"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " +"the scope of \"Show\"." +msgstr "Нажмите \"Показать\" чтобы разрешить просмотр. \"Не показывать\" позволит вам переопределить и ограничить область показа." + +#: ../../include/acl_selectors.php:116 +msgid "Show" +msgstr "Показать" + +#: ../../include/acl_selectors.php:117 +msgid "Don't show" +msgstr "Не показывать" + +#: ../../include/acl_selectors.php:123 ../../Zotlabs/Module/Photos.php:707 +#: ../../Zotlabs/Module/Photos.php:1076 +#: ../../Zotlabs/Module/Filestorage.php:170 +#: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235 +#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372 +msgid "Permissions" +msgstr "Разрешения" + +#: ../../include/acl_selectors.php:125 ../../Zotlabs/Lib/ThreadItem.php:426 +#: ../../Zotlabs/Module/Photos.php:1298 +msgid "Close" +msgstr "Закрыть" + +#: ../../include/acl_selectors.php:150 +#, php-format +msgid "" +"Post permissions %s cannot be changed %s after a post is shared.
      These " +"permissions set who is allowed to view the post." +msgstr "Разрешения публикации %s не могут быть изменены %s после того, как ею поделились. Эти разрешения устанавливают кому разрешено просматривать эту публикацию." + +#: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:44 +#: ../../Zotlabs/Module/Profiles.php:736 +msgid "Miscellaneous" +msgstr "Прочее" + +#: ../../include/datetime.php:140 +msgid "Birthday" +msgstr "День рождения" + +#: ../../include/datetime.php:140 +msgid "Age: " +msgstr "Возраст:" + +#: ../../include/datetime.php:140 +msgid "YYYY-MM-DD or MM-DD" +msgstr "YYYY-MM-DD или MM-DD" + +#: ../../include/datetime.php:211 ../../Zotlabs/Module/Appman.php:141 +#: ../../Zotlabs/Module/Appman.php:142 ../../Zotlabs/Module/Events.php:460 +#: ../../Zotlabs/Module/Events.php:465 ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:749 +msgid "Required" +msgstr "Требуется" + +#: ../../include/datetime.php:244 +msgid "less than a second ago" +msgstr "менее чем одну секунду" + +#: ../../include/datetime.php:262 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" +msgstr "%1$d %2$s тому назад" + +#: ../../include/datetime.php:273 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "год" +msgstr[1] "года" +msgstr[2] "лет" + +#: ../../include/datetime.php:276 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "месяц" +msgstr[1] "месяца" +msgstr[2] "месяцев" + +#: ../../include/datetime.php:279 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "неделю" +msgstr[1] "недели" +msgstr[2] "недель" + +#: ../../include/datetime.php:282 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "день" +msgstr[1] "дня" +msgstr[2] "дней" + +#: ../../include/datetime.php:285 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "час" +msgstr[1] "часа" +msgstr[2] "часов" + +#: ../../include/datetime.php:288 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "минуту" +msgstr[1] "минуты" +msgstr[2] "минут" + +#: ../../include/datetime.php:291 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "секунду" +msgstr[1] "секунды" +msgstr[2] "секунд" + +#: ../../include/datetime.php:520 +#, php-format +msgid "%1$s's birthday" +msgstr "У %1$s День рождения" + +#: ../../include/datetime.php:521 +#, php-format +msgid "Happy Birthday %1$s" +msgstr "С Днем рождения %1$s !" + +#: ../../include/dba/dba_driver.php:178 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "Не удается найти DNS информацию для сервера базы данных '%s'" + +#: ../../include/text.php:492 +msgid "prev" +msgstr "предыдущий" + +#: ../../include/text.php:494 +msgid "first" +msgstr "первый" + +#: ../../include/text.php:523 +msgid "last" +msgstr "последний" + +#: ../../include/text.php:526 +msgid "next" +msgstr "следующий" + +#: ../../include/text.php:537 +msgid "older" +msgstr "старше" + +#: ../../include/text.php:539 +msgid "newer" +msgstr "новее" + +#: ../../include/text.php:963 +msgid "No connections" +msgstr "Нет контактов" + +#: ../../include/text.php:975 ../../Zotlabs/Lib/Apps.php:298 +#: ../../Zotlabs/Module/Connections.php:331 +msgid "Connections" +msgstr "Контакты" + +#: ../../include/text.php:995 +#, php-format +msgid "View all %s connections" +msgstr "Просмотреть все %s контактов" + +#: ../../include/text.php:1051 +#, php-format +msgid "Network: %s" +msgstr "Сеть: %s" + +#: ../../include/text.php:1063 ../../include/text.php:1075 +#: ../../Zotlabs/Widget/Notes.php:18 ../../Zotlabs/Module/Rbmark.php:32 +#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Admin/Profs.php:94 +#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:53 +msgid "Save" +msgstr "Запомнить" + +#: ../../include/text.php:1140 ../../include/text.php:1144 +msgid "poke" +msgstr "Ткнуть" + +#: ../../include/text.php:1145 +msgid "ping" +msgstr "Пингануть" + +#: ../../include/text.php:1145 +msgid "pinged" +msgstr "Отпингован" + +#: ../../include/text.php:1146 +msgid "prod" +msgstr "Подтолкнуть" + +#: ../../include/text.php:1146 +msgid "prodded" +msgstr "Подтолкнут" + +#: ../../include/text.php:1147 +msgid "slap" +msgstr "Шлёпнуть" + +#: ../../include/text.php:1147 +msgid "slapped" +msgstr "Шлёпнут" + +#: ../../include/text.php:1148 +msgid "finger" +msgstr "Указать" + +#: ../../include/text.php:1148 +msgid "fingered" +msgstr "Указан" + +#: ../../include/text.php:1149 +msgid "rebuff" +msgstr "Дать отпор" + +#: ../../include/text.php:1149 +msgid "rebuffed" +msgstr "Дан отпор" + +#: ../../include/text.php:1172 +msgid "happy" +msgstr "счастливый" + +#: ../../include/text.php:1173 msgid "sad" msgstr "грустный" -#: ../../include/text.php:911 -msgid "mellow" -msgstr "спокойный" +#: ../../include/text.php:1174 +msgid "mellow" +msgstr "спокойный" + +#: ../../include/text.php:1175 +msgid "tired" +msgstr "усталый" + +#: ../../include/text.php:1176 +msgid "perky" +msgstr "весёлый" + +#: ../../include/text.php:1177 +msgid "angry" +msgstr "сердитый" + +#: ../../include/text.php:1178 +msgid "stupefied" +msgstr "отупевший" + +#: ../../include/text.php:1179 +msgid "puzzled" +msgstr "недоумевающий" + +#: ../../include/text.php:1180 +msgid "interested" +msgstr "заинтересованный" + +#: ../../include/text.php:1181 +msgid "bitter" +msgstr "едкий" + +#: ../../include/text.php:1182 +msgid "cheerful" +msgstr "бодрый" + +#: ../../include/text.php:1183 +msgid "alive" +msgstr "энергичный" + +#: ../../include/text.php:1184 +msgid "annoyed" +msgstr "раздражённый" + +#: ../../include/text.php:1185 +msgid "anxious" +msgstr "обеспокоенный" + +#: ../../include/text.php:1186 +msgid "cranky" +msgstr "капризный" + +#: ../../include/text.php:1187 +msgid "disturbed" +msgstr "встревоженный" + +#: ../../include/text.php:1188 +msgid "frustrated" +msgstr "разочарованный" + +#: ../../include/text.php:1189 +msgid "depressed" +msgstr "подавленный" + +#: ../../include/text.php:1190 +msgid "motivated" +msgstr "мотивированный" + +#: ../../include/text.php:1191 +msgid "relaxed" +msgstr "расслабленный" + +#: ../../include/text.php:1192 +msgid "surprised" +msgstr "удивленный" + +#: ../../include/text.php:1371 ../../include/js_strings.php:86 +msgid "Monday" +msgstr "Понедельник" + +#: ../../include/text.php:1371 ../../include/js_strings.php:87 +msgid "Tuesday" +msgstr "Вторник" + +#: ../../include/text.php:1371 ../../include/js_strings.php:88 +msgid "Wednesday" +msgstr "Среда" + +#: ../../include/text.php:1371 ../../include/js_strings.php:89 +msgid "Thursday" +msgstr "Четверг" + +#: ../../include/text.php:1371 ../../include/js_strings.php:90 +msgid "Friday" +msgstr "Пятница" + +#: ../../include/text.php:1371 ../../include/js_strings.php:91 +msgid "Saturday" +msgstr "Суббота" + +#: ../../include/text.php:1371 ../../include/js_strings.php:85 +msgid "Sunday" +msgstr "Воскресенье" + +#: ../../include/text.php:1375 ../../include/js_strings.php:61 +msgid "January" +msgstr "Январь" + +#: ../../include/text.php:1375 ../../include/js_strings.php:62 +msgid "February" +msgstr "Февраль" + +#: ../../include/text.php:1375 ../../include/js_strings.php:63 +msgid "March" +msgstr "Март" + +#: ../../include/text.php:1375 ../../include/js_strings.php:64 +msgid "April" +msgstr "Апрель" + +#: ../../include/text.php:1375 +msgid "May" +msgstr "Май" + +#: ../../include/text.php:1375 ../../include/js_strings.php:66 +msgid "June" +msgstr "Июнь" + +#: ../../include/text.php:1375 ../../include/js_strings.php:67 +msgid "July" +msgstr "Июль" + +#: ../../include/text.php:1375 ../../include/js_strings.php:68 +msgid "August" +msgstr "Август" + +#: ../../include/text.php:1375 ../../include/js_strings.php:69 +msgid "September" +msgstr "Сентябрь" + +#: ../../include/text.php:1375 ../../include/js_strings.php:70 +msgid "October" +msgstr "Октябрь" + +#: ../../include/text.php:1375 ../../include/js_strings.php:71 +msgid "November" +msgstr "Ноябрь" + +#: ../../include/text.php:1375 ../../include/js_strings.php:72 +msgid "December" +msgstr "Декабрь" + +#: ../../include/text.php:1449 +msgid "Unknown Attachment" +msgstr "Неизвестное вложение" + +#: ../../include/text.php:1451 ../../Zotlabs/Module/Sharedwithme.php:107 +#: ../../Zotlabs/Storage/Browser.php:287 +msgid "Size" +msgstr "Размер" + +#: ../../include/text.php:1487 +msgid "remove category" +msgstr "удалить категорию" + +#: ../../include/text.php:1561 +msgid "remove from file" +msgstr "удалить из файла" + +#: ../../include/text.php:1703 ../../include/message.php:12 +msgid "Download binary/encrypted content" +msgstr "Загрузить двоичное / зашифрованное содержимое" + +#: ../../include/text.php:1844 ../../Zotlabs/Module/Events.php:660 +#: ../../Zotlabs/Module/Cal.php:315 +msgid "Link to Source" +msgstr "Ссылка на источник" + +#: ../../include/text.php:1874 +msgid "Page layout" +msgstr "Шаблон страницы" + +#: ../../include/text.php:1874 +msgid "You can create your own with the layouts tool" +msgstr "Вы можете создать свой собственный с помощью инструмента шаблонов" + +#: ../../include/text.php:1884 ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../Zotlabs/Module/Wiki.php:208 +#: ../../Zotlabs/Module/Wiki.php:350 +msgid "BBcode" +msgstr "" + +#: ../../include/text.php:1885 +msgid "HTML" +msgstr "" + +#: ../../include/text.php:1887 ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../Zotlabs/Module/Wiki.php:208 +msgid "Text" +msgstr "Текст" + +#: ../../include/text.php:1888 +msgid "Comanche Layout" +msgstr "Шаблон Comanche" + +#: ../../include/text.php:1893 +msgid "PHP" +msgstr "" + +#: ../../include/text.php:1902 +msgid "Page content type" +msgstr "Тип содержимого страницы" + +#: ../../include/text.php:2035 +msgid "activity" +msgstr "активность" + +#: ../../include/text.php:2135 +msgid "a-z, 0-9, -, and _ only" +msgstr "Только a-z, 0-9, -, и _" + +#: ../../include/text.php:2455 +msgid "Design Tools" +msgstr "Инструменты дизайна" + +#: ../../include/text.php:2458 ../../Zotlabs/Module/Blocks.php:154 +msgid "Blocks" +msgstr "Блокировки" + +#: ../../include/text.php:2459 ../../Zotlabs/Module/Menu.php:170 +msgid "Menus" +msgstr "Меню" + +#: ../../include/text.php:2460 ../../Zotlabs/Module/Layouts.php:184 +msgid "Layouts" +msgstr "Шаблоны" + +#: ../../include/text.php:2461 +msgid "Pages" +msgstr "Страницы" + +#: ../../include/text.php:2482 ../../Zotlabs/Module/Cal.php:344 +msgid "Import" +msgstr "Импортировать" + +#: ../../include/text.php:2483 +msgid "Import website..." +msgstr "Импорт веб-сайта..." + +#: ../../include/text.php:2484 +msgid "Select folder to import" +msgstr "Выбрать каталог для импорта" + +#: ../../include/text.php:2485 +msgid "Import from a zipped folder:" +msgstr "Импортировать из каталога в zip-архиве:" + +#: ../../include/text.php:2486 +msgid "Import from cloud files:" +msgstr "Импортировать из сетевых файлов:" + +#: ../../include/text.php:2487 +msgid "/cloud/channel/path/to/folder" +msgstr "" + +#: ../../include/text.php:2488 +msgid "Enter path to website files" +msgstr "Введите путь к файлам веб-сайта" + +#: ../../include/text.php:2489 +msgid "Select folder" +msgstr "Выбрать каталог" + +#: ../../include/text.php:2490 +msgid "Export website..." +msgstr "Экспорт веб-сайта..." + +#: ../../include/text.php:2491 +msgid "Export to a zip file" +msgstr "Экспортировать в ZIP файл." + +#: ../../include/text.php:2492 +msgid "website.zip" +msgstr "" + +#: ../../include/text.php:2493 +msgid "Enter a name for the zip file." +msgstr "Введите имя для ZIP файла." + +#: ../../include/text.php:2494 +msgid "Export to cloud files" +msgstr "Эскпортировать в сетевые файлы:" + +#: ../../include/text.php:2495 +msgid "/path/to/export/folder" +msgstr "" + +#: ../../include/text.php:2496 +msgid "Enter a path to a cloud files destination." +msgstr "Введите путь к расположению сетевых файлов." + +#: ../../include/text.php:2497 +msgid "Specify folder" +msgstr "Указать каталог" + +#: ../../include/text.php:2817 ../../Zotlabs/Storage/Browser.php:131 +msgid "Collection" +msgstr "Коллекция" + +#: ../../include/security.php:541 +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 "Не верный токен безопасности для формы. Вероятно, это произошло потому, что форма была открыта слишком долго (> 3-х часов) перед его отправкой." + +#: ../../include/menu.php:118 ../../include/channel.php:1296 +#: ../../include/channel.php:1300 ../../Zotlabs/Lib/ThreadItem.php:128 +#: ../../Zotlabs/Lib/Apps.php:475 ../../Zotlabs/Widget/Cdav.php:126 +#: ../../Zotlabs/Widget/Cdav.php:162 ../../Zotlabs/Module/Connections.php:281 +#: ../../Zotlabs/Module/Connections.php:319 +#: ../../Zotlabs/Module/Connections.php:339 +#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Card_edit.php:99 +#: ../../Zotlabs/Module/Editblock.php:114 ../../Zotlabs/Module/Webpages.php:240 +#: ../../Zotlabs/Module/Editwebpage.php:142 +#: ../../Zotlabs/Module/Editlayout.php:114 +#: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Blocks.php:160 +#: ../../Zotlabs/Module/Menu.php:175 +#: ../../Zotlabs/Module/Settings/Oauth2.php:150 +#: ../../Zotlabs/Module/Settings/Oauth.php:150 +#: ../../Zotlabs/Module/Article_edit.php:99 ../../Zotlabs/Module/Wiki.php:202 +#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Group.php:216 +#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Storage/Browser.php:290 +msgid "Edit" +msgstr "Изменить" + +#: ../../include/items.php:891 ../../include/items.php:951 +msgid "(Unknown)" +msgstr "(Неизвестный)" + +#: ../../include/items.php:1137 +msgid "Visible to anybody on the internet." +msgstr "Виден всем в интернете." + +#: ../../include/items.php:1139 +msgid "Visible to you only." +msgstr "Видно только вам." + +#: ../../include/items.php:1141 +msgid "Visible to anybody in this network." +msgstr "Видно всем в этой сети." + +#: ../../include/items.php:1143 +msgid "Visible to anybody authenticated." +msgstr "Видно всем аутентифицированным." + +#: ../../include/items.php:1145 +#, php-format +msgid "Visible to anybody on %s." +msgstr "Видно всем в %s." + +#: ../../include/items.php:1147 +msgid "Visible to all connections." +msgstr "Видно всем контактам." + +#: ../../include/items.php:1149 +msgid "Visible to approved connections." +msgstr "Видно только одобренным контактам." + +#: ../../include/items.php:1151 +msgid "Visible to specific connections." +msgstr "Видно указанным контактам." + +#: ../../include/items.php:3566 ../../Zotlabs/Module/Viewsrc.php:25 +#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62 +#: ../../Zotlabs/Module/Admin/Addons.php:259 +#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94 +#: ../../Zotlabs/Module/Display.php:46 ../../Zotlabs/Module/Display.php:453 +msgid "Item not found." +msgstr "Элемент не найден." + +#: ../../include/items.php:4125 ../../Zotlabs/Module/Group.php:51 +#: ../../Zotlabs/Module/Group.php:181 +msgid "Privacy group not found." +msgstr "Группа безопасности не найдена." + +#: ../../include/items.php:4141 +msgid "Privacy group is empty." +msgstr "Группа безопасности пуста" + +#: ../../include/items.php:4148 +#, php-format +msgid "Privacy group: %s" +msgstr "Группа безопасности: %s" + +#: ../../include/items.php:4158 ../../Zotlabs/Module/Connedit.php:850 +#, php-format +msgid "Connection: %s" +msgstr "Контакт: %s" + +#: ../../include/items.php:4160 +msgid "Connection not found." +msgstr "Контакт не найден." + +#: ../../include/items.php:4502 ../../Zotlabs/Module/Cover_photo.php:269 +msgid "female" +msgstr "женщина" + +#: ../../include/items.php:4503 ../../Zotlabs/Module/Cover_photo.php:270 +#, php-format +msgid "%1$s updated her %2$s" +msgstr "%1$s обновила её %2$s" + +#: ../../include/items.php:4504 ../../Zotlabs/Module/Cover_photo.php:271 +msgid "male" +msgstr "мужчина" + +#: ../../include/items.php:4505 ../../Zotlabs/Module/Cover_photo.php:272 +#, php-format +msgid "%1$s updated his %2$s" +msgstr "%1$s обновил его %2$s" + +#: ../../include/items.php:4507 ../../Zotlabs/Module/Cover_photo.php:274 +#, php-format +msgid "%1$s updated their %2$s" +msgstr "%1$s обновили их %2$s" + +#: ../../include/items.php:4509 +msgid "profile photo" +msgstr "Фотография профиля" + +#: ../../include/items.php:4700 +#, php-format +msgid "[Edited %s]" +msgstr "[Отредактировано %s]" + +#: ../../include/items.php:4700 +msgctxt "edit_activity" +msgid "Post" +msgstr "Публикация" + +#: ../../include/items.php:4700 +msgctxt "edit_activity" +msgid "Comment" +msgstr "Комментарий" + +#: ../../include/contact_widgets.php:11 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/contact_widgets.php:16 ../../Zotlabs/Module/Admin/Site.php:313 +msgid "Advanced" +msgstr "Дополнительно" + +#: ../../include/contact_widgets.php:19 +msgid "Find Channels" +msgstr "Поиск каналов" + +#: ../../include/contact_widgets.php:20 +msgid "Enter name or interest" +msgstr "Впишите имя или интерес" + +#: ../../include/contact_widgets.php:21 +msgid "Connect/Follow" +msgstr "Подключить / отслеживать" + +#: ../../include/contact_widgets.php:22 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "Примеры: Владимир Ильич, Революционер" + +#: ../../include/contact_widgets.php:23 +#: ../../Zotlabs/Module/Connections.php:338 +#: ../../Zotlabs/Module/Directory.php:401 +#: ../../Zotlabs/Module/Directory.php:406 +msgid "Find" +msgstr "Поиск" + +#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Suggest.php:64 +#: ../../Zotlabs/Module/Directory.php:405 +msgid "Channel Suggestions" +msgstr "Рекомендации каналов" + +#: ../../include/contact_widgets.php:26 +msgid "Random Profile" +msgstr "Случайный профиль" + +#: ../../include/contact_widgets.php:27 +msgid "Invite Friends" +msgstr "Пригласить друзей" + +#: ../../include/contact_widgets.php:29 +msgid "Advanced example: name=fred and country=iceland" +msgstr "Расширенный пример: name=ivan and country=russia" + +#: ../../include/contact_widgets.php:53 ../../include/features.php:488 +#: ../../Zotlabs/Widget/Filer.php:28 +#: ../../Zotlabs/Widget/Activity_filter.php:134 +msgid "Saved Folders" +msgstr "Сохранённые каталоги" + +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100 +#: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189 +#: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31 +msgid "Everything" +msgstr "Всё" + +#: ../../include/contact_widgets.php:223 +msgid "Common Connections" +msgstr "Общие контакты" + +#: ../../include/contact_widgets.php:228 +#, php-format +msgid "View all %d common connections" +msgstr "Просмотреть все %d общих контактов" + +#: ../../include/channel.php:35 +msgid "Unable to obtain identity information from database" +msgstr "Невозможно получить идентификационную информацию из базы данных" + +#: ../../include/channel.php:68 +msgid "Empty name" +msgstr "Пустое имя" + +#: ../../include/channel.php:71 +msgid "Name too long" +msgstr "Слишком длинное имя" + +#: ../../include/channel.php:188 +msgid "No account identifier" +msgstr "Идентификатор аккаунта отсутствует" + +#: ../../include/channel.php:200 +msgid "Nickname is required." +msgstr "Требуется псевдоним." + +#: ../../include/channel.php:214 ../../include/channel.php:599 +#: ../../Zotlabs/Module/Changeaddr.php:46 +msgid "Reserved nickname. Please choose another." +msgstr "Зарезервированый псевдоним. Пожалуйста, выберите другой." + +#: ../../include/channel.php:219 ../../include/channel.php:604 +#: ../../Zotlabs/Module/Changeaddr.php:51 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "Псевдоним имеет недопустимые символы или уже используется на этом сайте." + +#: ../../include/channel.php:277 +msgid "Unable to retrieve created identity" +msgstr "Не удается получить созданный идентификатор" + +#: ../../include/channel.php:373 +msgid "Default Profile" +msgstr "Профиль по умолчанию" + +#: ../../include/channel.php:437 ../../include/channel.php:438 +#: ../../include/channel.php:445 ../../include/selectors.php:123 +#: ../../Zotlabs/Widget/Affinity.php:24 ../../Zotlabs/Module/Connedit.php:711 +#: ../../Zotlabs/Module/Settings/Channel.php:68 +#: ../../Zotlabs/Module/Settings/Channel.php:72 +#: ../../Zotlabs/Module/Settings/Channel.php:73 +#: ../../Zotlabs/Module/Settings/Channel.php:76 +#: ../../Zotlabs/Module/Settings/Channel.php:87 +msgid "Friends" +msgstr "Друзья" + +#: ../../include/channel.php:532 ../../include/channel.php:621 +msgid "Unable to retrieve modified identity" +msgstr "Не удается найти изменённый идентификатор" + +#: ../../include/channel.php:1197 ../../Zotlabs/Module/Connect.php:17 +#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Layouts.php:31 +#: ../../Zotlabs/Module/Filestorage.php:51 +#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Webpages.php:33 +#: ../../Zotlabs/Module/Editwebpage.php:32 +#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Articles.php:29 +#: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Blocks.php:33 +#: ../../Zotlabs/Module/Menu.php:91 ../../Zotlabs/Module/Cards.php:33 +#: ../../Zotlabs/Module/Profile.php:20 +msgid "Requested profile is not available." +msgstr "Запрашиваемый профиль не доступен." + +#: ../../include/channel.php:1289 ../../Zotlabs/Module/Profiles.php:728 +msgid "Change profile photo" +msgstr "Изменить фотографию профиля" + +#: ../../include/channel.php:1297 +msgid "Create New Profile" +msgstr "Создать новый профиль" + +#: ../../include/channel.php:1315 ../../Zotlabs/Module/Profiles.php:820 +msgid "Profile Image" +msgstr "Изображение профиля" + +#: ../../include/channel.php:1318 +msgid "Visible to everybody" +msgstr "Видно всем" + +#: ../../include/channel.php:1319 ../../Zotlabs/Module/Profiles.php:725 +#: ../../Zotlabs/Module/Profiles.php:824 +msgid "Edit visibility" +msgstr "Редактировать видимость" + +#: ../../include/channel.php:1395 ../../include/channel.php:1523 +msgid "Gender:" +msgstr "Пол:" + +#: ../../include/channel.php:1397 ../../include/channel.php:1591 +msgid "Homepage:" +msgstr "Домашняя страница:" + +#: ../../include/channel.php:1398 +msgid "Online Now" +msgstr "Сейчас в сети" + +#: ../../include/channel.php:1451 +msgid "Change your profile photo" +msgstr "Изменить фотографию вашего профиля" + +#: ../../include/channel.php:1482 +msgid "Trans" +msgstr "Трансексуал" + +#: ../../include/channel.php:1484 ../../include/selectors.php:49 +msgid "Neuter" +msgstr "Среднего рода" + +#: ../../include/channel.php:1486 ../../include/selectors.php:49 +msgid "Non-specific" +msgstr "Неспецифический" + +#: ../../include/channel.php:1521 ../../Zotlabs/Module/Settings/Channel.php:522 +msgid "Full Name:" +msgstr "Полное имя:" + +#: ../../include/channel.php:1528 +msgid "Like this channel" +msgstr "нравится этот канал" + +#: ../../include/channel.php:1552 +msgid "j F, Y" +msgstr "" + +#: ../../include/channel.php:1553 +msgid "j F" +msgstr "" + +#: ../../include/channel.php:1560 +msgid "Birthday:" +msgstr "День рождения:" + +#: ../../include/channel.php:1564 ../../Zotlabs/Module/Directory.php:319 +msgid "Age:" +msgstr "Возраст:" + +#: ../../include/channel.php:1573 +#, php-format +msgid "for %1$d %2$s" +msgstr "для %1$d %2$s" + +#: ../../include/channel.php:1585 +msgid "Tags:" +msgstr "Теги:" + +#: ../../include/channel.php:1589 +msgid "Sexual Preference:" +msgstr "Сексуальные предпочтения:" + +#: ../../include/channel.php:1593 ../../Zotlabs/Module/Directory.php:335 +msgid "Hometown:" +msgstr "Родной город:" + +#: ../../include/channel.php:1595 +msgid "Political Views:" +msgstr "Политические взгляды:" + +#: ../../include/channel.php:1597 +msgid "Religion:" +msgstr "Религия:" + +#: ../../include/channel.php:1599 ../../Zotlabs/Module/Directory.php:337 +msgid "About:" +msgstr "О себе:" + +#: ../../include/channel.php:1601 +msgid "Hobbies/Interests:" +msgstr "Хобби / интересы:" + +#: ../../include/channel.php:1603 +msgid "Likes:" +msgstr "Что вам нравится:" + +#: ../../include/channel.php:1605 +msgid "Dislikes:" +msgstr "Что вам не нравится:" + +#: ../../include/channel.php:1607 +msgid "Contact information and Social Networks:" +msgstr "Контактная информация и социальные сети:" + +#: ../../include/channel.php:1609 +msgid "My other channels:" +msgstr "Мои другие каналы:" + +#: ../../include/channel.php:1611 +msgid "Musical interests:" +msgstr "Музыкальные интересы:" + +#: ../../include/channel.php:1613 +msgid "Books, literature:" +msgstr "Книги, литература:" + +#: ../../include/channel.php:1615 +msgid "Television:" +msgstr "Телевидение:" + +#: ../../include/channel.php:1617 +msgid "Film/dance/culture/entertainment:" +msgstr "Кино / танцы / культура / развлечения:" + +#: ../../include/channel.php:1619 +msgid "Love/Romance:" +msgstr "Любовь / романтика:" + +#: ../../include/channel.php:1621 +msgid "Work/employment:" +msgstr "Работа / занятость:" + +#: ../../include/channel.php:1623 +msgid "School/education:" +msgstr "Школа / образование:" + +#: ../../include/channel.php:1644 ../../Zotlabs/Module/Profperm.php:113 +msgid "Profile" +msgstr "Профиль" + +#: ../../include/channel.php:1646 +msgid "Like this thing" +msgstr "нравится этo" + +#: ../../include/channel.php:1647 ../../Zotlabs/Module/Events.php:691 +#: ../../Zotlabs/Module/Cal.php:341 +msgid "Export" +msgstr "Экспорт" + +#: ../../include/channel.php:2081 ../../Zotlabs/Module/Cover_photo.php:276 +msgid "cover photo" +msgstr "фотография обложки" + +#: ../../include/channel.php:2335 ../../Zotlabs/Module/Rmagic.php:76 +msgid "Enter your channel address (e.g. channel@example.com)" +msgstr "Введите адрес вашего канала (например: channel@example.com)" + +#: ../../include/channel.php:2336 ../../Zotlabs/Module/Rmagic.php:77 +msgid "Authenticate" +msgstr "Проверка подлинности" + +#: ../../include/channel.php:2490 ../../Zotlabs/Module/Admin/Accounts.php:91 +#, php-format +msgid "Account '%s' deleted" +msgstr "Аккаунт '%s' удален" + +#: ../../include/features.php:56 +msgid "General Features" +msgstr "Главные функции" + +#: ../../include/features.php:60 ../../Zotlabs/Widget/Newmember.php:62 +msgid "New Member Links" +msgstr "Ссылки для новичков" + +#: ../../include/features.php:61 +msgid "Display new member quick links menu" +msgstr "Показать меню быстрых ссылок для новых участников" + +#: ../../include/features.php:69 +msgid "Advanced Profiles" +msgstr "Расширенные профили" + +#: ../../include/features.php:70 +msgid "Additional profile sections and selections" +msgstr "Дополнительные секции и выборы профиля" + +#: ../../include/features.php:78 +msgid "Profile Import/Export" +msgstr "Импорт / экспорт профиля" + +#: ../../include/features.php:79 +msgid "Save and load profile details across sites/channels" +msgstr "Сохранение и загрузка настроек профиля на всех сайтах / каналах" + +#: ../../include/features.php:87 +msgid "Web Pages" +msgstr "Веб-страницы" + +#: ../../include/features.php:88 +msgid "Provide managed web pages on your channel" +msgstr "Предоставлять управляемые веб-страницы на Вашем канале" + +#: ../../include/features.php:97 +msgid "Provide a wiki for your channel" +msgstr "Предоставьте Wiki для вашего канала" + +#: ../../include/features.php:114 +msgid "Private Notes" +msgstr "Личные заметки" + +#: ../../include/features.php:115 +msgid "Enables a tool to store notes and reminders (note: not encrypted)" +msgstr "Включает инструмент для хранения заметок и напоминаний (прим.: не зашифровано)" + +#: ../../include/features.php:124 +msgid "Create personal planning cards" +msgstr "Создать личные карточки планирования" + +#: ../../include/features.php:134 +msgid "Create interactive articles" +msgstr "Создать интерактивные статьи" + +#: ../../include/features.php:142 +msgid "Navigation Channel Select" +msgstr "Выбор канала навигации" + +#: ../../include/features.php:143 +msgid "Change channels directly from within the navigation dropdown menu" +msgstr "Изменить канал напрямую из выпадающего меню" + +#: ../../include/features.php:151 +msgid "Photo Location" +msgstr "Местоположение фотографии" + +#: ../../include/features.php:152 +msgid "If location data is available on uploaded photos, link this to a map." +msgstr "Если данные о местоположении доступны на загруженных фотографий, связать их с картой." + +#: ../../include/features.php:160 +msgid "Access Controlled Chatrooms" +msgstr "Получить доступ к контролируемым чатам" + +#: ../../include/features.php:161 +msgid "Provide chatrooms and chat services with access control." +msgstr "Предоставлять чаты и их службы с контролем доступа." + +#: ../../include/features.php:170 +msgid "Smart Birthdays" +msgstr "\"Умные\" Дни рождений" + +#: ../../include/features.php:171 +msgid "" +"Make birthday events timezone aware in case your friends are scattered " +"across the planet." +msgstr "Сделать уведомления о днях рождения зависимыми от часового пояса в том случае, если ваши друзья разбросаны по планете." + +#: ../../include/features.php:179 +msgid "Event Timezone Selection" +msgstr "Выбор часового пояса события" + +#: ../../include/features.php:180 +msgid "Allow event creation in timezones other than your own." +msgstr "Разрешить создание события в часовой зоне отличной от вашей" + +#: ../../include/features.php:189 +msgid "Premium Channel" +msgstr "Премиум-канал" + +#: ../../include/features.php:190 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "Позволяет установить ограничения и условия для подключающихся к вашему каналу" + +#: ../../include/features.php:198 +msgid "Advanced Directory Search" +msgstr "Расширенный поиск в каталоге" + +#: ../../include/features.php:199 +msgid "Allows creation of complex directory search queries" +msgstr "Позволяет создание сложных поисковых запросов в каталоге" + +#: ../../include/features.php:207 +msgid "Advanced Theme and Layout Settings" +msgstr "Расширенный настройки темы и отображения" + +#: ../../include/features.php:208 +msgid "Allows fine tuning of themes and page layouts" +msgstr "Разрешает тонкую настройку тем и шаблонов страниц" + +#: ../../include/features.php:217 +msgid "Access Control and Permissions" +msgstr "Управление доступом и разрешениями" + +#: ../../include/features.php:222 +msgid "Enable management and selection of privacy groups" +msgstr "Включить управление и выбор групп безопасности" + +#: ../../include/features.php:230 +msgid "Multiple Profiles" +msgstr "Несколько профилей" + +#: ../../include/features.php:231 +msgid "Ability to create multiple profiles" +msgstr "Возможность создания нескольких профилей" + +#: ../../include/features.php:240 ../../Zotlabs/Widget/Settings_menu.php:108 +#: ../../Zotlabs/Module/Settings/Permcats.php:99 +msgid "Permission Categories" +msgstr "Категории разрешений" + +#: ../../include/features.php:241 +msgid "Create custom connection permission limits" +msgstr "Создать пользовательские ограничения на доступ к подключению" + +#: ../../include/features.php:249 +msgid "OAuth1 Clients" +msgstr "Клиенты OAuth1" + +#: ../../include/features.php:250 +msgid "Manage OAuth1 authenticatication tokens for mobile and remote apps." +msgstr "Управлять токенами аутентификации OAuth1 для мобильных и удалённых приложений." + +#: ../../include/features.php:258 +msgid "OAuth2 Clients" +msgstr "Клиенты OAuth2" + +#: ../../include/features.php:259 +msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps." +msgstr "Управлять токенами аутентификации OAuth2 для мобильных и удалённых приложений." + +#: ../../include/features.php:267 +msgid "Access Tokens" +msgstr "Токены доступа" + +#: ../../include/features.php:268 +msgid "Create access tokens so that non-members can access private content." +msgstr "Создать токены доступа для доступа к приватному содержимому." + +#: ../../include/features.php:279 +msgid "Post Composition Features" +msgstr "Функции создания публикаций" + +#: ../../include/features.php:283 +msgid "Large Photos" +msgstr "Большие фотографии" + +#: ../../include/features.php:284 +msgid "" +"Include large (1024px) photo thumbnails in posts. If not enabled, use small " +"(640px) photo thumbnails" +msgstr "Включить большие (1024px) миниатюры изображений в публикациях. Если не включено, использовать маленькие (640px) миниатюры." + +#: ../../include/features.php:292 ../../Zotlabs/Widget/Settings_menu.php:133 +#: ../../Zotlabs/Module/Sources.php:99 +msgid "Channel Sources" +msgstr "Источники канала" + +#: ../../include/features.php:293 +msgid "Automatically import channel content from other channels or feeds" +msgstr "Автоматический импорт контента из других каналов или лент" + +#: ../../include/features.php:301 +msgid "Even More Encryption" +msgstr "Еще больше шифрования" + +#: ../../include/features.php:302 +msgid "" +"Allow optional encryption of content end-to-end with a shared secret key" +msgstr "Разрешить дополнительное end-to-end шифрование содержимого с общим секретным ключом" + +#: ../../include/features.php:310 +msgid "Enable Voting Tools" +msgstr "Включить инструменты голосования" + +#: ../../include/features.php:311 +msgid "Provide a class of post which others can vote on" +msgstr "Предоставь класс публикаций с возможностью голосования" + +#: ../../include/features.php:319 +msgid "Disable Comments" +msgstr "Отключить комментарии" + +#: ../../include/features.php:320 +msgid "Provide the option to disable comments for a post" +msgstr "Предоставить возможность отключать комментарии для публикаций" + +#: ../../include/features.php:328 +msgid "Delayed Posting" +msgstr "Задержанная публикация" + +#: ../../include/features.php:329 +msgid "Allow posts to be published at a later date" +msgstr "Разрешить размешать публикации следующими датами" + +#: ../../include/features.php:337 +msgid "Content Expiration" +msgstr "Истечение срока действия содержимого" + +#: ../../include/features.php:338 +msgid "Remove posts/comments and/or private messages at a future time" +msgstr "Удалять публикации / комментарии и / или личные сообщения" + +#: ../../include/features.php:346 +msgid "Suppress Duplicate Posts/Comments" +msgstr "Подавлять дублирующие публикации / комментарии" + +#: ../../include/features.php:347 +msgid "" +"Prevent posts with identical content to be published with less than two " +"minutes in between submissions." +msgstr "Предотвращает появление публикаций с одинаковым содержимым если интервал между ними менее 2 минут" + +#: ../../include/features.php:355 +msgid "Auto-save drafts of posts and comments" +msgstr "Автоматически сохранять черновики публикаций и комментариев" + +#: ../../include/features.php:356 +msgid "" +"Automatically saves post and comment drafts in local browser storage to help " +"prevent accidental loss of compositions" +msgstr "Автоматически сохраняет черновики публикаций и комментариев в локальном хранилище браузера для предотвращения их случайной утраты" + +#: ../../include/features.php:367 +msgid "Network and Stream Filtering" +msgstr "Фильтрация сети и потока" + +#: ../../include/features.php:371 +msgid "Search by Date" +msgstr "Поиск по дате" + +#: ../../include/features.php:372 +msgid "Ability to select posts by date ranges" +msgstr "Возможность выбора сообщений по диапазонам дат" + +#: ../../include/features.php:381 ../../Zotlabs/Widget/Savedsearch.php:83 +msgid "Saved Searches" +msgstr "Сохранённые поиски" + +#: ../../include/features.php:382 +msgid "Save search terms for re-use" +msgstr "Сохранять результаты поиска для повторного использования" + +#: ../../include/features.php:390 +msgid "Alternate Stream Order" +msgstr "Отображение потока" + +#: ../../include/features.php:391 +msgid "" +"Ability to order the stream by last post date, last comment date or " +"unthreaded activities" +msgstr "" +"Возможность показывать поток по дате последнего сообщения, последнего комментария или " +"по дате публикации" + +#: ../../include/features.php:399 +msgid "Contact Filter" +msgstr "Фильтр контактов" + +#: ../../include/features.php:400 +msgid "Ability to display only posts of a selected contact" +msgstr "Возможность показа публикаций только от выбранных контактов" + +#: ../../include/features.php:408 +msgid "Forum Filter" +msgstr "Фильтр по форумам" + +#: ../../include/features.php:409 +msgid "Ability to display only posts of a specific forum" +msgstr "Возможность показа публикаций только определённого форума" + +#: ../../include/features.php:417 +msgid "Personal Posts Filter" +msgstr "Персональный фильтр публикаций" + +#: ../../include/features.php:418 +msgid "Ability to display only posts that you've interacted on" +msgstr "Возможность показа только тех публикаций с которыми вы взаимодействовали" + +#: ../../include/features.php:426 +msgid "Affinity Tool" +msgstr "Инструмент сходства / соответствия" + +#: ../../include/features.php:427 +msgid "Filter stream activity by depth of relationships" +msgstr "Фильтровать потоки активности по глубине отношений" + +#: ../../include/features.php:435 ../../Zotlabs/Lib/Apps.php:300 +msgid "Suggest Channels" +msgstr "Предлагаемые каналы" + +#: ../../include/features.php:436 +msgid "Show friend and connection suggestions" +msgstr "Показать предложения в друзья" + +#: ../../include/features.php:444 +msgid "Connection Filtering" +msgstr "Фильтрация контактов" + +#: ../../include/features.php:445 +msgid "Filter incoming posts from connections based on keywords/content" +msgstr "Фильтр входящих сообщений от контактов на основе ключевых слов / контента" + +#: ../../include/features.php:457 +msgid "Post/Comment Tools" +msgstr "Инструменты публикаций / комментариев" + +#: ../../include/features.php:461 +msgid "Community Tagging" +msgstr "Отметки сообщества" + +#: ../../include/features.php:462 +msgid "Ability to tag existing posts" +msgstr "Возможность помечать тегами существующие публикации" + +#: ../../include/features.php:470 +msgid "Post Categories" +msgstr "Категории публикаций" + +#: ../../include/features.php:471 +msgid "Add categories to your posts" +msgstr "Добавить категории для ваших публикаций" + +#: ../../include/features.php:479 +msgid "Emoji Reactions" +msgstr "Реакции Emoji" + +#: ../../include/features.php:480 +msgid "Add emoji reaction ability to posts" +msgstr "Возможность добавлять реакции Emoji к публикациям" + +#: ../../include/features.php:489 +msgid "Ability to file posts under folders" +msgstr "Возможность размещать публикации в каталогах" + +#: ../../include/features.php:497 +msgid "Dislike Posts" +msgstr "Не нравящиеся публикации" + +#: ../../include/features.php:498 +msgid "Ability to dislike posts/comments" +msgstr "Возможность отмечать не нравящиеся публикации / комментарии" + +#: ../../include/features.php:506 +msgid "Star Posts" +msgstr "Помечать сообщения" + +#: ../../include/features.php:507 +msgid "Ability to mark special posts with a star indicator" +msgstr "Возможность отметить специальные сообщения индикатором-звёздочкой" + +#: ../../include/features.php:515 +msgid "Tag Cloud" +msgstr "Облако тегов" + +#: ../../include/features.php:516 +msgid "Provide a personal tag cloud on your channel page" +msgstr "Показывает личное облако тегов на странице канала" + +#: ../../include/message.php:40 +msgid "Unable to determine sender." +msgstr "Невозможно определить отправителя." + +#: ../../include/message.php:79 +msgid "No recipient provided." +msgstr "Получатель не предоставлен." + +#: ../../include/message.php:84 +msgid "[no subject]" +msgstr "[без темы]" + +#: ../../include/message.php:214 +msgid "Stored post could not be verified." +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 "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/js_strings.php:5 +msgid "Delete this item?" +msgstr "Удалить этот элемент?" + +#: ../../include/js_strings.php:6 ../../Zotlabs/Lib/ThreadItem.php:756 +#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1244 +msgid "Comment" +msgstr "Комментарий" + +#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:463 +#, php-format +msgid "%s show all" +msgstr "%s показать всё" + +#: ../../include/js_strings.php:8 +#, php-format +msgid "%s show less" +msgstr "%s показать меньше" + +#: ../../include/js_strings.php:9 +#, php-format +msgid "%s expand" +msgstr "%s развернуть" + +#: ../../include/js_strings.php:10 +#, php-format +msgid "%s collapse" +msgstr "%s свернуть" + +#: ../../include/js_strings.php:11 +msgid "Password too short" +msgstr "Пароль слишком короткий" + +#: ../../include/js_strings.php:12 +msgid "Passwords do not match" +msgstr "Пароли не совпадают" + +#: ../../include/js_strings.php:13 +msgid "everybody" +msgstr "все" + +#: ../../include/js_strings.php:14 +msgid "Secret Passphrase" +msgstr "Тайный пароль" + +#: ../../include/js_strings.php:15 +msgid "Passphrase hint" +msgstr "Подсказка для пароля" + +#: ../../include/js_strings.php:16 +msgid "Notice: Permissions have changed but have not yet been submitted." +msgstr "Уведомление: Права доступа изменились, но до сих пор не сохранены." + +#: ../../include/js_strings.php:17 +msgid "close all" +msgstr "закрыть все" + +#: ../../include/js_strings.php:18 +msgid "Nothing new here" +msgstr "Здесь нет ничего нового" + +#: ../../include/js_strings.php:19 +msgid "Rate This Channel (this is public)" +msgstr "Оценкa этoго канала (общедоступно)" + +#: ../../include/js_strings.php:20 ../../Zotlabs/Module/Connedit.php:870 +#: ../../Zotlabs/Module/Rate.php:155 +msgid "Rating" +msgstr "Оценка" + +#: ../../include/js_strings.php:21 +msgid "Describe (optional)" +msgstr "Охарактеризовать (необязательно)" + +#: ../../include/js_strings.php:23 +msgid "Please enter a link URL" +msgstr "Пожалуйста, введите URL ссылки" + +#: ../../include/js_strings.php:24 +msgid "Unsaved changes. Are you sure you wish to leave this page?" +msgstr "Есть несохраненные изменения. Вы уверены, что хотите покинуть эту страницу?" + +#: ../../include/js_strings.php:25 ../../Zotlabs/Module/Cdav.php:872 +#: ../../Zotlabs/Module/Pubsites.php:52 ../../Zotlabs/Module/Events.php:475 +#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Profiles.php:509 +#: ../../Zotlabs/Module/Profiles.php:734 +msgid "Location" +msgstr "Место" + +#: ../../include/js_strings.php:26 +msgid "lovely" +msgstr "прекрасно" + +#: ../../include/js_strings.php:27 +msgid "wonderful" +msgstr "замечательно" + +#: ../../include/js_strings.php:28 +msgid "fantastic" +msgstr "фантастично" + +#: ../../include/js_strings.php:29 +msgid "great" +msgstr "отлично" + +#: ../../include/js_strings.php:30 +msgid "" +"Your chosen nickname was either already taken or not valid. Please use our " +"suggestion (" +msgstr "" +"Выбранный вами псевдоним уже используется или недействителен. Попробуйте использовать " +"наше предложение (" + +#: ../../include/js_strings.php:31 +msgid ") or enter a new one." +msgstr ") или введите новый." + +#: ../../include/js_strings.php:32 +msgid "Thank you, this nickname is valid." +msgstr "Спасибо, этот псевдоним может быть использован." + +#: ../../include/js_strings.php:33 +msgid "A channel name is required." +msgstr "Требуется название канала." + +#: ../../include/js_strings.php:34 +msgid "This is a " +msgstr "Это " + +#: ../../include/js_strings.php:35 +msgid " channel name" +msgstr " название канала" + +#: ../../include/js_strings.php:41 +msgid "timeago.prefixAgo" +msgstr "" + +#: ../../include/js_strings.php:42 +msgid "timeago.prefixFromNow" +msgstr "" + +#: ../../include/js_strings.php:43 +msgid "timeago.suffixAgo" +msgstr "назад" + +#: ../../include/js_strings.php:44 +msgid "timeago.suffixFromNow" +msgstr "" + +#: ../../include/js_strings.php:47 +msgid "less than a minute" +msgstr "менее чем одну минуту" + +#: ../../include/js_strings.php:48 +msgid "about a minute" +msgstr "около минуты" + +#: ../../include/js_strings.php:49 +#, php-format +msgid "%d minutes" +msgstr "%d минут" + +#: ../../include/js_strings.php:50 +msgid "about an hour" +msgstr "около часа" + +#: ../../include/js_strings.php:51 +#, php-format +msgid "about %d hours" +msgstr "около %d часов" + +#: ../../include/js_strings.php:52 +msgid "a day" +msgstr "день" + +#: ../../include/js_strings.php:53 +#, php-format +msgid "%d days" +msgstr "%d дней" + +#: ../../include/js_strings.php:54 +msgid "about a month" +msgstr "около месяца" + +#: ../../include/js_strings.php:55 +#, php-format +msgid "%d months" +msgstr "%d месяцев" + +#: ../../include/js_strings.php:56 +msgid "about a year" +msgstr "около года" + +#: ../../include/js_strings.php:57 +#, php-format +msgid "%d years" +msgstr "%d лет" + +#: ../../include/js_strings.php:58 +msgid " " +msgstr " " + +#: ../../include/js_strings.php:59 +msgid "timeago.numbers" +msgstr "" + +#: ../../include/js_strings.php:65 +msgctxt "long" +msgid "May" +msgstr "Май" + +#: ../../include/js_strings.php:73 +msgid "Jan" +msgstr "Янв" + +#: ../../include/js_strings.php:74 +msgid "Feb" +msgstr "Фев" + +#: ../../include/js_strings.php:75 +msgid "Mar" +msgstr "Мар" + +#: ../../include/js_strings.php:76 +msgid "Apr" +msgstr "Апр" + +#: ../../include/js_strings.php:77 +msgctxt "short" +msgid "May" +msgstr "Май" + +#: ../../include/js_strings.php:78 +msgid "Jun" +msgstr "Июн" + +#: ../../include/js_strings.php:79 +msgid "Jul" +msgstr "Июл" + +#: ../../include/js_strings.php:80 +msgid "Aug" +msgstr "Авг" + +#: ../../include/js_strings.php:81 +msgid "Sep" +msgstr "Сен" + +#: ../../include/js_strings.php:82 +msgid "Oct" +msgstr "Окт" + +#: ../../include/js_strings.php:83 +msgid "Nov" +msgstr "Ноя" + +#: ../../include/js_strings.php:84 +msgid "Dec" +msgstr "Дек" + +#: ../../include/js_strings.php:92 +msgid "Sun" +msgstr "Вск" + +#: ../../include/js_strings.php:93 +msgid "Mon" +msgstr "Пон" + +#: ../../include/js_strings.php:94 +msgid "Tue" +msgstr "Вт" + +#: ../../include/js_strings.php:95 +msgid "Wed" +msgstr "Ср" + +#: ../../include/js_strings.php:96 +msgid "Thu" +msgstr "Чет" + +#: ../../include/js_strings.php:97 +msgid "Fri" +msgstr "Пят" + +#: ../../include/js_strings.php:98 +msgid "Sat" +msgstr "Суб" + +#: ../../include/js_strings.php:99 +msgctxt "calendar" +msgid "today" +msgstr "сегодня" + +#: ../../include/js_strings.php:100 +msgctxt "calendar" +msgid "month" +msgstr "месяц" + +#: ../../include/js_strings.php:101 +msgctxt "calendar" +msgid "week" +msgstr "неделя" + +#: ../../include/js_strings.php:102 +msgctxt "calendar" +msgid "day" +msgstr "день" + +#: ../../include/js_strings.php:103 +msgctxt "calendar" +msgid "All day" +msgstr "Весь день" + +#: ../../include/oembed.php:224 +msgid "View PDF" +msgstr "Просмотреть PDF" + +#: ../../include/oembed.php:347 +msgid " by " +msgstr " по " + +#: ../../include/oembed.php:348 +msgid " on " +msgstr " на " + +#: ../../include/oembed.php:377 +msgid "Embedded content" +msgstr "Встроенное содержимое" + +#: ../../include/oembed.php:386 +msgid "Embedding disabled" +msgstr "Встраивание отключено" + +#: ../../include/photos.php:151 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "Файл превышает предельный размер для сайта в %lu байт" + +#: ../../include/photos.php:162 +msgid "Image file is empty." +msgstr "Файл изображения пуст." + +#: ../../include/photos.php:196 ../../Zotlabs/Module/Profile_photo.php:225 +#: ../../Zotlabs/Module/Cover_photo.php:205 +msgid "Unable to process image" +msgstr "Не удается обработать изображение" + +#: ../../include/photos.php:327 +msgid "Photo storage failed." +msgstr "Ошибка хранилища фотографий." + +#: ../../include/photos.php:376 +msgid "a new photo" +msgstr "новая фотография" + +#: ../../include/photos.php:380 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" +msgstr "%1$s опубликовал %2$s к %3$s" + +#: ../../include/photos.php:668 ../../Zotlabs/Module/Photos.php:1370 +#: ../../Zotlabs/Module/Photos.php:1383 ../../Zotlabs/Module/Photos.php:1384 +msgid "Recent Photos" +msgstr "Последние фотографии" + +#: ../../include/photos.php:672 +msgid "Upload New Photos" +msgstr "Загрузить новые фотографии" + +#: ../../include/connections.php:133 +msgid "New window" +msgstr "Новое окно" + +#: ../../include/connections.php:134 +msgid "Open the selected location in a different window or browser tab" +msgstr "Открыть выбранное местоположение в другом окне или вкладке браузера" + +#: ../../Zotlabs/Lib/NativeWiki.php:151 +msgid "Wiki updated successfully" +msgstr "Wiki успешно обновлена" + +#: ../../Zotlabs/Lib/NativeWiki.php:205 +msgid "Wiki files deleted successfully" +msgstr "Wiki успешно удалена" + +#: ../../Zotlabs/Lib/Techlevels.php:10 +msgid "0. Beginner/Basic" +msgstr "Начинающий / Базовый" + +#: ../../Zotlabs/Lib/Techlevels.php:11 +msgid "1. Novice - not skilled but willing to learn" +msgstr "1. Новичок - не опытный, но желающий учиться" + +#: ../../Zotlabs/Lib/Techlevels.php:12 +msgid "2. Intermediate - somewhat comfortable" +msgstr "2. Промежуточный - более удобный" + +#: ../../Zotlabs/Lib/Techlevels.php:13 +msgid "3. Advanced - very comfortable" +msgstr "3. Продвинутый - очень удобный" + +#: ../../Zotlabs/Lib/Techlevels.php:14 +msgid "4. Expert - I can write computer code" +msgstr "4. Эксперт - я умею программировать" + +#: ../../Zotlabs/Lib/Techlevels.php:15 +msgid "5. Wizard - I probably know more than you do" +msgstr "5. Волшебник - возможно я знаю больше чем ты" + +#: ../../Zotlabs/Lib/PermissionDescription.php:108 +msgid "Public" +msgstr "Общедоступно" + +#: ../../Zotlabs/Lib/PermissionDescription.php:109 +msgid "Anybody in the $Projectname network" +msgstr "Любому в сети $Projectname" + +#: ../../Zotlabs/Lib/PermissionDescription.php:110 +#, php-format +msgid "Any account on %s" +msgstr "Любой аккаунт в %s" + +#: ../../Zotlabs/Lib/PermissionDescription.php:111 +msgid "Any of my connections" +msgstr "Любой из моих контактов" + +#: ../../Zotlabs/Lib/PermissionDescription.php:112 +msgid "Only connections I specifically allow" +msgstr "Только те контакты, кому я дам разрешение" + +#: ../../Zotlabs/Lib/PermissionDescription.php:113 +msgid "Anybody authenticated (could include visitors from other networks)" +msgstr "Любой аутентифицированный (может включать посетителей их других сетей)" + +#: ../../Zotlabs/Lib/PermissionDescription.php:114 +msgid "Any connections including those who haven't yet been approved" +msgstr "Любые контакты включая те, которые вы ещё не одобрили" + +#: ../../Zotlabs/Lib/PermissionDescription.php:150 +msgid "" +"This is your default setting for the audience of your normal stream, and " +"posts." +msgstr "Это настройка по умолчанию для аудитории ваших обычных потоков и публикаций" + +#: ../../Zotlabs/Lib/PermissionDescription.php:151 +msgid "" +"This is your default setting for who can view your default channel profile" +msgstr "Это настройка по умолчанию для тех, кто может просматривать профиль вашего основного канала" + +#: ../../Zotlabs/Lib/PermissionDescription.php:152 +msgid "This is your default setting for who can view your connections" +msgstr "Это настройка по умолчанию для тех, кто может просматривать ваши контакты" + +#: ../../Zotlabs/Lib/PermissionDescription.php:153 +msgid "" +"This is your default setting for who can view your file storage and photos" +msgstr "Это настройка по умолчанию для тех, кто может просматривать ваше хранилище файлов и фотографий" + +#: ../../Zotlabs/Lib/PermissionDescription.php:154 +msgid "This is your default setting for the audience of your webpages" +msgstr "Это настройка по умолчанию для аудитории ваших веб-страниц" + +#: ../../Zotlabs/Lib/ThreadItem.php:152 ../../Zotlabs/Storage/Browser.php:280 +msgid "Admin Delete" +msgstr "Удалено администратором" + +#: ../../Zotlabs/Lib/ThreadItem.php:162 ../../Zotlabs/Module/Filer.php:54 +msgid "Save to Folder" +msgstr "Сохранить в каталог" + +#: ../../Zotlabs/Lib/ThreadItem.php:183 +msgid "I will attend" +msgstr "Я буду присутствовать" + +#: ../../Zotlabs/Lib/ThreadItem.php:183 +msgid "I will not attend" +msgstr "Я не буду присутствовать" + +#: ../../Zotlabs/Lib/ThreadItem.php:183 +msgid "I might attend" +msgstr "Я возможно буду присутствовать" + +#: ../../Zotlabs/Lib/ThreadItem.php:193 +msgid "I agree" +msgstr "Я согласен" + +#: ../../Zotlabs/Lib/ThreadItem.php:193 +msgid "I disagree" +msgstr "Я не согласен" + +#: ../../Zotlabs/Lib/ThreadItem.php:193 +msgid "I abstain" +msgstr "Я воздержался" + +#: ../../Zotlabs/Lib/ThreadItem.php:212 ../../Zotlabs/Lib/ThreadItem.php:224 +#: ../../Zotlabs/Module/Photos.php:1161 ../../Zotlabs/Module/Photos.php:1173 +msgid "View all" +msgstr "Просмотреть все" + +#: ../../Zotlabs/Lib/ThreadItem.php:267 +msgid "Add Tag" +msgstr "Добавить тег" + +#: ../../Zotlabs/Lib/ThreadItem.php:285 ../../Zotlabs/Module/Photos.php:1105 +msgid "I like this (toggle)" +msgstr "мне это нравится (переключение)" + +#: ../../Zotlabs/Lib/ThreadItem.php:286 ../../Zotlabs/Module/Photos.php:1106 +msgid "I don't like this (toggle)" +msgstr "мне это не нравится (переключение)" + +#: ../../Zotlabs/Lib/ThreadItem.php:290 +msgid "Share This" +msgstr "Поделиться этим" + +#: ../../Zotlabs/Lib/ThreadItem.php:290 +msgid "share" +msgstr "поделиться" + +#: ../../Zotlabs/Lib/ThreadItem.php:299 +msgid "Delivery Report" +msgstr "Отчёт о доставке" + +#: ../../Zotlabs/Lib/ThreadItem.php:317 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Lib/ThreadItem.php:347 ../../Zotlabs/Lib/ThreadItem.php:348 +#, php-format +msgid "View %s's profile - %s" +msgstr "Просмотр %s профиля - %s" + +#: ../../Zotlabs/Lib/ThreadItem.php:351 +msgid "to" +msgstr "к" + +#: ../../Zotlabs/Lib/ThreadItem.php:352 +msgid "via" +msgstr "через" + +#: ../../Zotlabs/Lib/ThreadItem.php:353 +msgid "Wall-to-Wall" +msgstr "Стена-к-Стене" + +#: ../../Zotlabs/Lib/ThreadItem.php:354 +msgid "via Wall-To-Wall:" +msgstr "через Стена-к-Стене:" + +#: ../../Zotlabs/Lib/ThreadItem.php:379 +msgid "Attend" +msgstr "Посетить" + +#: ../../Zotlabs/Lib/ThreadItem.php:380 +msgid "Attendance Options" +msgstr "Параметры посещаемости" + +#: ../../Zotlabs/Lib/ThreadItem.php:381 +msgid "Vote" +msgstr "Голосовать" + +#: ../../Zotlabs/Lib/ThreadItem.php:382 +msgid "Voting Options" +msgstr "Параметры голосования" + +#: ../../Zotlabs/Lib/ThreadItem.php:404 +msgid "Add to Calendar" +msgstr "Добавить в календарь" + +#: ../../Zotlabs/Lib/ThreadItem.php:413 +#: ../../Zotlabs/Module/Notifications.php:60 +msgid "Mark all seen" +msgstr "Отметить как просмотренное" + +#: ../../Zotlabs/Lib/ThreadItem.php:420 ../../Zotlabs/Module/Photos.php:1292 +msgctxt "noun" +msgid "Likes" +msgstr "Нравится" + +#: ../../Zotlabs/Lib/ThreadItem.php:421 ../../Zotlabs/Module/Photos.php:1293 +msgctxt "noun" +msgid "Dislikes" +msgstr "Не нравится" + +#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../Zotlabs/Module/Photos.php:1124 +#: ../../Zotlabs/Module/Photos.php:1242 +msgid "This is you" +msgstr "Это вы" + +#: ../../Zotlabs/Lib/ThreadItem.php:763 +msgid "Image" +msgstr "Изображение" + +#: ../../Zotlabs/Lib/ThreadItem.php:765 +msgid "Insert Link" +msgstr "Вставить ссылку" + +#: ../../Zotlabs/Lib/ThreadItem.php:766 +msgid "Video" +msgstr "Видео" + +#: ../../Zotlabs/Lib/ThreadItem.php:776 +msgid "Your full name (required)" +msgstr "Ваше полное имя (требуется)" + +#: ../../Zotlabs/Lib/ThreadItem.php:777 +msgid "Your email address (required)" +msgstr "Ваш адрес электронной почты (требуется)" + +#: ../../Zotlabs/Lib/ThreadItem.php:778 +msgid "Your website URL (optional)" +msgstr "URL вашего вебсайта (необязательно)" + +#: ../../Zotlabs/Lib/Apps.php:291 ../../Zotlabs/Module/Apps.php:50 +msgid "Apps" +msgstr "Приложения" + +#: ../../Zotlabs/Lib/Apps.php:294 +msgid "Site Admin" +msgstr "Администратор сайта" + +#: ../../Zotlabs/Lib/Apps.php:296 +msgid "View Bookmarks" +msgstr "Просмотреть закадки" + +#: ../../Zotlabs/Lib/Apps.php:297 +msgid "My Chatrooms" +msgstr "Мои чаты" + +#: ../../Zotlabs/Lib/Apps.php:299 +msgid "Remote Diagnostics" +msgstr "Удалённая диагностика" + +#: ../../Zotlabs/Lib/Apps.php:303 +msgid "Activity" +msgstr "Активность" + +#: ../../Zotlabs/Lib/Apps.php:308 +msgid "Channel Home" +msgstr "Главная канала" + +#: ../../Zotlabs/Lib/Apps.php:312 +msgid "Directory" +msgstr "Каталог" + +#: ../../Zotlabs/Lib/Apps.php:314 +msgid "Mail" +msgstr "Переписка" + +#: ../../Zotlabs/Lib/Apps.php:315 ../../Zotlabs/Module/Mood.php:135 +msgid "Mood" +msgstr "Настроение" + +#: ../../Zotlabs/Lib/Apps.php:317 +msgid "Chat" +msgstr "Чат" + +#: ../../Zotlabs/Lib/Apps.php:319 +msgid "Probe" +msgstr "Проба" + +#: ../../Zotlabs/Lib/Apps.php:320 +msgid "Suggest" +msgstr "Предложить" + +#: ../../Zotlabs/Lib/Apps.php:321 +msgid "Random Channel" +msgstr "Случайный канал" + +#: ../../Zotlabs/Lib/Apps.php:322 +msgid "Invite" +msgstr "Пригласить" + +#: ../../Zotlabs/Lib/Apps.php:323 ../../Zotlabs/Widget/Admin.php:26 +msgid "Features" +msgstr "Функции" + +#: ../../Zotlabs/Lib/Apps.php:325 +msgid "Post" +msgstr "Публикация" + +#: ../../Zotlabs/Lib/Apps.php:456 ../../Zotlabs/Module/Cdav.php:1186 +#: ../../Zotlabs/Module/Connedit.php:922 +#: ../../Zotlabs/Module/Admin/Addons.php:453 +#: ../../Zotlabs/Module/Settings/Oauth2.php:40 +#: ../../Zotlabs/Module/Settings/Oauth2.php:113 +#: ../../Zotlabs/Module/Settings/Oauth.php:43 +#: ../../Zotlabs/Module/Settings/Oauth.php:114 +#: ../../Zotlabs/Module/Profiles.php:799 +msgid "Update" +msgstr "Обновить" + +#: ../../Zotlabs/Lib/Apps.php:456 ../../Zotlabs/Module/Admin/Addons.php:422 +msgid "Install" +msgstr "Установить" + +#: ../../Zotlabs/Lib/Apps.php:473 +msgid "Purchase" +msgstr "Купить" + +#: ../../Zotlabs/Lib/Apps.php:477 +msgid "Undelete" +msgstr "Восстановить" + +#: ../../Zotlabs/Lib/Apps.php:485 +msgid "Add to app-tray" +msgstr "Добавить в app-tray" + +#: ../../Zotlabs/Lib/Apps.php:486 +msgid "Remove from app-tray" +msgstr "Удалить из app-tray" + +#: ../../Zotlabs/Lib/Apps.php:487 +msgid "Pin to navbar" +msgstr "Добавить на панель навигации" + +#: ../../Zotlabs/Lib/Apps.php:488 +msgid "Unpin from navbar" +msgstr "Удалить с панели навигации" + +#: ../../Zotlabs/Lib/Enotify.php:60 +msgid "$Projectname Notification" +msgstr "Оповещение $Projectname " + +#: ../../Zotlabs/Lib/Enotify.php:63 +msgid "Thank You," +msgstr "Спасибо," + +#: ../../Zotlabs/Lib/Enotify.php:66 +#, php-format +msgid "This email was sent by %1$s at %2$s." +msgstr "Это письмо было отправлено %1$s на %2$s." + +#: ../../Zotlabs/Lib/Enotify.php:67 +#, php-format +msgid "" +"To stop receiving these messages, please adjust your Notification Settings " +"at %s" +msgstr "Чтобы прекратить получать эти сообщения, настройте параметры уведомлений в %s" + +#: ../../Zotlabs/Lib/Enotify.php:68 +#, php-format +msgid "To stop receiving these messages, please adjust your %s." +msgstr "Чтобы прекратить получать эти сообщения, пожалуйста настройте ваш %s." + +#: ../../Zotlabs/Lib/Enotify.php:68 +#: ../../Zotlabs/Module/Settings/Channel.php:570 +msgid "Notification Settings" +msgstr "Настройки уведомлений" + +#: ../../Zotlabs/Lib/Enotify.php:123 +#, php-format +msgid "%s " +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:127 +#, php-format +msgid "[$Projectname:Notify] New mail received at %s" +msgstr "[$Projectname:Notify] Получено новое сообщение в %s" + +#: ../../Zotlabs/Lib/Enotify.php:129 +#, php-format +msgid "%1$s sent you a new private message at %2$s." +msgstr "%1$s отправил вам новое личное сообщение в %2$s." + +#: ../../Zotlabs/Lib/Enotify.php:130 +#, php-format +msgid "%1$s sent you %2$s." +msgstr "%1$s послал вам %2$s." + +#: ../../Zotlabs/Lib/Enotify.php:130 +msgid "a private message" +msgstr "личное сообщение" + +#: ../../Zotlabs/Lib/Enotify.php:131 +#, php-format +msgid "Please visit %s to view and/or reply to your private messages." +msgstr "Пожалуйста, посетите %s для просмотра и/или ответа на ваши личные сообщения." + +#: ../../Zotlabs/Lib/Enotify.php:144 +msgid "commented on" +msgstr " прокомментировал в" + +#: ../../Zotlabs/Lib/Enotify.php:155 +msgid "liked" +msgstr "понравилось" + +#: ../../Zotlabs/Lib/Enotify.php:158 +msgid "disliked" +msgstr "не понравилось" + +#: ../../Zotlabs/Lib/Enotify.php:201 +#, php-format +msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:209 +#, php-format +msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:218 +#, php-format +msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" +msgstr "%1$s%2$s [zrl=%3$s]ваш %4$s[/zrl]" + +#: ../../Zotlabs/Lib/Enotify.php:230 +#, php-format +msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s" +msgstr "[$Projectname:Notify] Отмодерирован комментарий к беседе #%1$d по %2$s" + +#: ../../Zotlabs/Lib/Enotify.php:232 +#, php-format +msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s" +msgstr "[$Projectname:Notify] Комментарий к беседе #%1$d по %2$s" + +#: ../../Zotlabs/Lib/Enotify.php:233 +#, php-format +msgid "%1$s commented on an item/conversation you have been following." +msgstr "%1$s прокомментировал тему / беседу за которым вы следите." + +#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:317 +#: ../../Zotlabs/Lib/Enotify.php:333 ../../Zotlabs/Lib/Enotify.php:358 +#: ../../Zotlabs/Lib/Enotify.php:375 ../../Zotlabs/Lib/Enotify.php:388 +#, php-format +msgid "Please visit %s to view and/or reply to the conversation." +msgstr "Пожалуйста, посетите %s для просмотра и / или ответа в беседе." + +#: ../../Zotlabs/Lib/Enotify.php:240 ../../Zotlabs/Lib/Enotify.php:241 +#, php-format +msgid "Please visit %s to approve or reject this comment." +msgstr "Пожалуйста посетитет %s для одобрения и отклонения комментария." + +#: ../../Zotlabs/Lib/Enotify.php:299 +#, php-format +msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]" +msgstr "%1$s понравился [zrl=%2$s]ваш %3$s[/zrl]" + +#: ../../Zotlabs/Lib/Enotify.php:313 +#, php-format +msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s" +msgstr "[$Projectname:Notify] Беседа получила отметку \"нравится\" #%1$d от %2$s" + +#: ../../Zotlabs/Lib/Enotify.php:314 +#, php-format +msgid "%1$s liked an item/conversation you created." +msgstr "%1$s нравится тема / беседа которую вы создали." + +#: ../../Zotlabs/Lib/Enotify.php:325 +#, php-format +msgid "[$Projectname:Notify] %s posted to your profile wall" +msgstr "[$Projectname:Notify] %s сделал публикацию на стене вашего профиля" + +#: ../../Zotlabs/Lib/Enotify.php:327 +#, php-format +msgid "%1$s posted to your profile wall at %2$s" +msgstr "%1$s сделал публикацию на стене вашего профиля в %2$s" + +#: ../../Zotlabs/Lib/Enotify.php:329 +#, php-format +msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" +msgstr "%1$s опубликовал на [zrl=%2$s]вашей стене[/zrl]" + +#: ../../Zotlabs/Lib/Enotify.php:352 +#, php-format +msgid "[$Projectname:Notify] %s tagged you" +msgstr "[$Projectname:Notify] %s отметил вас" + +#: ../../Zotlabs/Lib/Enotify.php:353 +#, php-format +msgid "%1$s tagged you at %2$s" +msgstr "%1$s отметил вас в %2$s" + +#: ../../Zotlabs/Lib/Enotify.php:354 +#, php-format +msgid "%1$s [zrl=%2$s]tagged you[/zrl]." +msgstr "%1$s [zrl=%2$s]отметил вас[/zrl]." + +#: ../../Zotlabs/Lib/Enotify.php:365 +#, php-format +msgid "[$Projectname:Notify] %1$s poked you" +msgstr "[$Projectname:Notify] %1$s ткнул вас" + +#: ../../Zotlabs/Lib/Enotify.php:366 +#, php-format +msgid "%1$s poked you at %2$s" +msgstr "%1$s ткнул вас в %2$s" + +#: ../../Zotlabs/Lib/Enotify.php:367 +#, php-format +msgid "%1$s [zrl=%2$s]poked you[/zrl]." +msgstr "%1$s [zrl=%2$s]ткнул вас[/zrl]." + +#: ../../Zotlabs/Lib/Enotify.php:382 +#, php-format +msgid "[$Projectname:Notify] %s tagged your post" +msgstr "[$Projectname:Notify] %s отметил вашу публикацию" + +#: ../../Zotlabs/Lib/Enotify.php:383 +#, php-format +msgid "%1$s tagged your post at %2$s" +msgstr "%1$s отметил вашу публикацию на %2$s" + +#: ../../Zotlabs/Lib/Enotify.php:384 +#, php-format +msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" +msgstr "%1$s отметил [zrl=%2$s]вашу публикацию[/zrl]" + +#: ../../Zotlabs/Lib/Enotify.php:395 +msgid "[$Projectname:Notify] Introduction received" +msgstr "[$Projectname:Notify] Получено приглашение" + +#: ../../Zotlabs/Lib/Enotify.php:396 +#, php-format +msgid "You've received an new connection request from '%1$s' at %2$s" +msgstr "Вы получили новый запрос контакта от '%1$s' в %2$s" + +#: ../../Zotlabs/Lib/Enotify.php:397 +#, php-format +msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s." +msgstr "Вы получили [zrl=%1$s]новый запрос контакта[/zrl] от %2$s." + +#: ../../Zotlabs/Lib/Enotify.php:400 ../../Zotlabs/Lib/Enotify.php:418 +#, php-format +msgid "You may visit their profile at %s" +msgstr "Вы можете увидеть его профиль по ссылке %s" + +#: ../../Zotlabs/Lib/Enotify.php:402 +#, php-format +msgid "Please visit %s to approve or reject the connection request." +msgstr "Пожалуйста, посетите %s, чтобы одобрить или отклонить запрос контакта." + +#: ../../Zotlabs/Lib/Enotify.php:409 +msgid "[$Projectname:Notify] Friend suggestion received" +msgstr "[$Projectname:Notify] Получено предложение дружить" + +#: ../../Zotlabs/Lib/Enotify.php:410 +#, php-format +msgid "You've received a friend suggestion from '%1$s' at %2$s" +msgstr "Вы получили предложение дружить от '%1$s' в %2$s" + +#: ../../Zotlabs/Lib/Enotify.php:411 +#, php-format +msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." +msgstr "Вы получили [zrl=%1$s]предложение дружить[/zrl] для %2$s от %3$s." + +#: ../../Zotlabs/Lib/Enotify.php:416 +msgid "Name:" +msgstr "Имя:" + +#: ../../Zotlabs/Lib/Enotify.php:417 +msgid "Photo:" +msgstr "Фото:" + +#: ../../Zotlabs/Lib/Enotify.php:420 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." +msgstr "Пожалуйста, посетите %s, чтобы одобрить или отклонить предложение." + +#: ../../Zotlabs/Lib/Enotify.php:640 +msgid "[$Projectname:Notify]" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:808 +msgid "created a new post" +msgstr "создал новую публикацию" + +#: ../../Zotlabs/Lib/Enotify.php:809 +#, php-format +msgid "commented on %s's post" +msgstr "прокомментировал публикацию %s" + +#: ../../Zotlabs/Lib/Enotify.php:816 +#, php-format +msgid "edited a post dated %s" +msgstr "отредактировал публикацию датированную %s" + +#: ../../Zotlabs/Lib/Enotify.php:820 +#, php-format +msgid "edited a comment dated %s" +msgstr "отредактировал комментарий датированный %s" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:42 +#: ../../Zotlabs/Lib/NativeWikiPage.php:93 +msgid "(No Title)" +msgstr "(нет заголовка)" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:107 +msgid "Wiki page create failed." +msgstr "Не удалось создать страницу Wiki." + +#: ../../Zotlabs/Lib/NativeWikiPage.php:120 +msgid "Wiki not found." +msgstr "Wiki не найдена." + +#: ../../Zotlabs/Lib/NativeWikiPage.php:131 +msgid "Destination name already exists" +msgstr "Имя назначения уже существует" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:163 +#: ../../Zotlabs/Lib/NativeWikiPage.php:359 +msgid "Page not found" +msgstr "Страница не найдена." + +#: ../../Zotlabs/Lib/NativeWikiPage.php:194 +msgid "Error reading page content" +msgstr "Ошибка чтения содержимого страницы" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:350 +#: ../../Zotlabs/Lib/NativeWikiPage.php:400 +#: ../../Zotlabs/Lib/NativeWikiPage.php:467 +#: ../../Zotlabs/Lib/NativeWikiPage.php:508 +msgid "Error reading wiki" +msgstr "Ошибка чтения Wiki" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:388 +msgid "Page update failed." +msgstr "Не удалось обновить страницу." + +#: ../../Zotlabs/Lib/NativeWikiPage.php:422 +msgid "Nothing deleted" +msgstr "Ничего не удалено" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:488 +msgid "Compare: object not found." +msgstr "Сравнение: объект не найден." + +#: ../../Zotlabs/Lib/NativeWikiPage.php:494 +msgid "Page updated" +msgstr "Страница обновлена" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:497 +msgid "Untitled" +msgstr "Не озаглавлено" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:503 +msgid "Wiki resource_id required for git commit" +msgstr "Требуется resource_id Wiki для отправки в Git" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:559 +#: ../../Zotlabs/Widget/Wiki_page_history.php:23 +msgctxt "wiki_history" +msgid "Message" +msgstr "Сообщение" + +#: ../../Zotlabs/Lib/Permcat.php:82 +msgctxt "permcat" +msgid "default" +msgstr "по умолчанию" + +#: ../../Zotlabs/Lib/Permcat.php:133 +msgctxt "permcat" +msgid "follower" +msgstr "поклонник" + +#: ../../Zotlabs/Lib/Permcat.php:137 +msgctxt "permcat" +msgid "contributor" +msgstr "участник" + +#: ../../Zotlabs/Lib/Permcat.php:141 +msgctxt "permcat" +msgid "publisher" +msgstr "издатель" + +#: ../../Zotlabs/Lib/DB_Upgrade.php:83 +#, php-format +msgid "Update Error at %s" +msgstr "Ошибка обновления на %s" + +#: ../../Zotlabs/Lib/DB_Upgrade.php:89 +#, php-format +msgid "Update %s failed. See error logs." +msgstr "Выполнение %s неудачно. Проверьте системный журнал." + +#: ../../Zotlabs/Lib/Chatroom.php:23 +msgid "Missing room name" +msgstr "Отсутствует название комнаты" + +#: ../../Zotlabs/Lib/Chatroom.php:32 +msgid "Duplicate room name" +msgstr "Название комнаты дублируется" + +#: ../../Zotlabs/Lib/Chatroom.php:82 ../../Zotlabs/Lib/Chatroom.php:90 +msgid "Invalid room specifier." +msgstr "Неверный указатель комнаты." + +#: ../../Zotlabs/Lib/Chatroom.php:122 +msgid "Room not found." +msgstr "Комната не найдена." + +#: ../../Zotlabs/Lib/Chatroom.php:143 +msgid "Room is full" +msgstr "Комната переполнена" + +#: ../../Zotlabs/Widget/Activity_order.php:86 +msgid "Commented Date" +msgstr "По комментариям" + +#: ../../Zotlabs/Widget/Activity_order.php:90 +msgid "Order by last commented date" +msgstr "Сортировка по дате последнего комментария" + +#: ../../Zotlabs/Widget/Activity_order.php:93 +msgid "Posted Date" +msgstr "По публикациям" + +#: ../../Zotlabs/Widget/Activity_order.php:97 +msgid "Order by last posted date" +msgstr "Сортировка по дате последней публикации" + +#: ../../Zotlabs/Widget/Activity_order.php:100 +msgid "Date Unthreaded" +msgstr "По порядку" + +#: ../../Zotlabs/Widget/Activity_order.php:104 +msgid "Order unthreaded by date" +msgstr "Сортировка в порядке поступления" + +#: ../../Zotlabs/Widget/Activity_order.php:119 +msgid "Activity Order" +msgstr "Сортировка по активности" + +#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:308 +msgid "Site" +msgstr "Сайт" + +#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Module/Admin.php:96 +#: ../../Zotlabs/Module/Admin/Accounts.php:167 +#: ../../Zotlabs/Module/Admin/Accounts.php:180 +msgid "Accounts" +msgstr "Учётные записи" + +#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60 +msgid "Member registrations waiting for confirmation" +msgstr "Регистрации участников, ожидающие подверждения" + +#: ../../Zotlabs/Widget/Admin.php:24 ../../Zotlabs/Module/Admin.php:114 +#: ../../Zotlabs/Module/Admin/Channels.php:146 +msgid "Channels" +msgstr "Каналы" + +#: ../../Zotlabs/Widget/Admin.php:25 ../../Zotlabs/Module/Admin/Security.php:93 +msgid "Security" +msgstr "Безопасность" + +#: ../../Zotlabs/Widget/Admin.php:27 ../../Zotlabs/Module/Admin/Addons.php:342 +#: ../../Zotlabs/Module/Admin/Addons.php:437 +msgid "Addons" +msgstr "Расширения" + +#: ../../Zotlabs/Widget/Admin.php:28 ../../Zotlabs/Module/Admin/Themes.php:123 +#: ../../Zotlabs/Module/Admin/Themes.php:157 +msgid "Themes" +msgstr "Темы" + +#: ../../Zotlabs/Widget/Admin.php:29 +msgid "Inspect queue" +msgstr "Просмотр очереди" + +#: ../../Zotlabs/Widget/Admin.php:30 ../../Zotlabs/Module/Admin/Profs.php:168 +msgid "Profile Fields" +msgstr "Поля профиля" + +#: ../../Zotlabs/Widget/Admin.php:31 +msgid "DB updates" +msgstr "Обновление базы данных" + +#: ../../Zotlabs/Widget/Admin.php:48 ../../Zotlabs/Widget/Admin.php:58 +#: ../../Zotlabs/Module/Admin/Logs.php:83 +msgid "Logs" +msgstr "Журналы" + +#: ../../Zotlabs/Widget/Admin.php:56 +msgid "Addon Features" +msgstr "Настройки расширений" + +#: ../../Zotlabs/Widget/Tasklist.php:23 +msgid "Tasks" +msgstr "Задачи" + +#: ../../Zotlabs/Widget/Suggestions.php:46 ../../Zotlabs/Module/Suggest.php:58 +msgid "Ignore/Hide" +msgstr "Игнорировать / cкрыть" + +#: ../../Zotlabs/Widget/Suggestions.php:51 +msgid "Suggestions" +msgstr "Рекомендации" + +#: ../../Zotlabs/Widget/Suggestions.php:52 +msgid "See more..." +msgstr "Просмотреть больше..." + +#: ../../Zotlabs/Widget/Conversations.php:17 +msgid "Received Messages" +msgstr "Полученные сообщения" + +#: ../../Zotlabs/Widget/Conversations.php:21 +msgid "Sent Messages" +msgstr "Отправленные сообщения" + +#: ../../Zotlabs/Widget/Conversations.php:25 +msgid "Conversations" +msgstr "Беседы" + +#: ../../Zotlabs/Widget/Conversations.php:37 +msgid "No messages." +msgstr "Сообщений нет." + +#: ../../Zotlabs/Widget/Conversations.php:57 +msgid "Delete conversation" +msgstr "Удалить беседу" + +#: ../../Zotlabs/Widget/Cdav.php:37 +msgid "Select Channel" +msgstr "Выбрать канал" + +#: ../../Zotlabs/Widget/Cdav.php:42 +msgid "Read-write" +msgstr "Чтение-запись" + +#: ../../Zotlabs/Widget/Cdav.php:43 +msgid "Read-only" +msgstr "Только чтение" + +#: ../../Zotlabs/Widget/Cdav.php:117 +msgid "My Calendars" +msgstr "Мои календари" + +#: ../../Zotlabs/Widget/Cdav.php:119 +msgid "Shared Calendars" +msgstr "Общие календари" + +#: ../../Zotlabs/Widget/Cdav.php:123 +msgid "Share this calendar" +msgstr "Поделиться этим календарём" + +#: ../../Zotlabs/Widget/Cdav.php:125 +msgid "Calendar name and color" +msgstr "Имя и цвет календаря" + +#: ../../Zotlabs/Widget/Cdav.php:127 +msgid "Create new calendar" +msgstr "Создать новый календарь" + +#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165 +#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/Layouts.php:185 +#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Webpages.php:239 +#: ../../Zotlabs/Module/Articles.php:96 ../../Zotlabs/Module/Blocks.php:159 +#: ../../Zotlabs/Module/Menu.php:181 ../../Zotlabs/Module/New_channel.php:188 +#: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:390 +msgid "Create" +msgstr "Создать" + +#: ../../Zotlabs/Widget/Cdav.php:129 +msgid "Calendar Name" +msgstr "Имя календаря" + +#: ../../Zotlabs/Widget/Cdav.php:130 +msgid "Calendar Tools" +msgstr "Инструменты календаря" + +#: ../../Zotlabs/Widget/Cdav.php:131 +msgid "Import calendar" +msgstr "Импортировать календарь" + +#: ../../Zotlabs/Widget/Cdav.php:132 +msgid "Select a calendar to import to" +msgstr "Выбрать календарь для импорта в" + +#: ../../Zotlabs/Widget/Cdav.php:133 ../../Zotlabs/Widget/Cdav.php:169 +#: ../../Zotlabs/Widget/Album.php:97 ../../Zotlabs/Widget/Portfolio.php:110 +#: ../../Zotlabs/Module/Photos.php:717 +#: ../../Zotlabs/Module/Profile_photo.php:459 +#: ../../Zotlabs/Module/Cover_photo.php:395 +#: ../../Zotlabs/Module/Embedphotos.php:158 +#: ../../Zotlabs/Storage/Browser.php:392 +msgid "Upload" +msgstr "Загрузка" + +#: ../../Zotlabs/Widget/Cdav.php:159 +msgid "Addressbooks" +msgstr "Адресные книги" + +#: ../../Zotlabs/Widget/Cdav.php:161 +msgid "Addressbook name" +msgstr "Имя адресной книги" + +#: ../../Zotlabs/Widget/Cdav.php:163 +msgid "Create new addressbook" +msgstr "Создать новую адресную книгу" + +#: ../../Zotlabs/Widget/Cdav.php:164 +msgid "Addressbook Name" +msgstr "Имя адресной книги" + +#: ../../Zotlabs/Widget/Cdav.php:166 +msgid "Addressbook Tools" +msgstr "Инструменты адресной книги" + +#: ../../Zotlabs/Widget/Cdav.php:167 +msgid "Import addressbook" +msgstr "Импортировать адресную книгу" + +#: ../../Zotlabs/Widget/Cdav.php:168 +msgid "Select an addressbook to import to" +msgstr "Выбрать адресную книгу для импорта в" + +#: ../../Zotlabs/Widget/Activity.php:50 +msgctxt "widget" +msgid "Activity" +msgstr "Активность" + +#: ../../Zotlabs/Widget/Hq_controls.php:14 +msgid "HQ Control Panel" +msgstr "Панель управления HQ" + +#: ../../Zotlabs/Widget/Hq_controls.php:17 +msgid "Create a new post" +msgstr "Создать новую публикацию" + +#: ../../Zotlabs/Widget/Wiki_pages.php:32 +#: ../../Zotlabs/Widget/Wiki_pages.php:89 +msgid "Add new page" +msgstr "Добавить новую страницу" + +#: ../../Zotlabs/Widget/Wiki_pages.php:39 +#: ../../Zotlabs/Widget/Wiki_pages.php:96 ../../Zotlabs/Module/Dreport.php:151 +msgid "Options" +msgstr "Параметры" + +#: ../../Zotlabs/Widget/Wiki_pages.php:83 +msgid "Wiki Pages" +msgstr "Wiki страницы" + +#: ../../Zotlabs/Widget/Wiki_pages.php:94 +msgid "Page name" +msgstr "Название страницы" + +#: ../../Zotlabs/Widget/Mailmenu.php:13 +msgid "Private Mail Menu" +msgstr "Меню личной переписки" + +#: ../../Zotlabs/Widget/Mailmenu.php:15 +msgid "Combined View" +msgstr "Комбинированный вид" + +#: ../../Zotlabs/Widget/Mailmenu.php:20 +msgid "Inbox" +msgstr "Входящие" + +#: ../../Zotlabs/Widget/Mailmenu.php:25 +msgid "Outbox" +msgstr "Исходящие" + +#: ../../Zotlabs/Widget/Mailmenu.php:30 +msgid "New Message" +msgstr "Новое сообщение" + +#: ../../Zotlabs/Widget/Photo_rand.php:58 ../../Zotlabs/Widget/Photo.php:48 +msgid "photo/image" +msgstr "фотография / изображение" + +#: ../../Zotlabs/Widget/Archive.php:43 +msgid "Archives" +msgstr "Архивы" + +#: ../../Zotlabs/Widget/Eventstools.php:13 +msgid "Events Tools" +msgstr "Инструменты для событий" + +#: ../../Zotlabs/Widget/Eventstools.php:14 +msgid "Export Calendar" +msgstr "Экспортировать календарь" + +#: ../../Zotlabs/Widget/Eventstools.php:15 +msgid "Import Calendar" +msgstr "Импортировать календарь" + +#: ../../Zotlabs/Widget/Wiki_list.php:15 +msgid "Wiki List" +msgstr "Список Wiki" + +#: ../../Zotlabs/Widget/Settings_menu.php:35 +msgid "Account settings" +msgstr "Настройки аккаунта" + +#: ../../Zotlabs/Widget/Settings_menu.php:41 +msgid "Channel settings" +msgstr "Выбор канала" + +#: ../../Zotlabs/Widget/Settings_menu.php:50 +msgid "Additional features" +msgstr "Дополнительные функции" + +#: ../../Zotlabs/Widget/Settings_menu.php:57 +msgid "Addon settings" +msgstr "Настройки расширений" + +#: ../../Zotlabs/Widget/Settings_menu.php:63 +msgid "Display settings" +msgstr "Настройки отображения" + +#: ../../Zotlabs/Widget/Settings_menu.php:70 +msgid "Manage locations" +msgstr "Управление местоположением" + +#: ../../Zotlabs/Widget/Settings_menu.php:77 +msgid "Export channel" +msgstr "Экспортировать канал" + +#: ../../Zotlabs/Widget/Settings_menu.php:84 +msgid "OAuth1 apps" +msgstr "Приложения OAuth1" + +#: ../../Zotlabs/Widget/Settings_menu.php:92 +msgid "OAuth2 apps" +msgstr "Приложения OAuth2" + +#: ../../Zotlabs/Widget/Settings_menu.php:100 +#: ../../Zotlabs/Module/Settings/Tokens.php:150 +msgid "Guest Access Tokens" +msgstr "Токен гостевого доступа" + +#: ../../Zotlabs/Widget/Settings_menu.php:117 +#: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238 +msgid "Connection Default Permissions" +msgstr "Разрешения по умолчанию для контакта" + +#: ../../Zotlabs/Widget/Settings_menu.php:125 +msgid "Premium Channel Settings" +msgstr "Настройки премиум-канала" + +#: ../../Zotlabs/Widget/Album.php:78 ../../Zotlabs/Widget/Portfolio.php:87 +#: ../../Zotlabs/Module/Photos.php:816 ../../Zotlabs/Module/Photos.php:1355 +#: ../../Zotlabs/Module/Embedphotos.php:140 +msgid "View Photo" +msgstr "Посмотреть фотографию" + +#: ../../Zotlabs/Widget/Album.php:95 ../../Zotlabs/Widget/Portfolio.php:108 +#: ../../Zotlabs/Module/Photos.php:847 ../../Zotlabs/Module/Embedphotos.php:156 +msgid "Edit Album" +msgstr "Редактировать Фотоальбом" + +#: ../../Zotlabs/Widget/Pubsites.php:12 ../../Zotlabs/Module/Pubsites.php:24 +msgid "Public Hubs" +msgstr "Публичные хабы" + +#: ../../Zotlabs/Widget/Notes.php:16 +msgid "Notes" +msgstr "Заметки" + +#: ../../Zotlabs/Widget/Chatroom_list.php:20 +msgid "Overview" +msgstr "Обзор" + +#: ../../Zotlabs/Widget/Appstore.php:11 +msgid "App Collections" +msgstr "Коллекции приложений" + +#: ../../Zotlabs/Widget/Appstore.php:13 +msgid "Available Apps" +msgstr "Доступные приложения" + +#: ../../Zotlabs/Widget/Appstore.php:14 +msgid "Installed apps" +msgstr "Установленные приложения" + +#: ../../Zotlabs/Widget/Bookmarkedchats.php:24 +msgid "Bookmarked Chatrooms" +msgstr "Закладки чатов" + +#: ../../Zotlabs/Widget/Follow.php:22 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "У вас есть %1$.0f из %2$.0f разрешенных контактов." + +#: ../../Zotlabs/Widget/Follow.php:29 +msgid "Add New Connection" +msgstr "Добавить новый контакт" + +#: ../../Zotlabs/Widget/Follow.php:30 +msgid "Enter channel address" +msgstr "Введите адрес канала" + +#: ../../Zotlabs/Widget/Follow.php:31 +msgid "Examples: bob@example.com, https://example.com/barbara" +msgstr "Пример: ivan@example.com, http://example.com/ivan" + +#: ../../Zotlabs/Widget/Chatroom_members.php:11 +msgid "Chat Members" +msgstr "Участники чата" + +#: ../../Zotlabs/Widget/Suggestedchats.php:32 +msgid "Suggested Chatrooms" +msgstr "Рекомендуемые чаты" + +#: ../../Zotlabs/Widget/Rating.php:51 +msgid "Rating Tools" +msgstr "Инструменты оценки" + +#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57 +msgid "Rate Me" +msgstr "Оценить меня" + +#: ../../Zotlabs/Widget/Rating.php:60 +msgid "View Ratings" +msgstr "Просмотр оценок" + +#: ../../Zotlabs/Widget/Savedsearch.php:75 +msgid "Remove term" +msgstr "Удалить термин" + +#: ../../Zotlabs/Widget/Affinity.php:22 ../../Zotlabs/Module/Connedit.php:709 +msgid "Me" +msgstr "Я" + +#: ../../Zotlabs/Widget/Affinity.php:23 ../../Zotlabs/Module/Connedit.php:710 +msgid "Family" +msgstr "Семья" + +#: ../../Zotlabs/Widget/Affinity.php:25 ../../Zotlabs/Module/Connedit.php:712 +msgid "Acquaintances" +msgstr "Знакомые" + +#: ../../Zotlabs/Widget/Affinity.php:26 ../../Zotlabs/Module/Connections.php:94 +#: ../../Zotlabs/Module/Connections.php:108 +#: ../../Zotlabs/Module/Connedit.php:713 +msgid "All" +msgstr "Все" + +#: ../../Zotlabs/Widget/Affinity.php:45 +msgid "Refresh" +msgstr "Обновить" + +#: ../../Zotlabs/Widget/Activity_filter.php:24 +msgid "Personal Posts" +msgstr "Личные публикации" + +#: ../../Zotlabs/Widget/Activity_filter.php:28 +msgid "Show posts that mention or involve me" +msgstr "Показывать публикации где вы были упомянуты или привлечены" + +#: ../../Zotlabs/Widget/Activity_filter.php:39 +msgid "Starred Posts" +msgstr "Отмеченные публикации" + +#: ../../Zotlabs/Widget/Activity_filter.php:43 +msgid "Show posts that I have starred" +msgstr "Показывать публикации которые я отметил" + +#: ../../Zotlabs/Widget/Activity_filter.php:63 +#, php-format +msgid "Show posts related to the %s privacy group" +msgstr "Показывать публикации относящиеся к группе безопасности %s" + +#: ../../Zotlabs/Widget/Activity_filter.php:72 +msgid "Show my privacy groups" +msgstr "Показывать мои группы безопасности" + +#: ../../Zotlabs/Widget/Activity_filter.php:93 +msgid "Show posts to this forum" +msgstr "Показывать публикации этого форума" + +#: ../../Zotlabs/Widget/Activity_filter.php:100 +#: ../../Zotlabs/Widget/Notifications.php:119 +#: ../../Zotlabs/Widget/Notifications.php:120 +#: ../../Zotlabs/Widget/Forums.php:100 +msgid "Forums" +msgstr "Форумы" + +#: ../../Zotlabs/Widget/Activity_filter.php:104 +msgid "Show forums" +msgstr "Показывать форумы" + +#: ../../Zotlabs/Widget/Activity_filter.php:128 +#, php-format +msgid "Show posts that I have filed to %s" +msgstr "Показывать публикации которые я добавил в %s" + +#: ../../Zotlabs/Widget/Activity_filter.php:138 +msgid "Show filed post categories" +msgstr "Показывать категории добавленных публикаций" + +#: ../../Zotlabs/Widget/Activity_filter.php:152 +msgid "Panel search" +msgstr "Панель поиска" + +#: ../../Zotlabs/Widget/Activity_filter.php:162 +#: ../../Zotlabs/Widget/Notifications.php:27 +#: ../../Zotlabs/Widget/Notifications.php:46 +#: ../../Zotlabs/Widget/Notifications.php:122 +#: ../../Zotlabs/Widget/Notifications.php:153 +msgid "Filter by name" +msgstr "Отфильтровать по имени" + +#: ../../Zotlabs/Widget/Activity_filter.php:177 +msgid "Remove active filter" +msgstr "Удалить активный фильтр" + +#: ../../Zotlabs/Widget/Activity_filter.php:193 +msgid "Activity Filters" +msgstr "Фильтры активности" + +#: ../../Zotlabs/Widget/Cover_photo.php:54 +msgid "Click to show more" +msgstr "Нажмите чтобы показать больше" + +#: ../../Zotlabs/Widget/Notifications.php:16 +msgid "New Network Activity" +msgstr "Новая сетевая активность" + +#: ../../Zotlabs/Widget/Notifications.php:17 +msgid "New Network Activity Notifications" +msgstr "Новые уведомления о сетевой активности" + +#: ../../Zotlabs/Widget/Notifications.php:20 +msgid "View your network activity" +msgstr "Просмотреть вашу сетевую активность" + +#: ../../Zotlabs/Widget/Notifications.php:23 +msgid "Mark all notifications read" +msgstr "Пометить уведомления как прочитанные" + +#: ../../Zotlabs/Widget/Notifications.php:26 +#: ../../Zotlabs/Widget/Notifications.php:45 +#: ../../Zotlabs/Widget/Notifications.php:152 +msgid "Show new posts only" +msgstr "Показывать только новые публикации" + +#: ../../Zotlabs/Widget/Notifications.php:35 +msgid "New Home Activity" +msgstr "Новая локальная активность" + +#: ../../Zotlabs/Widget/Notifications.php:36 +msgid "New Home Activity Notifications" +msgstr "Новые уведомления локальной активности" + +#: ../../Zotlabs/Widget/Notifications.php:39 +msgid "View your home activity" +msgstr "Просмотреть локальную активность" + +#: ../../Zotlabs/Widget/Notifications.php:42 +#: ../../Zotlabs/Widget/Notifications.php:149 +msgid "Mark all notifications seen" +msgstr "Пометить уведомления как просмотренные" + +#: ../../Zotlabs/Widget/Notifications.php:54 +msgid "New Mails" +msgstr "Новая переписка" + +#: ../../Zotlabs/Widget/Notifications.php:55 +msgid "New Mails Notifications" +msgstr "Уведомления о новой переписке" + +#: ../../Zotlabs/Widget/Notifications.php:58 +msgid "View your private mails" +msgstr "Просмотреть вашу личную переписку" + +#: ../../Zotlabs/Widget/Notifications.php:61 +msgid "Mark all messages seen" +msgstr "Пометить сообщения как просмотренные" + +#: ../../Zotlabs/Widget/Notifications.php:69 +msgid "New Events" +msgstr "Новые события" + +#: ../../Zotlabs/Widget/Notifications.php:70 +msgid "New Events Notifications" +msgstr "Уведомления о новых событиях" + +#: ../../Zotlabs/Widget/Notifications.php:73 +msgid "View events" +msgstr "Просмотреть события" + +#: ../../Zotlabs/Widget/Notifications.php:76 +msgid "Mark all events seen" +msgstr "Пометить все события как просмотренные" + +#: ../../Zotlabs/Widget/Notifications.php:84 +#: ../../Zotlabs/Module/Connections.php:147 +msgid "New Connections" +msgstr "Новые контакты" + +#: ../../Zotlabs/Widget/Notifications.php:85 +msgid "New Connections Notifications" +msgstr "Уведомления о новых контактах" + +#: ../../Zotlabs/Widget/Notifications.php:88 +msgid "View all connections" +msgstr "Просмотр всех контактов" + +#: ../../Zotlabs/Widget/Notifications.php:96 +msgid "New Files" +msgstr "Новые файлы" + +#: ../../Zotlabs/Widget/Notifications.php:97 +msgid "New Files Notifications" +msgstr "Уведомления о новых файлах" + +#: ../../Zotlabs/Widget/Notifications.php:104 +#: ../../Zotlabs/Widget/Notifications.php:105 +msgid "Notices" +msgstr "Оповещения" + +#: ../../Zotlabs/Widget/Notifications.php:108 +msgid "View all notices" +msgstr "Просмотреть все оповещения" + +#: ../../Zotlabs/Widget/Notifications.php:111 +msgid "Mark all notices seen" +msgstr "Пометить все оповещения как просмотренные" + +#: ../../Zotlabs/Widget/Notifications.php:132 +msgid "New Registrations" +msgstr "Новые регистрации" + +#: ../../Zotlabs/Widget/Notifications.php:133 +msgid "New Registrations Notifications" +msgstr "Уведомления о новых регистрациях" + +#: ../../Zotlabs/Widget/Notifications.php:142 +#: ../../Zotlabs/Module/Pubstream.php:95 +msgid "Public Stream" +msgstr "Публичный поток" + +#: ../../Zotlabs/Widget/Notifications.php:143 +msgid "Public Stream Notifications" +msgstr "Уведомления публичного потока" + +#: ../../Zotlabs/Widget/Notifications.php:146 +msgid "View the public stream" +msgstr "Просмотреть публичный поток" + +#: ../../Zotlabs/Widget/Notifications.php:161 +msgid "Sorry, you have got no notifications at the moment" +msgstr "Извините, но сейчас у вас нет уведомлений" + +#: ../../Zotlabs/Widget/Newmember.php:24 +msgid "Profile Creation" +msgstr "Создание профиля" + +#: ../../Zotlabs/Widget/Newmember.php:26 +msgid "Upload profile photo" +msgstr "Загрузить фотографию профиля" + +#: ../../Zotlabs/Widget/Newmember.php:27 +msgid "Upload cover photo" +msgstr "Загрузить фотографию обложки" + +#: ../../Zotlabs/Widget/Newmember.php:31 +msgid "Find and Connect with others" +msgstr "Найти и вступить в контакт" + +#: ../../Zotlabs/Widget/Newmember.php:33 +msgid "View the directory" +msgstr "Просмотреть каталог" + +#: ../../Zotlabs/Widget/Newmember.php:34 ../../Zotlabs/Module/Go.php:38 +msgid "View friend suggestions" +msgstr "Просмотр рекомендуемых друзей" + +#: ../../Zotlabs/Widget/Newmember.php:35 +msgid "Manage your connections" +msgstr "Управлять вашими контактами" + +#: ../../Zotlabs/Widget/Newmember.php:38 +msgid "Communicate" +msgstr "Связаться" + +#: ../../Zotlabs/Widget/Newmember.php:40 +msgid "View your channel homepage" +msgstr "Домашняя страница канала" + +#: ../../Zotlabs/Widget/Newmember.php:41 +msgid "View your network stream" +msgstr "Просмотреть ваш сетевой поток" + +#: ../../Zotlabs/Widget/Newmember.php:47 +msgid "Documentation" +msgstr "Документация" + +#: ../../Zotlabs/Widget/Newmember.php:58 +msgid "View public stream" +msgstr "Просмотреть публичный поток" + +#: ../../Zotlabs/Access/PermissionRoles.php:283 +msgid "Social Networking" +msgstr "Социальная Сеть" + +#: ../../Zotlabs/Access/PermissionRoles.php:284 +msgid "Social - Federation" +msgstr "Социальная - Федерация" + +#: ../../Zotlabs/Access/PermissionRoles.php:285 +msgid "Social - Mostly Public" +msgstr "Социальная - В основном общественный" + +#: ../../Zotlabs/Access/PermissionRoles.php:286 +msgid "Social - Restricted" +msgstr "Социальная - Ограниченный" + +#: ../../Zotlabs/Access/PermissionRoles.php:287 +msgid "Social - Private" +msgstr "Социальная - Частный" + +#: ../../Zotlabs/Access/PermissionRoles.php:290 +msgid "Community Forum" +msgstr "Форум сообщества" + +#: ../../Zotlabs/Access/PermissionRoles.php:291 +msgid "Forum - Mostly Public" +msgstr "Форум - В основном общественный" + +#: ../../Zotlabs/Access/PermissionRoles.php:292 +msgid "Forum - Restricted" +msgstr "Форум - Ограниченный" + +#: ../../Zotlabs/Access/PermissionRoles.php:293 +msgid "Forum - Private" +msgstr "Форум - Частный" + +#: ../../Zotlabs/Access/PermissionRoles.php:296 +msgid "Feed Republish" +msgstr "Публиковать ленты новостей" + +#: ../../Zotlabs/Access/PermissionRoles.php:297 +msgid "Feed - Mostly Public" +msgstr "Ленты новостей - В основном общественный" + +#: ../../Zotlabs/Access/PermissionRoles.php:298 +msgid "Feed - Restricted" +msgstr "Ленты новостей - Ограниченный" + +#: ../../Zotlabs/Access/PermissionRoles.php:301 +msgid "Special Purpose" +msgstr "Спец. назначение" + +#: ../../Zotlabs/Access/PermissionRoles.php:302 +msgid "Special - Celebrity/Soapbox" +msgstr "Спец. назначение - Знаменитость/Soapbox" + +#: ../../Zotlabs/Access/PermissionRoles.php:303 +msgid "Special - Group Repository" +msgstr "Спец. назначение - Групповой репозиторий" + +#: ../../Zotlabs/Access/PermissionRoles.php:307 +msgid "Custom/Expert Mode" +msgstr "Экспертный режим" + +#: ../../Zotlabs/Access/Permissions.php:56 +msgid "Can view my channel stream and posts" +msgstr "Может просматривать мою ленту и сообщения" + +#: ../../Zotlabs/Access/Permissions.php:57 +msgid "Can send me their channel stream and posts" +msgstr "Может присылать мне свои потоки и сообщения" + +#: ../../Zotlabs/Access/Permissions.php:58 +msgid "Can view my default channel profile" +msgstr "Может просматривать мой стандартный профиль канала" + +#: ../../Zotlabs/Access/Permissions.php:59 +msgid "Can view my connections" +msgstr "Может просматривать мои контакты" -#: ../../include/text.php:912 -msgid "tired" -msgstr "усталый" +#: ../../Zotlabs/Access/Permissions.php:60 +msgid "Can view my file storage and photos" +msgstr "Может просматривать мое хранилище файлов" -#: ../../include/text.php:913 -msgid "perky" -msgstr "весёлый" +#: ../../Zotlabs/Access/Permissions.php:61 +msgid "Can upload/modify my file storage and photos" +msgstr "Может загружать/изменять мои файлы и фотографии в хранилище" -#: ../../include/text.php:914 -msgid "angry" -msgstr "сердитый" +#: ../../Zotlabs/Access/Permissions.php:62 +msgid "Can view my channel webpages" +msgstr "Может просматривать мои веб-страницы" -#: ../../include/text.php:915 -msgid "stupified" -msgstr "отупевший" +#: ../../Zotlabs/Access/Permissions.php:63 +msgid "Can view my wiki pages" +msgstr "Может просматривать мои вики-страницы" -#: ../../include/text.php:916 -msgid "puzzled" -msgstr "недоумённый" +#: ../../Zotlabs/Access/Permissions.php:64 +msgid "Can create/edit my channel webpages" +msgstr "Может редактировать мои веб-страницы" -#: ../../include/text.php:917 -msgid "interested" -msgstr "заинтересованный" +#: ../../Zotlabs/Access/Permissions.php:65 +msgid "Can write to my wiki pages" +msgstr "Может редактировать мои вики-страницы" -#: ../../include/text.php:918 -msgid "bitter" -msgstr "озлобленный" +#: ../../Zotlabs/Access/Permissions.php:66 +msgid "Can post on my channel (wall) page" +msgstr "Может публиковать на моей странице канала (\"стена\")" -#: ../../include/text.php:919 -msgid "cheerful" -msgstr "бодрый" +#: ../../Zotlabs/Access/Permissions.php:67 +msgid "Can comment on or like my posts" +msgstr "Может прокомментировать или отмечать как понравившиеся мои посты" -#: ../../include/text.php:920 -msgid "alive" -msgstr "энергичный" +#: ../../Zotlabs/Access/Permissions.php:68 +msgid "Can send me private mail messages" +msgstr "Может отправлять мне личные сообщения по эл. почте" -#: ../../include/text.php:921 -msgid "annoyed" -msgstr "раздражённый" +#: ../../Zotlabs/Access/Permissions.php:69 +msgid "Can like/dislike profiles and profile things" +msgstr "Может комментировать или отмечать как нравится/ненравится мой профиль" -#: ../../include/text.php:922 -msgid "anxious" -msgstr "обеспокоенный" +#: ../../Zotlabs/Access/Permissions.php:70 +msgid "Can forward to all my channel connections via ! mentions in posts" +msgstr "Может отправлять всем подписчикам моего канала через использование ! в публикациях" -#: ../../include/text.php:923 -msgid "cranky" -msgstr "капризный" +#: ../../Zotlabs/Access/Permissions.php:71 +msgid "Can chat with me" +msgstr "Может общаться со мной в чате" -#: ../../include/text.php:924 -msgid "disturbed" -msgstr "встревоженный" +#: ../../Zotlabs/Access/Permissions.php:72 +msgid "Can source my public posts in derived channels" +msgstr "Может использовать мои публичные сообщения в клонированных лентах сообщений" -#: ../../include/text.php:925 -msgid "frustrated" -msgstr "разочарованный" +#: ../../Zotlabs/Access/Permissions.php:73 +msgid "Can administer my channel" +msgstr "Может администрировать мой канал" -#: ../../include/text.php:926 -msgid "depressed" -msgstr "" +#: ../../Zotlabs/Zot/Auth.php:152 +msgid "" +"Remote authentication blocked. You are logged into this site locally. Please " +"logout and retry." +msgstr "Удалённая аутентификация заблокирована. Вы вошли на этот сайт локально. Пожалуйста, выйдите и попробуйте ещё раз." -#: ../../include/text.php:927 -msgid "motivated" -msgstr "мотивированный" +#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56 +msgid "App installed." +msgstr "Приложение установлено." -#: ../../include/text.php:928 -msgid "relaxed" -msgstr "расслабленный" +#: ../../Zotlabs/Module/Appman.php:49 +msgid "Malformed app." +msgstr "Неработающее приложение." -#: ../../include/text.php:929 -msgid "surprised" -msgstr "удивленный" +#: ../../Zotlabs/Module/Appman.php:130 +msgid "Embed code" +msgstr "Встроить код" -#: ../../include/text.php:1090 -msgid "Monday" -msgstr "Понедельник" +#: ../../Zotlabs/Module/Appman.php:136 +msgid "Edit App" +msgstr "Редактировать приложение" -#: ../../include/text.php:1090 -msgid "Tuesday" -msgstr "Вторник" +#: ../../Zotlabs/Module/Appman.php:136 +msgid "Create App" +msgstr "Создать приложение" -#: ../../include/text.php:1090 -msgid "Wednesday" -msgstr "Среда" +#: ../../Zotlabs/Module/Appman.php:141 +msgid "Name of app" +msgstr "Наименование приложения" -#: ../../include/text.php:1090 -msgid "Thursday" -msgstr "Четверг" +#: ../../Zotlabs/Module/Appman.php:142 +msgid "Location (URL) of app" +msgstr "Местоположение (URL) приложения" -#: ../../include/text.php:1090 -msgid "Friday" -msgstr "Пятница" +#: ../../Zotlabs/Module/Appman.php:144 +msgid "Photo icon URL" +msgstr "URL пиктограммы" -#: ../../include/text.php:1090 -msgid "Saturday" -msgstr "Суббота" +#: ../../Zotlabs/Module/Appman.php:144 +msgid "80 x 80 pixels - optional" +msgstr "80 x 80 пикселей - необязательно" + +#: ../../Zotlabs/Module/Appman.php:145 +msgid "Categories (optional, comma separated list)" +msgstr "Категории (необязательно, список через запятую)" + +#: ../../Zotlabs/Module/Appman.php:146 +msgid "Version ID" +msgstr "ID версии" + +#: ../../Zotlabs/Module/Appman.php:147 +msgid "Price of app" +msgstr "Цена приложения" + +#: ../../Zotlabs/Module/Appman.php:148 +msgid "Location (URL) to purchase app" +msgstr "Ссылка (URL) для покупки приложения" + +#: ../../Zotlabs/Module/Acl.php:359 +msgid "network" +msgstr "сеть" + +#: ../../Zotlabs/Module/Cdav.php:785 +msgid "INVALID EVENT DISMISSED!" +msgstr "НЕДЕЙСТВИТЕЛЬНОЕ СОБЫТИЕ ОТКЛОНЕНО!" + +#: ../../Zotlabs/Module/Cdav.php:786 +msgid "Summary: " +msgstr "Резюме:" + +#: ../../Zotlabs/Module/Cdav.php:787 +msgid "Date: " +msgstr "Дата:" + +#: ../../Zotlabs/Module/Cdav.php:788 ../../Zotlabs/Module/Cdav.php:795 +msgid "Reason: " +msgstr "Причина:" + +#: ../../Zotlabs/Module/Cdav.php:793 +msgid "INVALID CARD DISMISSED!" +msgstr "НЕДЕЙСТВИТЕЛЬНАЯ КАРТОЧКА ОТКЛОНЕНА!" + +#: ../../Zotlabs/Module/Cdav.php:794 +msgid "Name: " +msgstr "Имя:" + +#: ../../Zotlabs/Module/Cdav.php:868 ../../Zotlabs/Module/Events.php:460 +msgid "Event title" +msgstr "Наименование события" + +#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Events.php:466 +msgid "Start date and time" +msgstr "Дата и время начала" + +#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Cdav.php:870 +msgid "Example: YYYY-MM-DD HH:mm" +msgstr "Пример: YYYY-MM-DD HH:mm" + +#: ../../Zotlabs/Module/Cdav.php:870 +msgid "End date and time" +msgstr "Дата и время окончания" + +#: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Photos.php:976 +#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698 +#: ../../Zotlabs/Module/Cal.php:339 ../../Zotlabs/Module/Cal.php:346 +msgid "Previous" +msgstr "Предыдущая" + +#: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Photos.php:985 +#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Events.php:699 +#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347 +#: ../../Zotlabs/Module/Setup.php:263 +msgid "Next" +msgstr "Следующая" + +#: ../../Zotlabs/Module/Cdav.php:881 ../../Zotlabs/Module/Events.php:700 +#: ../../Zotlabs/Module/Cal.php:348 +msgid "Today" +msgstr "Сегодня" + +#: ../../Zotlabs/Module/Cdav.php:882 ../../Zotlabs/Module/Events.php:695 +msgid "Month" +msgstr "Месяц" + +#: ../../Zotlabs/Module/Cdav.php:883 ../../Zotlabs/Module/Events.php:696 +msgid "Week" +msgstr "Неделя" + +#: ../../Zotlabs/Module/Cdav.php:884 ../../Zotlabs/Module/Events.php:697 +msgid "Day" +msgstr "День" + +#: ../../Zotlabs/Module/Cdav.php:885 +msgid "List month" +msgstr "Просмотреть месяц" + +#: ../../Zotlabs/Module/Cdav.php:886 +msgid "List week" +msgstr "Просмотреть неделю" + +#: ../../Zotlabs/Module/Cdav.php:887 +msgid "List day" +msgstr "Просмотреть день" + +#: ../../Zotlabs/Module/Cdav.php:894 +msgid "More" +msgstr "Больше" + +#: ../../Zotlabs/Module/Cdav.php:895 +msgid "Less" +msgstr "Меньше" + +#: ../../Zotlabs/Module/Cdav.php:896 +msgid "Select calendar" +msgstr "Выбрать календарь" + +#: ../../Zotlabs/Module/Cdav.php:898 +msgid "Delete all" +msgstr "Удалить всё" + +#: ../../Zotlabs/Module/Cdav.php:900 +msgid "Sorry! Editing of recurrent events is not yet implemented." +msgstr "Простите, но редактирование повторяющихся событий пока не реализовано." + +#: ../../Zotlabs/Module/Cdav.php:1171 ../../Zotlabs/Module/Connedit.php:907 +msgid "Organisation" +msgstr "Организация" + +#: ../../Zotlabs/Module/Cdav.php:1172 ../../Zotlabs/Module/Connedit.php:908 +msgid "Title" +msgstr "Наименование" + +#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909 +#: ../../Zotlabs/Module/Profiles.php:786 +msgid "Phone" +msgstr "Телефон" + +#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911 +#: ../../Zotlabs/Module/Profiles.php:788 +msgid "Instant messenger" +msgstr "Мессенджер" + +#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912 +#: ../../Zotlabs/Module/Profiles.php:789 +msgid "Website" +msgstr "Веб-сайт" + +#: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Connedit.php:913 +#: ../../Zotlabs/Module/Admin/Channels.php:160 +#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:502 +#: ../../Zotlabs/Module/Profiles.php:790 +msgid "Address" +msgstr "Адрес" + +#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914 +#: ../../Zotlabs/Module/Profiles.php:791 +msgid "Note" +msgstr "Заметка" + +#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920 +#: ../../Zotlabs/Module/Profiles.php:797 +msgid "Add Field" +msgstr "Добавить поле" + +#: ../../Zotlabs/Module/Cdav.php:1189 ../../Zotlabs/Module/Connedit.php:925 +msgid "P.O. Box" +msgstr "абонентский ящик" + +#: ../../Zotlabs/Module/Cdav.php:1190 ../../Zotlabs/Module/Connedit.php:926 +msgid "Additional" +msgstr "Дополнительно" + +#: ../../Zotlabs/Module/Cdav.php:1191 ../../Zotlabs/Module/Connedit.php:927 +msgid "Street" +msgstr "Улица" + +#: ../../Zotlabs/Module/Cdav.php:1192 ../../Zotlabs/Module/Connedit.php:928 +msgid "Locality" +msgstr "Населённый пункт" + +#: ../../Zotlabs/Module/Cdav.php:1193 ../../Zotlabs/Module/Connedit.php:929 +msgid "Region" +msgstr "Регион" + +#: ../../Zotlabs/Module/Cdav.php:1194 ../../Zotlabs/Module/Connedit.php:930 +msgid "ZIP Code" +msgstr "Индекс" + +#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Profiles.php:757 +msgid "Country" +msgstr "Страна" + +#: ../../Zotlabs/Module/Cdav.php:1242 +msgid "Default Calendar" +msgstr "Календарь по умолчанию" + +#: ../../Zotlabs/Module/Cdav.php:1252 +msgid "Default Addressbook" +msgstr "Адресная книга по умолчанию" + +#: ../../Zotlabs/Module/Go.php:21 +msgid "This page is available only to site members" +msgstr "Эта страница доступна только для подписчиков сайта" + +#: ../../Zotlabs/Module/Go.php:27 +msgid "Welcome" +msgstr "Добро пожаловать" + +#: ../../Zotlabs/Module/Go.php:29 +msgid "What would you like to do?" +msgstr "Что бы вы хотели сделать?" + +#: ../../Zotlabs/Module/Go.php:31 +msgid "" +"Please bookmark this page if you would like to return to it in the future" +msgstr "Пожалуйста, запомните эту страницу если вы хотите вернуться на неё в будущем" + +#: ../../Zotlabs/Module/Go.php:35 +msgid "Upload a profile photo" +msgstr "Загрузить фотографию профиля" + +#: ../../Zotlabs/Module/Go.php:36 +msgid "Upload a cover photo" +msgstr "Загрузить фотографию обложки" + +#: ../../Zotlabs/Module/Go.php:37 +msgid "Edit your default profile" +msgstr "Редактировать ваш профиль по умолчанию" + +#: ../../Zotlabs/Module/Go.php:39 +msgid "View the channel directory" +msgstr "Просмотр каталога каналов" + +#: ../../Zotlabs/Module/Go.php:40 +msgid "View/edit your channel settings" +msgstr "Просмотреть / редактировать настройки вашего канала" + +#: ../../Zotlabs/Module/Go.php:41 +msgid "View the site or project documentation" +msgstr "Просмотр документации сайта / проекта" + +#: ../../Zotlabs/Module/Go.php:42 +msgid "Visit your channel homepage" +msgstr "Посетить страницу вашего канала" + +#: ../../Zotlabs/Module/Go.php:43 +msgid "" +"View your connections and/or add somebody whose address you already know" +msgstr "Просмотреть ваши контакты и / или добавить кого-то чей адрес в уже знаете" + +#: ../../Zotlabs/Module/Go.php:44 +msgid "" +"View your personal stream (this may be empty until you add some connections)" +msgstr "Ваш персональный поток (может быть пуст пока вы не добавите контакты)" + +#: ../../Zotlabs/Module/Go.php:52 +msgid "View the public stream. Warning: this content is not moderated" +msgstr "Просмотр публичного потока. Предупреждение: этот контент не модерируется" + +#: ../../Zotlabs/Module/Photos.php:78 +msgid "Page owner information could not be retrieved." +msgstr "Информация о владельце страницы не может быть получена." + +#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:113 +msgid "Album not found." +msgstr "Альбом не найден." + +#: ../../Zotlabs/Module/Photos.php:103 +msgid "Delete Album" +msgstr "Удалить альбом" + +#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1088 +msgid "Delete Photo" +msgstr "Удалить фотографию" + +#: ../../Zotlabs/Module/Photos.php:545 ../../Zotlabs/Module/Ratings.php:83 +#: ../../Zotlabs/Module/Search.php:17 +#: ../../Zotlabs/Module/Viewconnections.php:23 +#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Directory.php:68 +#: ../../Zotlabs/Module/Display.php:30 +msgid "Public access denied." +msgstr "Общественный доступ запрещен." + +#: ../../Zotlabs/Module/Photos.php:556 +msgid "No photos selected" +msgstr "Никакие фотографии не выбраны" + +#: ../../Zotlabs/Module/Photos.php:605 +msgid "Access to this item is restricted." +msgstr "Доступ к этому элементу ограничен." + +#: ../../Zotlabs/Module/Photos.php:651 +#, php-format +msgid "%1$.2f MB of %2$.2f MB photo storage used." +msgstr "Вы использовали %1$.2f мегабайт из %2$.2f для хранения фото." + +#: ../../Zotlabs/Module/Photos.php:654 +#, php-format +msgid "%1$.2f MB photo storage used." +msgstr "Вы использовали %1$.2f мегабайт для хранения фото." + +#: ../../Zotlabs/Module/Photos.php:696 +msgid "Upload Photos" +msgstr "Загрузить фотографии" + +#: ../../Zotlabs/Module/Photos.php:700 +msgid "Enter an album name" +msgstr "Введите название альбома" + +#: ../../Zotlabs/Module/Photos.php:701 +msgid "or select an existing album (doubleclick)" +msgstr "или выберите существующий альбом (двойной щелчок)" + +#: ../../Zotlabs/Module/Photos.php:702 +msgid "Create a status post for this upload" +msgstr "Сделать публикацию о статусе для этой загрузки" + +#: ../../Zotlabs/Module/Photos.php:704 +msgid "Description (optional)" +msgstr "Описание (необязательно)" + +#: ../../Zotlabs/Module/Photos.php:790 +msgid "Show Newest First" +msgstr "Показать новые первыми" + +#: ../../Zotlabs/Module/Photos.php:792 +msgid "Show Oldest First" +msgstr "Показать старые первыми" + +#: ../../Zotlabs/Module/Photos.php:849 ../../Zotlabs/Module/Photos.php:1386 +msgid "Add Photos" +msgstr "Добавить фотографии" + +#: ../../Zotlabs/Module/Photos.php:897 +msgid "Permission denied. Access to this item may be restricted." +msgstr "Доступ запрещен. Доступ к этому элементу может быть ограничен." + +#: ../../Zotlabs/Module/Photos.php:899 +msgid "Photo not available" +msgstr "Фотография не доступна" + +#: ../../Zotlabs/Module/Photos.php:957 +msgid "Use as profile photo" +msgstr "Использовать в качестве фотографии профиля" + +#: ../../Zotlabs/Module/Photos.php:958 +msgid "Use as cover photo" +msgstr "Использовать в качестве фотографии обложки" + +#: ../../Zotlabs/Module/Photos.php:965 +msgid "Private Photo" +msgstr "Личная фотография" + +#: ../../Zotlabs/Module/Photos.php:980 +msgid "View Full Size" +msgstr "Посмотреть в полный размер" + +#: ../../Zotlabs/Module/Photos.php:1062 +msgid "Edit photo" +msgstr "Редактировать фотографию" + +#: ../../Zotlabs/Module/Photos.php:1064 +msgid "Rotate CW (right)" +msgstr "Повернуть CW (направо)" + +#: ../../Zotlabs/Module/Photos.php:1065 +msgid "Rotate CCW (left)" +msgstr "Повернуть CCW (налево)" + +#: ../../Zotlabs/Module/Photos.php:1068 +msgid "Move photo to album" +msgstr "Переместить фотографию в альбом" + +#: ../../Zotlabs/Module/Photos.php:1069 +msgid "Enter a new album name" +msgstr "Введите новое название альбома" + +#: ../../Zotlabs/Module/Photos.php:1070 +msgid "or select an existing one (doubleclick)" +msgstr "или выбрать существующую (двойной щелчок)" + +#: ../../Zotlabs/Module/Photos.php:1075 +msgid "Add a Tag" +msgstr "Добавить тег" + +#: ../../Zotlabs/Module/Photos.php:1083 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" +msgstr "Пример: @bob, @Barbara_Jensen, @jim@example.com" + +#: ../../Zotlabs/Module/Photos.php:1086 +msgid "Flag as adult in album view" +msgstr "Пометить как альбом \"для взрослых\"" + +#: ../../Zotlabs/Module/Photos.php:1270 +msgid "Photo Tools" +msgstr "Фото-Инструменты" + +#: ../../Zotlabs/Module/Photos.php:1279 +msgid "In This Photo:" +msgstr "На этой фотографии:" + +#: ../../Zotlabs/Module/Photos.php:1284 +msgid "Map" +msgstr "Карта" + +#: ../../Zotlabs/Module/Pubsites.php:27 +msgid "" +"The listed hubs allow public registration for the $Projectname network. All " +"hubs in the network are interlinked so membership on any of them conveys " +"membership in the network as a whole. Some hubs may require subscription or " +"provide tiered service plans. The hub itself may provide " +"additional details." +msgstr "Указанные хабы разрешают публичную регистрацию для сети $Projectname. Все хабы в сети взаимосвязаны, поэтому членство в любом из них передает членство во всю сеть. Некоторым хабам может потребоваться подписка или предоставление многоуровневых планов обслуживания. Сам хаб может предоставить дополнительные сведения." + +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Hub URL" +msgstr "URL сервера" + +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Access Type" +msgstr "Тип доступа" + +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Registration Policy" +msgstr "Политика регистрации" + +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Stats" +msgstr "Статистика" + +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Software" +msgstr "Программное обеспечение" + +#: ../../Zotlabs/Module/Pubsites.php:49 +msgid "Rate" +msgstr "Оценка" + +#: ../../Zotlabs/Module/Pubsites.php:60 ../../Zotlabs/Module/Events.php:694 +#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Webpages.php:246 +#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Wiki.php:204 +msgid "View" +msgstr "Просмотр" + +#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 +msgid "Continue" +msgstr "Продолжить" + +#: ../../Zotlabs/Module/Connect.php:90 +msgid "Premium Channel Setup" +msgstr "Установка премиум канала" + +#: ../../Zotlabs/Module/Connect.php:92 +msgid "Enable premium channel connection restrictions" +msgstr "Включить ограничения для премиум канала" + +#: ../../Zotlabs/Module/Connect.php:93 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." +msgstr "Пожалуйста введите ваши ограничения или условия, такие, как оплата PayPal, правила использования и т.п." + +#: ../../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/Connect.php:96 +msgid "" +"Potential connections will then see the following text before proceeding:" +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." +msgstr "Продолжая, я подтверждаю что я выполнил все условия представленные на данной странице." + +#: ../../Zotlabs/Module/Connect.php:106 +msgid "(No specific instructions have been provided by the channel owner.)" +msgstr "(Владельцем канала не было представлено никаких специальных инструкций.)" + +#: ../../Zotlabs/Module/Connect.php:114 +msgid "Restricted or Premium Channel" +msgstr "Ограниченный или Премиум канал" + +#: ../../Zotlabs/Module/Poke.php:183 +msgid "Poke somebody" +msgstr "Ткнуть кого-нибудь" + +#: ../../Zotlabs/Module/Poke.php:186 +msgid "Poke/Prod" +msgstr "Толкнуть / подтолкнуть" + +#: ../../Zotlabs/Module/Poke.php:187 +msgid "Poke, prod or do other things to somebody" +msgstr "Толкнуть, подтолкнуть или сделать что-то ещё с кем-то" + +#: ../../Zotlabs/Module/Poke.php:194 +msgid "Recipient" +msgstr "Получатель" -#: ../../include/text.php:1090 -msgid "Sunday" -msgstr "Воскресенье" +#: ../../Zotlabs/Module/Poke.php:195 +msgid "Choose what you wish to do to recipient" +msgstr "Выбрать что вы хотите сделать с получателем" -#: ../../include/text.php:1094 -msgid "January" -msgstr "Январь" +#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199 +msgid "Make this post private" +msgstr "Сделать эту публикацию приватной" -#: ../../include/text.php:1094 -msgid "February" -msgstr "Февраль" +#: ../../Zotlabs/Module/Oexchange.php:27 +msgid "Unable to find your hub." +msgstr "Невозможно найти ваш сервер" -#: ../../include/text.php:1094 -msgid "March" -msgstr "Март" +#: ../../Zotlabs/Module/Oexchange.php:41 +msgid "Post successful." +msgstr "Успешно опубликовано." -#: ../../include/text.php:1094 -msgid "April" -msgstr "Апрель" +#: ../../Zotlabs/Module/Impel.php:183 +#, php-format +msgid "%s element installed" +msgstr "%s элемент установлен" -#: ../../include/text.php:1094 -msgid "May" -msgstr "Май" +#: ../../Zotlabs/Module/Impel.php:186 +#, php-format +msgid "%s element installation failed" +msgstr "%sустановка элемента неудачна." -#: ../../include/text.php:1094 -msgid "June" -msgstr "Июнь" +#: ../../Zotlabs/Module/Ping.php:332 +msgid "sent you a private message" +msgstr "отправил вам личное сообщение" -#: ../../include/text.php:1094 -msgid "July" -msgstr "Июль" +#: ../../Zotlabs/Module/Ping.php:385 +msgid "added your channel" +msgstr "добавил ваш канал" -#: ../../include/text.php:1094 -msgid "August" -msgstr "Август" +#: ../../Zotlabs/Module/Ping.php:409 +msgid "requires approval" +msgstr "Требуется подтверждение" -#: ../../include/text.php:1094 -msgid "September" -msgstr "Сентябрь" +#: ../../Zotlabs/Module/Ping.php:419 +msgid "g A l F d" +msgstr "g A l F d" -#: ../../include/text.php:1094 -msgid "October" -msgstr "Октябрь" +#: ../../Zotlabs/Module/Ping.php:437 +msgid "[today]" +msgstr "[сегодня]" -#: ../../include/text.php:1094 -msgid "November" -msgstr "Ноябрь" +#: ../../Zotlabs/Module/Ping.php:446 +msgid "posted an event" +msgstr "событие опубликовано" -#: ../../include/text.php:1094 -msgid "December" -msgstr "Декабрь" +#: ../../Zotlabs/Module/Ping.php:479 +msgid "shared a file with you" +msgstr "с вами поделились файлом" -#: ../../include/text.php:1172 -msgid "unknown.???" -msgstr "неизвестный.???" +#: ../../Zotlabs/Module/Ping.php:654 +msgid "Private forum" +msgstr "Частный форум" -#: ../../include/text.php:1173 -msgid "bytes" -msgstr "байт" +#: ../../Zotlabs/Module/Ping.php:654 +msgid "Public forum" +msgstr "Публичный форум" -#: ../../include/text.php:1208 -msgid "remove category" -msgstr "" +#: ../../Zotlabs/Module/Achievements.php:38 +msgid "Some blurb about what to do when you're new here" +msgstr "Некоторые предложения о том, что делать, если вы здесь новичок " -#: ../../include/text.php:1257 -msgid "remove from file" -msgstr "" +#: ../../Zotlabs/Module/Connections.php:55 +#: ../../Zotlabs/Module/Connections.php:112 +#: ../../Zotlabs/Module/Connections.php:256 +msgid "Active" +msgstr "Активен" -#: ../../include/text.php:1318 ../../include/text.php:1330 -msgid "Click to open/close" -msgstr "Нажмите, чтобы открыть/закрыть" +#: ../../Zotlabs/Module/Connections.php:60 +#: ../../Zotlabs/Module/Connections.php:164 +#: ../../Zotlabs/Module/Connections.php:261 +msgid "Blocked" +msgstr "Заблокирован" -#: ../../include/text.php:1485 ../../mod/events.php:355 -msgid "Link to Source" -msgstr "Ссылка на источник" +#: ../../Zotlabs/Module/Connections.php:65 +#: ../../Zotlabs/Module/Connections.php:171 +#: ../../Zotlabs/Module/Connections.php:260 +msgid "Ignored" +msgstr "Игнорируется" -#: ../../include/text.php:1504 -msgid "Select a page layout: " -msgstr "" +#: ../../Zotlabs/Module/Connections.php:70 +#: ../../Zotlabs/Module/Connections.php:185 +#: ../../Zotlabs/Module/Connections.php:259 +msgid "Hidden" +msgstr "Скрыт" -#: ../../include/text.php:1507 ../../include/text.php:1572 -msgid "default" -msgstr "по умолчанию" +#: ../../Zotlabs/Module/Connections.php:75 +#: ../../Zotlabs/Module/Connections.php:178 +msgid "Archived/Unreachable" +msgstr "Заархивировано / недоступно" -#: ../../include/text.php:1543 -msgid "Page content type: " -msgstr "" +#: ../../Zotlabs/Module/Connections.php:140 +msgid "Active Connections" +msgstr "Активные контакты" -#: ../../include/text.php:1584 -msgid "Select an alternate language" -msgstr "Выбор альтернативного языка" +#: ../../Zotlabs/Module/Connections.php:143 +msgid "Show active connections" +msgstr "Показать активные контакты" -#: ../../include/text.php:1718 -msgid "activity" -msgstr "активность" +#: ../../Zotlabs/Module/Connections.php:150 +msgid "Show pending (new) connections" +msgstr "Просмотр (новых) ожидающих контактов" -#: ../../include/text.php:1977 -msgid "Design" -msgstr "Дизайн" +#: ../../Zotlabs/Module/Connections.php:167 +msgid "Only show blocked connections" +msgstr "Показать только заблокированные контакты" -#: ../../include/text.php:1979 -msgid "Blocks" -msgstr "Блоки" +#: ../../Zotlabs/Module/Connections.php:174 +msgid "Only show ignored connections" +msgstr "Показать только проигнорированные контакты" -#: ../../include/text.php:1980 -msgid "Menus" -msgstr "Меню" +#: ../../Zotlabs/Module/Connections.php:181 +msgid "Only show archived/unreachable connections" +msgstr "Показать только заархивированные / недоступные контакты" -#: ../../include/text.php:1981 -msgid "Layouts" -msgstr "Шаблоны" +#: ../../Zotlabs/Module/Connections.php:188 +msgid "Only show hidden connections" +msgstr "Показать только скрытые контакты" -#: ../../include/text.php:1982 -msgid "Pages" -msgstr "Страницы" +#: ../../Zotlabs/Module/Connections.php:200 +#: ../../Zotlabs/Module/Profperm.php:140 +msgid "All Connections" +msgstr "Все контакты" -#: ../../include/apps.php:118 -msgid "Site Admin" -msgstr "Админ сайта" +#: ../../Zotlabs/Module/Connections.php:203 +msgid "Show all connections" +msgstr "Просмотр всех контактов" -#: ../../include/apps.php:120 -msgid "Address Book" -msgstr "Адресная книга" +#: ../../Zotlabs/Module/Connections.php:257 +msgid "Pending approval" +msgstr "Ожидающие подтверждения" -#: ../../include/apps.php:134 ../../mod/mood.php:131 -msgid "Mood" -msgstr "Настроение" +#: ../../Zotlabs/Module/Connections.php:258 +msgid "Archived" +msgstr "Зархивирован" -#: ../../include/apps.php:138 -msgid "Probe" -msgstr "" +#: ../../Zotlabs/Module/Connections.php:262 +msgid "Not connected at this location" +msgstr "Не подключено в этом месте" -#: ../../include/apps.php:139 -msgid "Suggest" +#: ../../Zotlabs/Module/Connections.php:279 +#, php-format +msgid "%1$s [%2$s]" msgstr "" -#: ../../include/apps.php:224 ../../mod/settings.php:79 -#: ../../mod/settings.php:541 -msgid "Update" -msgstr "Обновление" +#: ../../Zotlabs/Module/Connections.php:280 +msgid "Edit connection" +msgstr "Редактировать контакт" -#: ../../include/apps.php:224 -msgid "Install" -msgstr "Установка" +#: ../../Zotlabs/Module/Connections.php:282 +msgid "Delete connection" +msgstr "Удалить контакт" -#: ../../include/apps.php:229 -msgid "Purchase" -msgstr "" +#: ../../Zotlabs/Module/Connections.php:291 +msgid "Channel address" +msgstr "Адрес канала" -#: ../../include/apps.php:313 ../../include/apps.php:364 -#: ../../mod/connedit.php:434 -msgid "Unknown" -msgstr "Неизвестный" +#: ../../Zotlabs/Module/Connections.php:293 +msgid "Network" +msgstr "Сеть" -#: ../../include/zot.php:607 -msgid "Invalid data packet" -msgstr "Неверный пакет данных" +#: ../../Zotlabs/Module/Connections.php:296 +msgid "Call" +msgstr "Вызов" -#: ../../include/zot.php:617 -msgid "Unable to verify channel signature" -msgstr "Невозможно проверить сигнатуру канала" +#: ../../Zotlabs/Module/Connections.php:298 +msgid "Status" +msgstr "Статус" -#: ../../include/zot.php:814 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "" +#: ../../Zotlabs/Module/Connections.php:300 +msgid "Connected" +msgstr "Подключено" -#: ../../include/message.php:18 -msgid "No recipient provided." -msgstr "" +#: ../../Zotlabs/Module/Connections.php:302 +msgid "Approve connection" +msgstr "Утвердить контакт" -#: ../../include/message.php:23 -msgid "[no subject]" -msgstr "[без темы]" +#: ../../Zotlabs/Module/Connections.php:304 +msgid "Ignore connection" +msgstr "Игнорировать контакт" -#: ../../include/message.php:42 -msgid "Unable to determine sender." -msgstr "Невозможно определить отправителя." +#: ../../Zotlabs/Module/Connections.php:305 +#: ../../Zotlabs/Module/Connedit.php:630 +msgid "Ignore" +msgstr "Игнорировать" -#: ../../include/message.php:143 -msgid "Stored post could not be verified." -msgstr "" +#: ../../Zotlabs/Module/Connections.php:306 +msgid "Recent activity" +msgstr "Последние действия" -#: ../../include/plugin.php:486 ../../include/plugin.php:488 -msgid "Click here to upgrade." -msgstr "Нажмите здесь, чтобы обновить." +#: ../../Zotlabs/Module/Connections.php:336 +msgid "Search your connections" +msgstr "Поиск ваших контактов" -#: ../../include/plugin.php:494 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" +#: ../../Zotlabs/Module/Connections.php:337 +msgid "Connections search" +msgstr "Поиск контаков" -#: ../../include/plugin.php:499 -msgid "This action is not available under your subscription plan." -msgstr "" +#: ../../Zotlabs/Module/Item.php:194 +msgid "Unable to locate original post." +msgstr "Не удалось найти оригинальную публикацию." -#: ../../include/widgets.php:80 -msgid "System" -msgstr "Система" +#: ../../Zotlabs/Module/Item.php:477 +msgid "Empty post discarded." +msgstr "Пустая публикация отклонена." -#: ../../include/widgets.php:83 -msgid "Create Personal App" -msgstr "Создать собственное приложение" +#: ../../Zotlabs/Module/Item.php:864 +msgid "Duplicate post suppressed." +msgstr "Подавлена дублирующаяся публикация." -#: ../../include/widgets.php:84 -msgid "Edit Personal App" -msgstr "Редактировать собственное приложение" +#: ../../Zotlabs/Module/Item.php:1009 +msgid "System error. Post not saved." +msgstr "Системная ошибка. Публикация не сохранена." -#: ../../include/widgets.php:130 ../../mod/suggest.php:53 -msgid "Ignore/Hide" -msgstr "Игнорировать / Скрыть" +#: ../../Zotlabs/Module/Item.php:1045 +msgid "Your comment is awaiting approval." +msgstr "Ваш комментарий ожидает одобрения." -#: ../../include/widgets.php:136 ../../mod/connections.php:267 -msgid "Suggestions" -msgstr "Рекомендации" +#: ../../Zotlabs/Module/Item.php:1162 +msgid "Unable to obtain post information from database." +msgstr "Невозможно получить информацию о публикации из базы данных" -#: ../../include/widgets.php:137 -msgid "See more..." -msgstr "Просмотреть больше..." +#: ../../Zotlabs/Module/Item.php:1191 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." +msgstr "Вы достигли вашего ограничения в %1$.0f публикаций высокого уровня." -#: ../../include/widgets.php:159 +#: ../../Zotlabs/Module/Item.php:1198 #, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "" +msgid "You have reached your limit of %1$.0f webpages." +msgstr "Вы достигли вашего ограничения в %1$.0f страниц." -#: ../../include/widgets.php:165 -msgid "Add New Connection" -msgstr "Добавить новый контакт" +#: ../../Zotlabs/Module/Events.php:25 +msgid "Calendar entries imported." +msgstr "События календаря импортированы." -#: ../../include/widgets.php:166 -msgid "Enter the channel address" -msgstr "Введите адрес канала" +#: ../../Zotlabs/Module/Events.php:27 +msgid "No calendar entries found." +msgstr "Не найдено событий в календаре." -#: ../../include/widgets.php:167 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "Пример: bob@example.com, http://example.com/barbara" +#: ../../Zotlabs/Module/Events.php:110 +msgid "Event can not end before it has started." +msgstr "Событие не может завершиться до его начала." -#: ../../include/widgets.php:184 -msgid "Notes" -msgstr "Заметки" +#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121 +#: ../../Zotlabs/Module/Events.php:143 +msgid "Unable to generate preview." +msgstr "Невозможно создать предварительный просмотр." -#: ../../include/widgets.php:256 -msgid "Remove term" -msgstr "Удалить термин" +#: ../../Zotlabs/Module/Events.php:119 +msgid "Event title and start time are required." +msgstr "Требуются наименование события и время начала." -#: ../../include/widgets.php:335 -msgid "Archives" -msgstr "Архивы" +#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265 +msgid "Event not found." +msgstr "Событие не найдено." -#: ../../include/widgets.php:397 -msgid "Refresh" -msgstr "Обновить" +#: ../../Zotlabs/Module/Events.php:460 +msgid "Edit event title" +msgstr "Редактировать наименование события" -#: ../../include/widgets.php:398 ../../mod/connedit.php:428 -msgid "Me" -msgstr "Я" +#: ../../Zotlabs/Module/Events.php:462 +msgid "Categories (comma-separated list)" +msgstr "Категории (список через запятую)" -#: ../../include/widgets.php:399 ../../mod/connedit.php:430 -msgid "Best Friends" -msgstr "Лучшие друзья" +#: ../../Zotlabs/Module/Events.php:463 +msgid "Edit Category" +msgstr "Редактировать категорию" -#: ../../include/widgets.php:401 -msgid "Co-workers" -msgstr "Сотрудники" +#: ../../Zotlabs/Module/Events.php:463 +msgid "Category" +msgstr "Категория" -#: ../../include/widgets.php:402 ../../mod/connedit.php:432 -msgid "Former Friends" -msgstr "Приятели" +#: ../../Zotlabs/Module/Events.php:466 +msgid "Edit start date and time" +msgstr "Редактировать дату и время начала" -#: ../../include/widgets.php:403 ../../mod/connedit.php:433 -msgid "Acquaintances" -msgstr "Знакомые" +#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470 +msgid "Finish date and time are not known or not relevant" +msgstr "Дата и время окончания неизвестны или неприменимы" -#: ../../include/widgets.php:404 -msgid "Everybody" -msgstr "Все" +#: ../../Zotlabs/Module/Events.php:469 +msgid "Edit finish date and time" +msgstr "Редактировать дату и время окончания" -#: ../../include/widgets.php:436 -msgid "Account settings" -msgstr "Настройки аккаунта" +#: ../../Zotlabs/Module/Events.php:469 +msgid "Finish date and time" +msgstr "Дата и время окончания" -#: ../../include/widgets.php:442 -msgid "Channel settings" -msgstr "Настройки канала" +#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472 +msgid "Adjust for viewer timezone" +msgstr "Настройте просмотр часовых поясов" -#: ../../include/widgets.php:448 -msgid "Additional features" -msgstr "Дополнительные функции" +#: ../../Zotlabs/Module/Events.php:471 +msgid "" +"Important for events that happen in a particular place. Not practical for " +"global holidays." +msgstr "Важно для событий, которые происходят в определённом месте. Не подходит для всеобщих праздников." -#: ../../include/widgets.php:454 -msgid "Feature settings" -msgstr "Настройки компонентов" +#: ../../Zotlabs/Module/Events.php:473 +msgid "Edit Description" +msgstr "Редактировать описание" -#: ../../include/widgets.php:460 -msgid "Display settings" -msgstr "Настройки отображения" +#: ../../Zotlabs/Module/Events.php:475 +msgid "Edit Location" +msgstr "Редактировать местоположение" -#: ../../include/widgets.php:466 -msgid "Connected apps" -msgstr "Подключенные приложения" +#: ../../Zotlabs/Module/Events.php:489 +msgid "Timezone:" +msgstr "Часовой пояс:" -#: ../../include/widgets.php:472 -msgid "Export channel" -msgstr "Экспорт канала" +#: ../../Zotlabs/Module/Events.php:494 +msgid "Advanced Options" +msgstr "Дополнительные настройки" -#: ../../include/widgets.php:484 -msgid "Automatic Permissions (Advanced)" -msgstr "Автоматические разрешения (дополнительно)" +#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:266 +msgid "l, F j" +msgstr "" -#: ../../include/widgets.php:494 -msgid "Premium Channel Settings" -msgstr "Настройки премиум канала" +#: ../../Zotlabs/Module/Events.php:633 +msgid "Edit event" +msgstr "Редактировать событие" -#: ../../include/widgets.php:531 -msgid "Check Mail" -msgstr "Проверить снова" +#: ../../Zotlabs/Module/Events.php:635 +msgid "Delete event" +msgstr "Удалить событие" -#: ../../include/widgets.php:612 -msgid "Chat Rooms" -msgstr "Чаты" +#: ../../Zotlabs/Module/Events.php:669 +msgid "calendar" +msgstr "календарь" -#: ../../include/widgets.php:630 -msgid "Bookmarked Chatrooms" -msgstr "Закладки чатов" +#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338 +msgid "Edit Event" +msgstr "Редактировать событие" -#: ../../include/widgets.php:648 -msgid "Suggested Chatrooms" -msgstr "Рекомендуемые чаты" +#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338 +msgid "Create Event" +msgstr "Создать событие" -#: ../../include/ItemObject.php:118 -msgid "Save to Folder" -msgstr "Сохранить в папку" +#: ../../Zotlabs/Module/Events.php:731 +msgid "Event removed" +msgstr "Событие удалено" -#: ../../include/ItemObject.php:130 ../../include/ItemObject.php:142 -msgid "View all" -msgstr "Просмотреть все" +#: ../../Zotlabs/Module/Events.php:734 +msgid "Failed to remove event" +msgstr "Не удалось удалить событие" -#: ../../include/ItemObject.php:139 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "не-нравится" -msgstr[1] "не-нравится" -msgstr[2] "не-нравится" +#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189 +#: ../../Zotlabs/Module/Editlayout.php:128 +msgid "Layout Name" +msgstr "Название шаблона" -#: ../../include/ItemObject.php:167 -msgid "Add Star" -msgstr "Добавить маркировку" +#: ../../Zotlabs/Module/Layouts.php:132 ../../Zotlabs/Module/Editlayout.php:129 +msgid "Layout Description (Optional)" +msgstr "Описание шаблона (необязательно)" -#: ../../include/ItemObject.php:168 -msgid "Remove Star" -msgstr "Удалить маркировку" +#: ../../Zotlabs/Module/Layouts.php:186 +msgid "Comanche page description language help" +msgstr "Помощь по языку описания страниц Comanche " -#: ../../include/ItemObject.php:169 -msgid "Toggle Star Status" -msgstr "Переключить статус маркировки" +#: ../../Zotlabs/Module/Layouts.php:190 +msgid "Layout Description" +msgstr "Описание шаблона" -#: ../../include/ItemObject.php:173 -msgid "starred" -msgstr "помеченные" +#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251 +#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:177 +msgid "Created" +msgstr "Создано" -#: ../../include/ItemObject.php:190 -msgid "Add Tag" -msgstr "Добавить тег" +#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252 +#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:178 +msgid "Edited" +msgstr "Отредактировано" -#: ../../include/ItemObject.php:208 ../../mod/photos.php:974 -msgid "I like this (toggle)" -msgstr "мне это нравится (переключение)" +#: ../../Zotlabs/Module/Layouts.php:195 +msgid "Download PDL file" +msgstr "Загрузить PDL файл" -#: ../../include/ItemObject.php:209 ../../mod/photos.php:975 -msgid "I don't like this (toggle)" -msgstr "мне это не нравится (переключение)" +#: ../../Zotlabs/Module/Notifications.php:55 ../../Zotlabs/Module/Notify.php:61 +msgid "No more system notifications." +msgstr "Нет новых оповещений системы." -#: ../../include/ItemObject.php:211 -msgid "Share This" -msgstr "Поделиться этим" +#: ../../Zotlabs/Module/Notifications.php:59 ../../Zotlabs/Module/Notify.php:65 +msgid "System Notifications" +msgstr "Системные оповещения " -#: ../../include/ItemObject.php:211 -msgid "share" -msgstr "поделиться" +#: ../../Zotlabs/Module/Pdledit.php:21 +msgid "Layout updated." +msgstr "Шаблон обновлен." -#: ../../include/ItemObject.php:235 ../../include/ItemObject.php:236 -#, php-format -msgid "View %s's profile - %s" -msgstr "Просмотр %s's профиля - %s" +#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219 +msgid "Feature disabled." +msgstr "Функция отключена." -#: ../../include/ItemObject.php:237 -msgid "to" -msgstr "к" +#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:90 +msgid "Edit System Page Description" +msgstr "Редактировать описание системной страницы" -#: ../../include/ItemObject.php:238 -msgid "via" -msgstr "через" +#: ../../Zotlabs/Module/Pdledit.php:68 +msgid "(modified)" +msgstr "(изменено)" -#: ../../include/ItemObject.php:239 -msgid "Wall-to-Wall" -msgstr "Стена-к-Стене" +#: ../../Zotlabs/Module/Pdledit.php:68 ../../Zotlabs/Module/Lostpass.php:133 +msgid "Reset" +msgstr "Сбросить" -#: ../../include/ItemObject.php:240 -msgid "via Wall-To-Wall:" -msgstr "через Стена-к-Стене:" +#: ../../Zotlabs/Module/Pdledit.php:85 +msgid "Layout not found." +msgstr "Шаблон не найден." -#: ../../include/ItemObject.php:274 -msgid "Save Bookmarks" -msgstr "Сохранить закладки" +#: ../../Zotlabs/Module/Pdledit.php:91 +msgid "Module Name:" +msgstr "Имя модуля:" -#: ../../include/ItemObject.php:275 -msgid "Add to Calendar" -msgstr "Добавить в календарь" +#: ../../Zotlabs/Module/Pdledit.php:92 +msgid "Layout Help" +msgstr "Помощь к шаблону" -#: ../../include/ItemObject.php:283 -msgctxt "noun" -msgid "Likes" -msgstr "нравится" +#: ../../Zotlabs/Module/Pdledit.php:93 +msgid "Edit another layout" +msgstr "Редактировать другой шаблон" -#: ../../include/ItemObject.php:284 -msgctxt "noun" -msgid "Dislikes" -msgstr "не-нравится" +#: ../../Zotlabs/Module/Pdledit.php:94 +msgid "System layout" +msgstr "Системный шаблон" -#: ../../include/ItemObject.php:315 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d комментарий" -msgstr[1] "%d комментария" -msgstr[2] "%d комментариев" +#: ../../Zotlabs/Module/Mail.php:73 +msgid "Unable to lookup recipient." +msgstr "Не удалось найти получателя." -#: ../../include/ItemObject.php:316 ../../include/js_strings.php:7 -msgid "[+] show all" -msgstr "[+] показать все" +#: ../../Zotlabs/Module/Mail.php:80 +msgid "Unable to communicate with requested channel." +msgstr "Не удалось установить связь с запрашиваемым каналом." -#: ../../include/ItemObject.php:580 ../../mod/photos.php:993 -#: ../../mod/photos.php:1080 -msgid "This is you" -msgstr "Это вы" +#: ../../Zotlabs/Module/Mail.php:87 +msgid "Cannot verify requested channel." +msgstr "Не удалось установить подлинность требуемого канала." -#: ../../include/ItemObject.php:582 ../../include/js_strings.php:6 -#: ../../mod/photos.php:995 ../../mod/photos.php:1082 -msgid "Comment" -msgstr "Комментарий" +#: ../../Zotlabs/Module/Mail.php:105 +msgid "Selected channel has private message restrictions. Send failed." +msgstr "Выбранный канал ограничивает частные сообщения. Отправка не удалась." -#: ../../include/ItemObject.php:583 ../../mod/mood.php:135 -#: ../../mod/settings.php:515 ../../mod/settings.php:627 -#: ../../mod/settings.php:655 ../../mod/settings.php:679 -#: ../../mod/settings.php:749 ../../mod/settings.php:927 -#: ../../mod/poke.php:166 ../../mod/profiles.php:515 ../../mod/chat.php:177 -#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:476 -#: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58 -#: ../../mod/photos.php:563 ../../mod/photos.php:668 ../../mod/photos.php:956 -#: ../../mod/photos.php:996 ../../mod/photos.php:1083 -#: ../../mod/sources.php:104 ../../mod/sources.php:138 -#: ../../mod/events.php:492 ../../mod/filestorage.php:137 -#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:442 -#: ../../mod/admin.php:751 ../../mod/admin.php:886 ../../mod/admin.php:1019 -#: ../../mod/admin.php:1218 ../../mod/admin.php:1305 ../../mod/thing.php:286 -#: ../../mod/thing.php:329 ../../mod/import.php:393 ../../mod/invite.php:156 -#: ../../mod/mail.php:223 ../../mod/mail.php:335 ../../mod/appman.php:99 -#: ../../view/theme/apw/php/config.php:256 -#: ../../view/theme/blogga/php/config.php:67 -#: ../../view/theme/blogga/view/theme/blog/config.php:67 -#: ../../view/theme/redbasic/php/config.php:99 -msgid "Submit" -msgstr "Отправить" +#: ../../Zotlabs/Module/Mail.php:160 +msgid "Messages" +msgstr "Сообщения" -#: ../../include/ItemObject.php:584 -msgid "Bold" -msgstr "Жирный" +#: ../../Zotlabs/Module/Mail.php:173 +msgid "message" +msgstr "сообщение" -#: ../../include/ItemObject.php:585 -msgid "Italic" -msgstr "Курсив" +#: ../../Zotlabs/Module/Mail.php:214 +msgid "Message recalled." +msgstr "Сообщение отозванно." + +#: ../../Zotlabs/Module/Mail.php:227 +msgid "Conversation removed." +msgstr "Разговор удален." -#: ../../include/ItemObject.php:586 -msgid "Underline" -msgstr "Подчеркнутый" +#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "Истекает YYYY-MM-DD HH:MM" -#: ../../include/ItemObject.php:587 -msgid "Quote" -msgstr "Цитата" +#: ../../Zotlabs/Module/Mail.php:270 +msgid "Requested channel is not in this network" +msgstr "Запрашиваемый канал не доступен." -#: ../../include/ItemObject.php:588 -msgid "Code" -msgstr "Код" +#: ../../Zotlabs/Module/Mail.php:278 +msgid "Send Private Message" +msgstr "Отправить личное сообщение" -#: ../../include/ItemObject.php:589 -msgid "Image" -msgstr "Изображение" +#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421 +msgid "To:" +msgstr "Кому:" -#: ../../include/ItemObject.php:590 -msgid "Link" -msgstr "Ссылка" +#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423 +msgid "Subject:" +msgstr "Тема:" -#: ../../include/ItemObject.php:591 -msgid "Video" -msgstr "Видео" +#: ../../Zotlabs/Module/Mail.php:285 ../../Zotlabs/Module/Invite.php:140 +msgid "Your message:" +msgstr "Сообщение:" -#: ../../include/js_strings.php:5 -msgid "Delete this item?" -msgstr "Удалить этот элемент?" +#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 +msgid "Attach file" +msgstr "Прикрепить файл" -#: ../../include/js_strings.php:8 -msgid "[-] show less" -msgstr "[-] показать меньше" +#: ../../Zotlabs/Module/Mail.php:289 +msgid "Send" +msgstr "Отправить" -#: ../../include/js_strings.php:9 -msgid "[+] expand" -msgstr "[+] развернуть" +#: ../../Zotlabs/Module/Mail.php:393 +msgid "Delete message" +msgstr "Удалить сообщение" -#: ../../include/js_strings.php:10 -msgid "[-] collapse" -msgstr "[-] свернуть" +#: ../../Zotlabs/Module/Mail.php:394 +msgid "Delivery report" +msgstr "Отчёт о доставке" -#: ../../include/js_strings.php:11 -msgid "Password too short" -msgstr "Пароль слишком короткий" +#: ../../Zotlabs/Module/Mail.php:395 +msgid "Recall message" +msgstr "Отозвать сообщение" -#: ../../include/js_strings.php:12 -msgid "Passwords do not match" -msgstr "Пароли не совпадают" +#: ../../Zotlabs/Module/Mail.php:397 +msgid "Message has been recalled." +msgstr "Сообщение отозванно" -#: ../../include/js_strings.php:13 ../../mod/photos.php:39 -msgid "everybody" -msgstr "все" +#: ../../Zotlabs/Module/Mail.php:414 +msgid "Delete Conversation" +msgstr "Удалить разговор" -#: ../../include/js_strings.php:14 -msgid "Secret Passphrase" -msgstr "Тайный пароль" +#: ../../Zotlabs/Module/Mail.php:416 +msgid "" +"No secure communications available. You may be able to " +"respond from the sender's profile page." +msgstr "Безопасная связь недоступна. Вы можете попытаться ответить со страницы профиля отправителя." -#: ../../include/js_strings.php:15 -msgid "Passphrase hint" -msgstr "" +#: ../../Zotlabs/Module/Mail.php:420 +msgid "Send Reply" +msgstr "Отправить ответ" -#: ../../include/js_strings.php:16 -msgid "Notice: Permissions have changed but have not yet been submitted." -msgstr "" +#: ../../Zotlabs/Module/Mail.php:425 +#, php-format +msgid "Your message for %s (%s):" +msgstr "Ваше сообщение для %s (%s):" -#: ../../include/js_strings.php:17 -msgid "close all" -msgstr "закрыть все" +#: ../../Zotlabs/Module/Removeme.php:35 +msgid "" +"Channel removals are not allowed within 48 hours of changing the account " +"password." +msgstr "Удаление канала не разрешается в течении 48 часов после смены пароля у аккаунта." -#: ../../include/js_strings.php:19 -msgid "timeago.prefixAgo" -msgstr "timeago.prefixAgo" +#: ../../Zotlabs/Module/Removeme.php:60 +msgid "Remove This Channel" +msgstr "Удалить этот канал" -#: ../../include/js_strings.php:20 -msgid "timeago.prefixFromNow" -msgstr "timeago.prefixFromNow" +#: ../../Zotlabs/Module/Removeme.php:61 +#: ../../Zotlabs/Module/Removeaccount.php:58 +#: ../../Zotlabs/Module/Changeaddr.php:78 +msgid "WARNING: " +msgstr "ПРЕДУПРЕЖДЕНИЕ:" -#: ../../include/js_strings.php:21 -msgid "ago" -msgstr "тому назад" +#: ../../Zotlabs/Module/Removeme.php:61 +msgid "This channel will be completely removed from the network. " +msgstr "Этот канал будет полностью удалён из сети." -#: ../../include/js_strings.php:22 -msgid "from now" -msgstr "с этого времени" +#: ../../Zotlabs/Module/Removeme.php:61 +#: ../../Zotlabs/Module/Removeaccount.php:58 +msgid "This action is permanent and can not be undone!" +msgstr "Это действие необратимо и не может быть отменено!" -#: ../../include/js_strings.php:23 -msgid "less than a minute" -msgstr "менее чем одну минуту назад" +#: ../../Zotlabs/Module/Removeme.php:62 +#: ../../Zotlabs/Module/Removeaccount.php:59 +#: ../../Zotlabs/Module/Changeaddr.php:79 +msgid "Please enter your password for verification:" +msgstr "Пожалуйста, введите ваш пароль для проверки:" -#: ../../include/js_strings.php:24 -msgid "about a minute" -msgstr "около минуты" +#: ../../Zotlabs/Module/Removeme.php:63 +msgid "Remove this channel and all its clones from the network" +msgstr "Удалить этот канал и все его клоны из сети" -#: ../../include/js_strings.php:25 -#, php-format -msgid "%d minutes" -msgstr "%d мин." +#: ../../Zotlabs/Module/Removeme.php:63 +msgid "" +"By default only the instance of the channel located on this hub will be " +"removed from the network" +msgstr "По умолчанию только представление канала расположенное на данном хабе будет удалено из сети" -#: ../../include/js_strings.php:26 -msgid "about an hour" -msgstr "около часа" +#: ../../Zotlabs/Module/Removeme.php:64 +#: ../../Zotlabs/Module/Settings/Channel.php:622 +msgid "Remove Channel" +msgstr "Удаление канала" + +#: ../../Zotlabs/Module/Hq.php:134 ../../Zotlabs/Module/Channel.php:164 +#: ../../Zotlabs/Module/Pubstream.php:80 ../../Zotlabs/Module/Network.php:204 +#: ../../Zotlabs/Module/Display.php:81 +msgid "Reset form" +msgstr "Очистить форму" + +#: ../../Zotlabs/Module/Hq.php:140 +msgid "Welcome to Hubzilla!" +msgstr "Добро пожаловать в Hubzilla!" + +#: ../../Zotlabs/Module/Hq.php:140 +msgid "You have got no unseen posts..." +msgstr "У вас нет видимых публикаций..." + +#: ../../Zotlabs/Module/Card_edit.php:17 ../../Zotlabs/Module/Card_edit.php:33 +#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 +#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editwebpage.php:80 +#: ../../Zotlabs/Module/Editlayout.php:79 +#: ../../Zotlabs/Module/Article_edit.php:17 +#: ../../Zotlabs/Module/Article_edit.php:33 +msgid "Item not found" +msgstr "Элемент не найден" -#: ../../include/js_strings.php:27 -#, php-format -msgid "about %d hours" -msgstr "около %d час." +#: ../../Zotlabs/Module/Card_edit.php:44 ../../Zotlabs/Module/Block.php:41 +#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Cal.php:62 +#: ../../Zotlabs/Module/Wall_upload.php:31 +#: ../../Zotlabs/Module/Article_edit.php:44 +#: ../../Zotlabs/Module/Chanview.php:96 +msgid "Channel not found." +msgstr "Канал не найден." -#: ../../include/js_strings.php:28 -msgid "a day" -msgstr "день" +#: ../../Zotlabs/Module/Card_edit.php:128 +msgid "Edit Card" +msgstr "Редактировать карточку" -#: ../../include/js_strings.php:29 -#, php-format -msgid "%d days" -msgstr "%d дн." +#: ../../Zotlabs/Module/Xchan.php:10 +msgid "Xchan Lookup" +msgstr "Поиск Xchan" -#: ../../include/js_strings.php:30 -msgid "about a month" -msgstr "около месяца" +#: ../../Zotlabs/Module/Xchan.php:13 +msgid "Lookup xchan beginning with (or webbie): " +msgstr "Запрос Xchan начинается с (или webbie):" -#: ../../include/js_strings.php:31 -#, php-format -msgid "%d months" -msgstr "%d мес." +#: ../../Zotlabs/Module/Xchan.php:41 ../../Zotlabs/Module/Mitem.php:134 +#: ../../Zotlabs/Module/Menu.php:231 +msgid "Not found." +msgstr "Не найдено." -#: ../../include/js_strings.php:32 -msgid "about a year" -msgstr "около года" +#: ../../Zotlabs/Module/Suggest.php:39 +msgid "" +"No suggestions available. If this is a new site, please try again in 24 " +"hours." +msgstr "Нет предложений. Если это новый сайт, повторите попытку через 24 часа." -#: ../../include/js_strings.php:33 -#, php-format -msgid "%d years" -msgstr "%d лет" +#: ../../Zotlabs/Module/Channel.php:50 ../../Zotlabs/Module/Hcard.php:37 +#: ../../Zotlabs/Module/Profile.php:45 +msgid "Posts and comments" +msgstr "Публикации и комментарии" -#: ../../include/js_strings.php:34 -msgid " " -msgstr " " +#: ../../Zotlabs/Module/Channel.php:57 ../../Zotlabs/Module/Hcard.php:44 +#: ../../Zotlabs/Module/Profile.php:52 +msgid "Only posts" +msgstr "Только публикации" -#: ../../include/js_strings.php:35 -msgid "timeago.numbers" -msgstr "timeago.numbers" +#: ../../Zotlabs/Module/Channel.php:112 +msgid "Insufficient permissions. Request redirected to profile page." +msgstr "Недостаточно прав. Запрос перенаправлен на страницу профиля." -#: ../../include/Contact.php:123 -msgid "New window" -msgstr "Новое окно" +#: ../../Zotlabs/Module/Channel.php:129 ../../Zotlabs/Module/Network.php:174 +msgid "Search Results For:" +msgstr "Результаты поиска для:" -#: ../../include/Contact.php:124 -msgid "Open the selected location in a different window or browser tab" -msgstr "Откройте выбранное местоположение в другом окне или вкладке браузера" +#: ../../Zotlabs/Module/Help.php:23 +msgid "Documentation Search" +msgstr "Поиск документации" -#: ../../include/profile_selectors.php:6 -msgid "Male" -msgstr "Мужской" +#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:126 +msgid "Members" +msgstr "Участники" -#: ../../include/profile_selectors.php:6 -msgid "Female" -msgstr "Женский" +#: ../../Zotlabs/Module/Help.php:82 +msgid "Administrators" +msgstr "Администраторы" -#: ../../include/profile_selectors.php:6 -msgid "Currently Male" -msgstr "В настоящее время мужской" +#: ../../Zotlabs/Module/Help.php:83 +msgid "Developers" +msgstr "Разработчики" -#: ../../include/profile_selectors.php:6 -msgid "Currently Female" -msgstr "В настоящее время женский" +#: ../../Zotlabs/Module/Help.php:84 +msgid "Tutorials" +msgstr "Руководства" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Male" -msgstr "В основном мужской" +#: ../../Zotlabs/Module/Help.php:95 +msgid "$Projectname Documentation" +msgstr "$Projectname Документация" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Female" -msgstr "В основном женский" +#: ../../Zotlabs/Module/Help.php:96 +msgid "Contents" +msgstr "Содержимое" -#: ../../include/profile_selectors.php:6 -msgid "Transgender" -msgstr "Транссексуал" +#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25 +msgid "This site is not a directory server" +msgstr "Этот сайт не является сервером каталога" -#: ../../include/profile_selectors.php:6 -msgid "Intersex" -msgstr "Intersex" +#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58 +msgid "Export Channel" +msgstr "Экспорт канала" -#: ../../include/profile_selectors.php:6 -msgid "Transsexual" -msgstr "Транссексуал" +#: ../../Zotlabs/Module/Uexport.php:59 +msgid "" +"Export your basic channel information to a file. This acts as a backup of " +"your connections, permissions, profile and basic data, which can be used to " +"import your data to a new server hub, but does not contain your content." +msgstr "Экспортировать основную информацию из канала в файл. Служит в качестве резервной копии ваших контактов, основных данных и профиля, однако не включает содержимое. Может быть использовано для импорта ваши данных на новый сервер." -#: ../../include/profile_selectors.php:6 -msgid "Hermaphrodite" -msgstr "Гермафродит" +#: ../../Zotlabs/Module/Uexport.php:60 +msgid "Export Content" +msgstr "Экспортировать содержимое" -#: ../../include/profile_selectors.php:6 -msgid "Neuter" -msgstr "Среднего рода" +#: ../../Zotlabs/Module/Uexport.php:61 +msgid "" +"Export your channel information and recent content to a JSON backup that can " +"be restored or imported to another server hub. This backs up all of your " +"connections, permissions, profile data and several months of posts. This " +"file may be VERY large. Please be patient - it may take several minutes for " +"this download to begin." +msgstr "Экспортировать информацию из вашего канала и его содержимое в резервную копию в формате JSON которая может быть использована для восстановления или импорта на другом сервере. Сохраняет все ваши контакты, разрешения, данные профиля и публикации за несколько месяцев. Файл может иметь очень большой размер. Пожалуйста, будьте терпеливы и подождите несколько минут пока не начнётся загрузка." + +#: ../../Zotlabs/Module/Uexport.php:63 +msgid "Export your posts from a given year." +msgstr "Экспортировать ваши публикации за данный год." + +#: ../../Zotlabs/Module/Uexport.php:65 +msgid "" +"You may also export your posts and conversations for a particular year or " +"month. Adjust the date in your browser location bar to select other dates. " +"If the export fails (possibly due to memory exhaustion on your server hub), " +"please try again selecting a more limited date range." +msgstr "Вы также можете экспортировать ваши публикации и беседы за определённый месяц или год. Выберите дату в панели местоположения в браузере. Если экспорт будет неудачным (это возможно, например, из-за исчерпания памяти на сервере), повторите попытку, выбрав меньший диапазон дат." -#: ../../include/profile_selectors.php:6 -msgid "Non-specific" -msgstr "Неспецифический" +#: ../../Zotlabs/Module/Uexport.php:66 +#, php-format +msgid "" +"To select all posts for a given year, such as this year, visit %2$s" +msgstr "" +"Для выбора всех публикаций заданного года, например текущего, посетите %2$s" -#: ../../include/profile_selectors.php:6 -msgid "Other" -msgstr "Другой" +#: ../../Zotlabs/Module/Uexport.php:67 +#, php-format +msgid "" +"To select all posts for a given month, such as January of this year, visit " +"%2$s" +msgstr "" +"Для выбора всех публикаций заданного месяца, например за январь сего года, посетите %2$s" -#: ../../include/profile_selectors.php:6 -msgid "Undecided" -msgstr "Нерешительный" +#: ../../Zotlabs/Module/Uexport.php:68 +#, php-format +msgid "" +"These content files may be imported or restored by visiting " +"%2$s on any site containing your channel. For best results please import " +"or restore these in date order (oldest first)." +msgstr "" +"Данные файлы с содержимым могут быть импортированы и восстановлены на любом содержащем " +"ваш канал сайте. Посетите %2$s. Для лучших результатов пожалуйста " +"производите импорт и восстановление в порядке датировки (старые сначала)." -#: ../../include/profile_selectors.php:23 -msgid "Males" -msgstr "Самец" +#: ../../Zotlabs/Module/Chatsvc.php:131 +msgid "Away" +msgstr "Нет на месте" -#: ../../include/profile_selectors.php:23 -msgid "Females" -msgstr "Самка" +#: ../../Zotlabs/Module/Chatsvc.php:136 +msgid "Online" +msgstr "В сети" -#: ../../include/profile_selectors.php:23 -msgid "Gay" -msgstr "Гей" +#: ../../Zotlabs/Module/Block.php:29 ../../Zotlabs/Module/Page.php:39 +msgid "Invalid item." +msgstr "Недействительный элемент." -#: ../../include/profile_selectors.php:23 -msgid "Lesbian" -msgstr "Лесбиянка" +#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95 +msgid "Authorize application connection" +msgstr "Авторизовать подключение приложения" -#: ../../include/profile_selectors.php:23 -msgid "No Preference" -msgstr "Без предпочтений" +#: ../../Zotlabs/Module/Api.php:75 +msgid "Return to your app and insert this Security Code:" +msgstr "Вернитесь к своему приложению и вставьте этот код безопасности:" -#: ../../include/profile_selectors.php:23 -msgid "Bisexual" -msgstr "Двуполый" +#: ../../Zotlabs/Module/Api.php:85 +msgid "Please login to continue." +msgstr "Пожалуйста, войдите, чтобы продолжить." -#: ../../include/profile_selectors.php:23 -msgid "Autosexual" -msgstr "Autosexual" +#: ../../Zotlabs/Module/Api.php:97 +msgid "" +"Do you want to authorize this application to access your posts and contacts, " +"and/or create new posts for you?" +msgstr "Вы хотите авторизовать это приложение для доступа к вашим публикациям и контактам и / или созданию новых публикаций?" -#: ../../include/profile_selectors.php:23 -msgid "Abstinent" -msgstr "Воздержанный" +#: ../../Zotlabs/Module/Viewsrc.php:43 +msgid "item" +msgstr "пункт" -#: ../../include/profile_selectors.php:23 -msgid "Virgin" -msgstr "Девственница" +#: ../../Zotlabs/Module/Ratings.php:70 +msgid "No ratings" +msgstr "Оценок нет" -#: ../../include/profile_selectors.php:23 -msgid "Deviant" -msgstr "Отклоняющийся от нормы" +#: ../../Zotlabs/Module/Ratings.php:98 +msgid "Rating: " +msgstr "Оценкa:" -#: ../../include/profile_selectors.php:23 -msgid "Fetish" -msgstr "Фетиш" +#: ../../Zotlabs/Module/Ratings.php:99 +msgid "Website: " +msgstr "Веб-сайт:" -#: ../../include/profile_selectors.php:23 -msgid "Oodles" -msgstr "Множественный" +#: ../../Zotlabs/Module/Ratings.php:101 +msgid "Description: " +msgstr "Описание:" -#: ../../include/profile_selectors.php:23 -msgid "Nonsexual" -msgstr "Несексуальный" +#: ../../Zotlabs/Module/Sources.php:38 +msgid "Failed to create source. No channel selected." +msgstr "Не удалось создать источник. Канал не выбран." -#: ../../include/profile_selectors.php:42 -msgid "Single" -msgstr "Одинок" +#: ../../Zotlabs/Module/Sources.php:54 +msgid "Source created." +msgstr "Источник создан." -#: ../../include/profile_selectors.php:42 -msgid "Lonely" -msgstr "Уединенный" +#: ../../Zotlabs/Module/Sources.php:67 +msgid "Source updated." +msgstr "Источник обновлен." -#: ../../include/profile_selectors.php:42 -msgid "Available" -msgstr "Доступный" +#: ../../Zotlabs/Module/Sources.php:93 +msgid "*" +msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Unavailable" -msgstr "Недоступный" +#: ../../Zotlabs/Module/Sources.php:100 +msgid "Manage remote sources of content for your channel." +msgstr "Управлять удалённым источниками содержимого для вашего канала" -#: ../../include/profile_selectors.php:42 -msgid "Has crush" -msgstr "Столкновение" +#: ../../Zotlabs/Module/Sources.php:101 ../../Zotlabs/Module/Sources.php:111 +msgid "New Source" +msgstr "Новый источник" -#: ../../include/profile_selectors.php:42 -msgid "Infatuated" -msgstr "Влюбленный" +#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:146 +msgid "" +"Import all or selected content from the following channel into this channel " +"and distribute it according to your channel settings." +msgstr "Импортировать всё или выбранное содержимое из следующего канала в этот канал и распределить его в соответствии с вашими настройками." -#: ../../include/profile_selectors.php:42 -msgid "Dating" -msgstr "Датировка" +#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147 +msgid "Only import content with these words (one per line)" +msgstr "Импортировать содержимое только с этим текстом (построчно)" -#: ../../include/profile_selectors.php:42 -msgid "Unfaithful" -msgstr "Неверный" +#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147 +msgid "Leave blank to import all public content" +msgstr "Оставьте пустым для импорта всего общедоступного содержимого" -#: ../../include/profile_selectors.php:42 -msgid "Sex Addict" -msgstr "Секс наркоман" +#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:153 +msgid "Channel Name" +msgstr "Название канала" -#: ../../include/profile_selectors.php:42 -msgid "Friends/Benefits" -msgstr "Друзья / Преимущества" +#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150 +msgid "" +"Add the following categories to posts imported from this source (comma " +"separated)" +msgstr "Добавить следующие категории к импортированным публикациям из этого источника (через запятые)" -#: ../../include/profile_selectors.php:42 -msgid "Casual" -msgstr "Случайный" +#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150 +#: ../../Zotlabs/Module/Settings/Oauth.php:94 +msgid "Optional" +msgstr "Необязательно" -#: ../../include/profile_selectors.php:42 -msgid "Engaged" -msgstr "Помолвленный" +#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +msgid "Resend posts with this channel as author" +msgstr "Отправить публикации в этот канал повторно как автор" -#: ../../include/profile_selectors.php:42 -msgid "Married" -msgstr "Женат" +#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +msgid "Copyrights may apply" +msgstr "Могут применяться авторские права" -#: ../../include/profile_selectors.php:42 -msgid "Imaginarily married" -msgstr "Мысленно женат" +#: ../../Zotlabs/Module/Sources.php:136 ../../Zotlabs/Module/Sources.php:166 +msgid "Source not found." +msgstr "Источник не найден." -#: ../../include/profile_selectors.php:42 -msgid "Partners" -msgstr "Партнеры" +#: ../../Zotlabs/Module/Sources.php:143 +msgid "Edit Source" +msgstr "Редактировать источник" -#: ../../include/profile_selectors.php:42 -msgid "Cohabiting" -msgstr "Сожительствующие" +#: ../../Zotlabs/Module/Sources.php:144 +msgid "Delete Source" +msgstr "Удалить источник" -#: ../../include/profile_selectors.php:42 -msgid "Common law" -msgstr "" +#: ../../Zotlabs/Module/Sources.php:174 +msgid "Source removed" +msgstr "Источник удален" -#: ../../include/profile_selectors.php:42 -msgid "Happy" -msgstr "Счастливый" +#: ../../Zotlabs/Module/Sources.php:176 +msgid "Unable to remove source." +msgstr "Невозможно удалить источник." -#: ../../include/profile_selectors.php:42 -msgid "Not looking" -msgstr "Не нуждаюсь" +#: ../../Zotlabs/Module/Siteinfo.php:21 +msgid "About this site" +msgstr "Об этом сайте" -#: ../../include/profile_selectors.php:42 -msgid "Swinger" -msgstr "" +#: ../../Zotlabs/Module/Siteinfo.php:22 +msgid "Site Name" +msgstr "Название сайта" -#: ../../include/profile_selectors.php:42 -msgid "Betrayed" -msgstr "" +#: ../../Zotlabs/Module/Siteinfo.php:24 ../../Zotlabs/Module/Admin/Site.php:325 +msgid "Site Information" +msgstr "Информация о сайте" -#: ../../include/profile_selectors.php:42 -msgid "Separated" -msgstr "" +#: ../../Zotlabs/Module/Siteinfo.php:26 +msgid "Administrator" +msgstr "Администратор" + +#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:241 +msgid "Terms of Service" +msgstr "Условия предоставления услуг" -#: ../../include/profile_selectors.php:42 -msgid "Unstable" -msgstr "Колеблющийся" +#: ../../Zotlabs/Module/Siteinfo.php:29 +msgid "Software and Project information" +msgstr "Информация о программном обеспечении и проекте" -#: ../../include/profile_selectors.php:42 -msgid "Divorced" -msgstr "Разведенный" +#: ../../Zotlabs/Module/Siteinfo.php:30 +msgid "This site is powered by $Projectname" +msgstr "Этот сайт работает на $Projectname" -#: ../../include/profile_selectors.php:42 -msgid "Imaginarily divorced" -msgstr "Мысленно разведенный" +#: ../../Zotlabs/Module/Siteinfo.php:31 +msgid "" +"Federated and decentralised networking and identity services provided by Zot" +msgstr "Объединенные и децентрализованные сети и службы идентификациии обеспечиваются Zot" -#: ../../include/profile_selectors.php:42 -msgid "Widowed" -msgstr "Овдовевший" +#: ../../Zotlabs/Module/Siteinfo.php:34 +msgid "Additional federated transport protocols:" +msgstr "Дополнительные федеративные транспортные протоколы:" -#: ../../include/profile_selectors.php:42 -msgid "Uncertain" -msgstr "Неопределенный" +#: ../../Zotlabs/Module/Siteinfo.php:36 +#, php-format +msgid "Version %s" +msgstr "Версия %s" -#: ../../include/profile_selectors.php:42 -msgid "It's complicated" -msgstr "Это сложно" +#: ../../Zotlabs/Module/Siteinfo.php:37 +msgid "Project homepage" +msgstr "Домашняя страница проекта" -#: ../../include/profile_selectors.php:42 -msgid "Don't care" -msgstr "Не заботьтесь" +#: ../../Zotlabs/Module/Siteinfo.php:38 +msgid "Developer homepage" +msgstr "Домашняя страница разработчика" -#: ../../include/profile_selectors.php:42 -msgid "Ask me" -msgstr "Спроси меня" +#: ../../Zotlabs/Module/Profile_photo.php:66 +#: ../../Zotlabs/Module/Cover_photo.php:57 +msgid "Image uploaded but image cropping failed." +msgstr "Изображение загружено но обрезка не удалась." -#: ../../include/auth.php:79 -msgid "Logged out." -msgstr "Вышел из системы." +#: ../../Zotlabs/Module/Profile_photo.php:142 +#: ../../Zotlabs/Module/Cover_photo.php:191 +msgid "Image resize failed." +msgstr "Не удалось изменить размер изображения." -#: ../../include/auth.php:198 -msgid "Failed authentication" -msgstr "Ошибка аутентификации" +#: ../../Zotlabs/Module/Profile_photo.php:260 +#: ../../Zotlabs/Module/Cover_photo.php:229 +msgid "Image upload failed." +msgstr "Загрузка изображения не удалась." -#: ../../include/auth.php:213 ../../mod/openid.php:188 -msgid "Login failed." -msgstr "Не удалось войти." +#: ../../Zotlabs/Module/Profile_photo.php:279 +#: ../../Zotlabs/Module/Cover_photo.php:246 +msgid "Unable to process image." +msgstr "Невозможно обработать изображение." -#: ../../include/items.php:306 ../../mod/profperm.php:23 -#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:202 -#: ../../index.php:360 -msgid "Permission denied" -msgstr "Доступ запрещен" +#: ../../Zotlabs/Module/Profile_photo.php:343 +#: ../../Zotlabs/Module/Profile_photo.php:390 +#: ../../Zotlabs/Module/Cover_photo.php:339 +#: ../../Zotlabs/Module/Cover_photo.php:354 +msgid "Photo not available." +msgstr "Фотография недоступна." -#: ../../include/items.php:830 -msgid "(Unknown)" -msgstr "(Неизвестный)" +#: ../../Zotlabs/Module/Profile_photo.php:454 +msgid "" +"Your default profile photo is visible to anybody on the internet. Profile " +"photos for alternate profiles will inherit the permissions of the profile" +msgstr "" +"Фотография вашего профиля по умолчанию видна всем в Интернете. Фотография" +"профиля для альтернативных профилей наследуют разрешения текущего профиля" -#: ../../include/items.php:3618 ../../mod/home.php:67 ../../mod/display.php:32 -#: ../../mod/filestorage.php:18 ../../mod/admin.php:159 -#: ../../mod/admin.php:923 ../../mod/admin.php:1126 ../../mod/thing.php:78 -#: ../../mod/viewsrc.php:18 -msgid "Item not found." -msgstr "Элемент не найден." +#: ../../Zotlabs/Module/Profile_photo.php:454 +msgid "" +"Your profile photo is visible to anybody on the internet and may be " +"distributed to other websites." +msgstr "" +"Фотография вашего профиля видна всем в Интернете и может быть отправлена " +"на другие сайты." -#: ../../include/items.php:4051 ../../mod/group.php:38 ../../mod/group.php:140 -msgid "Collection not found." -msgstr "Коллекция не найдена." +#: ../../Zotlabs/Module/Profile_photo.php:456 +#: ../../Zotlabs/Module/Cover_photo.php:392 +msgid "Upload File:" +msgstr "Загрузить файл:" -#: ../../include/items.php:4066 -msgid "Collection is empty." -msgstr "Коллекция пуста." +#: ../../Zotlabs/Module/Profile_photo.php:457 +#: ../../Zotlabs/Module/Cover_photo.php:393 +msgid "Select a profile:" +msgstr "Выбрать профиль:" -#: ../../include/items.php:4073 -#, php-format -msgid "Collection: %s" -msgstr "Коллекции: %s" +#: ../../Zotlabs/Module/Profile_photo.php:458 +msgid "Use Photo for Profile" +msgstr "Использовать фотографию для профиля" -#: ../../include/items.php:4084 -#, php-format -msgid "Connection: %s" -msgstr "Контакты: %s" +#: ../../Zotlabs/Module/Profile_photo.php:458 +msgid "Change Profile Photo" +msgstr "Изменить фотографию профиля" -#: ../../include/items.php:4087 -msgid "Connection not found." -msgstr "Контакт не найден." +#: ../../Zotlabs/Module/Profile_photo.php:459 +msgid "Use" +msgstr "Использовать" + +#: ../../Zotlabs/Module/Profile_photo.php:463 +#: ../../Zotlabs/Module/Profile_photo.php:464 +#: ../../Zotlabs/Module/Cover_photo.php:397 +#: ../../Zotlabs/Module/Cover_photo.php:398 +msgid "Use a photo from your albums" +msgstr "Использовать фотографию из ваших альбомов" + +#: ../../Zotlabs/Module/Profile_photo.php:469 +#: ../../Zotlabs/Module/Cover_photo.php:403 ../../Zotlabs/Module/Wiki.php:383 +msgid "Choose a different album" +msgstr "Выбрать другой альбом" + +#: ../../Zotlabs/Module/Profile_photo.php:474 +#: ../../Zotlabs/Module/Cover_photo.php:409 +msgid "Select existing photo" +msgstr "Выбрать существующую фотографию" + +#: ../../Zotlabs/Module/Profile_photo.php:493 +#: ../../Zotlabs/Module/Cover_photo.php:426 +msgid "Crop Image" +msgstr "Обрезать изображение" + +#: ../../Zotlabs/Module/Profile_photo.php:494 +#: ../../Zotlabs/Module/Cover_photo.php:427 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "Пожалуйста настройте обрезку изображения для оптимального просмотра." -#: ../../include/permissions.php:13 -msgid "Can view my \"public\" stream and posts" -msgstr "Может просматривать мои \"публичные\" поток и сообщения" +#: ../../Zotlabs/Module/Profile_photo.php:496 +#: ../../Zotlabs/Module/Cover_photo.php:429 +msgid "Done Editing" +msgstr "Закончить редактирование" -#: ../../include/permissions.php:14 -msgid "Can view my \"public\" channel profile" -msgstr "Может просматривать мой \"публичный\" профиль канала" +#: ../../Zotlabs/Module/Subthread.php:142 +#, php-format +msgid "%1$s is following %2$s's %3$s" +msgstr "%1$s отслеживает %2$s's %3$s" -#: ../../include/permissions.php:15 -msgid "Can view my \"public\" photo albums" -msgstr "Может просматривать мои \"публичные\" фотоальбомы" +#: ../../Zotlabs/Module/Subthread.php:144 +#, php-format +msgid "%1$s stopped following %2$s's %3$s" +msgstr "%1$s прекратил отслеживать %2$s's %3$s" -#: ../../include/permissions.php:16 -msgid "Can view my \"public\" address book" -msgstr "Может просматривать мою \"публичную\" адресную книгу" +#: ../../Zotlabs/Module/Common.php:14 +msgid "No channel." +msgstr "Канала нет." -#: ../../include/permissions.php:17 -msgid "Can view my \"public\" file storage" -msgstr "Может просматривать мои \"публичные\" файлы" +#: ../../Zotlabs/Module/Common.php:45 +msgid "No connections in common." +msgstr "Общих контактов нет." -#: ../../include/permissions.php:18 -msgid "Can view my \"public\" pages" -msgstr "Может просматривать мои \"публичные\" страницы" +#: ../../Zotlabs/Module/Common.php:65 +msgid "View Common Connections" +msgstr "Просмотр общий контактов" -#: ../../include/permissions.php:21 -msgid "Can send me their channel stream and posts" -msgstr "Может прислать мне свои потоки и сообщения" +#: ../../Zotlabs/Module/Filestorage.php:79 +msgid "Permission Denied." +msgstr "Доступ запрещен." -#: ../../include/permissions.php:22 -msgid "Can post on my channel page (\"wall\")" -msgstr "Может публиковать на моей странице канала (\"стена\")" +#: ../../Zotlabs/Module/Filestorage.php:112 +msgid "File not found." +msgstr "Файл не найден." -#: ../../include/permissions.php:23 -msgid "Can comment on my posts" -msgstr "Может комментировать мои сообщения" +#: ../../Zotlabs/Module/Filestorage.php:165 +msgid "Edit file permissions" +msgstr "Редактировать разрешения файла" -#: ../../include/permissions.php:24 -msgid "Can send me private mail messages" -msgstr "Может отправлять мне личные сообщения по эл. почте" +#: ../../Zotlabs/Module/Filestorage.php:177 +msgid "Set/edit permissions" +msgstr "Редактировать разрешения" -#: ../../include/permissions.php:25 -msgid "Can post photos to my photo albums" -msgstr "Может публиковать фотографии в мои фотоальбомы" +#: ../../Zotlabs/Module/Filestorage.php:178 +msgid "Include all files and sub folders" +msgstr "Включить все файлы и подкаталоги" -#: ../../include/permissions.php:26 -msgid "Can forward to all my channel contacts via post @mentions" -msgstr "" +#: ../../Zotlabs/Module/Filestorage.php:179 +msgid "Return to file list" +msgstr "Вернутся к списку файлов" -#: ../../include/permissions.php:26 -msgid "Advanced - useful for creating group forum channels" -msgstr "" +#: ../../Zotlabs/Module/Filestorage.php:181 +msgid "Copy/paste this code to attach file to a post" +msgstr "Копировать / вставить этот код для прикрепления файла к публикации" -#: ../../include/permissions.php:27 -msgid "Can chat with me (when available)" -msgstr "Можете общаться со мной в чате (при наличии)" +#: ../../Zotlabs/Module/Filestorage.php:182 +msgid "Copy/paste this URL to link file from a web page" +msgstr "Копировать / вставить эту URL для ссылки на файл со страницы" -#: ../../include/permissions.php:28 -msgid "Can write to my \"public\" file storage" -msgstr "Может писать в моё \"публичное\" хранилище файлов" +#: ../../Zotlabs/Module/Filestorage.php:184 +msgid "Share this file" +msgstr "Поделиться этим файлом" -#: ../../include/permissions.php:29 -msgid "Can edit my \"public\" pages" -msgstr "Может редактировать мои \"публичные\" страницы" +#: ../../Zotlabs/Module/Filestorage.php:185 +msgid "Show URL to this file" +msgstr "Показать URL этого файла" -#: ../../include/permissions.php:31 -msgid "Can source my \"public\" posts in derived channels" -msgstr "" +#: ../../Zotlabs/Module/Filestorage.php:186 +#: ../../Zotlabs/Storage/Browser.php:405 +msgid "Show in your contacts shared folder" +msgstr "Показать общий каталог в ваших контактах" -#: ../../include/permissions.php:31 -msgid "Somewhat advanced - very useful in open communities" -msgstr "" +#: ../../Zotlabs/Module/Tagger.php:48 +msgid "Post not found." +msgstr "Публикация не найдена" -#: ../../include/permissions.php:33 -msgid "Can administer my channel resources" -msgstr "Может администрировать мои ресурсы канала" +#: ../../Zotlabs/Module/Tagger.php:119 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "%1$s отметил тегом %2$s %3$s с %4$s" -#: ../../include/permissions.php:33 +#: ../../Zotlabs/Module/Page.php:173 msgid "" -"Extremely advanced. Leave this alone unless you know what you are doing" -msgstr "" - -#: ../../mod/mood.php:132 -msgid "Set your current mood and tell your friends" -msgstr "" +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " +"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " +"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " +"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " +"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." +msgstr "Бля бля бля Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +#: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97 +#: ../../Zotlabs/Module/Blocks.php:155 +msgid "Block Name" +msgstr "Название блока" -#: ../../mod/mitem.php:14 ../../mod/menu.php:92 -msgid "Menu not found." -msgstr "Меню не найдено." +#: ../../Zotlabs/Module/Editblock.php:138 +msgid "Edit Block" +msgstr "Редактировать блок" -#: ../../mod/mitem.php:47 -msgid "Menu element updated." -msgstr "Меню обновлено." +#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43 +msgid "Item is not editable" +msgstr "Элемент нельзя редактировать" -#: ../../mod/mitem.php:51 -msgid "Unable to update menu element." -msgstr "" +#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144 +msgid "Edit post" +msgstr "Редактировать сообщение" -#: ../../mod/mitem.php:57 -msgid "Menu element added." -msgstr "Элемент меню добавлен." +#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98 +msgid "Tag removed" +msgstr "Тег удалён" -#: ../../mod/mitem.php:61 -msgid "Unable to add menu element." -msgstr "Невозможно добавить элемент меню." +#: ../../Zotlabs/Module/Tagrm.php:123 +msgid "Remove Item Tag" +msgstr "Удалить тег элемента" -#: ../../mod/mitem.php:78 ../../mod/dirprofile.php:175 ../../mod/menu.php:120 -#: ../../mod/xchan.php:27 -msgid "Not found." -msgstr "Не найдено." +#: ../../Zotlabs/Module/Tagrm.php:125 +msgid "Select a tag to remove: " +msgstr "Выбрать тег для удаления:" -#: ../../mod/mitem.php:96 -msgid "Manage Menu Elements" -msgstr "Управление элементов меню" +#: ../../Zotlabs/Module/Removeaccount.php:35 +msgid "" +"Account removals are not allowed within 48 hours of changing the account " +"password." +msgstr "Удаление канала не разрешается в течении 48 часов после смены пароля у аккаунта." -#: ../../mod/mitem.php:99 -msgid "Edit menu" -msgstr "Редактировать меню" +#: ../../Zotlabs/Module/Removeaccount.php:57 +msgid "Remove This Account" +msgstr "Удалить этот аккаунт" -#: ../../mod/mitem.php:102 -msgid "Edit element" -msgstr "Редактировать элемент" +#: ../../Zotlabs/Module/Removeaccount.php:58 +msgid "" +"This account and all its channels will be completely removed from the " +"network. " +msgstr "Этот аккаунт и все его каналы будут полностью удалены из сети." -#: ../../mod/mitem.php:103 -msgid "Drop element" -msgstr "Удалить элемент" +#: ../../Zotlabs/Module/Removeaccount.php:60 +msgid "" +"Remove this account, all its channels and all its channel clones from the " +"network" +msgstr "Удалить этот аккаунт, все его каналы и их клоны из сети." -#: ../../mod/mitem.php:104 -msgid "New element" -msgstr "Новый элемент" +#: ../../Zotlabs/Module/Removeaccount.php:60 +msgid "" +"By default only the instances of the channels located on this hub will be " +"removed from the network" +msgstr "По умолчанию только представление канала расположенное на данном хабе будет удалено из сети" -#: ../../mod/mitem.php:105 -msgid "Edit this menu container" -msgstr "" +#: ../../Zotlabs/Module/Removeaccount.php:61 +#: ../../Zotlabs/Module/Settings/Account.php:120 +msgid "Remove Account" +msgstr "Удалить аккаунт" -#: ../../mod/mitem.php:106 -msgid "Add menu element" -msgstr "Добавить элемент меню" +#: ../../Zotlabs/Module/Admin.php:97 +msgid "Blocked accounts" +msgstr "Заблокированные аккаунты" -#: ../../mod/mitem.php:107 -msgid "Delete this menu item" -msgstr "Удалить элемент меню" +#: ../../Zotlabs/Module/Admin.php:98 +msgid "Expired accounts" +msgstr "Просроченные аккаунты" -#: ../../mod/mitem.php:108 -msgid "Edit this menu item" -msgstr "Редактировать элемент меню" +#: ../../Zotlabs/Module/Admin.php:99 +msgid "Expiring accounts" +msgstr "Близкие к просрочке аккаунты" -#: ../../mod/mitem.php:131 -msgid "New Menu Element" -msgstr "Новый элемент меню" +#: ../../Zotlabs/Module/Admin.php:115 ../../Zotlabs/Module/Locs.php:119 +msgid "Primary" +msgstr "Основной" -#: ../../mod/mitem.php:133 ../../mod/mitem.php:176 -msgid "Menu Item Permissions" -msgstr "" +#: ../../Zotlabs/Module/Admin.php:116 +msgid "Clones" +msgstr "Клоны" -#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:960 -msgid "(click to open/close)" -msgstr "(нажмите, чтобы открыть / закрыть)" +#: ../../Zotlabs/Module/Admin.php:122 +msgid "Message queues" +msgstr "Очередь сообщений" + +#: ../../Zotlabs/Module/Admin.php:136 +msgid "Your software should be updated" +msgstr "Ваше программное обеспечение должно быть обновлено" + +#: ../../Zotlabs/Module/Admin.php:140 ../../Zotlabs/Module/Admin/Addons.php:341 +#: ../../Zotlabs/Module/Admin/Addons.php:436 +#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Logs.php:82 +#: ../../Zotlabs/Module/Admin/Accounts.php:166 +#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin/Themes.php:122 +#: ../../Zotlabs/Module/Admin/Themes.php:156 +#: ../../Zotlabs/Module/Admin/Channels.php:145 +msgid "Administration" +msgstr "Администрирование" -#: ../../mod/mitem.php:136 ../../mod/mitem.php:180 -msgid "Link text" -msgstr "Текст ссылки" +#: ../../Zotlabs/Module/Admin.php:141 +msgid "Summary" +msgstr "Резюме" -#: ../../mod/mitem.php:137 ../../mod/mitem.php:181 -msgid "URL of link" -msgstr "URL ссылки" +#: ../../Zotlabs/Module/Admin.php:144 +msgid "Registered accounts" +msgstr "Зарегистрированные аккаунты" -#: ../../mod/mitem.php:138 ../../mod/mitem.php:182 -msgid "Use Red magic-auth if available" -msgstr "" +#: ../../Zotlabs/Module/Admin.php:145 +msgid "Pending registrations" +msgstr "Ждут утверждения" -#: ../../mod/mitem.php:139 ../../mod/mitem.php:183 -msgid "Open link in new window" -msgstr "Открыть ссылку в новом окне" +#: ../../Zotlabs/Module/Admin.php:146 +msgid "Registered channels" +msgstr "Зарегистрированные каналы" -#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 -msgid "Order in list" -msgstr "" +#: ../../Zotlabs/Module/Admin.php:147 +msgid "Active addons" +msgstr "Активные расширения" -#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 -msgid "Higher numbers will sink to bottom of listing" -msgstr "" +#: ../../Zotlabs/Module/Admin.php:148 +msgid "Version" +msgstr "Версия системы" -#: ../../mod/mitem.php:154 -msgid "Menu item not found." -msgstr "Элемент меню не найден." +#: ../../Zotlabs/Module/Admin.php:149 +msgid "Repository version (master)" +msgstr "Версия репозитория (master)" -#: ../../mod/mitem.php:163 -msgid "Menu item deleted." -msgstr "Элемент меню удален." +#: ../../Zotlabs/Module/Admin.php:150 +msgid "Repository version (dev)" +msgstr "Версия репозитория (dev)" -#: ../../mod/mitem.php:165 -msgid "Menu item could not be deleted." -msgstr "" +#: ../../Zotlabs/Module/Connedit.php:79 ../../Zotlabs/Module/Defperms.php:59 +msgid "Could not access contact record." +msgstr "Не удалось получить доступ к записи контакта." -#: ../../mod/mitem.php:174 -msgid "Edit Menu Element" -msgstr "Редактировать элемент меню" +#: ../../Zotlabs/Module/Connedit.php:109 +msgid "Could not locate selected profile." +msgstr "Не удалось обнаружить выбранный профиль." -#: ../../mod/mitem.php:186 ../../mod/menu.php:114 -msgid "Modify" -msgstr "Изменить" +#: ../../Zotlabs/Module/Connedit.php:246 +msgid "Connection updated." +msgstr "Контакты обновлены." -#: ../../mod/ping.php:192 -msgid "sent you a private message" -msgstr "отправил вам личное сообщение" +#: ../../Zotlabs/Module/Connedit.php:248 +msgid "Failed to update connection record." +msgstr "Не удалось обновить запись контакта." -#: ../../mod/ping.php:250 -msgid "added your channel" -msgstr "добавил ваш канал" +#: ../../Zotlabs/Module/Connedit.php:302 +msgid "is now connected to" +msgstr "теперь подключён к" -#: ../../mod/ping.php:294 -msgid "posted an event" -msgstr "" +#: ../../Zotlabs/Module/Connedit.php:427 +msgid "Could not access address book record." +msgstr "Не удалось получить доступ к записи адресной книги." -#: ../../mod/acl.php:239 -msgid "network" -msgstr "сеть" +#: ../../Zotlabs/Module/Connedit.php:475 +msgid "Refresh failed - channel is currently unavailable." +msgstr "Обновление невозможно - в настоящее время канал недоступен." -#: ../../mod/settings.php:71 -msgid "Name is required" -msgstr "Необходимо имя" +#: ../../Zotlabs/Module/Connedit.php:490 ../../Zotlabs/Module/Connedit.php:499 +#: ../../Zotlabs/Module/Connedit.php:508 ../../Zotlabs/Module/Connedit.php:517 +#: ../../Zotlabs/Module/Connedit.php:530 +msgid "Unable to set address book parameters." +msgstr "Не удалось получить доступ к параметрам адресной книги." -#: ../../mod/settings.php:75 -msgid "Key and Secret are required" -msgstr "" +#: ../../Zotlabs/Module/Connedit.php:554 +msgid "Connection has been removed." +msgstr "Контакт был удалён." -#: ../../mod/settings.php:195 -msgid "Passwords do not match. Password unchanged." -msgstr "Пароли не совпадают. Пароль не изменён." +#: ../../Zotlabs/Module/Connedit.php:597 +#, php-format +msgid "View %s's profile" +msgstr "Просмотр %s профиля" -#: ../../mod/settings.php:199 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "Пустые пароли не допускаются. Пароль не изменён." +#: ../../Zotlabs/Module/Connedit.php:601 +msgid "Refresh Permissions" +msgstr "Обновить разрешения" -#: ../../mod/settings.php:212 -msgid "Password changed." -msgstr "Пароль изменен." +#: ../../Zotlabs/Module/Connedit.php:604 +msgid "Fetch updated permissions" +msgstr "Получить обновлённые разрешения" -#: ../../mod/settings.php:214 -msgid "Password update failed. Please try again." -msgstr "Изменение пароля закончилось неуспешно. Пожалуйста, попробуйте еще раз." +#: ../../Zotlabs/Module/Connedit.php:608 +msgid "Refresh Photo" +msgstr "Обновить фотографию" -#: ../../mod/settings.php:228 -msgid "Not valid email." -msgstr "Не действительный адрес электронной почты." +#: ../../Zotlabs/Module/Connedit.php:611 +msgid "Fetch updated photo" +msgstr "Получить обновлённую фотографию" -#: ../../mod/settings.php:231 -msgid "Protected email address. Cannot change to that email." -msgstr "Защищенный адрес электронной почты. Нельзя изменить." +#: ../../Zotlabs/Module/Connedit.php:618 +msgid "View recent posts and comments" +msgstr "Просмотреть последние публикации и комментарии" -#: ../../mod/settings.php:240 -msgid "System failure storing new email. Please try again." -msgstr "" +#: ../../Zotlabs/Module/Connedit.php:622 +#: ../../Zotlabs/Module/Admin/Accounts.php:177 +msgid "Unblock" +msgstr "Разблокировать" -#: ../../mod/settings.php:443 -msgid "Settings updated." -msgstr "Настройки обновленны." +#: ../../Zotlabs/Module/Connedit.php:622 +#: ../../Zotlabs/Module/Admin/Accounts.php:176 +msgid "Block" +msgstr "Блокировать" -#: ../../mod/settings.php:514 ../../mod/settings.php:540 -#: ../../mod/settings.php:576 -msgid "Add application" -msgstr "Добавить приложения" +#: ../../Zotlabs/Module/Connedit.php:625 +msgid "Block (or Unblock) all communications with this connection" +msgstr "Блокировать (или разблокировать) связи с этим контактом" -#: ../../mod/settings.php:517 ../../mod/settings.php:543 -#: ../../mod/admin.php:893 -#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:35 -msgid "Name" -msgstr "Имя" +#: ../../Zotlabs/Module/Connedit.php:626 +msgid "This connection is blocked!" +msgstr "Этот контакт заблокирован!" -#: ../../mod/settings.php:517 -msgid "Name of application" -msgstr "Название приложения" +#: ../../Zotlabs/Module/Connedit.php:630 +msgid "Unignore" +msgstr "Не игнорировать" -#: ../../mod/settings.php:518 ../../mod/settings.php:544 -msgid "Consumer Key" -msgstr "Ключ клиента" +#: ../../Zotlabs/Module/Connedit.php:633 +msgid "Ignore (or Unignore) all inbound communications from this connection" +msgstr "Игнорировать (или не игнорировать) все связи для этого контакта" -#: ../../mod/settings.php:518 ../../mod/settings.php:519 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "" +#: ../../Zotlabs/Module/Connedit.php:634 +msgid "This connection is ignored!" +msgstr "Этот контакт игнорируется!" -#: ../../mod/settings.php:519 ../../mod/settings.php:545 -msgid "Consumer Secret" -msgstr "Секрет клиента" +#: ../../Zotlabs/Module/Connedit.php:638 +msgid "Unarchive" +msgstr "Разархивировать" -#: ../../mod/settings.php:520 ../../mod/settings.php:546 -msgid "Redirect" -msgstr "Перенаправление" +#: ../../Zotlabs/Module/Connedit.php:638 +msgid "Archive" +msgstr "Заархивировать" -#: ../../mod/settings.php:520 +#: ../../Zotlabs/Module/Connedit.php:641 msgid "" -"Redirect URI - leave blank unless your application specifically requires " -"this" -msgstr "" +"Archive (or Unarchive) this connection - mark channel dead but keep content" +msgstr "Заархивировать (или разархивировать) этот контакт - пометить канал отключённым но сохранить содержимое" -#: ../../mod/settings.php:521 ../../mod/settings.php:547 -msgid "Icon url" -msgstr "URL-адрес значка" +#: ../../Zotlabs/Module/Connedit.php:642 +msgid "This connection is archived!" +msgstr "Этот контакт заархивирован!" -#: ../../mod/settings.php:521 -msgid "Optional" -msgstr "Необязательно" +#: ../../Zotlabs/Module/Connedit.php:646 +msgid "Unhide" +msgstr "Показать" -#: ../../mod/settings.php:532 -msgid "You can't edit this application." -msgstr "Вы не можете редактировать это приложение." +#: ../../Zotlabs/Module/Connedit.php:646 +msgid "Hide" +msgstr "Скрыть" -#: ../../mod/settings.php:575 -msgid "Connected Apps" -msgstr "Подключенные приложения" +#: ../../Zotlabs/Module/Connedit.php:649 +msgid "Hide or Unhide this connection from your other connections" +msgstr "Скрыть или показать этот контакт от / для остальных" -#: ../../mod/settings.php:579 -msgid "Client key starts with" -msgstr "" +#: ../../Zotlabs/Module/Connedit.php:650 +msgid "This connection is hidden!" +msgstr "Этот контакт скрыт!" -#: ../../mod/settings.php:580 -msgid "No name" -msgstr "Без названия" +#: ../../Zotlabs/Module/Connedit.php:657 +msgid "Delete this connection" +msgstr "Удалить этот контакт" -#: ../../mod/settings.php:581 -msgid "Remove authorization" -msgstr "Удалить разрешение" +#: ../../Zotlabs/Module/Connedit.php:665 +msgid "Fetch Vcard" +msgstr "Получить vCard" -#: ../../mod/settings.php:592 -msgid "No feature settings configured" -msgstr "Параметры функций не настроены" +#: ../../Zotlabs/Module/Connedit.php:668 +msgid "Fetch electronic calling card for this connection" +msgstr "Получить электронную телефонную карточку для этого контакта" -#: ../../mod/settings.php:600 -msgid "Feature Settings" -msgstr "Настройки функции" +#: ../../Zotlabs/Module/Connedit.php:679 +msgid "Open Individual Permissions section by default" +msgstr "Открывать раздел \"Индивидуальные разрешения\" по умолчанию" -#: ../../mod/settings.php:623 -msgid "Account Settings" -msgstr "Настройки аккаунта" +#: ../../Zotlabs/Module/Connedit.php:702 +msgid "Affinity" +msgstr "Сходство" -#: ../../mod/settings.php:624 -msgid "Password Settings" -msgstr "Настройки пароля" +#: ../../Zotlabs/Module/Connedit.php:705 +msgid "Open Set Affinity section by default" +msgstr "Открыть секцию установления сходства по умолчанию" -#: ../../mod/settings.php:625 -msgid "New Password:" -msgstr "Новый пароль:" +#: ../../Zotlabs/Module/Connedit.php:739 +msgid "Filter" +msgstr "Фильтр" -#: ../../mod/settings.php:626 -msgid "Confirm:" -msgstr "Подтверждение:" +#: ../../Zotlabs/Module/Connedit.php:742 +msgid "Open Custom Filter section by default" +msgstr "Открывать секцию \"Настраиваемый фильтр\" по умолчанию" -#: ../../mod/settings.php:626 -msgid "Leave password fields blank unless changing" -msgstr "Оставьте поля пустыми, если не меняется" +#: ../../Zotlabs/Module/Connedit.php:779 +msgid "Approve this connection" +msgstr "Утвердить этот контакт" -#: ../../mod/settings.php:628 ../../mod/settings.php:936 -msgid "Email Address:" -msgstr "Адрес электронной почты:" +#: ../../Zotlabs/Module/Connedit.php:779 +msgid "Accept connection to allow communication" +msgstr "Принять контакт чтобы разрешить связь" -#: ../../mod/settings.php:629 -msgid "Remove Account" -msgstr "Удалить аккаунт" +#: ../../Zotlabs/Module/Connedit.php:784 +msgid "Set Affinity" +msgstr "Установить сходство" -#: ../../mod/settings.php:630 -msgid "Warning: This action is permanent and cannot be reversed." -msgstr "" +#: ../../Zotlabs/Module/Connedit.php:787 +msgid "Set Profile" +msgstr "Установить профиль" -#: ../../mod/settings.php:646 -msgid "Off" -msgstr "Выкл." +#: ../../Zotlabs/Module/Connedit.php:790 +msgid "Set Affinity & Profile" +msgstr "Установить сходство и профиль" -#: ../../mod/settings.php:646 -msgid "On" -msgstr "Вкл." +#: ../../Zotlabs/Module/Connedit.php:838 +msgid "This connection is unreachable from this location." +msgstr "Этот контакт недоступен для данного местоположения" -#: ../../mod/settings.php:653 -msgid "Additional Features" -msgstr "Дополнительные функции" +#: ../../Zotlabs/Module/Connedit.php:839 +msgid "This connection may be unreachable from other channel locations." +msgstr "Этот контакт может быть недоступен из других мест размещения канала" -#: ../../mod/settings.php:678 -msgid "Connector Settings" -msgstr "Настройки соединителя" +#: ../../Zotlabs/Module/Connedit.php:841 +msgid "Location independence is not supported by their network." +msgstr "Независимое местоположение не поддерживается их сетью." -#: ../../mod/settings.php:708 ../../mod/admin.php:390 -msgid "No special theme for mobile devices" -msgstr "Нет специальной темы для мобильных устройств" +#: ../../Zotlabs/Module/Connedit.php:847 +msgid "" +"This connection is unreachable from this location. Location independence is " +"not supported by their network." +msgstr "Этот контакт недоступен из данного местоположения. Независимое местоположение не поддерживается их сетью." -#: ../../mod/settings.php:717 -#, php-format -msgid "%s - (Experimental)" -msgstr "%s - (экспериментальный)" +#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:239 +msgid "Apply these permissions automatically" +msgstr "Применить эти разрешения автоматически" -#: ../../mod/settings.php:747 -msgid "Display Settings" -msgstr "Настройки отображения" +#: ../../Zotlabs/Module/Connedit.php:851 +msgid "Connection requests will be approved without your interaction" +msgstr "Запросы контактов будут одобрены без вашего участия" -#: ../../mod/settings.php:753 -msgid "Display Theme:" -msgstr "Тема отображения:" +#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240 +msgid "Permission role" +msgstr "Роль разрешения" -#: ../../mod/settings.php:754 -msgid "Mobile Theme:" -msgstr "Мобильная тема отображения:" +#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241 +msgid "Add permission role" +msgstr "Добавить роль разрешения" -#: ../../mod/settings.php:755 -msgid "Update browser every xx seconds" -msgstr "Обновление браузера каждые ХХ секунд" +#: ../../Zotlabs/Module/Connedit.php:860 +msgid "This connection's primary address is" +msgstr "Главный адрес это контакта" -#: ../../mod/settings.php:755 -msgid "Minimum of 10 seconds, no maximum" -msgstr "Минимум 10 секунд, без максимума" +#: ../../Zotlabs/Module/Connedit.php:861 +msgid "Available locations:" +msgstr "Доступные расположения:" -#: ../../mod/settings.php:756 -msgid "Maximum number of conversations to load at any time:" -msgstr "" +#: ../../Zotlabs/Module/Connedit.php:866 ../../Zotlabs/Module/Defperms.php:245 +msgid "" +"The permissions indicated on this page will be applied to all new " +"connections." +msgstr "Разрешения, указанные на этой странице, будут применяться ко всем новым соединениям." -#: ../../mod/settings.php:756 -msgid "Maximum of 100 items" -msgstr "Максимум 100 элементов" +#: ../../Zotlabs/Module/Connedit.php:867 +msgid "Connection Tools" +msgstr "Инструменты контактов" -#: ../../mod/settings.php:757 -msgid "Don't show emoticons" -msgstr "Не показывать emoticons" +#: ../../Zotlabs/Module/Connedit.php:869 +msgid "Slide to adjust your degree of friendship" +msgstr "Прокрутить для настройки степени дружбы" -#: ../../mod/settings.php:758 -msgid "System Page Layout Editor - (advanced)" -msgstr "" +#: ../../Zotlabs/Module/Connedit.php:871 +msgid "Slide to adjust your rating" +msgstr "Прокрутить для настройки оценки" -#: ../../mod/settings.php:793 -msgid "Nobody except yourself" -msgstr "Никто, кроме вас" +#: ../../Zotlabs/Module/Connedit.php:872 ../../Zotlabs/Module/Connedit.php:877 +msgid "Optionally explain your rating" +msgstr "Объясните свою оценку (не обязательно)" -#: ../../mod/settings.php:794 -msgid "Only those you specifically allow" -msgstr "Только комы вы разрешили" +#: ../../Zotlabs/Module/Connedit.php:874 +msgid "Custom Filter" +msgstr "Настраиваемый фильтр" -#: ../../mod/settings.php:795 -msgid "Approved connections" -msgstr "Утвержденные контакты" +#: ../../Zotlabs/Module/Connedit.php:875 +msgid "Only import posts with this text" +msgstr "Импортировать публикации только с этим текстом" -#: ../../mod/settings.php:796 -msgid "Any connections" -msgstr "Все контакты" +#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876 +#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:348 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" +msgstr "слова по одному в строку, #тег, /шаблон/ или lang=xxl; оставьте пустым для импорта всех публикаций" -#: ../../mod/settings.php:797 -msgid "Anybody on this website" -msgstr "Любой на этом веб-сайте" +#: ../../Zotlabs/Module/Connedit.php:876 +msgid "Do not import posts with this text" +msgstr "Не импортировать публикации с этим текстом" -#: ../../mod/settings.php:798 -msgid "Anybody in this network" -msgstr "Любой в этой сети" +#: ../../Zotlabs/Module/Connedit.php:878 +msgid "This information is public!" +msgstr "Эта информация общедоступна!" -#: ../../mod/settings.php:799 -msgid "Anybody authenticated" -msgstr "" +#: ../../Zotlabs/Module/Connedit.php:883 +msgid "Connection Pending Approval" +msgstr "Ожидающие подтверждения контактов" -#: ../../mod/settings.php:800 -msgid "Anybody on the internet" -msgstr "Любой в интернете" +#: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248 +#: ../../Zotlabs/Module/Settings/Permcats.php:110 +#: ../../Zotlabs/Module/Settings/Tokens.php:163 +msgid "inherited" +msgstr "наследуется" -#: ../../mod/settings.php:877 -msgid "Publish your default profile in the network directory" -msgstr "Публикация вашего профиля по умолчанию в каталоге сети" +#: ../../Zotlabs/Module/Connedit.php:888 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "Пожалуйста, выберите профиль который вы хотит показывать в %s при безопасном просмотре." -#: ../../mod/settings.php:877 ../../mod/settings.php:882 -#: ../../mod/settings.php:953 ../../mod/api.php:106 ../../mod/profiles.php:493 -#: ../../mod/admin.php:420 -msgid "No" -msgstr "Нет" +#: ../../Zotlabs/Module/Connedit.php:890 +#: ../../Zotlabs/Module/Settings/Tokens.php:160 +msgid "Their Settings" +msgstr "Их настройки" -#: ../../mod/settings.php:877 ../../mod/settings.php:882 -#: ../../mod/settings.php:953 ../../mod/api.php:105 ../../mod/profiles.php:492 -#: ../../mod/admin.php:422 -msgid "Yes" -msgstr "Да" +#: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250 +#: ../../Zotlabs/Module/Settings/Permcats.php:108 +#: ../../Zotlabs/Module/Settings/Tokens.php:161 +msgid "My Settings" +msgstr "Мои настройки" -#: ../../mod/settings.php:882 -msgid "Allow us to suggest you as a potential friend to new members?" +#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253 +#: ../../Zotlabs/Module/Settings/Permcats.php:113 +#: ../../Zotlabs/Module/Settings/Tokens.php:166 +msgid "Individual Permissions" +msgstr "Индивидуальные разрешения" + +#: ../../Zotlabs/Module/Connedit.php:894 +#: ../../Zotlabs/Module/Settings/Permcats.php:114 +#: ../../Zotlabs/Module/Settings/Tokens.php:167 +msgid "" +"Some permissions may be inherited from your channel's privacy settings, which have higher priority than " +"individual settings. You can not change those settings here." msgstr "" +"Некоторые разрешения могут наследовать из " +"настроек приватности ваших каналов которые могут иметь более высокий приоритет " +"чем индивидуальные. Вы не можете менять эти настройки здесь." -#: ../../mod/settings.php:886 ../../mod/profile_photo.php:365 -msgid "or" -msgstr "или" +#: ../../Zotlabs/Module/Connedit.php:895 +msgid "" +"Some permissions may be inherited from your channel's privacy settings, 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 "" +"Некоторые разрешения могут быть унаследованы из " +"настроек приватности вашего канала, которые могут иметь более высокий приоритет " +"чем индивидуальные. Вы можете изменить эти настройки, однако они не будут применены до изменения " +"переданных по наследству настроек." -#: ../../mod/settings.php:891 -msgid "Your channel address is" -msgstr "Адрес канала:" +#: ../../Zotlabs/Module/Connedit.php:896 +msgid "Last update:" +msgstr "Последнее обновление:" -#: ../../mod/settings.php:925 -msgid "Channel Settings" -msgstr "Настройки канала" +#: ../../Zotlabs/Module/Connedit.php:904 +msgid "Details" +msgstr "Сведения" -#: ../../mod/settings.php:934 -msgid "Basic Settings" -msgstr "Основные настройки" +#: ../../Zotlabs/Module/Webpages.php:54 +msgid "Import Webpage Elements" +msgstr "Импортировать части веб-страницы" -#: ../../mod/settings.php:937 -msgid "Your Timezone:" -msgstr "Часовой пояс:" +#: ../../Zotlabs/Module/Webpages.php:55 +msgid "Import selected" +msgstr "Импортировать выбранное" -#: ../../mod/settings.php:938 -msgid "Default Post Location:" -msgstr "Откуда по умолчанию:" +#: ../../Zotlabs/Module/Webpages.php:78 +msgid "Export Webpage Elements" +msgstr "Экспортировать часть веб-страницы" -#: ../../mod/settings.php:938 -msgid "Geographical location to display on your posts" -msgstr "" +#: ../../Zotlabs/Module/Webpages.php:79 +msgid "Export selected" +msgstr "Экспортировать выбранное" -#: ../../mod/settings.php:939 -msgid "Use Browser Location:" -msgstr "Использовать указание браузерa:" +#: ../../Zotlabs/Module/Webpages.php:248 +msgid "Actions" +msgstr "Действия" -#: ../../mod/settings.php:941 -msgid "Adult Content" -msgstr "Содержимое для взрослых" +#: ../../Zotlabs/Module/Webpages.php:249 +msgid "Page Link" +msgstr "Ссылка страницы" -#: ../../mod/settings.php:941 -msgid "" -"This channel frequently or regularly publishes adult content. (Please tag " -"any adult material and/or nudity with #NSFW)" -msgstr "" +#: ../../Zotlabs/Module/Webpages.php:250 +msgid "Page Title" +msgstr "Заголовок страницы" -#: ../../mod/settings.php:943 -msgid "Security and Privacy Settings" -msgstr "Параметры безопасности и конфиденциальности" +#: ../../Zotlabs/Module/Webpages.php:280 +msgid "Invalid file type." +msgstr "Неверный тип файла." -#: ../../mod/settings.php:945 -msgid "Hide my online presence" -msgstr "Скрыть мое присутствие" +#: ../../Zotlabs/Module/Webpages.php:292 +msgid "Error opening zip file" +msgstr "Ошибка открытия ZIP файла" -#: ../../mod/settings.php:945 -msgid "Prevents displaying in your profile that you are online" -msgstr "Предотвращает показ в вашем профиле, что вы онлайн" +#: ../../Zotlabs/Module/Webpages.php:303 +msgid "Invalid folder path." +msgstr "Неверный путь к каталогу." -#: ../../mod/settings.php:947 -msgid "Simple Privacy Settings:" -msgstr "Быстрые настройки:" +#: ../../Zotlabs/Module/Webpages.php:330 +msgid "No webpage elements detected." +msgstr "Не обнаружено частей веб-страницы." -#: ../../mod/settings.php:948 -msgid "" -"Very Public - extremely permissive (should be used with caution)" -msgstr "" +#: ../../Zotlabs/Module/Webpages.php:405 +msgid "Import complete." +msgstr "Импорт завершен." -#: ../../mod/settings.php:949 -msgid "" -"Typical - default public, privacy when desired (similar to social " -"network permissions but with improved privacy)" -msgstr "" +#: ../../Zotlabs/Module/Editwebpage.php:139 +msgid "Page link" +msgstr "Ссылка страницы" -#: ../../mod/settings.php:950 -msgid "Private - default private, never open or public" -msgstr "" +#: ../../Zotlabs/Module/Editwebpage.php:166 +msgid "Edit Webpage" +msgstr "Редактировать веб-страницу" -#: ../../mod/settings.php:951 -msgid "Blocked - default blocked to/from everybody" -msgstr "" +#: ../../Zotlabs/Module/Editlayout.php:137 +msgid "Edit Layout" +msgstr "Редактировать шаблон" -#: ../../mod/settings.php:953 -msgid "Allow others to tag your posts" -msgstr "Разрешить другим помечать сообщения" +#: ../../Zotlabs/Module/Dirsearch.php:33 +msgid "This directory server requires an access token" +msgstr "Для доступа к этому серверу каталогов требуется токен" -#: ../../mod/settings.php:953 -msgid "" -"Often used by the community to retro-actively flag inappropriate content" -msgstr "" +#: ../../Zotlabs/Module/Moderate.php:65 +msgid "Comment approved" +msgstr "Комментарий одобрен" -#: ../../mod/settings.php:955 -msgid "Advanced Privacy Settings" -msgstr "Дополнительные настройки" +#: ../../Zotlabs/Module/Moderate.php:69 +msgid "Comment deleted" +msgstr "Комментарий удалён" -#: ../../mod/settings.php:957 -msgid "Expire other channel content after this many days" -msgstr "" +#: ../../Zotlabs/Module/Articles.php:95 +msgid "Add Article" +msgstr "Добавить статью" -#: ../../mod/settings.php:957 -msgid "0 or blank prevents expiration" -msgstr "" +#: ../../Zotlabs/Module/Bookmarks.php:56 +msgid "Bookmark added" +msgstr "Закладка добавлена" -#: ../../mod/settings.php:958 -msgid "Maximum Friend Requests/Day:" -msgstr "" +#: ../../Zotlabs/Module/Bookmarks.php:79 +msgid "My Bookmarks" +msgstr "Мои закладки" -#: ../../mod/settings.php:958 -msgid "May reduce spam activity" -msgstr "Может уменьшить активность спам" +#: ../../Zotlabs/Module/Bookmarks.php:90 +msgid "My Connections Bookmarks" +msgstr "Закладки моих контактов" -#: ../../mod/settings.php:959 -msgid "Default Post Permissions" -msgstr "Настройки по умолчанию" +#: ../../Zotlabs/Module/Sharedwithme.php:104 +msgid "Files: shared with me" +msgstr "Файлы: поделились со мной" -#: ../../mod/settings.php:971 -msgid "Maximum private messages per day from unknown people:" -msgstr "Максимальное количество личных сообщений от незнакомых людей:" +#: ../../Zotlabs/Module/Sharedwithme.php:106 +msgid "NEW" +msgstr "НОВОЕ" -#: ../../mod/settings.php:971 -msgid "Useful to reduce spamming" -msgstr "Полезно для уменьшения активности спам" +#: ../../Zotlabs/Module/Sharedwithme.php:108 +#: ../../Zotlabs/Storage/Browser.php:288 +msgid "Last Modified" +msgstr "Последнее изменение" -#: ../../mod/settings.php:974 -msgid "Notification Settings" -msgstr "Настройки уведомлений" +#: ../../Zotlabs/Module/Sharedwithme.php:109 +msgid "Remove all files" +msgstr "Удалить все файлы" -#: ../../mod/settings.php:975 -msgid "By default post a status message when:" -msgstr "" +#: ../../Zotlabs/Module/Sharedwithme.php:110 +msgid "Remove this file" +msgstr "Удалить этот файл" -#: ../../mod/settings.php:976 -msgid "accepting a friend request" -msgstr "" +#: ../../Zotlabs/Module/Rbmark.php:94 +msgid "Select a bookmark folder" +msgstr "Выбрать каталог для закладок" -#: ../../mod/settings.php:977 -msgid "joining a forum/community" -msgstr "" +#: ../../Zotlabs/Module/Rbmark.php:99 +msgid "Save Bookmark" +msgstr "Сохранить закладку" -#: ../../mod/settings.php:978 -msgid "making an interesting profile change" -msgstr "" +#: ../../Zotlabs/Module/Rbmark.php:100 +msgid "URL of bookmark" +msgstr "URL закладки" -#: ../../mod/settings.php:979 -msgid "Send a notification email when:" -msgstr "Отправить уведомление по электронной почте, если:" +#: ../../Zotlabs/Module/Rbmark.php:105 +msgid "Or enter new bookmark folder name" +msgstr "или введите новое имя каталога закладок" -#: ../../mod/settings.php:980 -msgid "You receive a connection request" -msgstr "" +#: ../../Zotlabs/Module/Cal.php:69 +msgid "Permissions denied." +msgstr "Доступ запрещен." -#: ../../mod/settings.php:981 -msgid "Your connections are confirmed" -msgstr "" +#: ../../Zotlabs/Module/Authorize.php:17 +msgid "Unknown App" +msgstr "Неизвестное приложение" -#: ../../mod/settings.php:982 -msgid "Someone writes on your profile wall" -msgstr "" +#: ../../Zotlabs/Module/Authorize.php:22 +msgid "Authorize" +msgstr "Авторизовать" -#: ../../mod/settings.php:983 -msgid "Someone writes a followup comment" -msgstr "" +#: ../../Zotlabs/Module/Authorize.php:23 +#, php-format +msgid "Do you authorize the app %s to access your channel data?" +msgstr "Авторизуете ли вы приложение %s для доступа к данным вашего канала?" -#: ../../mod/settings.php:984 -msgid "You receive a private message" -msgstr "Вы получили личное сообщение" +#: ../../Zotlabs/Module/Authorize.php:25 +msgid "Allow" +msgstr "Разрешить" -#: ../../mod/settings.php:985 -msgid "You receive a friend suggestion" -msgstr "Вы получили предложение дружить" +#: ../../Zotlabs/Module/Authorize.php:26 +#: ../../Zotlabs/Module/Admin/Accounts.php:174 +msgid "Deny" +msgstr "Запретить" -#: ../../mod/settings.php:986 -msgid "You are tagged in a post" -msgstr "" +#: ../../Zotlabs/Module/Search.php:230 +#, php-format +msgid "Items tagged with: %s" +msgstr "Объекты помечены как: %s" -#: ../../mod/settings.php:987 -msgid "You are poked/prodded/etc. in a post" -msgstr "" +#: ../../Zotlabs/Module/Search.php:232 +#, php-format +msgid "Search results for: %s" +msgstr "Результаты поиска для: %s" -#: ../../mod/settings.php:990 -msgid "Advanced Account/Page Type Settings" -msgstr "" +#: ../../Zotlabs/Module/Setup.php:170 +msgid "$Projectname Server - Setup" +msgstr "$Projectname сервер - Установка" -#: ../../mod/settings.php:991 -msgid "Change the behaviour of this account for special situations" -msgstr "" +#: ../../Zotlabs/Module/Setup.php:174 +msgid "Could not connect to database." +msgstr "Не удалось подключиться к серверу баз данных." -#: ../../mod/settings.php:994 +#: ../../Zotlabs/Module/Setup.php:178 msgid "" -"Please enable expert mode (in Settings > " -"Additional features) to adjust!" -msgstr "" - -#: ../../mod/settings.php:995 -msgid "Miscellaneous Settings" -msgstr "Дополнительные настройки" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." +msgstr "Не удалось подключиться к указанному URL. Вероятно проблема с SSL сертификатом или DNS." -#: ../../mod/settings.php:997 -msgid "Personal menu to display in your channel pages" -msgstr "" +#: ../../Zotlabs/Module/Setup.php:185 +msgid "Could not create table." +msgstr "Не удалось создать таблицу." -#: ../../mod/poke.php:159 -msgid "Poke/Prod" -msgstr "" +#: ../../Zotlabs/Module/Setup.php:191 +msgid "Your site database has been installed." +msgstr "Ваша база данных установлена." -#: ../../mod/poke.php:160 -msgid "poke, prod or do other things to somebody" +#: ../../Zotlabs/Module/Setup.php:197 +msgid "" +"You may need to import the file \"install/schema_xxx.sql\" manually using a " +"database client." msgstr "" +"Вам может понадобится импортировать файл \"install/schema_xxx.sql\" " +"вручную используя клиент базы данных." -#: ../../mod/poke.php:161 -msgid "Recipient" -msgstr "Получатель" - -#: ../../mod/poke.php:162 -msgid "Choose what you wish to do to recipient" -msgstr "" +#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262 +#: ../../Zotlabs/Module/Setup.php:749 +msgid "Please see the file \"install/INSTALL.txt\"." +msgstr "Пожалуйста, обратитесь к файлу \"install/INSTALL.txt\"." -#: ../../mod/poke.php:165 -msgid "Make this post private" -msgstr "Сделать это сообщение личным" +#: ../../Zotlabs/Module/Setup.php:259 +msgid "System check" +msgstr "Проверка системы" -#: ../../mod/api.php:76 ../../mod/api.php:102 -msgid "Authorize application connection" -msgstr "" +#: ../../Zotlabs/Module/Setup.php:264 +msgid "Check again" +msgstr "Перепроверить" -#: ../../mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" -msgstr "" +#: ../../Zotlabs/Module/Setup.php:286 +msgid "Database connection" +msgstr "Подключение к базе данных" -#: ../../mod/api.php:89 -msgid "Please login to continue." -msgstr "Пожалуйста, войдите, чтобы продолжить." +#: ../../Zotlabs/Module/Setup.php:287 +msgid "" +"In order to install $Projectname we need to know how to connect to your " +"database." +msgstr "Для установки $Projectname необходимо знать как подключиться к ваше базе данных." -#: ../../mod/api.php:104 +#: ../../Zotlabs/Module/Setup.php:288 msgid "" -"Do you want to authorize this application to access your posts and contacts," -" and/or create new posts for you?" -msgstr "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." +msgstr "Пожалуйста, свяжитесь с вашим хостинг провайдером или администрацией сайта если у вас есть вопросы об этих настройках." -#: ../../mod/post.php:226 +#: ../../Zotlabs/Module/Setup.php:289 msgid "" -"Remote authentication blocked. You are logged into this site locally. Please" -" logout and retry." -msgstr "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." +msgstr "Указанная ниже база данных должна существовать. Если это не так, пожалуйста, создайте её перед тем, как продолжить." -#: ../../mod/post.php:257 ../../mod/openid.php:72 ../../mod/openid.php:178 -#, php-format -msgid "Welcome %s. Remote authentication successful." -msgstr "Добро пожаловать %s. Удаленная аутентификация успешно завершена." +#: ../../Zotlabs/Module/Setup.php:293 +msgid "Database Server Name" +msgstr "Имя сервера баз данных" -#: ../../mod/attach.php:9 -msgid "Item not available." -msgstr "Элемент недоступен." +#: ../../Zotlabs/Module/Setup.php:293 +msgid "Default is 127.0.0.1" +msgstr "По умолчанию 127.0.0.1" -#: ../../mod/probe.php:23 ../../mod/probe.php:29 -#, php-format -msgid "Fetching URL returns error: %1$s" -msgstr "" +#: ../../Zotlabs/Module/Setup.php:294 +msgid "Database Port" +msgstr "Порт сервера баз данных" -#: ../../mod/block.php:27 ../../mod/page.php:35 -msgid "Invalid item." -msgstr "Недействительный элемент." +#: ../../Zotlabs/Module/Setup.php:294 +msgid "Communication port number - use 0 for default" +msgstr "Порт коммуникации - используйте 0 по умолчанию" -#: ../../mod/block.php:39 ../../mod/chanview.php:77 ../../mod/page.php:47 -#: ../../mod/home.php:54 ../../mod/wall_upload.php:28 -msgid "Channel not found." -msgstr "Канал не найден." +#: ../../Zotlabs/Module/Setup.php:295 +msgid "Database Login Name" +msgstr "Имя для подключения к базе данных" -#: ../../mod/block.php:75 ../../mod/page.php:83 ../../mod/display.php:100 -#: ../../mod/help.php:72 ../../index.php:236 -msgid "Page not found." -msgstr "Страница не найдена." +#: ../../Zotlabs/Module/Setup.php:296 +msgid "Database Login Password" +msgstr "Пароль для подключения к базе данных" -#: ../../mod/profile_photo.php:108 -msgid "Image uploaded but image cropping failed." -msgstr "" +#: ../../Zotlabs/Module/Setup.php:297 +msgid "Database Name" +msgstr "Имя базы данных" -#: ../../mod/profile_photo.php:161 -msgid "Image resize failed." -msgstr "Изменение размера изображения не удалось." +#: ../../Zotlabs/Module/Setup.php:298 +msgid "Database Type" +msgstr "Тип базы данных" + +#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341 +msgid "Site administrator email address" +msgstr "Адрес электронной почты администратора сайта" -#: ../../mod/profile_photo.php:205 +#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341 msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "" +"Your account email address must match this in order to use the web admin " +"panel." +msgstr "Ваш адрес электронной почты должен соответствовать этому для использования веб-панели администратора." -#: ../../mod/profile_photo.php:232 -#, php-format -msgid "Image exceeds size limit of %d" -msgstr "" +#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343 +msgid "Website URL" +msgstr "URL веб-сайта" -#: ../../mod/profile_photo.php:241 -msgid "Unable to process image." -msgstr "Невозможно обработать изображение." +#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343 +msgid "Please use SSL (https) URL if available." +msgstr "Пожалуйста, используйте SSL (https) URL если возможно." -#: ../../mod/profile_photo.php:290 ../../mod/profile_photo.php:339 -msgid "Photo not available." -msgstr "Фотография не доступна." +#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345 +msgid "Please select a default timezone for your website" +msgstr "Пожалуйста, выберите часовой пояс по умолчанию для вашего сайта" -#: ../../mod/profile_photo.php:358 -msgid "Upload File:" -msgstr "Загрузить файл:" +#: ../../Zotlabs/Module/Setup.php:330 +msgid "Site settings" +msgstr "Настройки сайта" -#: ../../mod/profile_photo.php:359 -msgid "Select a profile:" -msgstr "Выберите профиль:" +#: ../../Zotlabs/Module/Setup.php:384 +msgid "PHP version 5.5 or greater is required." +msgstr "Требуется PHP версии 5.5 или выше" + +#: ../../Zotlabs/Module/Setup.php:385 +msgid "PHP version" +msgstr "Версия PHP" + +#: ../../Zotlabs/Module/Setup.php:401 +msgid "Could not find a command line version of PHP in the web server PATH." +msgstr "Не удалось найти консольную версию PHP в путях переменной PATH веб-сервера." + +#: ../../Zotlabs/Module/Setup.php:402 +msgid "" +"If you don't have a command line version of PHP installed on server, you " +"will not be able to run background polling via cron." +msgstr "Если у вас на сервере не установлена консольная версия PHP вы не сможете запустить фоновый опрос через cron. " + +#: ../../Zotlabs/Module/Setup.php:406 +msgid "PHP executable path" +msgstr "Пусть к исполняемому модулю PHP" + +#: ../../Zotlabs/Module/Setup.php:406 +msgid "" +"Enter full path to php executable. You can leave this blank to continue the " +"installation." +msgstr "Введите полный путь к исполняемому модулю PHP. Вы можете оставить его пустым для продолжения установки." -#: ../../mod/profile_photo.php:360 -msgid "Upload Profile Photo" -msgstr "Загрузить фотографию профиля" +#: ../../Zotlabs/Module/Setup.php:411 +msgid "Command line PHP" +msgstr "Командная строка PHP" -#: ../../mod/profile_photo.php:365 -msgid "skip this step" -msgstr "пропустить этот шаг" +#: ../../Zotlabs/Module/Setup.php:421 +msgid "" +"Unable to check command line PHP, as shell_exec() is disabled. This is " +"required." +msgstr "Невозможно проверить командную строку PHP поскольку требуемая функция shell_exec() отключена." -#: ../../mod/profile_photo.php:365 -msgid "select a photo from your photo albums" +#: ../../Zotlabs/Module/Setup.php:424 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." msgstr "" +"В консольной версии PHP в вашей системе отключена опция \"register_argc_argv\". " -#: ../../mod/profile_photo.php:379 -msgid "Crop Image" -msgstr "Обрезать изображение" +#: ../../Zotlabs/Module/Setup.php:425 +msgid "This is required for message delivery to work." +msgstr "Это необходимо для функционирования доставки сообщений." -#: ../../mod/profile_photo.php:380 -msgid "Please adjust the image cropping for optimum viewing." +#: ../../Zotlabs/Module/Setup.php:428 +msgid "PHP register_argc_argv" msgstr "" -#: ../../mod/profile_photo.php:382 -msgid "Done Editing" -msgstr "Закончить редактирование" +#: ../../Zotlabs/Module/Setup.php:446 +#, php-format +msgid "" +"Your max allowed total upload size is set to %s. Maximum size of one file to " +"upload is set to %s. You are allowed to upload up to %d files at once." +msgstr "Максимально разрешённый общий размер загрузок установлен в %s. Максимальный размер одной загрузки установлен в %s. Вам разрешено загружать до %d файлов за один приём." -#: ../../mod/profile_photo.php:425 -msgid "Image uploaded successfully." -msgstr "Загрузка изображениея прошла успешно." +#: ../../Zotlabs/Module/Setup.php:451 +msgid "You can adjust these settings in the server php.ini file." +msgstr "Вы можете изменить эти настройки в файле php.ini на сервере." -#: ../../mod/profile_photo.php:427 -msgid "Image upload failed." -msgstr "Загрузка изображениея прошла безуспешно." +#: ../../Zotlabs/Module/Setup.php:453 +msgid "PHP upload limits" +msgstr "Максимальный размер загрузки в PHP" -#: ../../mod/profile_photo.php:436 -#, php-format -msgid "Image size reduction [%s] failed." +#: ../../Zotlabs/Module/Setup.php:476 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" msgstr "" +"Ошибка: функция \"openssl_pkey_new\" не может сгенерировать ключи шифрования" -#: ../../mod/blocks.php:66 -msgid "Block Name" -msgstr "Название блока" +#: ../../Zotlabs/Module/Setup.php:477 +msgid "" +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." +msgstr "" +"Если работаете под Windows, см. \"http://www.php.net/manual/en/openssl.installation.php\"." -#: ../../mod/profiles.php:18 ../../mod/profiles.php:138 -#: ../../mod/profiles.php:168 ../../mod/profiles.php:472 -msgid "Profile not found." -msgstr "Профиль не найден." +#: ../../Zotlabs/Module/Setup.php:480 +msgid "Generate encryption keys" +msgstr "Генерация ключей шифрования" -#: ../../mod/profiles.php:38 -msgid "Profile deleted." -msgstr "Профиль удален." +#: ../../Zotlabs/Module/Setup.php:497 +msgid "libCurl PHP module" +msgstr "" -#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 -msgid "Profile-" -msgstr "Профиль-" +#: ../../Zotlabs/Module/Setup.php:498 +msgid "GD graphics PHP module" +msgstr "" -#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 -msgid "New profile created." -msgstr "Новый профиль создан." +#: ../../Zotlabs/Module/Setup.php:499 +msgid "OpenSSL PHP module" +msgstr "" -#: ../../mod/profiles.php:98 -msgid "Profile unavailable to clone." -msgstr "Профиль недоступен для клонирования." +#: ../../Zotlabs/Module/Setup.php:500 +msgid "PDO database PHP module" +msgstr "" -#: ../../mod/profiles.php:178 -msgid "Profile Name is required." -msgstr "Имя профиля требуется." +#: ../../Zotlabs/Module/Setup.php:501 +msgid "mb_string PHP module" +msgstr "" -#: ../../mod/profiles.php:294 -msgid "Marital Status" -msgstr "Семейное положение" +#: ../../Zotlabs/Module/Setup.php:502 +msgid "xml PHP module" +msgstr "" -#: ../../mod/profiles.php:298 -msgid "Romantic Partner" -msgstr "Романтический партнер" +#: ../../Zotlabs/Module/Setup.php:503 +msgid "zip PHP module" +msgstr "" -#: ../../mod/profiles.php:302 -msgid "Likes" -msgstr "нравится" +#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509 +msgid "Apache mod_rewrite module" +msgstr "" -#: ../../mod/profiles.php:306 -msgid "Dislikes" -msgstr "не-нравится" +#: ../../Zotlabs/Module/Setup.php:507 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." +msgstr "Ошибка: требуемый модуль mod_rewrite веб-сервера Apache не установлен." -#: ../../mod/profiles.php:310 -msgid "Work/Employment" -msgstr "Работа / Занятость" +#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516 +msgid "exec" +msgstr "" -#: ../../mod/profiles.php:313 -msgid "Religion" -msgstr "Религия" +#: ../../Zotlabs/Module/Setup.php:513 +msgid "" +"Error: exec is required but is either not installed or has been disabled in " +"php.ini" +msgstr "" -#: ../../mod/profiles.php:317 -msgid "Political Views" -msgstr "Политические взгляды" +#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522 +msgid "shell_exec" +msgstr "" -#: ../../mod/profiles.php:321 -msgid "Gender" -msgstr "Пол" +#: ../../Zotlabs/Module/Setup.php:519 +msgid "" +"Error: shell_exec is required but is either not installed or has been " +"disabled in php.ini" +msgstr "" -#: ../../mod/profiles.php:325 -msgid "Sexual Preference" -msgstr "Сексуальная ориентация" +#: ../../Zotlabs/Module/Setup.php:527 +msgid "Error: libCURL PHP module required but not installed." +msgstr "" -#: ../../mod/profiles.php:329 -msgid "Homepage" -msgstr "Домашняя страница" +#: ../../Zotlabs/Module/Setup.php:531 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." +msgstr "" -#: ../../mod/profiles.php:333 -msgid "Interests" -msgstr "Интересы" +#: ../../Zotlabs/Module/Setup.php:535 +msgid "Error: openssl PHP module required but not installed." +msgstr "" -#: ../../mod/profiles.php:337 ../../mod/admin.php:893 -msgid "Address" -msgstr "Адрес" +#: ../../Zotlabs/Module/Setup.php:539 +msgid "Error: PDO database PHP module required but not installed." +msgstr "" -#: ../../mod/profiles.php:344 ../../mod/pubsites.php:25 -msgid "Location" -msgstr "Место" +#: ../../Zotlabs/Module/Setup.php:543 +msgid "Error: mb_string PHP module required but not installed." +msgstr "" -#: ../../mod/profiles.php:427 -msgid "Profile updated." -msgstr "Профиль обновлен." +#: ../../Zotlabs/Module/Setup.php:547 +msgid "Error: xml PHP module required for DAV but not installed." +msgstr "" -#: ../../mod/profiles.php:491 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "Скрывать от просмотра ваш список контактов/друзей в этом профиле?" +#: ../../Zotlabs/Module/Setup.php:551 +msgid "Error: zip PHP module required but not installed." +msgstr "" -#: ../../mod/profiles.php:514 -msgid "Edit Profile Details" -msgstr "Редактирование профиля" +#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579 +msgid ".htconfig.php is writable" +msgstr "" -#: ../../mod/profiles.php:516 -msgid "View this profile" -msgstr "Посмотреть этот профиль" +#: ../../Zotlabs/Module/Setup.php:575 +msgid "" +"The web installer needs to be able to create a file called \".htconfig.php\" " +"in the top folder of your web server and it is unable to do so." +msgstr "" -#: ../../mod/profiles.php:517 -msgid "Change Profile Photo" -msgstr "Изменить фотографию профиля" +#: ../../Zotlabs/Module/Setup.php:576 +msgid "" +"This is most often a permission setting, as the web server may not be able " +"to write files in your folder - even if you can." +msgstr "" -#: ../../mod/profiles.php:518 -msgid "Create a new profile using these settings" -msgstr "Создайте новый профиль со следующими настройками" +#: ../../Zotlabs/Module/Setup.php:577 +msgid "Please see install/INSTALL.txt for additional information." +msgstr "" -#: ../../mod/profiles.php:519 -msgid "Clone this profile" -msgstr "Клонировать этот профиль" +#: ../../Zotlabs/Module/Setup.php:593 +msgid "" +"This software uses the Smarty3 template engine to render its web views. " +"Smarty3 compiles templates to PHP to speed up rendering." +msgstr "" -#: ../../mod/profiles.php:520 -msgid "Delete this profile" -msgstr "Удалить этот профиль" +#: ../../Zotlabs/Module/Setup.php:594 +#, php-format +msgid "" +"In order to store these compiled templates, the web server needs to have " +"write access to the directory %s under the top level web folder." +msgstr "" -#: ../../mod/profiles.php:521 -msgid "Profile Name:" -msgstr "Имя профиля:" +#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616 +msgid "" +"Please ensure that the user that your web server runs as (e.g. www-data) has " +"write access to this folder." +msgstr "" -#: ../../mod/profiles.php:522 -msgid "Your Full Name:" -msgstr "Ваше полное имя:" +#: ../../Zotlabs/Module/Setup.php:596 +#, php-format +msgid "" +"Note: as a security measure, you should give the web server write access to " +"%s only--not the template files (.tpl) that it contains." +msgstr "" -#: ../../mod/profiles.php:523 -msgid "Title/Description:" -msgstr "Название / Описание:" +#: ../../Zotlabs/Module/Setup.php:599 +#, php-format +msgid "%s is writable" +msgstr "%s доступен для записи" -#: ../../mod/profiles.php:524 -msgid "Your Gender:" -msgstr "Ваш пол:" +#: ../../Zotlabs/Module/Setup.php:615 +msgid "" +"This software uses the store directory to save uploaded files. The web " +"server needs to have write access to the store directory under the top level " +"web folder" +msgstr "Эта программа использует каталог хранения для загруженных файлов. Для веб-сервера требуется доступ на запись начиная с верхнего уровня каталога хранения." -#: ../../mod/profiles.php:525 -#, php-format -msgid "Birthday (%s):" -msgstr "Ваш День Рождения (%s):" +#: ../../Zotlabs/Module/Setup.php:619 +msgid "store is writable" +msgstr "хранилище доступно для записи" -#: ../../mod/profiles.php:526 -msgid "Street Address:" -msgstr "Улица:" +#: ../../Zotlabs/Module/Setup.php:651 +msgid "" +"SSL certificate cannot be validated. Fix certificate or disable https access " +"to this site." +msgstr "" -#: ../../mod/profiles.php:527 -msgid "Locality/City:" -msgstr "Населенный пункт / город:" +#: ../../Zotlabs/Module/Setup.php:652 +msgid "" +"If you have https access to your website or allow connections to TCP port " +"443 (the https: port), you MUST use a browser-valid certificate. You MUST " +"NOT use self-signed certificates!" +msgstr "" -#: ../../mod/profiles.php:528 -msgid "Postal/Zip Code:" -msgstr "Почтовый индекс:" +#: ../../Zotlabs/Module/Setup.php:653 +msgid "" +"This restriction is incorporated because public posts from you may for " +"example contain references to images on your own hub." +msgstr "Эти ограничения приняты поскольку ваши общедоступные публикации могут, например, содержать ссылки на изображения на вашем собственном хабе." -#: ../../mod/profiles.php:529 -msgid "Country:" -msgstr "Страна:" +#: ../../Zotlabs/Module/Setup.php:654 +msgid "" +"If your certificate is not recognized, members of other sites (who may " +"themselves have valid certificates) will get a warning message on their own " +"site complaining about security issues." +msgstr "" -#: ../../mod/profiles.php:530 -msgid "Region/State:" -msgstr "Регион / Область:" +#: ../../Zotlabs/Module/Setup.php:655 +msgid "" +"This can cause usability issues elsewhere (not just on your own site) so we " +"must insist on this requirement." +msgstr "" -#: ../../mod/profiles.php:531 -msgid "♥ Marital Status:" +#: ../../Zotlabs/Module/Setup.php:656 +msgid "" +"Providers are available that issue free certificates which are browser-valid." msgstr "" -#: ../../mod/profiles.php:532 -msgid "Who: (if applicable)" -msgstr "Кто: (если это применимо)" +#: ../../Zotlabs/Module/Setup.php:658 +msgid "" +"If you are confident that the certificate is valid and signed by a trusted " +"authority, check to see if you have failed to install an intermediate cert. " +"These are not normally required by browsers, but are required for server-to-" +"server communications." +msgstr "" -#: ../../mod/profiles.php:533 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Примеры: cathy123, Cathy Williams, cathy@example.com" +#: ../../Zotlabs/Module/Setup.php:660 +msgid "SSL certificate validation" +msgstr "" -#: ../../mod/profiles.php:534 -msgid "Since [date]:" -msgstr "С тех пор [date]:" +#: ../../Zotlabs/Module/Setup.php:666 +msgid "" +"Url rewrite in .htaccess is not working. Check your server configuration." +"Test: " +msgstr "" -#: ../../mod/profiles.php:536 -msgid "Homepage URL:" -msgstr "URL-адрес домашней страницы:" +#: ../../Zotlabs/Module/Setup.php:669 +msgid "Url rewrite is working" +msgstr "Перезапись URL работает" -#: ../../mod/profiles.php:539 -msgid "Religious Views:" -msgstr "Религиозные взгляды:" +#: ../../Zotlabs/Module/Setup.php:683 +msgid "" +"The database configuration file \".htconfig.php\" could not be written. " +"Please use the enclosed text to create a configuration file in your web " +"server root." +msgstr "" -#: ../../mod/profiles.php:540 -msgid "Keywords:" -msgstr "Ключевые слова:" +#: ../../Zotlabs/Module/Setup.php:747 +msgid "

      What next?

      " +msgstr "

      Что дальше?

      " -#: ../../mod/profiles.php:543 -msgid "Example: fishing photography software" -msgstr "Пример: fishing photography software" +#: ../../Zotlabs/Module/Setup.php:748 +msgid "" +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." +msgstr "Вам понадобится [вручную] настроить запланированную задачу для опрашивателя." -#: ../../mod/profiles.php:544 -msgid "Used in directory listings" -msgstr "" +#: ../../Zotlabs/Module/Lockview.php:75 +msgid "Remote privacy information not available." +msgstr "Удаленная информация о конфиденциальности недоступна." -#: ../../mod/profiles.php:545 -msgid "Tell us about yourself..." -msgstr "Расскажите нам о себе ..." +#: ../../Zotlabs/Module/Lockview.php:96 +msgid "Visible to:" +msgstr "Видимо для:" -#: ../../mod/profiles.php:546 -msgid "Hobbies/Interests" -msgstr "Хобби / интересы" +#: ../../Zotlabs/Module/Follow.php:36 +msgid "Connection added." +msgstr "Контакт добавлен." -#: ../../mod/profiles.php:547 -msgid "Contact information and Social Networks" -msgstr "Информация и социальные сети контакта" +#: ../../Zotlabs/Module/Mitem.php:31 ../../Zotlabs/Module/Menu.php:208 +msgid "Menu not found." +msgstr "Меню не найдено" -#: ../../mod/profiles.php:548 -msgid "My other channels" -msgstr "Мои другие контакты" +#: ../../Zotlabs/Module/Mitem.php:63 +msgid "Unable to create element." +msgstr "Невозможно создать элемент." -#: ../../mod/profiles.php:549 -msgid "Musical interests" -msgstr "Музыкальные интересы" +#: ../../Zotlabs/Module/Mitem.php:87 +msgid "Unable to update menu element." +msgstr "Невозможно обновить элемент меню." -#: ../../mod/profiles.php:550 -msgid "Books, literature" -msgstr "Книги, литература" +#: ../../Zotlabs/Module/Mitem.php:103 +msgid "Unable to add menu element." +msgstr "Невозможно добавить элемент меню." -#: ../../mod/profiles.php:551 -msgid "Television" -msgstr "Телевидение" +#: ../../Zotlabs/Module/Mitem.php:167 ../../Zotlabs/Module/Mitem.php:246 +msgid "Menu Item Permissions" +msgstr "Разрешения на пункт меню" -#: ../../mod/profiles.php:552 -msgid "Film/dance/culture/entertainment" -msgstr "Кино / танцы / культура / развлечения" +#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 +#: ../../Zotlabs/Module/Settings/Channel.php:549 +msgid "(click to open/close)" +msgstr "(нажмите чтобы открыть/закрыть)" -#: ../../mod/profiles.php:553 -msgid "Love/romance" -msgstr "Любовь / Романс" +#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191 +msgid "Link Name" +msgstr "Имя ссылки" -#: ../../mod/profiles.php:554 -msgid "Work/employment" -msgstr "Работа / Занятость" +#: ../../Zotlabs/Module/Mitem.php:175 ../../Zotlabs/Module/Mitem.php:255 +msgid "Link or Submenu Target" +msgstr "Ссылка или цель подменю" -#: ../../mod/profiles.php:555 -msgid "School/education" -msgstr "Школа / образование" +#: ../../Zotlabs/Module/Mitem.php:175 +msgid "Enter URL of the link or select a menu name to create a submenu" +msgstr "Введите URL ссылки или выберите имя меню для создания подменю" -#: ../../mod/profiles.php:560 -msgid "" -"This is your public profile.
      It may " -"be visible to anybody using the internet." -msgstr "" +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:256 +msgid "Use magic-auth if available" +msgstr "Использовать magic-auth если возможно" -#: ../../mod/profiles.php:570 ../../mod/directory.php:143 -#: ../../mod/dirprofile.php:92 -msgid "Age: " -msgstr "Возраст:" +#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:257 +msgid "Open link in new window" +msgstr "Открыть ссылку в новом окне" -#: ../../mod/profiles.php:609 -msgid "Edit/Manage Profiles" -msgstr "Редактирование / Управление профилей" +#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258 +msgid "Order in list" +msgstr "Порядок в списке" -#: ../../mod/profiles.php:610 -msgid "Add profile things" -msgstr "" +#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258 +msgid "Higher numbers will sink to bottom of listing" +msgstr "Большие значения в конце списка" -#: ../../mod/profiles.php:611 -msgid "Include desirable objects in your profile" -msgstr "" +#: ../../Zotlabs/Module/Mitem.php:179 +msgid "Submit and finish" +msgstr "Отправить и завершить" -#: ../../mod/bookmarks.php:38 -msgid "Bookmark added" -msgstr "Закладка добавлена" +#: ../../Zotlabs/Module/Mitem.php:180 +msgid "Submit and continue" +msgstr "Отправить и продолжить" -#: ../../mod/bookmarks.php:58 -msgid "My Bookmarks" -msgstr "Мои закладки" +#: ../../Zotlabs/Module/Mitem.php:189 +msgid "Menu:" +msgstr "Меню:" -#: ../../mod/bookmarks.php:69 -msgid "My Connections Bookmarks" -msgstr "Закладки моих контактов" +#: ../../Zotlabs/Module/Mitem.php:192 +msgid "Link Target" +msgstr "Цель ссылки" -#: ../../mod/profperm.php:29 ../../mod/profperm.php:58 -msgid "Invalid profile identifier." -msgstr "" +#: ../../Zotlabs/Module/Mitem.php:195 +msgid "Edit menu" +msgstr "Редактировать меню" -#: ../../mod/profperm.php:110 -msgid "Profile Visibility Editor" -msgstr "Редактор видимости профиля" +#: ../../Zotlabs/Module/Mitem.php:198 +msgid "Edit element" +msgstr "Редактировать элемент" -#: ../../mod/profperm.php:114 -msgid "Click on a contact to add or remove." -msgstr "Нажмите на канал, чтобы добавить или удалить." +#: ../../Zotlabs/Module/Mitem.php:199 +msgid "Drop element" +msgstr "Удалить элемент" -#: ../../mod/profperm.php:123 -msgid "Visible To" -msgstr "Видно" +#: ../../Zotlabs/Module/Mitem.php:200 +msgid "New element" +msgstr "Новый элемент" -#: ../../mod/profperm.php:139 ../../mod/connections.php:279 -msgid "All Connections" -msgstr "Все контакты" +#: ../../Zotlabs/Module/Mitem.php:201 +msgid "Edit this menu container" +msgstr "Редактировать контейнер меню" -#: ../../mod/pubsites.php:16 -msgid "Public Sites" -msgstr "Публичные сайты" +#: ../../Zotlabs/Module/Mitem.php:202 +msgid "Add menu element" +msgstr "Добавить элемент меню" -#: ../../mod/pubsites.php:19 -msgid "" -"The listed sites allow public registration into the Hubzilla. All sites in" -" the matrix are interlinked so membership on any of them conveys membership " -"in the matrix as a whole. Some sites may require subscription or provide " -"tiered service plans. The provider links may provide " -"additional details." -msgstr "" +#: ../../Zotlabs/Module/Mitem.php:203 +msgid "Delete this menu item" +msgstr "Удалить этот элемент меню" -#: ../../mod/pubsites.php:25 -msgid "Site URL" -msgstr "URL веб-сайта" +#: ../../Zotlabs/Module/Mitem.php:204 +msgid "Edit this menu item" +msgstr "Редактировать этот элемент меню" -#: ../../mod/pubsites.php:25 -msgid "Access Type" -msgstr "Тип доступа" +#: ../../Zotlabs/Module/Mitem.php:222 +msgid "Menu item not found." +msgstr "Элемент меню не найден." -#: ../../mod/pubsites.php:25 -msgid "Registration Policy" -msgstr "Правила регистрации" +#: ../../Zotlabs/Module/Mitem.php:235 +msgid "Menu item deleted." +msgstr "Элемент меню удалён." -#: ../../mod/channel.php:25 ../../mod/chat.php:19 -msgid "You must be logged in to see this page." -msgstr "Вы должны авторизоваться, чтобы увидеть эту страницу." +#: ../../Zotlabs/Module/Mitem.php:237 +msgid "Menu item could not be deleted." +msgstr "Невозможно удалить элемент меню." -#: ../../mod/channel.php:86 -msgid "Insufficient permissions. Request redirected to profile page." -msgstr "" +#: ../../Zotlabs/Module/Mitem.php:244 +msgid "Edit Menu Element" +msgstr "Редактировать элемент меню" -#: ../../mod/rbmark.php:88 -msgid "Select a bookmark folder" -msgstr "" +#: ../../Zotlabs/Module/Mitem.php:254 +msgid "Link text" +msgstr "Текст ссылки" -#: ../../mod/rbmark.php:93 -msgid "Save Bookmark" -msgstr "Сохранить закладки" +#: ../../Zotlabs/Module/Admin/Addons.php:289 +#, php-format +msgid "Plugin %s disabled." +msgstr "Плагин %s отключен." -#: ../../mod/rbmark.php:94 -msgid "URL of bookmark" -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:294 +#, php-format +msgid "Plugin %s enabled." +msgstr "Плагин %s включен." -#: ../../mod/rbmark.php:95 ../../mod/appman.php:93 -msgid "Description" -msgstr "Описание" +#: ../../Zotlabs/Module/Admin/Addons.php:310 +#: ../../Zotlabs/Module/Admin/Themes.php:95 +msgid "Disable" +msgstr "Запретить" -#: ../../mod/rbmark.php:99 -msgid "Or enter new bookmark folder name" -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:313 +#: ../../Zotlabs/Module/Admin/Themes.php:97 +msgid "Enable" +msgstr "Разрешить" -#: ../../mod/chat.php:167 -msgid "Room not found" -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:343 +#: ../../Zotlabs/Module/Admin/Themes.php:124 +msgid "Toggle" +msgstr "Переключить" -#: ../../mod/chat.php:178 -msgid "Leave Room" -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:351 +#: ../../Zotlabs/Module/Admin/Themes.php:134 +msgid "Author: " +msgstr "Автор: " -#: ../../mod/chat.php:179 -msgid "Delete This Room" -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:352 +#: ../../Zotlabs/Module/Admin/Themes.php:135 +msgid "Maintainer: " +msgstr "Сопровождающий:" -#: ../../mod/chat.php:180 -msgid "I am away right now" -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:353 +msgid "Minimum project version: " +msgstr "Минимальная версия проекта:" -#: ../../mod/chat.php:181 -msgid "I am online" -msgstr "Я в сети" +#: ../../Zotlabs/Module/Admin/Addons.php:354 +msgid "Maximum project version: " +msgstr "Максимальная версия проекта:" -#: ../../mod/chat.php:183 -msgid "Bookmark this room" -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:355 +msgid "Minimum PHP version: " +msgstr "Минимальная версия PHP:" -#: ../../mod/chat.php:207 ../../mod/chat.php:229 -msgid "New Chatroom" -msgstr "Новый чат" +#: ../../Zotlabs/Module/Admin/Addons.php:356 +msgid "Compatible Server Roles: " +msgstr "Совместимые роли сервера:" -#: ../../mod/chat.php:208 -msgid "Chatroom Name" -msgstr "Название чата" +#: ../../Zotlabs/Module/Admin/Addons.php:357 +msgid "Requires: " +msgstr "Необходимо:" -#: ../../mod/chat.php:225 -#, php-format -msgid "%1$s's Chatrooms" -msgstr "Чаты пользователя %1$s" +#: ../../Zotlabs/Module/Admin/Addons.php:358 +#: ../../Zotlabs/Module/Admin/Addons.php:442 +msgid "Disabled - version incompatibility" +msgstr "Отключено - несовместимость версий" -#: ../../mod/register.php:43 -msgid "Maximum daily site registrations exceeded. Please try again tomorrow." -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:411 +msgid "Enter the public git repository URL of the addon repo." +msgstr "Введите URL публичного репозитория расширений git" -#: ../../mod/register.php:49 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:412 +msgid "Addon repo git URL" +msgstr "URL репозитория расширений git" -#: ../../mod/register.php:77 -msgid "Passwords do not match." -msgstr "Пароли не совпадают." +#: ../../Zotlabs/Module/Admin/Addons.php:413 +msgid "Custom repo name" +msgstr "Пользовательское имя репозитория" -#: ../../mod/register.php:105 -msgid "" -"Registration successful. Please check your email for validation " -"instructions." -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:413 +msgid "(optional)" +msgstr "(необязательно)" -#: ../../mod/register.php:111 -msgid "Your registration is pending approval by the site owner." -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:414 +msgid "Download Addon Repo" +msgstr "Загрузить репозиторий расширений" -#: ../../mod/register.php:114 -msgid "Your registration can not be processed." -msgstr "Ваша регистрация не может быть обработана." +#: ../../Zotlabs/Module/Admin/Addons.php:421 +msgid "Install new repo" +msgstr "Установить новый репозиторий" -#: ../../mod/register.php:147 -msgid "Registration on this site/hub is by approval only." -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:445 +msgid "Manage Repos" +msgstr "Управление репозиториями" -#: ../../mod/register.php:148 -msgid "Register at another affiliated site/hub" -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:446 +msgid "Installed Addon Repositories" +msgstr "Установленные репозитории расширений" -#: ../../mod/register.php:156 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:447 +msgid "Install a New Addon Repository" +msgstr "Установить новый репозиторий расширений" -#: ../../mod/register.php:167 -msgid "Terms of Service" -msgstr "Условия предоставления услуг" +#: ../../Zotlabs/Module/Admin/Addons.php:454 +msgid "Switch branch" +msgstr "Переключить ветку" -#: ../../mod/register.php:173 -#, php-format -msgid "I accept the %s for this website" -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:172 +msgid "Site settings updated." +msgstr "Настройки сайта обновлены." -#: ../../mod/register.php:175 +#: ../../Zotlabs/Module/Admin/Site.php:209 +#: ../../Zotlabs/Module/Settings/Display.php:130 #, php-format -msgid "I am over 13 years of age and accept the %s for this website" -msgstr "" +msgid "%s - (Incompatible)" +msgstr "%s - (несовместимо)" -#: ../../mod/register.php:189 ../../mod/admin.php:443 -msgid "Registration" -msgstr "Регистрация" +#: ../../Zotlabs/Module/Admin/Site.php:216 +msgid "mobile" +msgstr "мобильный" -#: ../../mod/register.php:194 -msgid "Membership on this site is by invitation only." -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:218 +msgid "experimental" +msgstr "экспериментальный" -#: ../../mod/register.php:195 -msgid "Please enter your invitation code" -msgstr "Пожалуйста, введите Ваш код приглашения" +#: ../../Zotlabs/Module/Admin/Site.php:220 +msgid "unsupported" +msgstr "неподдерживаемый" -#: ../../mod/register.php:198 -msgid "Your email address" -msgstr "Ваш адрес электронной почты" +#: ../../Zotlabs/Module/Admin/Site.php:267 +msgid "Yes - with approval" +msgstr "Да - требует подтверждения" -#: ../../mod/register.php:199 -msgid "Choose a password" -msgstr "Выберите пароль" +#: ../../Zotlabs/Module/Admin/Site.php:273 +msgid "My site is not a public server" +msgstr "Мой сайт не является публичным сервером" -#: ../../mod/register.php:200 -msgid "Please re-enter your password" -msgstr "Пожалуйста, введите пароль еще раз" +#: ../../Zotlabs/Module/Admin/Site.php:274 +msgid "My site has paid access only" +msgstr "Мой сайт доступен только с оплатой " -#: ../../mod/chatsvc.php:111 -msgid "Away" -msgstr "Нет на месте" +#: ../../Zotlabs/Module/Admin/Site.php:275 +msgid "My site has free access only" +msgstr "На моём сайте разрешён свободный доступ" -#: ../../mod/chatsvc.php:115 -msgid "Online" -msgstr "Сейчас в сети" +#: ../../Zotlabs/Module/Admin/Site.php:276 +msgid "My site offers free accounts with optional paid upgrades" +msgstr "На моём сайте разрешены бесплатные аккаунты с дополнительными платными услугами" -#: ../../mod/regmod.php:12 -msgid "Please login." -msgstr "Войдите пожалуйста." +#: ../../Zotlabs/Module/Admin/Site.php:288 +msgid "Beginner/Basic" +msgstr "Начинающий/Базовый" -#: ../../mod/cloud.php:113 -msgid "Hubzilla - Guests: Username: {your email address}, Password: +++" -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:289 +msgid "Novice - not skilled but willing to learn" +msgstr "Новичок - не опытный, но желающий учиться" -#: ../../mod/removeme.php:49 -msgid "Remove This Channel" -msgstr "Удалить этот канал" +#: ../../Zotlabs/Module/Admin/Site.php:290 +msgid "Intermediate - somewhat comfortable" +msgstr "Промежуточный - более удобный" -#: ../../mod/removeme.php:50 -msgid "" -"This will completely remove this channel from the network. Once this has " -"been done it is not recoverable." -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:291 +msgid "Advanced - very comfortable" +msgstr "Продвинутый - очень удобный" -#: ../../mod/removeme.php:51 -msgid "Please enter your password for verification:" -msgstr "Пожалуйста, введите пароль для проверки:" +#: ../../Zotlabs/Module/Admin/Site.php:292 +msgid "Expert - I can write computer code" +msgstr "Эксперт - я умею программировать" -#: ../../mod/removeme.php:52 -msgid "Remove this channel and all its clones from the network" -msgstr "Удалить этот канал и все его клоны из сети" +#: ../../Zotlabs/Module/Admin/Site.php:293 +msgid "Wizard - I probably know more than you do" +msgstr "Волшебник - возможно я знаю больше чем ты" -#: ../../mod/removeme.php:52 +#: ../../Zotlabs/Module/Admin/Site.php:299 +msgid "Default permission role for new accounts" +msgstr "Разрешения по умолчанию для новых аккаунтов" + +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "" -"By default only the instance of the channel located on this hub will be " -"removed from the network" +"This role will be used for the first channel created after registration." msgstr "" +"Эта роль будет использоваться для первого канала, созданного после регистрации." -#: ../../mod/removeme.php:53 -msgid "Remove Channel" -msgstr "Удалить канал" +#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Register.php:278 +msgid "Registration" +msgstr "Регистрация" -#: ../../mod/common.php:10 -msgid "No channel." -msgstr "Не канал." +#: ../../Zotlabs/Module/Admin/Site.php:311 +msgid "File upload" +msgstr "Загрузка файла" -#: ../../mod/common.php:39 -msgid "Common connections" -msgstr "Общие контакты" +#: ../../Zotlabs/Module/Admin/Site.php:312 +msgid "Policies" +msgstr "Правила" -#: ../../mod/common.php:44 -msgid "No connections in common." -msgstr "Общих контактов нет." +#: ../../Zotlabs/Module/Admin/Site.php:319 +msgid "Site default technical skill level" +msgstr "Уровень технических навыков на сайте по умолчанию" -#: ../../mod/rmagic.php:38 -msgid "" -"We encountered a problem while logging in with the OpenID you provided. " -"Please check the correct spelling of the ID." -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:319 +msgid "Used to provide a member experience matched to technical comfort level" +msgstr "Используется чтобы обеспечить удобство на уровне технических навыков пользователя" -#: ../../mod/rmagic.php:38 -msgid "The error message was:" -msgstr "Сообщение об ошибке было:" +#: ../../Zotlabs/Module/Admin/Site.php:321 +msgid "Lock the technical skill level setting" +msgstr "Заблокировать уровень технических навыков" -#: ../../mod/rmagic.php:42 -msgid "Authentication failed." -msgstr "Ошибка проверки подлинности." +#: ../../Zotlabs/Module/Admin/Site.php:321 +msgid "Members can set their own technical comfort level by default" +msgstr "Участники могут выбрать уровень своих технических навыков по умолчанию" -#: ../../mod/rmagic.php:78 -msgid "Remote Authentication" -msgstr "Удаленная аутентификация" +#: ../../Zotlabs/Module/Admin/Site.php:323 +msgid "Banner/Logo" +msgstr "Баннер / логотип" -#: ../../mod/rmagic.php:79 -msgid "Enter your channel address (e.g. channel@example.com)" -msgstr "Введите адрес вашего канала (например: channel@example.com)" +#: ../../Zotlabs/Module/Admin/Site.php:323 +msgid "Unfiltered HTML/CSS/JS is allowed" +msgstr "Разрешён нефильтруемый HTML/CSS/JS" -#: ../../mod/rmagic.php:80 -msgid "Authenticate" -msgstr "Проверка подлинности" +#: ../../Zotlabs/Module/Admin/Site.php:324 +msgid "Administrator Information" +msgstr "Информация об администраторе" -#: ../../mod/connect.php:55 ../../mod/connect.php:103 -msgid "Continue" -msgstr "Продолжить" +#: ../../Zotlabs/Module/Admin/Site.php:324 +msgid "" +"Contact information for site administrators. Displayed on siteinfo page. " +"BBCode can be used here" +msgstr "Контактная информация для администраторов сайта. Показывается на информационной странице сайта. Можно использовать BBCode." -#: ../../mod/connect.php:84 -msgid "Premium Channel Setup" -msgstr "Установка премиум канала" +#: ../../Zotlabs/Module/Admin/Site.php:325 +msgid "" +"Publicly visible description of this site. Displayed on siteinfo page. " +"BBCode can be used here" +msgstr "Публичное видимое описание сайта. Показывается на информационной странице сайта. Можно использовать BBCode." -#: ../../mod/connect.php:86 -msgid "Enable premium channel connection restrictions" -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:326 +msgid "System language" +msgstr "Язык системы" -#: ../../mod/connect.php:87 -msgid "" -"Please enter your restrictions or conditions, such as paypal receipt, usage " -"guidelines, etc." -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:327 +msgid "System theme" +msgstr "Системная тема" -#: ../../mod/connect.php:89 ../../mod/connect.php:109 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "" -"This channel may require additional steps or acknowledgement of the " -"following conditions prior to connecting:" -msgstr "" +"Default system theme - may be over-ridden by user profiles - change theme settings" +msgstr "Системная тема по умолчанию - может быть изменена в профиле пользователя - изменить параметры темы." -#: ../../mod/connect.php:90 -msgid "" -"Potential connections will then see the following text before proceeding:" -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:330 +msgid "Allow Feeds as Connections" +msgstr "Разрешить ленты новостей как контакты" -#: ../../mod/connect.php:91 ../../mod/connect.php:112 -msgid "" -"By continuing, I certify that I have complied with any instructions provided" -" on this page." -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:330 +msgid "(Heavy system resource usage)" +msgstr "(Высокое использование системных ресурсов)" -#: ../../mod/connect.php:100 -msgid "(No specific instructions have been provided by the channel owner.)" -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:331 +msgid "Maximum image size" +msgstr "Максимальный размер изображения" -#: ../../mod/connect.php:108 -msgid "Restricted or Premium Channel" -msgstr "Ограниченный или Премиум канал" +#: ../../Zotlabs/Module/Admin/Site.php:331 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." +msgstr "Максимальный размер загруженных изображений в байтах. По умолчанию 0 или без ограничений." -#: ../../mod/network.php:79 -msgid "No such group" -msgstr "Нет такой группы" +#: ../../Zotlabs/Module/Admin/Site.php:332 +msgid "Does this site allow new member registration?" +msgstr "Разрешается ли регистрация новых пользователей на этом сайте?" -#: ../../mod/network.php:118 -msgid "Search Results For:" -msgstr "Результаты поиска для:" +#: ../../Zotlabs/Module/Admin/Site.php:333 +msgid "Invitation only" +msgstr "Только по приглашениям" -#: ../../mod/network.php:172 -msgid "Collection is empty" -msgstr "Коллекция пуста" +#: ../../Zotlabs/Module/Admin/Site.php:333 +msgid "" +"Only allow new member registrations with an invitation code. Above register " +"policy must be set to Yes." +msgstr "" +"Регистрация пользователей разрешается только по приглашениям. Вышеуказанная " +"политика регистрация должны быть установлена в \"Да\"." -#: ../../mod/network.php:180 -msgid "Collection: " -msgstr "Коллекции: " +#: ../../Zotlabs/Module/Admin/Site.php:334 +msgid "Minimum age" +msgstr "Минимальный возраст" -#: ../../mod/network.php:193 -msgid "Connection: " -msgstr "Контакты: " +#: ../../Zotlabs/Module/Admin/Site.php:334 +msgid "Minimum age (in years) for who may register on this site." +msgstr "Минимальный возраст (в годах) для регистрации на этом сайте." -#: ../../mod/network.php:196 -msgid "Invalid connection." -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:335 +msgid "Which best describes the types of account offered by this hub?" +msgstr "Как лучше описать тип учётных записей предлагаемых на этом хабе?" -#: ../../mod/connections.php:37 ../../mod/connedit.php:64 -msgid "Could not access contact record." -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:336 +msgid "Register text" +msgstr "Текст регистрации" -#: ../../mod/connections.php:51 ../../mod/connedit.php:78 -msgid "Could not locate selected profile." -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:336 +msgid "Will be displayed prominently on the registration page." +msgstr "Будет отображаться на странице регистрации на видном месте." -#: ../../mod/connections.php:94 ../../mod/connedit.php:131 -msgid "Connection updated." -msgstr "Связи обновленны." +#: ../../Zotlabs/Module/Admin/Site.php:338 +msgid "Site homepage to show visitors (default: login box)" +msgstr "Домашняя страница, которая будет показываться посетителям сайт (по умочанию - форма входа)." -#: ../../mod/connections.php:96 ../../mod/connedit.php:133 -msgid "Failed to update connection record." -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:338 +msgid "" +"example: 'public' to show public stream, 'page/sys/home' to show a system " +"webpage called 'home' or 'include:home.html' to include a file." +msgstr "например: 'public' для показа публичного потока, 'page/sys/home' показывает системную страницу home или 'include:home.html' для подключения файла." -#: ../../mod/connections.php:191 ../../mod/connections.php:292 -msgid "Blocked" -msgstr "Заблокированные" +#: ../../Zotlabs/Module/Admin/Site.php:339 +msgid "Preserve site homepage URL" +msgstr "Сохранить URL главной страницы сайта" -#: ../../mod/connections.php:196 ../../mod/connections.php:299 -msgid "Ignored" -msgstr "Игнорируемые" +#: ../../Zotlabs/Module/Admin/Site.php:339 +msgid "" +"Present the site homepage in a frame at the original location instead of " +"redirecting" +msgstr "Показывать домашнюю страницу сайта во фрейме вместо стандартной переадресации" -#: ../../mod/connections.php:201 ../../mod/connections.php:313 -msgid "Hidden" -msgstr "Скрытые" +#: ../../Zotlabs/Module/Admin/Site.php:340 +msgid "Accounts abandoned after x days" +msgstr "Аккаунты считаются заброшенными после N дней" -#: ../../mod/connections.php:206 ../../mod/connections.php:306 -msgid "Archived" -msgstr "Зархивированные" +#: ../../Zotlabs/Module/Admin/Site.php:340 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "Системные ресурсы не будут расходоваться для опроса внешних сайтов для заброшенных аккаунтов. Введите 0 для отсутствия ограничений." -#: ../../mod/connections.php:230 ../../mod/connections.php:245 -msgid "All" -msgstr "Все" +#: ../../Zotlabs/Module/Admin/Site.php:341 +msgid "Allowed friend domains" +msgstr "Разрешенные домены друзей" -#: ../../mod/connections.php:240 ../../mod/connections.php:320 -msgid "Unconnected" -msgstr "Неприсоединенные" +#: ../../Zotlabs/Module/Admin/Site.php:341 +msgid "" +"Comma separated list of domains which are allowed to establish friendships " +"with this site. Wildcards are accepted. Empty to allow any domains" +msgstr "Список разделённых запятыми доменов с которыми разрешено устанавливать дружеские отношения на этом сайте. Wildcards разрешены. Пусто означает разрешены любые домены." -#: ../../mod/connections.php:270 -msgid "Suggest new connections" -msgstr "Предлагать новые контакты" +#: ../../Zotlabs/Module/Admin/Site.php:342 +msgid "Verify Email Addresses" +msgstr "Проверка адреса электронной почты" -#: ../../mod/connections.php:273 -msgid "New Connections" -msgstr "Новые контакты" +#: ../../Zotlabs/Module/Admin/Site.php:342 +msgid "" +"Check to verify email addresses used in account registration (recommended)." +msgstr "Включите для проверки адреса электронной почты использованного при регистрации (рекомендуется)." -#: ../../mod/connections.php:276 -msgid "Show pending (new) connections" -msgstr "Просмотр (новых) ждущих контактов" +#: ../../Zotlabs/Module/Admin/Site.php:343 +msgid "Force publish" +msgstr "Принудительно публиковать" -#: ../../mod/connections.php:282 -msgid "Show all connections" -msgstr "Просмотр всех контактов" +#: ../../Zotlabs/Module/Admin/Site.php:343 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "Включите для принудительного включения всех учётных записей на данном сайте в каталог." -#: ../../mod/connections.php:285 -msgid "Unblocked" -msgstr "Разрешенные" +#: ../../Zotlabs/Module/Admin/Site.php:344 +msgid "Import Public Streams" +msgstr "Импортированные публичные потоки" -#: ../../mod/connections.php:288 -msgid "Only show unblocked connections" -msgstr "Показать только разрешенные контакты" +#: ../../Zotlabs/Module/Admin/Site.php:344 +msgid "" +"Import and allow access to public content pulled from other sites. Warning: " +"this content is unmoderated." +msgstr "Импортировать и разрешить публичный доступ к загружаемым с других сайтов потоков. Внимание - этот контент не может модерироваться." -#: ../../mod/connections.php:295 -msgid "Only show blocked connections" -msgstr "Показать только заблокированные контакты" +#: ../../Zotlabs/Module/Admin/Site.php:345 +msgid "Site only Public Streams" +msgstr "Публичные потоки только с сайта" -#: ../../mod/connections.php:302 -msgid "Only show ignored connections" -msgstr "Показать только проигнорированные контакты" +#: ../../Zotlabs/Module/Admin/Site.php:345 +msgid "" +"Allow access to public content originating only from this site if Imported " +"Public Streams are disabled." +msgstr "Разрешить доступ к общедоступному контенту, исходящему только с этого сайта, если импортированные публичные потоки отключены." -#: ../../mod/connections.php:309 -msgid "Only show archived connections" -msgstr "Показать только архивированные контакты" +#: ../../Zotlabs/Module/Admin/Site.php:346 +msgid "Allow anybody on the internet to access the Public streams" +msgstr "Разрешить всем доступ к публичным потокам" -#: ../../mod/connections.php:316 -msgid "Only show hidden connections" -msgstr "Показать только скрытые контакты" +#: ../../Zotlabs/Module/Admin/Site.php:346 +msgid "" +"Disable to require authentication before viewing. Warning: this content is " +"unmoderated." +msgstr "Отключите если для просмотра требуется аутентификация. Внимание - этот контент не может модерироваться." -#: ../../mod/connections.php:323 -msgid "Only show one-way connections" -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:347 +msgid "Only import Public stream posts with this text" +msgstr "Импортировать только публичные потоки с этим текстом" -#: ../../mod/connections.php:368 -#, php-format -msgid "%1$s [%2$s]" -msgstr "%1$s [%2$s]" +#: ../../Zotlabs/Module/Admin/Site.php:348 +msgid "Do not import Public stream posts with this text" +msgstr "Не импортировать публичные потоки с этим текстом" -#: ../../mod/connections.php:369 -msgid "Edit contact" -msgstr "Редактировать контакт" +#: ../../Zotlabs/Module/Admin/Site.php:351 +msgid "Login on Homepage" +msgstr "Вход на домашней странице" -#: ../../mod/connections.php:390 -msgid "Search your connections" -msgstr "Поиск ваших связей" +#: ../../Zotlabs/Module/Admin/Site.php:351 +msgid "" +"Present a login box to visitors on the home page if no other content has " +"been configured." +msgstr "Предоставлять форму входа для посетителей на домашней странице если другого содержимого не настроено." -#: ../../mod/connections.php:391 -msgid "Finding: " -msgstr "Поиск:" +#: ../../Zotlabs/Module/Admin/Site.php:352 +msgid "Enable context help" +msgstr "Включить контекстную помощь" -#: ../../mod/rpost.php:97 ../../mod/editpost.php:42 -msgid "Edit post" -msgstr "Редактировать сообщение" +#: ../../Zotlabs/Module/Admin/Site.php:352 +msgid "" +"Display contextual help for the current page when the help button is pressed." +msgstr "Показывать контекстную помощь для текущей странице при нажатии на кнопку \"Помощь\"." -#: ../../mod/connedit.php:243 -msgid "Could not access address book record." -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:354 +msgid "Reply-to email address for system generated email." +msgstr "Адрес email Reply-to для генерируемых системой сообщений." -#: ../../mod/connedit.php:257 -msgid "Refresh failed - channel is currently unavailable." -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:355 +msgid "Sender (From) email address for system generated email." +msgstr "Адрес email отправителя (From) для генерируемых системой сообщений." -#: ../../mod/connedit.php:264 -msgid "Channel has been unblocked" -msgstr "Канал разблокирован" +#: ../../Zotlabs/Module/Admin/Site.php:356 +msgid "Name of email sender for system generated email." +msgstr "Имя отправителя для генерируемых системой сообщений." -#: ../../mod/connedit.php:265 -msgid "Channel has been blocked" -msgstr "Канал заблокирован" +#: ../../Zotlabs/Module/Admin/Site.php:358 +msgid "Directory Server URL" +msgstr "URL сервера каталогов" -#: ../../mod/connedit.php:269 ../../mod/connedit.php:281 -#: ../../mod/connedit.php:293 ../../mod/connedit.php:305 -#: ../../mod/connedit.php:320 -msgid "Unable to set address book parameters." -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:358 +msgid "Default directory server" +msgstr "Сервер каталогов по умолчанию" -#: ../../mod/connedit.php:276 -msgid "Channel has been unignored" -msgstr "Канал не проигнорирован" +#: ../../Zotlabs/Module/Admin/Site.php:360 +msgid "Proxy user" +msgstr "Имя пользователя proxy-сервера" -#: ../../mod/connedit.php:277 -msgid "Channel has been ignored" -msgstr "Канал проигнорирован" +#: ../../Zotlabs/Module/Admin/Site.php:361 +msgid "Proxy URL" +msgstr "URL proxy-сервера" -#: ../../mod/connedit.php:288 -msgid "Channel has been unarchived" -msgstr "Канал разархивирован" +#: ../../Zotlabs/Module/Admin/Site.php:362 +msgid "Network timeout" +msgstr "Время ожидания сети" -#: ../../mod/connedit.php:289 -msgid "Channel has been archived" -msgstr "Канал заархивирован" +#: ../../Zotlabs/Module/Admin/Site.php:362 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "Значение в секундах. Если установлен в 0 - без ограничений (не рекомендуется)." -#: ../../mod/connedit.php:300 -msgid "Channel has been unhidden" -msgstr "Канал открыт" +#: ../../Zotlabs/Module/Admin/Site.php:363 +msgid "Delivery interval" +msgstr "Интервал доставки" -#: ../../mod/connedit.php:301 -msgid "Channel has been hidden" -msgstr "Канал скрыт" +#: ../../Zotlabs/Module/Admin/Site.php:363 +msgid "" +"Delay background delivery processes by this many seconds to reduce system " +"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " +"for large dedicated servers." +msgstr "Значение задержки фоновых процессов доставки в секундах для снижения нагрузки на систему. Рекомендуется 4-5 для серверов совместного использования, 2-3 для частных виртуальных и 0-1 для выделенных серверов." -#: ../../mod/connedit.php:315 -msgid "Channel has been approved" -msgstr "Канал одобрен" +#: ../../Zotlabs/Module/Admin/Site.php:364 +msgid "Deliveries per process" +msgstr "Доставок на процесс" -#: ../../mod/connedit.php:316 -msgid "Channel has been unapproved" -msgstr "Канал не одобрен" +#: ../../Zotlabs/Module/Admin/Site.php:364 +msgid "" +"Number of deliveries to attempt in a single operating system process. Adjust " +"if necessary to tune system performance. Recommend: 1-5." +msgstr "Количество доставок для одного процесса. Настройте в соответствии с производительностью системы. Рекомендуется 1-5." -#: ../../mod/connedit.php:334 -msgid "Connection has been removed." -msgstr "Соединение было удалено." +#: ../../Zotlabs/Module/Admin/Site.php:365 +msgid "Queue Threshold" +msgstr "Порог очереди" -#: ../../mod/connedit.php:354 -#, php-format -msgid "View %s's profile" -msgstr "Просмотр %s's профиля" +#: ../../Zotlabs/Module/Admin/Site.php:365 +msgid "" +"Always defer immediate delivery if queue contains more than this number of " +"entries." +msgstr "Всегда откладывать немедленную доставку, если в очереди содержится большее количество записей, чем это." -#: ../../mod/connedit.php:358 -msgid "Refresh Permissions" -msgstr "Обновить разрешения" +#: ../../Zotlabs/Module/Admin/Site.php:366 +msgid "Poll interval" +msgstr "Интервал опроса" -#: ../../mod/connedit.php:361 -msgid "Fetch updated permissions" -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:366 +msgid "" +"Delay background polling processes by this many seconds to reduce system " +"load. If 0, use delivery interval." +msgstr "Задержка фоновых процессов опроса на указанное количество секунд для снижения нагрузки на систему. Если 0 - использовать интервал доставки." -#: ../../mod/connedit.php:365 -msgid "Recent Activity" -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:367 +msgid "Path to ImageMagick convert program" +msgstr "Путь к ImageMagick" -#: ../../mod/connedit.php:368 -msgid "View recent posts and comments" -msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:367 +msgid "" +"If set, use this program to generate photo thumbnails for huge images ( > " +"4000 pixels in either dimension), otherwise memory exhaustion may occur. " +"Example: /usr/bin/convert" +msgstr "При установке эта программа генерирует миниатюры изображений для больших файлов (свыше 4000 в любом измерении) для предотвращения утечки памяти. Пример: /usr/bin/convert" -#: ../../mod/connedit.php:372 ../../mod/connedit.php:515 -#: ../../mod/admin.php:760 -msgid "Unblock" -msgstr "Разрешить" +#: ../../Zotlabs/Module/Admin/Site.php:368 +msgid "Allow SVG thumbnails in file browser" +msgstr "Разрешить SVG миниатюры в просмотрщике файлов" -#: ../../mod/connedit.php:372 ../../mod/connedit.php:515 -#: ../../mod/admin.php:759 -msgid "Block" -msgstr "Заблокировать" +#: ../../Zotlabs/Module/Admin/Site.php:368 +msgid "WARNING: SVG images may contain malicious code." +msgstr "Внимание: изображения SVG могут содержать вредоносный код." -#: ../../mod/connedit.php:375 -msgid "Block or Unblock this connection" -msgstr "Запретить или разрешить этот канал" +#: ../../Zotlabs/Module/Admin/Site.php:369 +msgid "Maximum Load Average" +msgstr "Максимальная средняя нагрузка" -#: ../../mod/connedit.php:379 ../../mod/connedit.php:516 -msgid "Unignore" -msgstr "Не игнорировать" +#: ../../Zotlabs/Module/Admin/Site.php:369 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "Максимальная нагрузка системы для откладывания процессов опроса и доставки - по умолчанию 50." -#: ../../mod/connedit.php:379 ../../mod/connedit.php:516 -#: ../../mod/notifications.php:51 -msgid "Ignore" -msgstr "Игнорировать" +#: ../../Zotlabs/Module/Admin/Site.php:370 +msgid "Expiration period in days for imported (grid/network) content" +msgstr "Срок хранения в днях для импортированного содержимого (из матрицы / сети)." -#: ../../mod/connedit.php:382 -msgid "Ignore or Unignore this connection" -msgstr "Игнорировать или не игнорировать этот канал" +#: ../../Zotlabs/Module/Admin/Site.php:370 +msgid "0 for no expiration of imported content" +msgstr "0 для постоянного хранения импортированного содержимого" -#: ../../mod/connedit.php:385 -msgid "Unarchive" -msgstr "Разархивировать" +#: ../../Zotlabs/Module/Admin/Site.php:371 +msgid "" +"Do not expire any posts which have comments less than this many days ago" +msgstr "Продлевать строк хранения для любых публикаций, которые имею комментарии возрастом менее этого значения" -#: ../../mod/connedit.php:385 -msgid "Archive" -msgstr "Заархивировать" +#: ../../Zotlabs/Module/Admin/Site.php:373 +msgid "" +"Public servers: Optional landing (marketing) webpage for new registrants" +msgstr "Публичные серверы: необязательная маркетинговая лэндинг-страница для новых пользователей" -#: ../../mod/connedit.php:388 -msgid "Archive or Unarchive this connection" -msgstr " Заархивировать или разархивировать этот канал" +#: ../../Zotlabs/Module/Admin/Site.php:373 +#, php-format +msgid "Create this page first. Default is %s/register" +msgstr "Создать эту страницу первой. По умолчанию %s/register" -#: ../../mod/connedit.php:391 -msgid "Unhide" -msgstr "Показать" +#: ../../Zotlabs/Module/Admin/Site.php:374 +msgid "Page to display after creating a new channel" +msgstr "Страница для показа после создания нового канала" -#: ../../mod/connedit.php:391 -msgid "Hide" -msgstr "Скрыть" +#: ../../Zotlabs/Module/Admin/Site.php:374 +msgid "Default: profiles" +msgstr "По умолчанию: профили" -#: ../../mod/connedit.php:394 -msgid "Hide or Unhide this connection" -msgstr "Скрыть или показывать этот канал" +#: ../../Zotlabs/Module/Admin/Site.php:376 +msgid "Optional: site location" +msgstr "Необязательно: место размещения сайта" -#: ../../mod/connedit.php:401 -msgid "Delete this connection" -msgstr "Удалить этот контакт" +#: ../../Zotlabs/Module/Admin/Site.php:376 +msgid "Region or country" +msgstr "Регион или страна" -#: ../../mod/connedit.php:444 ../../mod/connedit.php:473 -msgid "Approve this connection" -msgstr "Утвердить этот контакт" +#: ../../Zotlabs/Module/Admin/Logs.php:28 +msgid "Log settings updated." +msgstr "Настройки журнала обновлены." -#: ../../mod/connedit.php:444 -msgid "Accept connection to allow communication" -msgstr "" +#: ../../Zotlabs/Module/Admin/Logs.php:85 +msgid "Clear" +msgstr "Очистить" -#: ../../mod/connedit.php:460 -msgid "Automatic Permissions Settings" -msgstr "Настройки автоматических разрешений" +#: ../../Zotlabs/Module/Admin/Logs.php:91 +msgid "Debugging" +msgstr "Отладка" -#: ../../mod/connedit.php:460 -#, php-format -msgid "Connections: settings for %s" -msgstr "" +#: ../../Zotlabs/Module/Admin/Logs.php:92 +msgid "Log file" +msgstr "Файл журнала" -#: ../../mod/connedit.php:464 +#: ../../Zotlabs/Module/Admin/Logs.php:92 msgid "" -"When receiving a channel introduction, any permissions provided here will be" -" applied to the new connection automatically and the introduction approved. " -"Leave this page if you do not wish to use this feature." -msgstr "" +"Must be writable by web server. Relative to your top-level webserver " +"directory." +msgstr "Должен быть доступен для записи веб-сервером. Пусть относителен основного каталога веб-сайта." -#: ../../mod/connedit.php:466 -msgid "Slide to adjust your degree of friendship" -msgstr "" +#: ../../Zotlabs/Module/Admin/Logs.php:93 +msgid "Log level" +msgstr "Уровень журнала" -#: ../../mod/connedit.php:472 -msgid "inherited" -msgstr "унаследованный" +#: ../../Zotlabs/Module/Admin/Accounts.php:37 +#, php-format +msgid "%s account blocked/unblocked" +msgid_plural "%s account blocked/unblocked" +msgstr[0] "" +msgstr[1] "" -#: ../../mod/connedit.php:474 -msgid "Connection has no individual permissions!" -msgstr "" +#: ../../Zotlabs/Module/Admin/Accounts.php:44 +#, php-format +msgid "%s account deleted" +msgid_plural "%s accounts deleted" +msgstr[0] "" +msgstr[1] "" -#: ../../mod/connedit.php:475 -msgid "" -"This may be appropriate based on your privacy " -"settings, though you may wish to review the \"Advanced Permissions\"." -msgstr "" +#: ../../Zotlabs/Module/Admin/Accounts.php:80 +msgid "Account not found" +msgstr "Аккаунт не найден" -#: ../../mod/connedit.php:477 -msgid "Profile Visibility" -msgstr "Видимость профиля" +#: ../../Zotlabs/Module/Admin/Accounts.php:99 +#, php-format +msgid "Account '%s' blocked" +msgstr "Аккаунт '%s' заблокирован" -#: ../../mod/connedit.php:478 +#: ../../Zotlabs/Module/Admin/Accounts.php:107 #, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "" +msgid "Account '%s' unblocked" +msgstr "Аккаунт '%s' разблокирован" -#: ../../mod/connedit.php:479 -msgid "Contact Information / Notes" -msgstr "Информация / Примечания о канале" +#: ../../Zotlabs/Module/Admin/Accounts.php:169 +#: ../../Zotlabs/Module/Admin/Channels.php:148 +msgid "select all" +msgstr "выбрать все" -#: ../../mod/connedit.php:480 -msgid "Edit contact notes" -msgstr "Редактировать примечания канала" +#: ../../Zotlabs/Module/Admin/Accounts.php:170 +msgid "Registrations waiting for confirm" +msgstr "Регистрации ждут подтверждения" -#: ../../mod/connedit.php:482 -msgid "Their Settings" -msgstr "Их настройки" +#: ../../Zotlabs/Module/Admin/Accounts.php:171 +msgid "Request date" +msgstr "Дата запроса" -#: ../../mod/connedit.php:483 -msgid "My Settings" -msgstr "Мои настройки" +#: ../../Zotlabs/Module/Admin/Accounts.php:172 +msgid "No registrations." +msgstr "Нет новых регистраций." -#: ../../mod/connedit.php:485 -msgid "Clear/Disable Automatic Permissions" +#: ../../Zotlabs/Module/Admin/Accounts.php:182 +msgid "ID" msgstr "" -#: ../../mod/connedit.php:486 -msgid "Forum Members" -msgstr "Участники форума" +#: ../../Zotlabs/Module/Admin/Accounts.php:184 +msgid "All Channels" +msgstr "Все каналы" -#: ../../mod/connedit.php:487 -msgid "Soapbox" -msgstr "Soapbox" +#: ../../Zotlabs/Module/Admin/Accounts.php:185 +msgid "Register date" +msgstr "Дата регистрации" -#: ../../mod/connedit.php:488 -msgid "Full Sharing (typical social network permissions)" -msgstr "" +#: ../../Zotlabs/Module/Admin/Accounts.php:186 +msgid "Last login" +msgstr "Последний вход" -#: ../../mod/connedit.php:489 -msgid "Cautious Sharing " -msgstr "" +#: ../../Zotlabs/Module/Admin/Accounts.php:187 +msgid "Expires" +msgstr "Срок действия" -#: ../../mod/connedit.php:490 -msgid "Follow Only" -msgstr "Только следовать" +#: ../../Zotlabs/Module/Admin/Accounts.php:188 +msgid "Service Class" +msgstr "Класс обслуживания" -#: ../../mod/connedit.php:491 -msgid "Individual Permissions" -msgstr "Индивидуальные разрешения" +#: ../../Zotlabs/Module/Admin/Accounts.php:190 +msgid "" +"Selected accounts will be deleted!\\n\\nEverything these accounts had posted " +"on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" +"Выбранные учётные записи будут удалены!\\n\\nВсё что было ими опубликовано " +"на этом сайте будет удалено навсегда!\\n\\nВы уверены?" -#: ../../mod/connedit.php:492 +#: ../../Zotlabs/Module/Admin/Accounts.php:191 msgid "" -"Some permissions may be inherited from your channel privacy settings, which have higher priority than " -"individual settings. Changing those inherited settings on this page will " -"have no effect." +"The account {0} will be deleted!\\n\\nEverything this account has posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" +"Этот аккаунт {0} будет удалён!\\n\\nВсё что им было опубликовано на этом " +"сайте будет удалено навсегда!\\n\\nВы уверены?" -#: ../../mod/connedit.php:493 -msgid "Advanced Permissions" -msgstr "Дополнительные разрешения" +#: ../../Zotlabs/Module/Admin/Security.php:83 +msgid "" +"By default, unfiltered HTML is allowed in embedded media. This is inherently " +"insecure." +msgstr "По умолчанию, HTML без фильтрации доступен во встраиваемых медиа. Это небезопасно." -#: ../../mod/connedit.php:494 -msgid "Simple Permissions (select one and submit)" -msgstr "" +#: ../../Zotlabs/Module/Admin/Security.php:86 +msgid "" +"The recommended setting is to only allow unfiltered HTML from the following " +"sites:" +msgstr "Рекомендуется настроить разрешения использовать HTML без фильтрации только для следующих сайтов:" -#: ../../mod/connedit.php:498 -#, php-format -msgid "Visit %s's profile - %s" -msgstr "Посетить %s's ​​профиль - %s" +#: ../../Zotlabs/Module/Admin/Security.php:87 +msgid "" +"https://youtube.com/
      https://www.youtube.com/
      https://youtu.be/" +"
      https://vimeo.com/
      https://soundcloud.com/
      " +msgstr "" -#: ../../mod/connedit.php:499 -msgid "Block/Unblock contact" -msgstr "Запретить/разрешить контакт" +#: ../../Zotlabs/Module/Admin/Security.php:88 +msgid "" +"All other embedded content will be filtered, unless " +"embedded content from that site is explicitly blocked." +msgstr "се остальные встроенные материалы будут отфильтрованы, если встроенное содержимое с этого сайта явно заблокировано." -#: ../../mod/connedit.php:500 -msgid "Ignore contact" -msgstr "Игнорировать контакт" +#: ../../Zotlabs/Module/Admin/Security.php:95 +msgid "Block public" +msgstr "Блокировать публичный доступ" -#: ../../mod/connedit.php:501 -msgid "Repair URL settings" -msgstr "Ремонт настройки URL" +#: ../../Zotlabs/Module/Admin/Security.php:95 +msgid "" +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently authenticated." +msgstr "Установите флажок для блокировки публичного доступа ко всем другим общедоступным страницам на этом сайте, если вы в настоящее время не аутентифицированы." -#: ../../mod/connedit.php:502 -msgid "View conversations" -msgstr "Просмотр разговоров" +#: ../../Zotlabs/Module/Admin/Security.php:96 +msgid "Provide a cloud root directory" +msgstr "Предоставить корневой каталог в облаке" -#: ../../mod/connedit.php:504 -msgid "Delete contact" -msgstr "Удалить контакт" +#: ../../Zotlabs/Module/Admin/Security.php:96 +msgid "" +"The cloud root directory lists all channel names which provide public files" +msgstr "" +"В корневом каталоге облака показываются все имена каналов, которые предоставляют общедоступные файлы" -#: ../../mod/connedit.php:507 -msgid "Last update:" -msgstr "Последнее обновление:" +#: ../../Zotlabs/Module/Admin/Security.php:97 +msgid "Show total disk space available to cloud uploads" +msgstr "Показывать общее доступное для загрузок место в хранилище" -#: ../../mod/connedit.php:509 -msgid "Update public posts" -msgstr "Обновить публичные сообщения" +#: ../../Zotlabs/Module/Admin/Security.php:98 +msgid "Set \"Transport Security\" HTTP header" +msgstr "Установить HTTP-заголовок \"Transport Security\"" -#: ../../mod/connedit.php:511 -msgid "Update now" -msgstr "Обновить сейчас" +#: ../../Zotlabs/Module/Admin/Security.php:99 +msgid "Set \"Content Security Policy\" HTTP header" +msgstr "Установить HTTP-заголовок \"Content Security Policy\"" -#: ../../mod/connedit.php:517 -msgid "Currently blocked" -msgstr "В настоящее время заблокирован" +#: ../../Zotlabs/Module/Admin/Security.php:100 +msgid "Allowed email domains" +msgstr "Разрешённые домены email" -#: ../../mod/connedit.php:518 -msgid "Currently ignored" -msgstr "В настоящее время игнорируются" +#: ../../Zotlabs/Module/Admin/Security.php:100 +msgid "" +"Comma separated list of domains which are allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains" +msgstr "Список разделённых запятыми доменов для которых разрешена регистрация " +"на этом сайте. Wildcards разрешены. Если пусто то разрешены любые домены." -#: ../../mod/connedit.php:519 -msgid "Currently archived" -msgstr "В настоящее время зархивированны" +#: ../../Zotlabs/Module/Admin/Security.php:101 +msgid "Not allowed email domains" +msgstr "Запрещённые домены email" -#: ../../mod/connedit.php:520 -msgid "Currently pending" -msgstr "В настоящее время в ожидании" +#: ../../Zotlabs/Module/Admin/Security.php:101 +msgid "" +"Comma separated list of domains which are not allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains, unless allowed domains have been defined." +msgstr "Список разделённых запятыми доменов для которых запрещена регистрация на этом сайте. " +"Wildcards разрешены. Если пусто то разрешены любые домены до тех пор, пока разрешённые " +"домены не будут указаны." -#: ../../mod/connedit.php:521 -msgid "Hide this contact from others" -msgstr "Скрыть этот канал от других" +#: ../../Zotlabs/Module/Admin/Security.php:102 +msgid "Allow communications only from these sites" +msgstr "Разрешить связь только с этими сайтами" -#: ../../mod/connedit.php:521 +#: ../../Zotlabs/Module/Admin/Security.php:102 msgid "" -"Replies/likes to your public posts may still be visible" -msgstr "" +"One site per line. Leave empty to allow communication from anywhere by " +"default" +msgstr "Один сайт на строку. Оставьте пустым для разрешения взаимодействия без ограничений (по умочанию)." -#: ../../mod/delegate.php:95 -msgid "No potential page delegates located." -msgstr "" +#: ../../Zotlabs/Module/Admin/Security.php:103 +msgid "Block communications from these sites" +msgstr "Блокировать связь с этими сайтами" -#: ../../mod/delegate.php:121 -msgid "Delegate Page Management" -msgstr "" +#: ../../Zotlabs/Module/Admin/Security.php:104 +msgid "Allow communications only from these channels" +msgstr "Разрешить связь только для этих каналов" -#: ../../mod/delegate.php:123 +#: ../../Zotlabs/Module/Admin/Security.php:104 msgid "" -"Delegates are able to manage all aspects of this account/page except for " -"basic account settings. Please do not delegate your personal account to " -"anybody that you do not trust completely." -msgstr "" +"One channel (hash) per line. Leave empty to allow from any channel by default" +msgstr "Один канал (или его хэш) на строку. Оставьте пустым для разрешения взаимодействия с любым каналом (по умолчанию)." -#: ../../mod/delegate.php:124 -msgid "Existing Page Managers" -msgstr "" +#: ../../Zotlabs/Module/Admin/Security.php:105 +msgid "Block communications from these channels" +msgstr "Блокировать связь с этими каналами" -#: ../../mod/delegate.php:126 -msgid "Existing Page Delegates" -msgstr "" +#: ../../Zotlabs/Module/Admin/Security.php:106 +msgid "Only allow embeds from secure (SSL) websites and links." +msgstr "Разрешать встраивание только для безопасных (SSL/TLS) сайтов и ссылок." -#: ../../mod/delegate.php:128 -msgid "Potential Delegates" -msgstr "" +#: ../../Zotlabs/Module/Admin/Security.php:107 +msgid "Allow unfiltered embedded HTML content only from these domains" +msgstr "Разрешить встраивать нефильтруемое HTML-содержимое только для этих доменов" -#: ../../mod/delegate.php:130 ../../mod/photos.php:906 ../../mod/tagrm.php:93 -msgid "Remove" -msgstr "Удалить" +#: ../../Zotlabs/Module/Admin/Security.php:107 +msgid "One site per line. By default embedded content is filtered." +msgstr "Один сайт на строку. По умолчанию встраиваемое содержимое фильтруется." -#: ../../mod/delegate.php:131 -msgid "Add" -msgstr "Добавить" +#: ../../Zotlabs/Module/Admin/Security.php:108 +msgid "Block embedded HTML from these domains" +msgstr "Блокировать встраивание HTML-содержимого для этих доменов" -#: ../../mod/delegate.php:132 -msgid "No entries." -msgstr "Нет записей." +#: ../../Zotlabs/Module/Admin/Dbsync.php:19 +msgid "Update has been marked successful" +msgstr "Обновление было помечено как успешное" -#: ../../mod/search.php:13 ../../mod/directory.php:15 -#: ../../mod/dirprofile.php:9 ../../mod/display.php:9 ../../mod/photos.php:443 -#: ../../mod/viewconnections.php:17 -msgid "Public access denied." -msgstr "Общественный доступ запрещен." +#: ../../Zotlabs/Module/Admin/Dbsync.php:31 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "Выполнение %s неудачно. Проверьте системный журнал." -#: ../../mod/directory.php:146 ../../mod/dirprofile.php:95 -msgid "Gender: " -msgstr "Пол:" +#: ../../Zotlabs/Module/Admin/Dbsync.php:34 +#, php-format +msgid "Update %s was successfully applied." +msgstr "Обновление %sбыло успешно применено." -#: ../../mod/directory.php:207 -msgid "Finding:" -msgstr "Поиск:" +#: ../../Zotlabs/Module/Admin/Dbsync.php:38 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "Обновление %s не вернуло статус. Неизвестно было ли оно успешным." -#: ../../mod/directory.php:215 -msgid "next page" -msgstr "следующая страница" +#: ../../Zotlabs/Module/Admin/Dbsync.php:41 +#, php-format +msgid "Update function %s could not be found." +msgstr "Функция обновления %sне может быть найдена." -#: ../../mod/directory.php:215 -msgid "previous page" -msgstr "предыдущая страница" +#: ../../Zotlabs/Module/Admin/Dbsync.php:59 +msgid "Failed Updates" +msgstr "Обновления с ошибками" -#: ../../mod/directory.php:222 -msgid "No entries (some entries may be hidden)." -msgstr "" +#: ../../Zotlabs/Module/Admin/Dbsync.php:61 +msgid "Mark success (if update was manually applied)" +msgstr "Пометить успешным (если обновление было применено вручную)" -#: ../../mod/dirprofile.php:108 -msgid "Status: " -msgstr "Статус:" +#: ../../Zotlabs/Module/Admin/Dbsync.php:62 +msgid "Attempt to execute this update step automatically" +msgstr "Попытаться применить это обновление автоматически" -#: ../../mod/dirprofile.php:109 -msgid "Sexual Preference: " -msgstr "Сексуальная ориентация:" +#: ../../Zotlabs/Module/Admin/Dbsync.php:67 +msgid "No failed updates." +msgstr "Ошибок обновлений нет." -#: ../../mod/dirprofile.php:111 -msgid "Homepage: " -msgstr "Домашняя страница:" +#: ../../Zotlabs/Module/Admin/Profs.php:89 +msgid "New Profile Field" +msgstr "Поле нового профиля" + +#: ../../Zotlabs/Module/Admin/Profs.php:90 +#: ../../Zotlabs/Module/Admin/Profs.php:110 +msgid "Field nickname" +msgstr "Псевдоним поля" + +#: ../../Zotlabs/Module/Admin/Profs.php:90 +#: ../../Zotlabs/Module/Admin/Profs.php:110 +msgid "System name of field" +msgstr "Системное имя поля" + +#: ../../Zotlabs/Module/Admin/Profs.php:91 +#: ../../Zotlabs/Module/Admin/Profs.php:111 +msgid "Input type" +msgstr "Тип ввода" + +#: ../../Zotlabs/Module/Admin/Profs.php:92 +#: ../../Zotlabs/Module/Admin/Profs.php:112 +msgid "Field Name" +msgstr "Имя поля" + +#: ../../Zotlabs/Module/Admin/Profs.php:92 +#: ../../Zotlabs/Module/Admin/Profs.php:112 +msgid "Label on profile pages" +msgstr "Метка на странице профиля" + +#: ../../Zotlabs/Module/Admin/Profs.php:93 +#: ../../Zotlabs/Module/Admin/Profs.php:113 +msgid "Help text" +msgstr "Текст подсказки" + +#: ../../Zotlabs/Module/Admin/Profs.php:93 +#: ../../Zotlabs/Module/Admin/Profs.php:113 +msgid "Additional info (optional)" +msgstr "Дополнительная информация (необязательно)" + +#: ../../Zotlabs/Module/Admin/Profs.php:103 +msgid "Field definition not found" +msgstr "Определения поля не найдено" + +#: ../../Zotlabs/Module/Admin/Profs.php:109 +msgid "Edit Profile Field" +msgstr "Редактировать поле профиля" + +#: ../../Zotlabs/Module/Admin/Profs.php:169 +msgid "Basic Profile Fields" +msgstr "Основные поля профиля" + +#: ../../Zotlabs/Module/Admin/Profs.php:170 +msgid "Advanced Profile Fields" +msgstr "Дополнительные поля профиля" + +#: ../../Zotlabs/Module/Admin/Profs.php:170 +msgid "(In addition to basic fields)" +msgstr "(к основым полям)" + +#: ../../Zotlabs/Module/Admin/Profs.php:172 +msgid "All available fields" +msgstr "Все доступные поля" + +#: ../../Zotlabs/Module/Admin/Profs.php:173 +msgid "Custom Fields" +msgstr "Настраиваемые поля" + +#: ../../Zotlabs/Module/Admin/Profs.php:177 +msgid "Create Custom Field" +msgstr "Создать настраиваемое поле" + +#: ../../Zotlabs/Module/Admin/Themes.php:26 +msgid "Theme settings updated." +msgstr "Настройки темы обновленны." -#: ../../mod/dirprofile.php:112 -msgid "Hometown: " -msgstr "Город проживания:" +#: ../../Zotlabs/Module/Admin/Themes.php:61 +msgid "No themes found." +msgstr "Темы не найдены." -#: ../../mod/dirprofile.php:114 -msgid "About: " -msgstr "О себе:" +#: ../../Zotlabs/Module/Admin/Themes.php:116 +msgid "Screenshot" +msgstr "Снимок экрана" -#: ../../mod/dirprofile.php:162 -msgid "Keywords: " -msgstr "Ключевые слова:" +#: ../../Zotlabs/Module/Admin/Themes.php:162 +msgid "[Experimental]" +msgstr "[экспериментальный]" -#: ../../mod/dirsearch.php:21 -msgid "This site is not a directory server" -msgstr "Этот сайт не является сервером каталога" +#: ../../Zotlabs/Module/Admin/Themes.php:163 +msgid "[Unsupported]" +msgstr "[неподдерживаемый]" -#: ../../mod/home.php:81 -msgid "Hubzilla - "The Network"" -msgstr "" +#: ../../Zotlabs/Module/Admin/Features.php:55 +#: ../../Zotlabs/Module/Admin/Features.php:56 +#: ../../Zotlabs/Module/Settings/Features.php:65 +msgid "Off" +msgstr "Выкл." + +#: ../../Zotlabs/Module/Admin/Features.php:55 +#: ../../Zotlabs/Module/Admin/Features.php:56 +#: ../../Zotlabs/Module/Settings/Features.php:65 +msgid "On" +msgstr "Вкл." -#: ../../mod/home.php:94 +#: ../../Zotlabs/Module/Admin/Features.php:56 #, php-format -msgid "Welcome to %s" -msgstr "Добро пожаловать в %s" +msgid "Lock feature %s" +msgstr "Функция блокировки \"%s\"" -#: ../../mod/setup.php:162 -msgid "Hubzilla Server - Setup" -msgstr "Hubzilla Сервер - Установка" +#: ../../Zotlabs/Module/Admin/Features.php:64 +msgid "Manage Additional Features" +msgstr "Управлять дополнительными функциями" -#: ../../mod/setup.php:168 -msgid "Could not connect to database." -msgstr "Не удалось подключиться к серверу баз данных." +#: ../../Zotlabs/Module/Admin/Queue.php:35 +msgid "Queue Statistics" +msgstr "Статистика очереди" -#: ../../mod/setup.php:172 -msgid "" -"Could not connect to specified site URL. Possible SSL certificate or DNS " -"issue." -msgstr "" +#: ../../Zotlabs/Module/Admin/Queue.php:36 +msgid "Total Entries" +msgstr "Всего записей" -#: ../../mod/setup.php:179 -msgid "Could not create table." -msgstr "Не удалось создать таблицу." +#: ../../Zotlabs/Module/Admin/Queue.php:37 +msgid "Priority" +msgstr "Приоритет" -#: ../../mod/setup.php:185 -msgid "Your site database has been installed." -msgstr "Ваша база данных установлена." +#: ../../Zotlabs/Module/Admin/Queue.php:38 +msgid "Destination URL" +msgstr "Конечный URL-адрес" -#: ../../mod/setup.php:190 -msgid "" -"You may need to import the file \"install/database.sql\" manually using " -"phpmyadmin or mysql." -msgstr "" +#: ../../Zotlabs/Module/Admin/Queue.php:39 +msgid "Mark hub permanently offline" +msgstr "Пометить хаб как постоянно отключенный" -#: ../../mod/setup.php:191 ../../mod/setup.php:260 ../../mod/setup.php:655 -msgid "Please see the file \"install/INSTALL.txt\"." -msgstr "Пожалуйста, обратитесь к файлу \"install/INSTALL.txt\"." +#: ../../Zotlabs/Module/Admin/Queue.php:40 +msgid "Empty queue for this hub" +msgstr "Освободить очередь для этого хаба" -#: ../../mod/setup.php:257 -msgid "System check" -msgstr "Проверка системы" +#: ../../Zotlabs/Module/Admin/Queue.php:41 +msgid "Last known contact" +msgstr "Последний известный контакт" -#: ../../mod/setup.php:261 ../../mod/events.php:380 -msgid "Next" -msgstr "Следующая" +#: ../../Zotlabs/Module/Admin/Account_edit.php:29 +#, php-format +msgid "Password changed for account %d." +msgstr "Пароль для аккаунта %d изменён." -#: ../../mod/setup.php:262 -msgid "Check again" -msgstr "Проверить снова" +#: ../../Zotlabs/Module/Admin/Account_edit.php:46 +msgid "Account settings updated." +msgstr "Настройки аккаунта обновлены." -#: ../../mod/setup.php:284 -msgid "Database connection" -msgstr "Подключение к базе данных" +#: ../../Zotlabs/Module/Admin/Account_edit.php:61 +msgid "Account not found." +msgstr "Учётная запись не найдена." -#: ../../mod/setup.php:285 -msgid "" -"In order to install Hubzilla we need to know how to connect to your " -"database." -msgstr "" +#: ../../Zotlabs/Module/Admin/Account_edit.php:68 +msgid "Account Edit" +msgstr "Редактировать аккаунт" -#: ../../mod/setup.php:286 -msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." -msgstr "" +#: ../../Zotlabs/Module/Admin/Account_edit.php:69 +msgid "New Password" +msgstr "Новый пароль" -#: ../../mod/setup.php:287 -msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." -msgstr "" +#: ../../Zotlabs/Module/Admin/Account_edit.php:70 +msgid "New Password again" +msgstr "Повторите новый пароль" -#: ../../mod/setup.php:291 -msgid "Database Server Name" -msgstr "Имя сервера базы данных" +#: ../../Zotlabs/Module/Admin/Account_edit.php:71 +msgid "Technical skill level" +msgstr "Уровень технических навыков" -#: ../../mod/setup.php:291 -msgid "Default is localhost" -msgstr "По умолчанию localhost" +#: ../../Zotlabs/Module/Admin/Account_edit.php:72 +msgid "Account language (for emails)" +msgstr "Язык сообщения для email" -#: ../../mod/setup.php:292 -msgid "Database Port" -msgstr "Порт базы данных" +#: ../../Zotlabs/Module/Admin/Account_edit.php:73 +msgid "Service class" +msgstr "Класс обслуживания" -#: ../../mod/setup.php:292 -msgid "Communication port number - use 0 for default" -msgstr "Порт коммуникации - используйте 0 по умолчанию" +#: ../../Zotlabs/Module/Admin/Channels.php:31 +#, php-format +msgid "%s channel censored/uncensored" +msgid_plural "%s channels censored/uncensored" +msgstr[0] "" +msgstr[1] "" -#: ../../mod/setup.php:293 -msgid "Database Login Name" -msgstr "Имя для подключения к базе данных" +#: ../../Zotlabs/Module/Admin/Channels.php:40 +#, php-format +msgid "%s channel code allowed/disallowed" +msgid_plural "%s channels code allowed/disallowed" +msgstr[0] "" +msgstr[1] "" -#: ../../mod/setup.php:294 -msgid "Database Login Password" -msgstr "Пароль для подключения к базе данных" +#: ../../Zotlabs/Module/Admin/Channels.php:46 +#, php-format +msgid "%s channel deleted" +msgid_plural "%s channels deleted" +msgstr[0] "" +msgstr[1] "" -#: ../../mod/setup.php:295 -msgid "Database Name" -msgstr "Имя базы данных" +#: ../../Zotlabs/Module/Admin/Channels.php:65 +msgid "Channel not found" +msgstr "Канал не найден" -#: ../../mod/setup.php:297 ../../mod/setup.php:339 -msgid "Site administrator email address" -msgstr "Адрес электронной почты администратора сайта" +#: ../../Zotlabs/Module/Admin/Channels.php:75 +#, php-format +msgid "Channel '%s' deleted" +msgstr "Канал '%s' удалён" -#: ../../mod/setup.php:297 ../../mod/setup.php:339 -msgid "" -"Your account email address must match this in order to use the web admin " -"panel." -msgstr "" +#: ../../Zotlabs/Module/Admin/Channels.php:87 +#, php-format +msgid "Channel '%s' censored" +msgstr "Канал '%s' цензурируется" -#: ../../mod/setup.php:298 ../../mod/setup.php:341 -msgid "Website URL" -msgstr "URL веб-сайта" +#: ../../Zotlabs/Module/Admin/Channels.php:87 +#, php-format +msgid "Channel '%s' uncensored" +msgstr "Канал '%s' нецензурируется" -#: ../../mod/setup.php:298 ../../mod/setup.php:341 -msgid "Please use SSL (https) URL if available." -msgstr "Пожалуйста, используйте SSL (https) URL если возможно." +#: ../../Zotlabs/Module/Admin/Channels.php:98 +#, php-format +msgid "Channel '%s' code allowed" +msgstr "Код в канале '%s' разрешён" -#: ../../mod/setup.php:301 ../../mod/setup.php:344 -msgid "Please select a default timezone for your website" -msgstr "Пожалуйста, выберите часовой пояс по умолчанию для вашего сайта" +#: ../../Zotlabs/Module/Admin/Channels.php:98 +#, php-format +msgid "Channel '%s' code disallowed" +msgstr "Код в канале '%s' запрещён" + +#: ../../Zotlabs/Module/Admin/Channels.php:150 +msgid "Censor" +msgstr "Цензурировать" + +#: ../../Zotlabs/Module/Admin/Channels.php:151 +msgid "Uncensor" +msgstr "Нецензурировать" + +#: ../../Zotlabs/Module/Admin/Channels.php:152 +msgid "Allow Code" +msgstr "Разрешить код" -#: ../../mod/setup.php:328 -msgid "Site settings" -msgstr "Настройки сайта" +#: ../../Zotlabs/Module/Admin/Channels.php:153 +msgid "Disallow Code" +msgstr "Запретить код" -#: ../../mod/setup.php:387 -msgid "Could not find a command line version of PHP in the web server PATH." +#: ../../Zotlabs/Module/Admin/Channels.php:158 +msgid "UID" msgstr "" -#: ../../mod/setup.php:388 +#: ../../Zotlabs/Module/Admin/Channels.php:162 msgid "" -"If you don't have a command line version of PHP installed on server, you " -"will not be able to run background polling via cron." +"Selected channels will be deleted!\\n\\nEverything that was posted in these " +"channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" +"Выбранные каналы будут удалены!\\n\\nВсё что было опубликовано в этих каналах " +"на этом сайте будет удалено навсегда!\\n\\nВы уверены?" -#: ../../mod/setup.php:392 -msgid "PHP executable path" -msgstr "PHP executable путь" - -#: ../../mod/setup.php:392 +#: ../../Zotlabs/Module/Admin/Channels.php:163 msgid "" -"Enter full path to php executable. You can leave this blank to continue the " -"installation." +"The channel {0} will be deleted!\\n\\nEverything that was posted in this " +"channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" +"Канал {0} будет удалён!\\n\\nВсё что было опубликовано в этом канале " +"на этом сайте будет удалено навсегда!\\n\\nВы уверены?" -#: ../../mod/setup.php:397 -msgid "Command line PHP" -msgstr "Command line PHP" +#: ../../Zotlabs/Module/Email_validation.php:24 +#: ../../Zotlabs/Module/Email_resend.php:12 +msgid "Token verification failed." +msgstr "Не удалось выполнить проверку токена." + +#: ../../Zotlabs/Module/Email_validation.php:36 +msgid "Email Verification Required" +msgstr "Требуется проверка адреса email" -#: ../../mod/setup.php:406 +#: ../../Zotlabs/Module/Email_validation.php:37 +#, php-format msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." +"A verification token was sent to your email address [%s]. Enter that token " +"here to complete the account verification step. Please allow a few minutes " +"for delivery, and check your spam folder if you do not see the message." msgstr "" +"Проверочный токен был выслн на ваш адрес электронной почты {%s]. Введите этот токен " +"здесь для завершения этапа проверки учётной записи. Пожалуйста, подождите несколько минут " +"для завершения доставки и проверьте вашу папку \"Спам\" если вы не видите письма." -#: ../../mod/setup.php:407 -msgid "This is required for message delivery to work." -msgstr "Это требуется для доставки сообщений." - -#: ../../mod/setup.php:409 -msgid "PHP register_argc_argv" -msgstr "PHP register_argc_argv" +#: ../../Zotlabs/Module/Email_validation.php:38 +msgid "Resend Email" +msgstr "Выслать повторно" -#: ../../mod/setup.php:430 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" -msgstr "" +#: ../../Zotlabs/Module/Email_validation.php:41 +msgid "Validation token" +msgstr "Проверочный токен" -#: ../../mod/setup.php:431 -msgid "" -"If running under Windows, please see " -"\"http://www.php.net/manual/en/openssl.installation.php\"." -msgstr "Если работаете под Windows, см. \"http://www.php.net/manual/en/openssl.installation.php\"." +#: ../../Zotlabs/Module/Invite.php:29 +msgid "Total invitation limit exceeded." +msgstr "Превышено общее количество приглашений." -#: ../../mod/setup.php:433 -msgid "Generate encryption keys" -msgstr "Генерация ключей шифрования" +#: ../../Zotlabs/Module/Invite.php:53 +#, php-format +msgid "%s : Not a valid email address." +msgstr "%s : Недействительный адрес электронной почты." -#: ../../mod/setup.php:440 -msgid "libCurl PHP module" -msgstr "libCurl PHP модуль" +#: ../../Zotlabs/Module/Invite.php:67 +msgid "Please join us on $Projectname" +msgstr "Присоединятесь к $Projectname !" -#: ../../mod/setup.php:441 -msgid "GD graphics PHP module" -msgstr "GD graphics PHP модуль" +#: ../../Zotlabs/Module/Invite.php:77 +msgid "Invitation limit exceeded. Please contact your site administrator." +msgstr "Превышен лимит приглашений. Пожалуйста, свяжитесь с администрацией сайта." -#: ../../mod/setup.php:442 -msgid "OpenSSL PHP module" -msgstr "OpenSSL PHP модуль" +#: ../../Zotlabs/Module/Invite.php:86 +#, php-format +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "" +msgstr[1] "" -#: ../../mod/setup.php:443 -msgid "mysqli PHP module" -msgstr "mysqli PHP модуль" +#: ../../Zotlabs/Module/Invite.php:107 +msgid "You have no more invitations available" +msgstr "У вас больше нет приглашений" -#: ../../mod/setup.php:444 -msgid "mb_string PHP module" -msgstr "mb_string PHP модуль" +#: ../../Zotlabs/Module/Invite.php:138 +msgid "Send invitations" +msgstr "Отправить приглашение" -#: ../../mod/setup.php:445 -msgid "mcrypt PHP module" -msgstr "mcrypt PHP модуль" +#: ../../Zotlabs/Module/Invite.php:139 +msgid "Enter email addresses, one per line:" +msgstr "Введите адреса электронной почты, по одному в строке:" -#: ../../mod/setup.php:450 ../../mod/setup.php:452 -msgid "Apache mod_rewrite module" -msgstr "Apache mod_rewrite модуль" +#: ../../Zotlabs/Module/Invite.php:141 +msgid "Please join my community on $Projectname." +msgstr "Присоединятесь к нашему сообществу $Projectname !" -#: ../../mod/setup.php:450 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." -msgstr "Ошибка: Apache веб-сервер модуль mod-rewrite требуется, но не установлен." +#: ../../Zotlabs/Module/Invite.php:143 +msgid "You will need to supply this invitation code:" +msgstr "Вам нужно предоставит этот код приглашения:" -#: ../../mod/setup.php:456 ../../mod/setup.php:459 -msgid "proc_open" -msgstr "proc_open" +#: ../../Zotlabs/Module/Invite.php:144 +msgid "1. Register at any $Projectname location (they are all inter-connected)" +msgstr "1. Зарегистрируйтесь на любом из серверов $Projectname" -#: ../../mod/setup.php:456 -msgid "" -"Error: proc_open is required but is either not installed or has been " -"disabled in php.ini" -msgstr "Ошибка: proc_open требуется, но не установлен или отключен в php.ini" +#: ../../Zotlabs/Module/Invite.php:146 +msgid "2. Enter my $Projectname network address into the site searchbar." +msgstr "2. Введите сетевой адрес $Projectname в поисковой строке сайта" -#: ../../mod/setup.php:464 -msgid "Error: libCURL PHP module required but not installed." -msgstr "Ошибка: Модуль libCURL PHP требуется, но не установлен." +#: ../../Zotlabs/Module/Invite.php:147 +msgid "or visit" +msgstr "или посетите" -#: ../../mod/setup.php:468 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." -msgstr "Ошибка: GD graphics PHP модуль с поддержкой JPEG требуется, но не установлен." +#: ../../Zotlabs/Module/Invite.php:149 +msgid "3. Click [Connect]" +msgstr "Нажать [Подключиться]" -#: ../../mod/setup.php:472 -msgid "Error: openssl PHP module required but not installed." -msgstr "Ошибка: openssl PHP модуль требуется, но не установлен." +#: ../../Zotlabs/Module/Blocks.php:156 +msgid "Block Title" +msgstr "Заблокировать заголовок" -#: ../../mod/setup.php:476 -msgid "Error: mysqli PHP module required but not installed." -msgstr "Ошибка: mysqli PHP модуль требуется, но не установлен." +#: ../../Zotlabs/Module/Cover_photo.php:168 +#: ../../Zotlabs/Module/Cover_photo.php:218 +msgid "Cover Photos" +msgstr "Фотографии обложки" -#: ../../mod/setup.php:480 -msgid "Error: mb_string PHP module required but not installed." -msgstr "Ошибка: mb_string PHP модуль требуется, но не установлен." +#: ../../Zotlabs/Module/Cover_photo.php:390 +msgid "Your cover photo may be visible to anybody on the internet" +msgstr "Ваше фото обложки может быть видно кому угодно в Интернете" -#: ../../mod/setup.php:484 -msgid "Error: mcrypt PHP module required but not installed." -msgstr "Ошибка: mcrypt PHP модуль требуется, но не установлен." +#: ../../Zotlabs/Module/Cover_photo.php:394 +msgid "Change Cover Photo" +msgstr "Изменить фотографию обложки" -#: ../../mod/setup.php:500 -msgid "" -"The web installer needs to be able to create a file called \".htconfig.php\"" -" in the top folder of your web server and it is unable to do so." -msgstr "Веб-установщик должен быть в состоянии создать файл с именем \".htconfig.php\" в верхней папке вашего веб-сервера, но он не в состоянии сделать это." +#: ../../Zotlabs/Module/Like.php:54 +msgid "Like/Dislike" +msgstr "Нравится / не нравится" -#: ../../mod/setup.php:501 -msgid "" -"This is most often a permission setting, as the web server may not be able " -"to write files in your folder - even if you can." -msgstr "" +#: ../../Zotlabs/Module/Like.php:59 +msgid "This action is restricted to members." +msgstr "Это действие доступно только участникам." -#: ../../mod/setup.php:502 +#: ../../Zotlabs/Module/Like.php:60 msgid "" -"At the end of this procedure, we will give you a text to save in a file " -"named .htconfig.php in your Red top folder." +"Please login with your $Projectname ID or register as a new $Projectname member to continue." msgstr "" +"Пожалуйста, для продолжения войдите с вашим $Projectname " +"ID или зарегистрируйтесь как новый участник $Projectname." -#: ../../mod/setup.php:503 -msgid "" -"You can alternatively skip this procedure and perform a manual installation." -" Please see the file \"install/INSTALL.txt\" for instructions." -msgstr "Вы можете пропустить эту процедуру и выполнить установку вручную. Обратитесь к файлу \"install/INSTALL.txt\" для получения инструкций." +#: ../../Zotlabs/Module/Like.php:109 ../../Zotlabs/Module/Like.php:135 +#: ../../Zotlabs/Module/Like.php:173 +msgid "Invalid request." +msgstr "Неверный запрос." -#: ../../mod/setup.php:506 -msgid ".htconfig.php is writable" -msgstr ".htconfig.php доступен для записи" +#: ../../Zotlabs/Module/Like.php:150 +msgid "thing" +msgstr "предмет" -#: ../../mod/setup.php:516 -msgid "" -"Red uses the Smarty3 template engine to render its web views. Smarty3 " -"compiles templates to PHP to speed up rendering." -msgstr "" +#: ../../Zotlabs/Module/Like.php:196 +msgid "Channel unavailable." +msgstr "Канал недоступен." -#: ../../mod/setup.php:517 -msgid "" -"In order to store these compiled templates, the web server needs to have " -"write access to the directory view/tpl/smarty3/ under the Red top level " -"folder." -msgstr "" +#: ../../Zotlabs/Module/Like.php:244 +msgid "Previous action reversed." +msgstr "Предыдущее действие отменено." -#: ../../mod/setup.php:518 ../../mod/setup.php:536 -msgid "" -"Please ensure that the user that your web server runs as (e.g. www-data) has" -" write access to this folder." -msgstr "" +#: ../../Zotlabs/Module/Like.php:442 +#, php-format +msgid "%1$s agrees with %2$s's %3$s" +msgstr "%1$s согласен с %2$s %3$s" -#: ../../mod/setup.php:519 -msgid "" -"Note: as a security measure, you should give the web server write access to " -"view/tpl/smarty3/ only--not the template files (.tpl) that it contains." -msgstr "" +#: ../../Zotlabs/Module/Like.php:444 +#, php-format +msgid "%1$s doesn't agree with %2$s's %3$s" +msgstr "%1$s не согласен с %2$s %3$s" -#: ../../mod/setup.php:522 -msgid "view/tpl/smarty3 is writable" -msgstr "view/tpl/smarty3 доступен для записи" +#: ../../Zotlabs/Module/Like.php:446 +#, php-format +msgid "%1$s abstains from a decision on %2$s's %3$s" +msgstr "%1$s воздерживается от решения по %2$s%3$s" -#: ../../mod/setup.php:535 -msgid "" -"Red uses the store directory to save uploaded files. The web server needs to" -" have write access to the store directory under the Red top level folder" -msgstr "" +#: ../../Zotlabs/Module/Like.php:564 +msgid "Action completed." +msgstr "Действие завершено." -#: ../../mod/setup.php:539 -msgid "store is writable" -msgstr "" +#: ../../Zotlabs/Module/Like.php:565 +msgid "Thank you." +msgstr "Спасибо." -#: ../../mod/setup.php:569 +#: ../../Zotlabs/Module/Defperms.php:239 +#: ../../Zotlabs/Module/Settings/Channel.php:488 msgid "" -"SSL certificate cannot be validated. Fix certificate or disable https access" -" to this site." -msgstr "" +"If enabled, connection requests will be approved without your interaction" +msgstr "Если включено, запросы контактов будут одобрены без вашего участия" -#: ../../mod/setup.php:570 -msgid "" -"If you have https access to your website or allow connections to TCP port " -"443 (the https: port), you MUST use a browser-valid certificate. You MUST " -"NOT use self-signed certificates!" -msgstr "" +#: ../../Zotlabs/Module/Defperms.php:246 +msgid "Automatic approval settings" +msgstr "Настройки автоматического одобрения" -#: ../../mod/setup.php:571 +#: ../../Zotlabs/Module/Defperms.php:254 msgid "" -"This restriction is incorporated because public posts from you may for " -"example contain references to images on your own hub." -msgstr "" +"Some individual permissions may have been preset or locked based on your " +"channel type and privacy settings." +msgstr "Некоторые индивидуальные разрешения могут быть предустановлены или заблокированы на основании типа вашего канала и настроек приватности." -#: ../../mod/setup.php:572 -msgid "" -"If your certificate is not recognised, members of other sites (who may " -"themselves have valid certificates) will get a warning message on their own " -"site complaining about security issues." -msgstr "" +#: ../../Zotlabs/Module/Menu.php:67 +msgid "Unable to update menu." +msgstr "Невозможно обновить меню." -#: ../../mod/setup.php:573 -msgid "" -"This can cause usability issues elsewhere (not just on your own site) so we " -"must insist on this requirement." -msgstr "" +#: ../../Zotlabs/Module/Menu.php:78 +msgid "Unable to create menu." +msgstr "Невозможно создать меню." -#: ../../mod/setup.php:574 -msgid "" -"Providers are available that issue free certificates which are browser-" -"valid." -msgstr "" +#: ../../Zotlabs/Module/Menu.php:160 ../../Zotlabs/Module/Menu.php:173 +msgid "Menu Name" +msgstr "Название меню" -#: ../../mod/setup.php:576 -msgid "SSL certificate validation" -msgstr "проверка сертификата SSL" +#: ../../Zotlabs/Module/Menu.php:160 +msgid "Unique name (not visible on webpage) - required" +msgstr "Уникальное название (не видимо на странице) - требуется" -#: ../../mod/setup.php:582 -msgid "" -"Url rewrite in .htaccess is not working. Check your server configuration." -msgstr "" +#: ../../Zotlabs/Module/Menu.php:161 ../../Zotlabs/Module/Menu.php:174 +msgid "Menu Title" +msgstr "Заголовок меню" -#: ../../mod/setup.php:584 -msgid "Url rewrite is working" -msgstr "Url rewrite работает" +#: ../../Zotlabs/Module/Menu.php:161 +msgid "Visible on webpage - leave empty for no title" +msgstr "Видимость на странице - оставьте пустым если не хотите иметь заголовок" -#: ../../mod/setup.php:594 -msgid "" -"The database configuration file \".htconfig.php\" could not be written. " -"Please use the enclosed text to create a configuration file in your web " -"server root." -msgstr "" +#: ../../Zotlabs/Module/Menu.php:162 +msgid "Allow Bookmarks" +msgstr "Разрешить закладки" -#: ../../mod/setup.php:618 -msgid "Errors encountered creating database tables." -msgstr "" +#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221 +msgid "Menu may be used to store saved bookmarks" +msgstr "Меню может использоваться, чтобы сохранить закладки" -#: ../../mod/setup.php:653 -msgid "

      What next

      " -msgstr "

      Что дальше

      " +#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:224 +msgid "Submit and proceed" +msgstr "Отправить и обработать" -#: ../../mod/setup.php:654 -msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the " -"poller." -msgstr "" +#: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Module/Locs.php:120 +msgid "Drop" +msgstr "Удалить" -#: ../../mod/editblock.php:8 ../../mod/editblock.php:27 -#: ../../mod/editblock.php:53 ../../mod/editlayout.php:36 -#: ../../mod/editpost.php:20 ../../mod/editwebpage.php:32 -msgid "Item not found" -msgstr "Элемент не найден" +#: ../../Zotlabs/Module/Menu.php:180 +msgid "Bookmarks allowed" +msgstr "Закладки разрешены" -#: ../../mod/editblock.php:77 -msgid "Edit Block" -msgstr "Редактировать блок" +#: ../../Zotlabs/Module/Menu.php:182 +msgid "Delete this menu" +msgstr "Удалить это меню" -#: ../../mod/editblock.php:87 -msgid "Delete block?" -msgstr "Удалить блок?" +#: ../../Zotlabs/Module/Menu.php:183 ../../Zotlabs/Module/Menu.php:218 +msgid "Edit menu contents" +msgstr "Редактировать содержание меню" -#: ../../mod/editblock.php:115 ../../mod/editlayout.php:110 -#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:147 -msgid "Insert YouTube video" -msgstr "Вставить YouTube видео" +#: ../../Zotlabs/Module/Menu.php:184 +msgid "Edit this menu" +msgstr "Редактировать это меню" -#: ../../mod/editblock.php:116 ../../mod/editlayout.php:111 -#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:148 -msgid "Insert Vorbis [.ogg] video" -msgstr "Вставить Vorbis [.ogg] видео" +#: ../../Zotlabs/Module/Menu.php:200 +msgid "Menu could not be deleted." +msgstr "Меню не может быть удалено." -#: ../../mod/editblock.php:117 ../../mod/editlayout.php:112 -#: ../../mod/editpost.php:118 ../../mod/editwebpage.php:149 -msgid "Insert Vorbis [.ogg] audio" -msgstr "Вставить Vorbis [.ogg] музыку" +#: ../../Zotlabs/Module/Menu.php:213 +msgid "Edit Menu" +msgstr "Редактировать меню" -#: ../../mod/editblock.php:153 -msgid "Delete Block" -msgstr "Удалить блок" +#: ../../Zotlabs/Module/Menu.php:217 +msgid "Add or remove entries to this menu" +msgstr "Добавить или удалить пункты этого меню" -#: ../../mod/pdledit.php:13 -msgid "Layout updated." -msgstr "Шаблон обновлен." +#: ../../Zotlabs/Module/Menu.php:219 +msgid "Menu name" +msgstr "Название меню" -#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53 -msgid "Edit System Page Description" -msgstr "" +#: ../../Zotlabs/Module/Menu.php:219 +msgid "Must be unique, only seen by you" +msgstr "Должно быть уникальным (видно только вам)" -#: ../../mod/pdledit.php:48 -msgid "Layout not found." -msgstr "Шаблон не найден" +#: ../../Zotlabs/Module/Menu.php:220 +msgid "Menu title" +msgstr "Заголовок меню" -#: ../../mod/pdledit.php:54 -msgid "Module Name:" -msgstr "Имя модуля:" +#: ../../Zotlabs/Module/Menu.php:220 +msgid "Menu title as seen by others" +msgstr "Видимый другими заголовок меню" -#: ../../mod/pdledit.php:55 ../../mod/layouts.php:59 -msgid "Layout Help" -msgstr "Помощь к шаблону" +#: ../../Zotlabs/Module/Menu.php:221 +msgid "Allow bookmarks" +msgstr "Разрешить закладки" -#: ../../mod/editlayout.php:72 -msgid "Edit Layout" -msgstr "Редактировать шаблон" +#: ../../Zotlabs/Module/Manage.php:138 ../../Zotlabs/Module/New_channel.php:147 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." +msgstr "Вы создали %1$.0f из %2$.0f возможных каналов." -#: ../../mod/editlayout.php:82 -msgid "Delete layout?" -msgstr "Удалить шаблон?" +#: ../../Zotlabs/Module/Manage.php:145 +msgid "Create a new channel" +msgstr "Создать новый канал" -#: ../../mod/editlayout.php:146 -msgid "Delete Layout" -msgstr "Удалить шаблон" +#: ../../Zotlabs/Module/Manage.php:145 ../../Zotlabs/Module/Chat.php:256 +#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Profiles.php:831 +msgid "Create New" +msgstr "Создать новый" -#: ../../mod/editpost.php:31 -msgid "Item is not editable" -msgstr "Элемент нельзя редактировать" +#: ../../Zotlabs/Module/Manage.php:171 +msgid "Current Channel" +msgstr "Текущий канал" -#: ../../mod/editpost.php:53 -msgid "Delete item?" -msgstr "Удалить элемент?" +#: ../../Zotlabs/Module/Manage.php:173 +msgid "Switch to one of your channels by selecting it." +msgstr "Выбрать и переключиться на один из ваших каналов" -#: ../../mod/editwebpage.php:106 -msgid "Edit Webpage" -msgstr "Редактировать веб-страницу" +#: ../../Zotlabs/Module/Manage.php:174 +msgid "Default Channel" +msgstr "Основной канал" -#: ../../mod/editwebpage.php:116 -msgid "Delete webpage?" -msgstr "Удалить веб-страницу?" +#: ../../Zotlabs/Module/Manage.php:175 +msgid "Make Default" +msgstr "Сделать основным" -#: ../../mod/editwebpage.php:186 -msgid "Delete Webpage" -msgstr "Удалить веб-страницу" +#: ../../Zotlabs/Module/Manage.php:178 +#, php-format +msgid "%d new messages" +msgstr "%d новых сообщений" -#: ../../mod/siteinfo.php:57 +#: ../../Zotlabs/Module/Manage.php:179 #, php-format -msgid "Version %s" -msgstr "Версия %s" +msgid "%d new introductions" +msgstr "%d новых представлений" -#: ../../mod/siteinfo.php:76 -msgid "Installed plugins/addons/apps:" -msgstr "" +#: ../../Zotlabs/Module/Manage.php:181 +msgid "Delegated Channel" +msgstr "Делегированный канал" -#: ../../mod/siteinfo.php:89 -msgid "No installed plugins/addons/apps" -msgstr "" +#: ../../Zotlabs/Module/Changeaddr.php:35 +msgid "" +"Channel name changes are not allowed within 48 hours of changing the account " +"password." +msgstr "Изменение названия канала не разрешается в течении 48 часов после смены пароля у аккаунта." -#: ../../mod/siteinfo.php:97 -msgid "Red" -msgstr "Red" +#: ../../Zotlabs/Module/Changeaddr.php:77 +msgid "Change channel nickname/address" +msgstr "Изменить псевдоним / адрес канала" -#: ../../mod/siteinfo.php:98 -msgid "" -"This is a hub of the Hubzilla - a global cooperative network of " -"decentralised privacy enhanced websites." -msgstr "" +#: ../../Zotlabs/Module/Changeaddr.php:78 +msgid "Any/all connections on other networks will be lost!" +msgstr "Любые / все контакты в других сетях будут утеряны!" -#: ../../mod/siteinfo.php:101 -msgid "Running at web location" -msgstr "" +#: ../../Zotlabs/Module/Changeaddr.php:80 +msgid "New channel address" +msgstr "Новый адрес канала" -#: ../../mod/siteinfo.php:102 -msgid "" -"Please visit GetZot.com to learn more " -"about the Hubzilla." -msgstr "Пожалуйста посетите GetZot.com чтобы узнать больше о Hubzilla." +#: ../../Zotlabs/Module/Changeaddr.php:81 +msgid "Rename Channel" +msgstr "Переименовать канал" -#: ../../mod/siteinfo.php:103 -msgid "Bug reports and issues: please visit" -msgstr "" +#: ../../Zotlabs/Module/Settings/Features.php:73 +msgid "Additional Features" +msgstr "Дополнительные функции" + +#: ../../Zotlabs/Module/Settings/Features.php:74 +#: ../../Zotlabs/Module/Settings/Account.php:116 +msgid "Your technical skill level" +msgstr "Ваш уровень технических навыков" -#: ../../mod/siteinfo.php:106 +#: ../../Zotlabs/Module/Settings/Features.php:74 +#: ../../Zotlabs/Module/Settings/Account.php:116 msgid "" -"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot " -"com" -msgstr "" +"Used to provide a member experience and additional features consistent with " +"your comfort level" +msgstr "Используется чтобы обеспечить соответствие опыта пользователя и функций на комфортном для вас уровне" -#: ../../mod/siteinfo.php:108 -msgid "Site Administrators" -msgstr "Администратор сайта" +#: ../../Zotlabs/Module/Settings/Channel.php:333 +msgid "Nobody except yourself" +msgstr "Никто кроме вас" -#: ../../mod/photos.php:77 -msgid "Page owner information could not be retrieved." -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:334 +msgid "Only those you specifically allow" +msgstr "Только персонально разрешённые" -#: ../../mod/photos.php:97 -msgid "Album not found." -msgstr "Альбом не найден." +#: ../../Zotlabs/Module/Settings/Channel.php:335 +msgid "Approved connections" +msgstr "Одобренные контакты" -#: ../../mod/photos.php:119 ../../mod/photos.php:669 -msgid "Delete Album" -msgstr "Удалить альбом" +#: ../../Zotlabs/Module/Settings/Channel.php:336 +msgid "Any connections" +msgstr "Любые контакты" -#: ../../mod/photos.php:159 ../../mod/photos.php:957 -msgid "Delete Photo" -msgstr "Удалить фотографию" +#: ../../Zotlabs/Module/Settings/Channel.php:337 +msgid "Anybody on this website" +msgstr "Любой на этом сайте" -#: ../../mod/photos.php:453 -msgid "No photos selected" -msgstr "Никакие фотографии не выбраны" +#: ../../Zotlabs/Module/Settings/Channel.php:338 +msgid "Anybody in this network" +msgstr "Любой в этой сети" -#: ../../mod/photos.php:500 -msgid "Access to this item is restricted." -msgstr "Доступ к этому элементу ограничен." +#: ../../Zotlabs/Module/Settings/Channel.php:339 +msgid "Anybody authenticated" +msgstr "Любой аутентифицированный" -#: ../../mod/photos.php:574 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." -msgstr "Вы использовали %1$.2f мегабайт из %2$.2f для хранения фото." +#: ../../Zotlabs/Module/Settings/Channel.php:340 +msgid "Anybody on the internet" +msgstr "Любой в интернете" -#: ../../mod/photos.php:577 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "Вы использовали %1$.2f мегабайт для хранения фото." +#: ../../Zotlabs/Module/Settings/Channel.php:415 +msgid "Publish your default profile in the network directory" +msgstr "Публиковать ваш профиль по умолчанию в сетевом каталоге" -#: ../../mod/photos.php:596 -msgid "Upload Photos" -msgstr "Загрузить фотографии" +#: ../../Zotlabs/Module/Settings/Channel.php:420 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "Разрешить предлагать вас как потенциального друга для новых пользователей?" + +#: ../../Zotlabs/Module/Settings/Channel.php:424 +msgid "or" +msgstr "или" + +#: ../../Zotlabs/Module/Settings/Channel.php:433 +msgid "Your channel address is" +msgstr "Адрес вашего канала" + +#: ../../Zotlabs/Module/Settings/Channel.php:436 +msgid "Your files/photos are accessible via WebDAV at" +msgstr "Ваши файы / фотографии доступны через WebDAV по" + +#: ../../Zotlabs/Module/Settings/Channel.php:488 +msgid "Automatic membership approval" +msgstr "Членство одобрено автоматически" + +#: ../../Zotlabs/Module/Settings/Channel.php:514 +msgid "Channel Settings" +msgstr "Выбор канала" + +#: ../../Zotlabs/Module/Settings/Channel.php:521 +msgid "Basic Settings" +msgstr "Основные настройки" + +#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Account.php:119 +msgid "Email Address:" +msgstr "Адрес email:" + +#: ../../Zotlabs/Module/Settings/Channel.php:524 +msgid "Your Timezone:" +msgstr "Часовой пояс:" + +#: ../../Zotlabs/Module/Settings/Channel.php:525 +msgid "Default Post Location:" +msgstr "Расположение по умолчанию:" + +#: ../../Zotlabs/Module/Settings/Channel.php:525 +msgid "Geographical location to display on your posts" +msgstr "Показывать географическое положение в ваших публикациях" + +#: ../../Zotlabs/Module/Settings/Channel.php:526 +msgid "Use Browser Location:" +msgstr "Определять расположение из браузера" + +#: ../../Zotlabs/Module/Settings/Channel.php:528 +msgid "Adult Content" +msgstr "Содержимое для взрослых" -#: ../../mod/photos.php:600 ../../mod/photos.php:664 -msgid "New album name: " -msgstr "Название нового альбома:" +#: ../../Zotlabs/Module/Settings/Channel.php:528 +msgid "" +"This channel frequently or regularly publishes adult content. (Please tag " +"any adult material and/or nudity with #NSFW)" +msgstr "Этот канал часто или регулярно публикует содержимое для взрослых. Пожалуйста, помечайте любой такой материал тегом #NSFW" + +#: ../../Zotlabs/Module/Settings/Channel.php:530 +msgid "Security and Privacy Settings" +msgstr "Безопасность и настройки приватности" + +#: ../../Zotlabs/Module/Settings/Channel.php:532 +msgid "Your permissions are already configured. Click to view/adjust" +msgstr "Ваши разрешения уже настроены. Нажмите чтобы просмотреть или изменить" + +#: ../../Zotlabs/Module/Settings/Channel.php:534 +msgid "Hide my online presence" +msgstr "Скрывать моё присутствие онлайн" -#: ../../mod/photos.php:601 -msgid "or existing album name: " -msgstr "или существующий альбом:" +#: ../../Zotlabs/Module/Settings/Channel.php:534 +msgid "Prevents displaying in your profile that you are online" +msgstr "Предотвращает отображения статуса \"в сети\" в вашем профиле" + +#: ../../Zotlabs/Module/Settings/Channel.php:536 +msgid "Simple Privacy Settings:" +msgstr "Простые настройки безопасности:" + +#: ../../Zotlabs/Module/Settings/Channel.php:537 +msgid "" +"Very Public - extremely permissive (should be used with caution)" +msgstr "Полностью открытый - сверхлиберальный (должен использоваться с осторожностью)" + +#: ../../Zotlabs/Module/Settings/Channel.php:538 +msgid "" +"Typical - default public, privacy when desired (similar to social " +"network permissions but with improved privacy)" +msgstr "Обычный - открытый по умолчанию, приватность по желанию (как в социальных сетях, но с улучшенными настройками)" -#: ../../mod/photos.php:602 -msgid "Do not show a status post for this upload" -msgstr "Не показывать пост о состоянии этой загрузки" +#: ../../Zotlabs/Module/Settings/Channel.php:539 +msgid "Private - default private, never open or public" +msgstr "Частный - частный по умочанию, не открытый и не публичный" -#: ../../mod/photos.php:653 ../../mod/photos.php:675 ../../mod/photos.php:1129 -#: ../../mod/photos.php:1144 -msgid "Contact Photos" -msgstr "Фотографии контакта" +#: ../../Zotlabs/Module/Settings/Channel.php:540 +msgid "Blocked - default blocked to/from everybody" +msgstr "Закрытый - заблокированный по умолчанию от / для всех" -#: ../../mod/photos.php:679 -msgid "Edit Album" -msgstr "Редактировать Фотоальбом" +#: ../../Zotlabs/Module/Settings/Channel.php:542 +msgid "Allow others to tag your posts" +msgstr "Разрешить другим отмечать ваши публикации" -#: ../../mod/photos.php:685 -msgid "Show Newest First" -msgstr "Показать новые первыми" +#: ../../Zotlabs/Module/Settings/Channel.php:542 +msgid "" +"Often used by the community to retro-actively flag inappropriate content" +msgstr "Часто используется сообществом для маркировки неподобающего содержания" -#: ../../mod/photos.php:687 -msgid "Show Oldest First" -msgstr "Показать старые первыми" +#: ../../Zotlabs/Module/Settings/Channel.php:544 +msgid "Channel Permission Limits" +msgstr "Ограничения разрешений канала" -#: ../../mod/photos.php:730 ../../mod/photos.php:1176 -msgid "View Photo" -msgstr "Посмотреть фотографию" +#: ../../Zotlabs/Module/Settings/Channel.php:546 +msgid "Expire other channel content after this many days" +msgstr "Храненить содержимое других каналов, дней" -#: ../../mod/photos.php:776 -msgid "Permission denied. Access to this item may be restricted." -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:546 +msgid "0 or blank to use the website limit." +msgstr "0 или пусто - использовать настройки сайта." -#: ../../mod/photos.php:778 -msgid "Photo not available" -msgstr "Фотография не доступна" +#: ../../Zotlabs/Module/Settings/Channel.php:546 +#, php-format +msgid "This website expires after %d days." +msgstr "Срок хранения содержимого этого сайта истекает через %d дней" -#: ../../mod/photos.php:838 -msgid "Use as profile photo" -msgstr "Использовать в качестве фотографии профиля" +#: ../../Zotlabs/Module/Settings/Channel.php:546 +msgid "This website does not expire imported content." +msgstr "Срок хранения импортированного содержимого этого сайта не ограничен." -#: ../../mod/photos.php:862 -msgid "View Full Size" -msgstr "Посмотреть в полный размер" +#: ../../Zotlabs/Module/Settings/Channel.php:546 +msgid "The website limit takes precedence if lower than your limit." +msgstr "Ограничение сайта имеет приоритет если ниже вашего значения." -#: ../../mod/photos.php:940 -msgid "Edit photo" -msgstr "Редактировать фотографию" +#: ../../Zotlabs/Module/Settings/Channel.php:547 +msgid "Maximum Friend Requests/Day:" +msgstr "Запросов в друзья в день:" -#: ../../mod/photos.php:942 -msgid "Rotate CW (right)" -msgstr "Повернуть CW (направо)" +#: ../../Zotlabs/Module/Settings/Channel.php:547 +msgid "May reduce spam activity" +msgstr "Может ограничить спам активность" -#: ../../mod/photos.php:943 -msgid "Rotate CCW (left)" -msgstr "Повернуть CCW (налево)" +#: ../../Zotlabs/Module/Settings/Channel.php:548 +msgid "Default Privacy Group" +msgstr "Группа конфиденциальности по умолчанию" -#: ../../mod/photos.php:946 -msgid "New album name" -msgstr "Новое название альбома:" +#: ../../Zotlabs/Module/Settings/Channel.php:550 +msgid "Use my default audience setting for the type of object published" +msgstr "Использовать настройки аудитории по умолчанию для типа опубликованного объекта" -#: ../../mod/photos.php:949 -msgid "Caption" -msgstr "Подпись" +#: ../../Zotlabs/Module/Settings/Channel.php:551 +msgid "Profile to assign new connections" +msgstr "Назначить профиль для новых контактов" -#: ../../mod/photos.php:951 -msgid "Add a Tag" -msgstr "Добавить тег" +#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/New_channel.php:177 +#: ../../Zotlabs/Module/Register.php:266 +msgid "Channel role and privacy" +msgstr "Роль и конфиденциальность канала" -#: ../../mod/photos.php:954 -msgid "" -"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "Например: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +#: ../../Zotlabs/Module/Settings/Channel.php:561 +msgid "Default Permissions Group" +msgstr "Группа разрешений по умолчанию" -#: ../../mod/photos.php:1107 -msgid "In This Photo:" -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:567 +msgid "Maximum private messages per day from unknown people:" +msgstr "Максимально количество сообщений от незнакомых людей, в день:" -#: ../../mod/photos.php:1182 -msgid "View Album" -msgstr "Посмотреть фотоальбом" +#: ../../Zotlabs/Module/Settings/Channel.php:567 +msgid "Useful to reduce spamming" +msgstr "Полезно для сокращения количества спама" -#: ../../mod/photos.php:1191 -msgid "Recent Photos" -msgstr "Последние фотографии" +#: ../../Zotlabs/Module/Settings/Channel.php:571 +msgid "By default post a status message when:" +msgstr "По умолчанию публиковать новый статус при:" -#: ../../mod/sources.php:32 -msgid "Failed to create source. No channel selected." -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:572 +msgid "accepting a friend request" +msgstr "одобрении запроса в друзья" -#: ../../mod/sources.php:45 -msgid "Source created." -msgstr "Источник создан" +#: ../../Zotlabs/Module/Settings/Channel.php:573 +msgid "joining a forum/community" +msgstr "вступлении в сообщество / форум" -#: ../../mod/sources.php:57 -msgid "Source updated." -msgstr "Источник обновлен." +#: ../../Zotlabs/Module/Settings/Channel.php:574 +msgid "making an interesting profile change" +msgstr "интересном изменении профиля" -#: ../../mod/sources.php:82 -msgid "*" -msgstr "*" +#: ../../Zotlabs/Module/Settings/Channel.php:575 +msgid "Send a notification email when:" +msgstr "Отправить уведомление по email когда:" -#: ../../mod/sources.php:89 -msgid "Manage remote sources of content for your channel." -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:576 +msgid "You receive a connection request" +msgstr "вы получили новый запрос контакта" -#: ../../mod/sources.php:90 ../../mod/sources.php:100 -msgid "New Source" -msgstr "Новый источник" +#: ../../Zotlabs/Module/Settings/Channel.php:577 +msgid "Your connections are confirmed" +msgstr "ваш запрос контакта был одобрен" -#: ../../mod/sources.php:101 ../../mod/sources.php:133 -msgid "" -"Import all or selected content from the following channel into this channel " -"and distribute it according to your channel settings." -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:578 +msgid "Someone writes on your profile wall" +msgstr "кто-то написал на стене вашего профиля" -#: ../../mod/sources.php:102 ../../mod/sources.php:134 -msgid "Only import content with these words (one per line)" -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:579 +msgid "Someone writes a followup comment" +msgstr "кто-то пишет комментарий" -#: ../../mod/sources.php:102 ../../mod/sources.php:134 -msgid "Leave blank to import all public content" -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:580 +msgid "You receive a private message" +msgstr "вы получили личное сообщение" -#: ../../mod/sources.php:103 ../../mod/sources.php:137 -#: ../../mod/new_channel.php:110 -msgid "Channel Name" -msgstr "Имя канала" +#: ../../Zotlabs/Module/Settings/Channel.php:581 +msgid "You receive a friend suggestion" +msgstr "вы получили предложение друзей" -#: ../../mod/sources.php:123 ../../mod/sources.php:150 -msgid "Source not found." -msgstr "Источник не найден." +#: ../../Zotlabs/Module/Settings/Channel.php:582 +msgid "You are tagged in a post" +msgstr "вы были отмечены в публикации" -#: ../../mod/sources.php:130 -msgid "Edit Source" -msgstr "Редактировать источник" +#: ../../Zotlabs/Module/Settings/Channel.php:583 +msgid "You are poked/prodded/etc. in a post" +msgstr "вас толкнули, подтолкнули и т.п. в публикации" -#: ../../mod/sources.php:131 -msgid "Delete Source" -msgstr "Удалить источник" +#: ../../Zotlabs/Module/Settings/Channel.php:585 +msgid "Someone likes your post/comment" +msgstr "кому-то нравится ваша публикация / комментарий" -#: ../../mod/sources.php:158 -msgid "Source removed" -msgstr "Источник удален" +#: ../../Zotlabs/Module/Settings/Channel.php:588 +msgid "Show visual notifications including:" +msgstr "Показывать визуальные оповещения включая:" -#: ../../mod/sources.php:160 -msgid "Unable to remove source." -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:590 +msgid "Unseen grid activity" +msgstr "невидимую сетевую активность" -#: ../../mod/filer.php:49 -msgid "- select -" -msgstr "- выбрать -" +#: ../../Zotlabs/Module/Settings/Channel.php:591 +msgid "Unseen channel activity" +msgstr "невидимую активность в канале" -#: ../../mod/events.php:72 -msgid "Event title and start time are required." -msgstr "Название события и время начала требуется." +#: ../../Zotlabs/Module/Settings/Channel.php:592 +msgid "Unseen private messages" +msgstr "невидимое личное сообщение" -#: ../../mod/events.php:310 -msgid "l, F j" -msgstr "l, F j" +#: ../../Zotlabs/Module/Settings/Channel.php:593 +msgid "Upcoming events" +msgstr "грядущие события" -#: ../../mod/events.php:332 -msgid "Edit event" -msgstr "Редактировать мероприятие" +#: ../../Zotlabs/Module/Settings/Channel.php:594 +msgid "Events today" +msgstr "события сегодня" -#: ../../mod/events.php:378 -msgid "Create New Event" -msgstr "Создать новое мероприятие" +#: ../../Zotlabs/Module/Settings/Channel.php:595 +msgid "Upcoming birthdays" +msgstr "грядущие дни рождения" -#: ../../mod/events.php:379 -msgid "Previous" -msgstr "Предыдущая" +#: ../../Zotlabs/Module/Settings/Channel.php:595 +msgid "Not available in all themes" +msgstr "не доступно во всех темах" -#: ../../mod/events.php:450 -msgid "hour:minute" -msgstr "часы:минуты" +#: ../../Zotlabs/Module/Settings/Channel.php:596 +msgid "System (personal) notifications" +msgstr "системные (личные) уведомления" -#: ../../mod/events.php:470 -msgid "Event details" -msgstr "Детали мероприятия" +#: ../../Zotlabs/Module/Settings/Channel.php:597 +msgid "System info messages" +msgstr "сообщения с системной информацией" -#: ../../mod/events.php:471 -#, php-format -msgid "Format is %s %s. Starting date and Title are required." -msgstr "Формат: %s %s. Дата начала и название необходимы." +#: ../../Zotlabs/Module/Settings/Channel.php:598 +msgid "System critical alerts" +msgstr "критические уведомления системы" -#: ../../mod/events.php:473 -msgid "Event Starts:" -msgstr "Начало мероприятия:" +#: ../../Zotlabs/Module/Settings/Channel.php:599 +msgid "New connections" +msgstr "новые контакты" -#: ../../mod/events.php:473 ../../mod/events.php:487 ../../mod/appman.php:91 -#: ../../mod/appman.php:92 -msgid "Required" -msgstr "Необходимо" +#: ../../Zotlabs/Module/Settings/Channel.php:600 +msgid "System Registrations" +msgstr "системные регистрации" -#: ../../mod/events.php:476 -msgid "Finish date/time is not known or not relevant" -msgstr "Дата окончания или время окончания не известно / не релевантно." +#: ../../Zotlabs/Module/Settings/Channel.php:601 +msgid "Unseen shared files" +msgstr "невидимые общие файлы" -#: ../../mod/events.php:478 -msgid "Event Finishes:" -msgstr "\t\nКонец мероприятий:" +#: ../../Zotlabs/Module/Settings/Channel.php:602 +msgid "Unseen public activity" +msgstr "невидимая публичная активность" -#: ../../mod/events.php:481 -msgid "Adjust for viewer timezone" -msgstr "Отрегулируйте для просмотра часовых поясов" +#: ../../Zotlabs/Module/Settings/Channel.php:603 +msgid "Unseen likes and dislikes" +msgstr "невидимые лайки и дислайки" -#: ../../mod/events.php:483 -msgid "Description:" -msgstr "Описание:" +#: ../../Zotlabs/Module/Settings/Channel.php:604 +msgid "Unseen forum posts" +msgstr "Невидимые публикации на форуме" -#: ../../mod/events.php:487 -msgid "Title:" -msgstr "Заголовок:" +#: ../../Zotlabs/Module/Settings/Channel.php:605 +msgid "Email notification hub (hostname)" +msgstr "Центр уведомлений по email (имя хоста)" -#: ../../mod/events.php:489 -msgid "Share this event" -msgstr "Поделиться этим мероприятием" +#: ../../Zotlabs/Module/Settings/Channel.php:605 +#, php-format +msgid "" +"If your channel is mirrored to multiple hubs, set this to your preferred " +"location. This will prevent duplicate email notifications. Example: %s" +msgstr "" +"Если ваш канал зеркалируется в нескольких местах, это ваше предпочтительное " +"местоположение. Это должно предотвратить дублировать уведомлений по email. Например: %s" -#: ../../mod/filestorage.php:68 -msgid "Permission Denied." -msgstr "Доступ запрещен." +#: ../../Zotlabs/Module/Settings/Channel.php:606 +msgid "Show new wall posts, private messages and connections under Notices" +msgstr "Показать новые сообщения на стене, личные сообщения и контакты в \"Уведомлениях\"" -#: ../../mod/filestorage.php:85 -msgid "File not found." -msgstr "Файл не найден." +#: ../../Zotlabs/Module/Settings/Channel.php:608 +msgid "Notify me of events this many days in advance" +msgstr "Уведомлять меня о событиях заранее, дней" -#: ../../mod/filestorage.php:122 -msgid "Edit file permissions" -msgstr "Редактировать разрешения файла" +#: ../../Zotlabs/Module/Settings/Channel.php:608 +msgid "Must be greater than 0" +msgstr "Должно быть больше 0" -#: ../../mod/filestorage.php:131 -msgid "Set/edit permissions" -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:614 +msgid "Advanced Account/Page Type Settings" +msgstr "Дополнительные настройки учётной записи / страницы" -#: ../../mod/filestorage.php:132 -msgid "Include all files and sub folders" -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:615 +msgid "Change the behaviour of this account for special situations" +msgstr "Изменить поведение этого аккаунта в особых ситуациях" -#: ../../mod/filestorage.php:133 -msgid "Return to file list" -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:617 +msgid "Miscellaneous Settings" +msgstr "Дополнительные настройки" -#: ../../mod/filestorage.php:135 -msgid "Copy/paste this code to attach file to a post" -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:618 +msgid "Default photo upload folder" +msgstr "Каталог загрузки фотографий по умолчанию" -#: ../../mod/filestorage.php:136 -msgid "Copy/paste this URL to link file from a web page" -msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:618 +#: ../../Zotlabs/Module/Settings/Channel.php:619 +msgid "%Y - current year, %m - current month" +msgstr "%Y - текущий год, %y - текущий месяц" -#: ../../mod/follow.php:25 -msgid "Channel added." -msgstr "Контакт добавлен." +#: ../../Zotlabs/Module/Settings/Channel.php:619 +msgid "Default file upload folder" +msgstr "Каталог загрузки файлов по умолчанию" -#: ../../mod/subthread.php:103 -#, php-format -msgid "%1$s is following %2$s's %3$s" -msgstr "%1$s следит %2$s's %3$s" +#: ../../Zotlabs/Module/Settings/Channel.php:621 +msgid "Personal menu to display in your channel pages" +msgstr "Персональное меню для отображения на странице вашего канала" -#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 -msgid "Contact not found." -msgstr "Контакт не найден." +#: ../../Zotlabs/Module/Settings/Channel.php:623 +msgid "Remove this channel." +msgstr "Удалить этот канал." -#: ../../mod/fsuggest.php:63 -msgid "Friend suggestion sent." -msgstr "Предложение дружить отправлено." +#: ../../Zotlabs/Module/Settings/Channel.php:624 +msgid "Firefox Share $Projectname provider" +msgstr "" -#: ../../mod/fsuggest.php:97 -msgid "Suggest Friends" -msgstr "Пригласить друзей" +#: ../../Zotlabs/Module/Settings/Channel.php:625 +msgid "Start calendar week on Monday" +msgstr "Начинать календарную неделю с понедельника" -#: ../../mod/fsuggest.php:99 -#, php-format -msgid "Suggest a friend for %s" -msgstr "" +#: ../../Zotlabs/Module/Settings/Featured.php:23 +msgid "Affinity Slider settings updated." +msgstr "Обновлены настройки слайдера cходства." -#: ../../mod/suggest.php:35 -msgid "" -"No suggestions available. If this is a new site, please try again in 24 " -"hours." -msgstr "" +#: ../../Zotlabs/Module/Settings/Featured.php:38 +msgid "No feature settings configured" +msgstr "Параметры функций не настроены" -#: ../../mod/group.php:20 -msgid "Collection created." -msgstr "Коллекция создана." +#: ../../Zotlabs/Module/Settings/Featured.php:45 +msgid "Default maximum affinity level" +msgstr "Максимальный уровень сходства по умолчанию." -#: ../../mod/group.php:26 -msgid "Could not create collection." -msgstr "Не удалось создать коллекцию." +#: ../../Zotlabs/Module/Settings/Featured.php:45 +msgid "0-99 default 99" +msgstr "0-99 (по умолчанию 99)" -#: ../../mod/group.php:54 -msgid "Collection updated." -msgstr "" +#: ../../Zotlabs/Module/Settings/Featured.php:50 +msgid "Default minimum affinity level" +msgstr "Минимальный уровень сходства по умолчанию." -#: ../../mod/group.php:86 -msgid "Create a collection of channels." -msgstr "Создать коллекцию контактов" +#: ../../Zotlabs/Module/Settings/Featured.php:50 +msgid "0-99 - default 0" +msgstr "0-99 (по умолчанию 0)" -#: ../../mod/group.php:87 ../../mod/group.php:183 -msgid "Collection Name: " -msgstr "Название коллекции:" +#: ../../Zotlabs/Module/Settings/Featured.php:54 +msgid "Affinity Slider Settings" +msgstr "Настройки слайдера сходства" -#: ../../mod/group.php:89 ../../mod/group.php:186 -msgid "Members are visible to other channels" -msgstr "Пользователи могут видеть другие каналы" +#: ../../Zotlabs/Module/Settings/Featured.php:67 +msgid "Addon Settings" +msgstr "Настройки расширений" -#: ../../mod/group.php:107 -msgid "Collection removed." -msgstr "Коллекция удалена." +#: ../../Zotlabs/Module/Settings/Featured.php:68 +msgid "Please save/submit changes to any panel before opening another." +msgstr "Пожалуйста сохраните / отправьте изменения на панели прежде чем открывать другую." -#: ../../mod/group.php:109 -msgid "Unable to remove collection." -msgstr "Невозможно удалить коллекцию." +#: ../../Zotlabs/Module/Settings/Account.php:20 +msgid "Not valid email." +msgstr "Не действительный адрес email." -#: ../../mod/group.php:182 -msgid "Collection Editor" -msgstr "Редактор коллекций" +#: ../../Zotlabs/Module/Settings/Account.php:23 +msgid "Protected email address. Cannot change to that email." +msgstr "Защищенный адрес электронной почты. Нельзя изменить." -#: ../../mod/group.php:196 -msgid "Members" -msgstr "Участники" +#: ../../Zotlabs/Module/Settings/Account.php:32 +msgid "System failure storing new email. Please try again." +msgstr "Системная ошибка сохранения email. Пожалуйста попробуйте ещё раз." -#: ../../mod/group.php:198 -msgid "All Connected Channels" -msgstr "Все подключенные контакы" +#: ../../Zotlabs/Module/Settings/Account.php:40 +msgid "Technical skill level updated" +msgstr "Уровень технических навыков обновлён" -#: ../../mod/group.php:231 -msgid "Click on a channel to add or remove." -msgstr "Нажмите на канал, чтобы добавить или удалить." +#: ../../Zotlabs/Module/Settings/Account.php:56 +msgid "Password verification failed." +msgstr "Не удалось выполнить проверку пароля." -#: ../../mod/tagger.php:98 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" -msgstr "" +#: ../../Zotlabs/Module/Settings/Account.php:63 +msgid "Passwords do not match. Password unchanged." +msgstr "Пароли не совпадают. Пароль не изменён." -#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55 -msgid "Help:" -msgstr "Помощь:" +#: ../../Zotlabs/Module/Settings/Account.php:67 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "Пустые пароли не допускаются. Пароль не изменён." -#: ../../mod/help.php:69 ../../index.php:233 -msgid "Not Found" -msgstr "Не найдено" +#: ../../Zotlabs/Module/Settings/Account.php:81 +msgid "Password changed." +msgstr "Пароль изменен." -#: ../../mod/tagrm.php:41 -msgid "Tag removed" -msgstr "Тег удален" +#: ../../Zotlabs/Module/Settings/Account.php:83 +msgid "Password update failed. Please try again." +msgstr "Изменение пароля не удалось. Пожалуйста, попробуйте ещё раз." -#: ../../mod/tagrm.php:79 -msgid "Remove Item Tag" -msgstr "Удалить Тег" +#: ../../Zotlabs/Module/Settings/Account.php:112 +msgid "Account Settings" +msgstr "Настройки аккаунта" -#: ../../mod/tagrm.php:81 -msgid "Select a tag to remove: " -msgstr "Выбрать тег для удаления: " +#: ../../Zotlabs/Module/Settings/Account.php:113 +msgid "Current Password" +msgstr "Текущий пароль" -#: ../../mod/admin.php:52 -msgid "Theme settings updated." -msgstr "Настройки темы обновленны." +#: ../../Zotlabs/Module/Settings/Account.php:114 +msgid "Enter New Password" +msgstr "Введите новый пароль:" -#: ../../mod/admin.php:92 ../../mod/admin.php:441 -msgid "Site" -msgstr "Сайт" +#: ../../Zotlabs/Module/Settings/Account.php:115 +msgid "Confirm New Password" +msgstr "Подтвердите новый пароль:" -#: ../../mod/admin.php:93 -msgid "Accounts" -msgstr "Пользователи" +#: ../../Zotlabs/Module/Settings/Account.php:115 +msgid "Leave password fields blank unless changing" +msgstr "Оставьте поля пустыми до измнения" -#: ../../mod/admin.php:94 ../../mod/admin.php:885 -msgid "Channels" -msgstr "Каналы" +#: ../../Zotlabs/Module/Settings/Account.php:121 +msgid "Remove this account including all its channels" +msgstr "Удалить этот аккаунт включая все каналы" -#: ../../mod/admin.php:95 ../../mod/admin.php:976 ../../mod/admin.php:1018 -msgid "Plugins" -msgstr "Плагины" +#: ../../Zotlabs/Module/Settings/Display.php:139 +#, php-format +msgid "%s - (Experimental)" +msgstr "%s - (экспериментальный)" -#: ../../mod/admin.php:96 ../../mod/admin.php:1181 ../../mod/admin.php:1217 -msgid "Themes" -msgstr "Темы" +#: ../../Zotlabs/Module/Settings/Display.php:187 +msgid "Display Settings" +msgstr "Настройки отображения" -#: ../../mod/admin.php:97 ../../mod/admin.php:541 -msgid "Server" -msgstr "Серверы" +#: ../../Zotlabs/Module/Settings/Display.php:188 +msgid "Theme Settings" +msgstr "Настройки темы" -#: ../../mod/admin.php:98 -msgid "DB updates" -msgstr "Обновление базы данных" +#: ../../Zotlabs/Module/Settings/Display.php:189 +msgid "Custom Theme Settings" +msgstr "Дополнительные настройки темы" -#: ../../mod/admin.php:112 ../../mod/admin.php:119 ../../mod/admin.php:1304 -msgid "Logs" -msgstr "Журналы" +#: ../../Zotlabs/Module/Settings/Display.php:190 +msgid "Content Settings" +msgstr "Настройки содержимого" -#: ../../mod/admin.php:118 -msgid "Plugin Features" -msgstr "Функции плагинов" +#: ../../Zotlabs/Module/Settings/Display.php:196 +msgid "Display Theme:" +msgstr "Тема отображения:" -#: ../../mod/admin.php:120 -msgid "User registrations waiting for confirmation" -msgstr "Регистрации пользователей, которые ждут подтверждения" +#: ../../Zotlabs/Module/Settings/Display.php:197 +msgid "Select scheme" +msgstr "Выбрать схему" -#: ../../mod/admin.php:197 -msgid "Message queues" -msgstr "Очередь недоставленных сообщений" +#: ../../Zotlabs/Module/Settings/Display.php:199 +msgid "Preload images before rendering the page" +msgstr "Предзагрузка изображений перед обработкой страницы" -#: ../../mod/admin.php:202 ../../mod/admin.php:440 ../../mod/admin.php:540 -#: ../../mod/admin.php:749 ../../mod/admin.php:884 ../../mod/admin.php:975 -#: ../../mod/admin.php:1017 ../../mod/admin.php:1180 ../../mod/admin.php:1216 -#: ../../mod/admin.php:1303 -msgid "Administration" -msgstr "Администрация" +#: ../../Zotlabs/Module/Settings/Display.php:199 +msgid "" +"The subjective page load time will be longer but the page will be ready when " +"displayed" +msgstr "Субъективное время загрузки страницы будет длиннее, но страница будет готова при отображении" -#: ../../mod/admin.php:203 -msgid "Summary" -msgstr "Резюме" +#: ../../Zotlabs/Module/Settings/Display.php:200 +msgid "Enable user zoom on mobile devices" +msgstr "Включить масштабирование на мобильных устройствах" -#: ../../mod/admin.php:205 -msgid "Registered users" -msgstr "Всего пользователeй" +#: ../../Zotlabs/Module/Settings/Display.php:201 +msgid "Update browser every xx seconds" +msgstr "Обновление браузера каждые N секунд" -#: ../../mod/admin.php:207 ../../mod/admin.php:544 -msgid "Pending registrations" -msgstr "Ждут утверждения" +#: ../../Zotlabs/Module/Settings/Display.php:201 +msgid "Minimum of 10 seconds, no maximum" +msgstr "Минимум 10 секунд, без максимума" -#: ../../mod/admin.php:208 -msgid "Version" -msgstr "Версия системы" +#: ../../Zotlabs/Module/Settings/Display.php:202 +msgid "Maximum number of conversations to load at any time:" +msgstr "Максимальное количество бесед для загрузки одновременно:" -#: ../../mod/admin.php:210 ../../mod/admin.php:545 -msgid "Active plugins" -msgstr "Активные плагины" +#: ../../Zotlabs/Module/Settings/Display.php:202 +msgid "Maximum of 100 items" +msgstr "Максимум 100 элементов" -#: ../../mod/admin.php:361 -msgid "Site settings updated." -msgstr "Настройки сайта обновлены." +#: ../../Zotlabs/Module/Settings/Display.php:203 +msgid "Show emoticons (smilies) as images" +msgstr "Показывать эмотиконы (смайлики) как изображения" -#: ../../mod/admin.php:392 -msgid "No special theme for accessibility" -msgstr "" +#: ../../Zotlabs/Module/Settings/Display.php:204 +msgid "Provide channel menu in navigation bar" +msgstr "Показывать меню канала в панели навигации" -#: ../../mod/admin.php:421 -msgid "Yes - with approval" -msgstr "" +#: ../../Zotlabs/Module/Settings/Display.php:204 +msgid "Default: channel menu located in app menu" +msgstr "По умолчанию каналы расположены в меню приложения" -#: ../../mod/admin.php:427 -msgid "My site is not a public server" -msgstr "" +#: ../../Zotlabs/Module/Settings/Display.php:205 +msgid "Manual conversation updates" +msgstr "Обновление бесед вручную" -#: ../../mod/admin.php:428 -msgid "My site has paid access only" -msgstr "" +#: ../../Zotlabs/Module/Settings/Display.php:205 +msgid "Default is on, turning this off may increase screen jumping" +msgstr "Включено по умолчанию, выключение может привести к рывкам в отображении" -#: ../../mod/admin.php:429 -msgid "My site has free access only" -msgstr "" +#: ../../Zotlabs/Module/Settings/Display.php:206 +msgid "Link post titles to source" +msgstr "Ссылки на источник заголовков публикаций" -#: ../../mod/admin.php:430 -msgid "My site offers free accounts with optional paid upgrades" -msgstr "" +#: ../../Zotlabs/Module/Settings/Display.php:207 +msgid "System Page Layout Editor - (advanced)" +msgstr "Системный редактор макета страницы - (продвинутый)" -#: ../../mod/admin.php:444 -msgid "File upload" -msgstr "Загрузка файла" +#: ../../Zotlabs/Module/Settings/Display.php:210 +msgid "Use blog/list mode on channel page" +msgstr "Использовать режим блога / списка на странице канала" -#: ../../mod/admin.php:445 -msgid "Policies" -msgstr "Правила" +#: ../../Zotlabs/Module/Settings/Display.php:210 +#: ../../Zotlabs/Module/Settings/Display.php:211 +msgid "(comments displayed separately)" +msgstr "(комментарии отображаются отдельно)" -#: ../../mod/admin.php:450 -msgid "Site name" -msgstr "Название сайта" +#: ../../Zotlabs/Module/Settings/Display.php:211 +msgid "Use blog/list mode on grid page" +msgstr "Использовать режим блога / списка на странице матрицы" -#: ../../mod/admin.php:451 -msgid "Banner/Logo" -msgstr "Баннер / логотип" +#: ../../Zotlabs/Module/Settings/Display.php:212 +msgid "Channel page max height of content (in pixels)" +msgstr "Максимальная высота содержания канала (в пикселях)" -#: ../../mod/admin.php:452 -msgid "Administrator Information" -msgstr "Информация об администраторе" +#: ../../Zotlabs/Module/Settings/Display.php:212 +#: ../../Zotlabs/Module/Settings/Display.php:213 +msgid "click to expand content exceeding this height" +msgstr "нажмите, чтобы увеличить содержимое, превышающее эту высоту" -#: ../../mod/admin.php:452 -msgid "" -"Contact information for site administrators. Displayed on siteinfo page. " -"BBCode can be used here" -msgstr "" +#: ../../Zotlabs/Module/Settings/Display.php:213 +msgid "Grid page max height of content (in pixels)" +msgstr "Максимальная высота содержания на страницах матрицы (в пикселях)" -#: ../../mod/admin.php:453 -msgid "System language" -msgstr "Язык системы" +#: ../../Zotlabs/Module/Settings/Permcats.php:23 +msgid "Permission Name is required." +msgstr "Требуется имя разрешения" -#: ../../mod/admin.php:454 -msgid "System theme" -msgstr "Тема системы" +#: ../../Zotlabs/Module/Settings/Permcats.php:42 +msgid "Permission category saved." +msgstr "Категория разрешения сохранена." -#: ../../mod/admin.php:454 +#: ../../Zotlabs/Module/Settings/Permcats.php:66 msgid "" -"Default system theme - may be over-ridden by user profiles - change theme settings" -msgstr "" +"Use this form to create permission rules for various classes of people or " +"connections." +msgstr "Используйте эту форму для создания правил разрешений для различных групп людей и контактов." -#: ../../mod/admin.php:455 -msgid "Mobile system theme" -msgstr "Мобильная тема системы" +#: ../../Zotlabs/Module/Settings/Permcats.php:107 +msgid "Permission Name" +msgstr "Имя разрешения" -#: ../../mod/admin.php:455 -msgid "Theme for mobile devices" -msgstr "Тема для мобильных устройств" - -#: ../../mod/admin.php:456 -msgid "Accessibility system theme" -msgstr "" +#: ../../Zotlabs/Module/Settings/Oauth2.php:36 +msgid "Name and Secret are required" +msgstr "Требуются имя и код" -#: ../../mod/admin.php:456 -msgid "Accessibility theme" -msgstr "" +#: ../../Zotlabs/Module/Settings/Oauth2.php:84 +msgid "Add OAuth2 application" +msgstr "Добавить приложение OAuth2" -#: ../../mod/admin.php:457 -msgid "Channel to use for this website's static pages" -msgstr "" +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth.php:90 +msgid "Name of application" +msgstr "Название приложения" -#: ../../mod/admin.php:457 -msgid "Site Channel" -msgstr "Канал сайта" +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth.php:91 +#: ../../Zotlabs/Module/Settings/Oauth.php:92 +msgid "Automatically generated - change if desired. Max length 20" +msgstr "Сгенерирован автоматические - измените если требуется. Макс. длина 20" -#: ../../mod/admin.php:459 -msgid "Maximum image size" -msgstr "Максимальный размер" +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +#: ../../Zotlabs/Module/Settings/Oauth.php:93 +#: ../../Zotlabs/Module/Settings/Oauth.php:119 +msgid "Redirect" +msgstr "Перенаправление" -#: ../../mod/admin.php:459 +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +#: ../../Zotlabs/Module/Settings/Oauth.php:93 msgid "" -"Maximum size in bytes of uploaded images. Default is 0, which means no " -"limits." -msgstr "" +"Redirect URI - leave blank unless your application specifically requires this" +msgstr "URI перенаправления - оставьте пустыми до тех пока ваше приложение не требует этого" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +msgid "Grant Types" +msgstr "Разрешить типы" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:91 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +#: ../../Zotlabs/Module/Settings/Oauth2.php:119 +msgid "leave blank unless your application sepcifically requires this" +msgstr "оставьте пустыми до тех пока ваше приложение не требует этого" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:91 +#: ../../Zotlabs/Module/Settings/Oauth2.php:119 +msgid "Authorization scope" +msgstr "Область полномочий" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:103 +msgid "OAuth2 Application not found." +msgstr "Приложение OAuth2 не найдено." + +#: ../../Zotlabs/Module/Settings/Oauth2.php:112 +#: ../../Zotlabs/Module/Settings/Oauth2.php:149 +#: ../../Zotlabs/Module/Settings/Oauth.php:87 +#: ../../Zotlabs/Module/Settings/Oauth.php:113 +#: ../../Zotlabs/Module/Settings/Oauth.php:149 +msgid "Add application" +msgstr "Добавить приложение" -#: ../../mod/admin.php:460 -msgid "Does this site allow new member registration?" -msgstr "" +#: ../../Zotlabs/Module/Settings/Oauth2.php:148 +msgid "Connected OAuth2 Apps" +msgstr "Подключённые приложения OAuth2" -#: ../../mod/admin.php:461 -msgid "Which best describes the types of account offered by this hub?" -msgstr "" +#: ../../Zotlabs/Module/Settings/Oauth2.php:152 +#: ../../Zotlabs/Module/Settings/Oauth.php:152 +msgid "Client key starts with" +msgstr "Ключ клиента начинаетя с" -#: ../../mod/admin.php:462 -msgid "Register text" -msgstr "Текст регистрации" +#: ../../Zotlabs/Module/Settings/Oauth2.php:153 +#: ../../Zotlabs/Module/Settings/Oauth.php:153 +msgid "No name" +msgstr "Без названия" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:154 +#: ../../Zotlabs/Module/Settings/Oauth.php:154 +msgid "Remove authorization" +msgstr "Удалить разрешение" -#: ../../mod/admin.php:462 -msgid "Will be displayed prominently on the registration page." -msgstr "" +#: ../../Zotlabs/Module/Settings/Oauth.php:35 +msgid "Name is required" +msgstr "Необходимо имя" -#: ../../mod/admin.php:463 -msgid "Accounts abandoned after x days" -msgstr "" +#: ../../Zotlabs/Module/Settings/Oauth.php:39 +msgid "Key and Secret are required" +msgstr "Требуются ключ и код" -#: ../../mod/admin.php:463 -msgid "" -"Will not waste system resources polling external sites for abandonded " -"accounts. Enter 0 for no time limit." -msgstr "" +#: ../../Zotlabs/Module/Settings/Oauth.php:94 +#: ../../Zotlabs/Module/Settings/Oauth.php:120 +msgid "Icon url" +msgstr "URL значка" -#: ../../mod/admin.php:464 -msgid "Allowed friend domains" -msgstr "Разрешенные домены друзей" +#: ../../Zotlabs/Module/Settings/Oauth.php:105 +msgid "Application not found." +msgstr "Приложение не найдено." -#: ../../mod/admin.php:464 -msgid "" -"Comma separated list of domains which are allowed to establish friendships " -"with this site. Wildcards are accepted. Empty to allow any domains" -msgstr "" +#: ../../Zotlabs/Module/Settings/Oauth.php:148 +msgid "Connected Apps" +msgstr "Подключенные приложения" -#: ../../mod/admin.php:465 -msgid "Allowed email domains" -msgstr "Разрешенные домены электронной почты" +#: ../../Zotlabs/Module/Settings/Tokens.php:31 +#, php-format +msgid "This channel is limited to %d tokens" +msgstr "Этот канал ограничен %d токенами" -#: ../../mod/admin.php:465 -msgid "" -"Comma separated list of domains which are allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains" -msgstr "" +#: ../../Zotlabs/Module/Settings/Tokens.php:37 +msgid "Name and Password are required." +msgstr "Требуются имя и пароль." -#: ../../mod/admin.php:466 -msgid "Block public" -msgstr "Блокировать публичный доступ" +#: ../../Zotlabs/Module/Settings/Tokens.php:77 +msgid "Token saved." +msgstr "Токен сохранён." -#: ../../mod/admin.php:466 +#: ../../Zotlabs/Module/Settings/Tokens.php:113 msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently logged in." -msgstr "" - -#: ../../mod/admin.php:467 -msgid "Force publish" -msgstr "Заставить публиковать" +"Use this form to create temporary access identifiers to share things with " +"non-members. These identities may be used in Access Control Lists and " +"visitors may login using these credentials to access private content." +msgstr "Используйте эту форму для создания идентификаторов временного доступа для сторонних пользователей. Эти идентификаторы могут использоваться в списках контроля доступа, и посетители могут использовать эти учетные данные для доступа к частному контенту." -#: ../../mod/admin.php:467 +#: ../../Zotlabs/Module/Settings/Tokens.php:115 msgid "" -"Check to force all profiles on this site to be listed in the site directory." -msgstr "" +"You may also provide dropbox style access links to friends and " +"associates by adding the Login Password to any specific site URL as shown. " +"Examples:" +msgstr "Вы также можете предоставить доступ в стиле dropbox для друзей и коллег, добавив имя и пароль для входа на любой URL-адрес сайта. Например:" -#: ../../mod/admin.php:468 -msgid "Disable discovery tab" -msgstr "Отключить вкладку \"обнаруженные\"" +#: ../../Zotlabs/Module/Settings/Tokens.php:157 +msgid "Login Name" +msgstr "Имя" -#: ../../mod/admin.php:468 -msgid "" -"Remove the tab in the network view with public content pulled from sources " -"chosen for this site." -msgstr "" +#: ../../Zotlabs/Module/Settings/Tokens.php:158 +msgid "Login Password" +msgstr "Пароль" -#: ../../mod/admin.php:469 -msgid "No login on Homepage" -msgstr "" +#: ../../Zotlabs/Module/Settings/Tokens.php:159 +msgid "Expires (yyyy-mm-dd)" +msgstr "Срок действия (yyyy-mm-dd)" -#: ../../mod/admin.php:469 -msgid "" -"Check to hide the login form from your sites homepage when visitors arrive " -"who are not logged in (e.g. when you put the content of the homepage in via " -"the site channel)." -msgstr "" +#: ../../Zotlabs/Module/Chat.php:181 +msgid "Room not found" +msgstr "Комната не найдена" -#: ../../mod/admin.php:471 -msgid "Proxy user" -msgstr "Proxy пользователь" +#: ../../Zotlabs/Module/Chat.php:197 +msgid "Leave Room" +msgstr "Покинуть комнату" -#: ../../mod/admin.php:472 -msgid "Proxy URL" -msgstr "Proxy URL" +#: ../../Zotlabs/Module/Chat.php:198 +msgid "Delete Room" +msgstr "Удалить комнату" -#: ../../mod/admin.php:473 -msgid "Network timeout" -msgstr "Время ожидания сети" +#: ../../Zotlabs/Module/Chat.php:199 +msgid "I am away right now" +msgstr "Я сейчас отошёл" -#: ../../mod/admin.php:473 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." -msgstr "" +#: ../../Zotlabs/Module/Chat.php:200 +msgid "I am online" +msgstr "Я на связи" -#: ../../mod/admin.php:474 -msgid "Delivery interval" -msgstr "Интервал доставки" +#: ../../Zotlabs/Module/Chat.php:202 +msgid "Bookmark this room" +msgstr "Запомнить эту комнату" -#: ../../mod/admin.php:474 -msgid "" -"Delay background delivery processes by this many seconds to reduce system " -"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " -"for large dedicated servers." -msgstr "" +#: ../../Zotlabs/Module/Chat.php:232 +msgid "New Chatroom" +msgstr "Новый чат" -#: ../../mod/admin.php:475 -msgid "Poll interval" -msgstr "Интервал опроса" +#: ../../Zotlabs/Module/Chat.php:233 +msgid "Chatroom name" +msgstr "Название чата" -#: ../../mod/admin.php:475 -msgid "" -"Delay background polling processes by this many seconds to reduce system " -"load. If 0, use delivery interval." -msgstr "" +#: ../../Zotlabs/Module/Chat.php:234 +msgid "Expiration of chats (minutes)" +msgstr "Завершение чатов (минут)" -#: ../../mod/admin.php:476 -msgid "Maximum Load Average" -msgstr "" +#: ../../Zotlabs/Module/Chat.php:250 +#, php-format +msgid "%1$s's Chatrooms" +msgstr "Чаты пользователя %1$s" -#: ../../mod/admin.php:476 -msgid "" -"Maximum system load before delivery and poll processes are deferred - " -"default 50." -msgstr "" +#: ../../Zotlabs/Module/Chat.php:255 +msgid "No chatrooms available" +msgstr "Нет доступных чатов" -#: ../../mod/admin.php:532 -msgid "No server found" -msgstr "Сервер не найден" +#: ../../Zotlabs/Module/Chat.php:259 +msgid "Expiration" +msgstr "Срок действия" -#: ../../mod/admin.php:539 ../../mod/admin.php:763 -msgid "ID" -msgstr "ID" +#: ../../Zotlabs/Module/Chat.php:260 +msgid "min" +msgstr "мин." -#: ../../mod/admin.php:539 -msgid "for channel" -msgstr "для канала" +#: ../../Zotlabs/Module/Rate.php:156 +msgid "Website:" +msgstr "Веб-сайт:" -#: ../../mod/admin.php:539 -msgid "on server" -msgstr "на сервере" +#: ../../Zotlabs/Module/Rate.php:159 +#, php-format +msgid "Remote Channel [%s] (not yet known on this site)" +msgstr "Удалённый канал [%s] (пока неизвестен на этом сайте)" -#: ../../mod/admin.php:539 -msgid "Status" -msgstr "Статус" +#: ../../Zotlabs/Module/Rate.php:160 +msgid "Rating (this information is public)" +msgstr "Оценка (эта информация общедоступна)" -#: ../../mod/admin.php:560 -msgid "Update has been marked successful" -msgstr "" +#: ../../Zotlabs/Module/Rate.php:161 +msgid "Optionally explain your rating (this information is public)" +msgstr "Объясните свою оценку (необязательно; эта информация общедоступна)" -#: ../../mod/admin.php:570 +#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34 #, php-format -msgid "Executing %s failed. Check system logs." -msgstr "" +msgid "Fetching URL returns error: %1$s" +msgstr "Загрузка URL возвращает ошибку: %1$s" -#: ../../mod/admin.php:573 -#, php-format -msgid "Update %s was successfully applied." -msgstr "" +#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 +msgid "Location not found." +msgstr "Местоположение не найдено" -#: ../../mod/admin.php:577 -#, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." -msgstr "" +#: ../../Zotlabs/Module/Locs.php:62 +msgid "Location lookup failed." +msgstr "Поиск местоположения не удался" -#: ../../mod/admin.php:580 -#, php-format -msgid "Update function %s could not be found." -msgstr "" +#: ../../Zotlabs/Module/Locs.php:66 +msgid "" +"Please select another location to become primary before removing the primary " +"location." +msgstr "Пожалуйста, выберите другое местоположение в качестве основного прежде чем удалить предыдущее" -#: ../../mod/admin.php:595 -msgid "No failed updates." -msgstr "Ошибок обновлений нет." +#: ../../Zotlabs/Module/Locs.php:95 +msgid "Syncing locations" +msgstr "Синхронизировать местоположение" -#: ../../mod/admin.php:599 -msgid "Failed Updates" -msgstr "Обновления с ошибками" +#: ../../Zotlabs/Module/Locs.php:105 +msgid "No locations found." +msgstr "Местоположений не найдено" -#: ../../mod/admin.php:601 -msgid "Mark success (if update was manually applied)" -msgstr "" +#: ../../Zotlabs/Module/Locs.php:116 +msgid "Manage Channel Locations" +msgstr "Управление местоположением канала" -#: ../../mod/admin.php:602 -msgid "Attempt to execute this update step automatically" -msgstr "" +#: ../../Zotlabs/Module/Locs.php:122 +msgid "Sync Now" +msgstr "Синхронизировать" -#: ../../mod/admin.php:628 -#, php-format -msgid "%s user blocked/unblocked" -msgid_plural "%s users blocked/unblocked" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +#: ../../Zotlabs/Module/Locs.php:123 +msgid "Please wait several minutes between consecutive operations." +msgstr "Пожалуйста, подождите несколько минут между последовательными операциями." -#: ../../mod/admin.php:635 -#, php-format -msgid "%s user deleted" -msgid_plural "%s users deleted" -msgstr[0] "%s канал удален" -msgstr[1] "%s канала удалены" -msgstr[2] "%s каналов удалено" +#: ../../Zotlabs/Module/Locs.php:124 +msgid "" +"When possible, drop a location by logging into that website/hub and removing " +"your channel." +msgstr "По возможности, очистите местоположение, войдя на этот веб-сайт / хаб и удалив свой канал." -#: ../../mod/admin.php:666 -msgid "Account not found" -msgstr "Аккаунт не найден" +#: ../../Zotlabs/Module/Locs.php:125 +msgid "Use this form to drop the location if the hub is no longer operating." +msgstr "Используйте эту форму, чтобы удалить местоположение, если хаб больше не функционирует." -#: ../../mod/admin.php:677 -#, php-format -msgid "User '%s' deleted" -msgstr "Пользователь '%s' удален" +#: ../../Zotlabs/Module/Import.php:66 ../../Zotlabs/Module/Import_items.php:48 +msgid "Nothing to import." +msgstr "Ничего импортировать." -#: ../../mod/admin.php:686 -#, php-format -msgid "User '%s' unblocked" -msgstr "Пользователь '%s' разрешен" +#: ../../Zotlabs/Module/Import.php:81 ../../Zotlabs/Module/Import.php:97 +#: ../../Zotlabs/Module/Import_items.php:72 +msgid "Unable to download data from old server" +msgstr "Невозможно загрузить данные со старого сервера" + +#: ../../Zotlabs/Module/Import.php:104 ../../Zotlabs/Module/Import_items.php:77 +msgid "Imported file is empty." +msgstr "Импортированный файл пуст." -#: ../../mod/admin.php:686 +#: ../../Zotlabs/Module/Import.php:146 #, php-format -msgid "User '%s' blocked" -msgstr "Пользователь '%s' заблокирован" +msgid "Your service plan only allows %d channels." +msgstr "Ваш класс обслуживания разрешает только %d каналов." -#: ../../mod/admin.php:750 ../../mod/admin.php:762 -msgid "Users" -msgstr "Пользователи" +#: ../../Zotlabs/Module/Import.php:173 +msgid "No channel. Import failed." +msgstr "Канала нет. Импорт невозможен." -#: ../../mod/admin.php:752 ../../mod/admin.php:887 -msgid "select all" -msgstr "выбрать все" +#: ../../Zotlabs/Module/Import.php:541 +msgid "You must be logged in to use this feature." +msgstr "Вы должны войти в систему, чтобы использовать эту функцию." -#: ../../mod/admin.php:753 -msgid "User registrations waiting for confirm" -msgstr "Регистрации пользователей ждут подтверждения" +#: ../../Zotlabs/Module/Import.php:546 +msgid "Import Channel" +msgstr "Импортировать канал" -#: ../../mod/admin.php:754 -msgid "Request date" -msgstr "Дата запроса" +#: ../../Zotlabs/Module/Import.php:547 +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 "Используйте эту форм для импорта существующего канала с другого сервера / хаба. Вы можете получить идентификационные данные канала со старого сервера / хаба через сеть или предоставить файл экспорта." -#: ../../mod/admin.php:755 -msgid "No registrations." -msgstr "Новых регистраций пока нет." +#: ../../Zotlabs/Module/Import.php:548 +#: ../../Zotlabs/Module/Import_items.php:127 +msgid "File to Upload" +msgstr "Файл для загрузки" -#: ../../mod/admin.php:756 -msgid "Approve" -msgstr "Утвердить" +#: ../../Zotlabs/Module/Import.php:549 +msgid "Or provide the old server/hub details" +msgstr "или предоставьте данные старого сервера" -#: ../../mod/admin.php:757 -msgid "Deny" -msgstr "Запретить" +#: ../../Zotlabs/Module/Import.php:551 +msgid "Your old identity address (xyz@example.com)" +msgstr "Ваш старый адрес идентичности (xyz@example.com)" -#: ../../mod/admin.php:763 -msgid "Register date" -msgstr "Дата регистрации" +#: ../../Zotlabs/Module/Import.php:552 +msgid "Your old login email address" +msgstr "Ваш старый адрес электронной почты" -#: ../../mod/admin.php:763 -msgid "Last login" -msgstr "Последний вход" +#: ../../Zotlabs/Module/Import.php:553 +msgid "Your old login password" +msgstr "Ваш старый пароль" -#: ../../mod/admin.php:763 -msgid "Expires" -msgstr "" +#: ../../Zotlabs/Module/Import.php:554 +msgid "Import a few months of posts if possible (limited by available memory" +msgstr "Импортировать несколько месяцев публикаций если возможно (ограничено доступной памятью)" -#: ../../mod/admin.php:763 -msgid "Service Class" -msgstr "Класс службы" +#: ../../Zotlabs/Module/Import.php:556 +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 "Для любого варианта, пожалуйста, выберите, следует ли сделать этот хаб вашим новым основным адресом, или ваше прежнее местоположение должно продолжить выполнять эту роль. Вы сможете отправлять сообщения из любого местоположения, но только одно может быть помечено как основное место для файлов, фотографий и мультимедиа." -#: ../../mod/admin.php:765 +#: ../../Zotlabs/Module/Import.php:558 +msgid "Make this hub my primary location" +msgstr "Сделать этот хаб главным" + +#: ../../Zotlabs/Module/Import.php:559 +msgid "Move this channel (disable all previous locations)" +msgstr "Переместить это канал (отключить все предыдущие месторасположения)" + +#: ../../Zotlabs/Module/Import.php:560 +msgid "Use this channel nickname instead of the one provided" +msgstr "Использовать псевдоним этого канала вместо предоставленного" + +#: ../../Zotlabs/Module/Import.php:560 msgid "" -"Selected users will be deleted!\\n\\nEverything these users had posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" +"Leave blank to keep your existing channel nickname. You will be randomly " +"assigned a similar nickname if either name is already allocated on this site." msgstr "" +"Оставьте пустым для сохранения существующего псевдонима канала. Вам будет случайным " +"образом назначен похожий псевдоним если такое имя уже выделено на этом сайте." -#: ../../mod/admin.php:766 +#: ../../Zotlabs/Module/Import.php:562 msgid "" -"The user {0} will be deleted!\\n\\nEverything this user has posted on this " -"site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" +"This process may take several minutes to complete. Please submit the form " +"only once and leave this page open until finished." +msgstr "Процесс может занять несколько минут. Пожалуйста, отправьте форму только один раз и оставьте эту страницу открытой до завершения." -#: ../../mod/admin.php:799 -#, php-format -msgid "%s channel censored/uncensored" -msgid_plural "%s channelss censored/uncensored" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +#: ../../Zotlabs/Module/Viewconnections.php:65 +msgid "No connections." +msgstr "Контактов нет." -#: ../../mod/admin.php:806 +#: ../../Zotlabs/Module/Viewconnections.php:83 #, php-format -msgid "%s channel deleted" -msgid_plural "%s channels deleted" -msgstr[0] "%s канал удален" -msgstr[1] "%s канала удалены" -msgstr[2] "%s каналы удалены" +msgid "Visit %s's profile [%s]" +msgstr "Посетить %s ​​профиль [%s]" -#: ../../mod/admin.php:825 -msgid "Channel not found" -msgstr "Канал не найден" +#: ../../Zotlabs/Module/Viewconnections.php:113 +msgid "View Connections" +msgstr "Просмотр контактов" -#: ../../mod/admin.php:836 -#, php-format -msgid "Channel '%s' deleted" -msgstr "Канал '%s' удален" +#: ../../Zotlabs/Module/Rmagic.php:35 +msgid "Authentication failed." +msgstr "Ошибка аутентификации." -#: ../../mod/admin.php:846 -#, php-format -msgid "Channel '%s' uncensored" -msgstr "" +#: ../../Zotlabs/Module/New_channel.php:156 +msgid "Your real name is recommended." +msgstr "Рекомендуется использовать ваше настоящее имя." -#: ../../mod/admin.php:846 -#, php-format -msgid "Channel '%s' censored" +#: ../../Zotlabs/Module/New_channel.php:157 +msgid "" +"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " +"Group\"" msgstr "" +"Примеры: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " +"Group\"" -#: ../../mod/admin.php:889 -msgid "Censor" +#: ../../Zotlabs/Module/New_channel.php:162 +msgid "" +"This will be used to create a unique network address (like an email address)." msgstr "" +"Это будет использовано для создания уникального сетевого адреса (наподобие email)." -#: ../../mod/admin.php:890 -msgid "Uncensor" -msgstr "" +#: ../../Zotlabs/Module/New_channel.php:164 +msgid "Allowed characters are a-z 0-9, - and _" +msgstr "Разрешённые символы a-z 0-9, - и _" -#: ../../mod/admin.php:893 -msgid "UID" -msgstr "UID" +#: ../../Zotlabs/Module/New_channel.php:174 +msgid "Channel name" +msgstr "Название канала" -#: ../../mod/admin.php:895 -msgid "" -"Selected channels will be deleted!\\n\\nEverything that was posted in these " -"channels on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" +#: ../../Zotlabs/Module/New_channel.php:176 +#: ../../Zotlabs/Module/Register.php:265 +msgid "Choose a short nickname" +msgstr "Выберите короткий псевдоним" -#: ../../mod/admin.php:896 +#: ../../Zotlabs/Module/New_channel.php:177 msgid "" -"The channel {0} will be deleted!\\n\\nEverything that was posted in this " -"channel on this site will be permanently deleted!\\n\\nAre you sure?" +"Select a channel permission role compatible with your usage needs and " +"privacy requirements." msgstr "" +"Выберите разрешения для канала в соответствии с вашими потребностями и " +"требованиями безопасности." -#: ../../mod/admin.php:935 -#, php-format -msgid "Plugin %s disabled." -msgstr "Плагин %s отключен." - -#: ../../mod/admin.php:939 -#, php-format -msgid "Plugin %s enabled." -msgstr "Плагин %s включен." +#: ../../Zotlabs/Module/New_channel.php:177 +#: ../../Zotlabs/Module/Register.php:266 +msgid "Read more about channel permission roles" +msgstr "Прочитать больше о разрешениях для каналов" -#: ../../mod/admin.php:949 ../../mod/admin.php:1151 -msgid "Disable" -msgstr "Запретить" +#: ../../Zotlabs/Module/New_channel.php:180 +msgid "Create a Channel" +msgstr "Создать канал" -#: ../../mod/admin.php:951 ../../mod/admin.php:1153 -msgid "Enable" -msgstr "Разрешить" +#: ../../Zotlabs/Module/New_channel.php:181 +msgid "" +"A channel is a unique network identity. It can represent a person (social " +"network profile), a forum (group), a business or celebrity page, a newsfeed, " +"and many other things." +msgstr "" +"Канал это уникальная сетевая идентичность. Он может представлять человека (профиль " +"в социальной сети), форум или группу, бизнес или страницу знаменитости, новостную ленту " +"и многие другие вещи." -#: ../../mod/admin.php:977 ../../mod/admin.php:1182 -msgid "Toggle" -msgstr "Переключить" +#: ../../Zotlabs/Module/New_channel.php:182 +msgid "" +"or import an existing channel from another location." +msgstr "или импортировать существующий канал из другого места." -#: ../../mod/admin.php:985 ../../mod/admin.php:1192 -msgid "Author: " -msgstr "Автор: " +#: ../../Zotlabs/Module/New_channel.php:187 +msgid "Validate" +msgstr "Проверить" -#: ../../mod/admin.php:986 ../../mod/admin.php:1193 -msgid "Maintainer: " -msgstr "Обслуживающий: " +#: ../../Zotlabs/Module/Apps.php:53 +msgid "Manage apps" +msgstr "Управление приложениями" -#: ../../mod/admin.php:1115 -msgid "No themes found." -msgstr "Темы не найдены." +#: ../../Zotlabs/Module/Apps.php:54 +msgid "Create new app" +msgstr "Создать новое приложение" -#: ../../mod/admin.php:1174 -msgid "Screenshot" -msgstr "Скриншот" +#: ../../Zotlabs/Module/Directory.php:106 +msgid "No default suggestions were found." +msgstr "Предложений по умолчанию не найдено." -#: ../../mod/admin.php:1222 -msgid "[Experimental]" -msgstr "[экспериментальный]" +#: ../../Zotlabs/Module/Directory.php:255 +#, php-format +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "%d оценка" +msgstr[1] "%d оценки" +msgstr[2] "%d оценок" -#: ../../mod/admin.php:1223 -msgid "[Unsupported]" -msgstr "[неподдерживаемый]" +#: ../../Zotlabs/Module/Directory.php:266 +msgid "Gender: " +msgstr "Пол:" -#: ../../mod/admin.php:1250 -msgid "Log settings updated." -msgstr "Настройки журнала обновленны." +#: ../../Zotlabs/Module/Directory.php:268 +msgid "Status: " +msgstr "Статус:" -#: ../../mod/admin.php:1306 -msgid "Clear" -msgstr "Очистить" +#: ../../Zotlabs/Module/Directory.php:270 +msgid "Homepage: " +msgstr "Домашняя страница:" -#: ../../mod/admin.php:1312 -msgid "Debugging" -msgstr "Включить/Выключить" +#: ../../Zotlabs/Module/Directory.php:330 +msgid "Description:" +msgstr "Описание:" -#: ../../mod/admin.php:1313 -msgid "Log file" -msgstr "Файл журнала" +#: ../../Zotlabs/Module/Directory.php:339 +msgid "Public Forum:" +msgstr "Публичный форум:" -#: ../../mod/admin.php:1313 -msgid "" -"Must be writable by web server. Relative to your Red top-level directory." -msgstr "Должна быть доступна для записи веб-сервером. Относительно верхнего уровня веб-сайта." +#: ../../Zotlabs/Module/Directory.php:342 +msgid "Keywords: " +msgstr "Ключевые слова:" -#: ../../mod/admin.php:1314 -msgid "Log level" -msgstr "Уровень журнала" +#: ../../Zotlabs/Module/Directory.php:345 +msgid "Don't suggest" +msgstr "Не предлагать" -#: ../../mod/thing.php:98 -msgid "Thing updated" -msgstr "" +#: ../../Zotlabs/Module/Directory.php:347 +msgid "Common connections (estimated):" +msgstr "Общие контакты (оценочно):" -#: ../../mod/thing.php:158 -msgid "Object store: failed" -msgstr "" +#: ../../Zotlabs/Module/Directory.php:396 +msgid "Global Directory" +msgstr "Глобальный каталог" -#: ../../mod/thing.php:162 -msgid "Thing added" -msgstr "" +#: ../../Zotlabs/Module/Directory.php:396 +msgid "Local Directory" +msgstr "Локальный каталог" -#: ../../mod/thing.php:182 -#, php-format -msgid "OBJ: %1$s %2$s %3$s" -msgstr "" +#: ../../Zotlabs/Module/Directory.php:402 +msgid "Finding:" +msgstr "Поиск:" -#: ../../mod/thing.php:234 -msgid "Show Thing" -msgstr "" +#: ../../Zotlabs/Module/Directory.php:407 +msgid "next page" +msgstr "следующая страница" -#: ../../mod/thing.php:241 -msgid "item not found." -msgstr "Элемент не найден." +#: ../../Zotlabs/Module/Directory.php:407 +msgid "previous page" +msgstr "предыдущая страница" -#: ../../mod/thing.php:272 -msgid "Edit Thing" -msgstr "" +#: ../../Zotlabs/Module/Directory.php:408 +msgid "Sort options" +msgstr "Параметры сортировки" -#: ../../mod/thing.php:274 ../../mod/thing.php:321 -msgid "Select a profile" -msgstr "Выберите профиль" +#: ../../Zotlabs/Module/Directory.php:409 +msgid "Alphabetic" +msgstr "По алфавиту" -#: ../../mod/thing.php:278 ../../mod/thing.php:324 -msgid "Post an activity" -msgstr "" +#: ../../Zotlabs/Module/Directory.php:410 +msgid "Reverse Alphabetic" +msgstr "Против алфавита" -#: ../../mod/thing.php:278 ../../mod/thing.php:324 -msgid "Only sends to viewers of the applicable profile" -msgstr "" +#: ../../Zotlabs/Module/Directory.php:411 +msgid "Newest to Oldest" +msgstr "От новых к старым" -#: ../../mod/thing.php:280 ../../mod/thing.php:326 -msgid "Name of thing e.g. something" -msgstr "" +#: ../../Zotlabs/Module/Directory.php:412 +msgid "Oldest to Newest" +msgstr "От старых к новым" -#: ../../mod/thing.php:282 ../../mod/thing.php:327 -msgid "URL of thing (optional)" -msgstr "" +#: ../../Zotlabs/Module/Directory.php:429 +msgid "No entries (some entries may be hidden)." +msgstr "Нет записей (некоторые записи могут быть скрыты)." -#: ../../mod/thing.php:284 ../../mod/thing.php:328 -msgid "URL for photo of thing (optional)" -msgstr "" +#: ../../Zotlabs/Module/Filer.php:52 +msgid "Enter a folder name" +msgstr "Введите название каталога" -#: ../../mod/thing.php:319 -msgid "Add Thing to your Profile" -msgstr "" +#: ../../Zotlabs/Module/Filer.php:52 +msgid "or select an existing folder (doubleclick)" +msgstr "или выберите существующий каталог (двойной щелчок)" -#: ../../mod/import.php:36 -msgid "Nothing to import." -msgstr "Ничего импортировать." +#: ../../Zotlabs/Module/Dreport.php:45 +msgid "Invalid message" +msgstr "Неверное сообщение" -#: ../../mod/import.php:58 -msgid "Unable to download data from old server" -msgstr "Невозможно загрузить данные из старого сервера" +#: ../../Zotlabs/Module/Dreport.php:78 +msgid "no results" +msgstr "Ничего не найдено." -#: ../../mod/import.php:64 -msgid "Imported file is empty." -msgstr "Импортированный файл пуст." +#: ../../Zotlabs/Module/Dreport.php:93 +msgid "channel sync processed" +msgstr "синхронизация канала завершена" -#: ../../mod/import.php:88 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." -msgstr "" +#: ../../Zotlabs/Module/Dreport.php:97 +msgid "queued" +msgstr "в очереди" -#: ../../mod/import.php:106 -msgid "Channel clone failed. Import failed." -msgstr "" +#: ../../Zotlabs/Module/Dreport.php:101 +msgid "posted" +msgstr "опубликовано" -#: ../../mod/import.php:116 -msgid "Cloned channel not found. Import failed." -msgstr "" +#: ../../Zotlabs/Module/Dreport.php:105 +msgid "accepted for delivery" +msgstr "принято к доставке" -#: ../../mod/import.php:364 -msgid "Import completed." -msgstr "Импорт завершен." +#: ../../Zotlabs/Module/Dreport.php:109 +msgid "updated" +msgstr "обновлено" -#: ../../mod/import.php:377 -msgid "You must be logged in to use this feature." -msgstr "Вы должны войти в систему, чтобы использовать эту функцию." +#: ../../Zotlabs/Module/Dreport.php:112 +msgid "update ignored" +msgstr "обновление игнорируется" -#: ../../mod/import.php:382 -msgid "Import Channel" -msgstr "Импорт канала" +#: ../../Zotlabs/Module/Dreport.php:115 +msgid "permission denied" +msgstr "доступ запрещен" -#: ../../mod/import.php:383 -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. Only identity and connections/relationships will " -"be imported. Importation of content is not yet available." -msgstr "" +#: ../../Zotlabs/Module/Dreport.php:119 +msgid "recipient not found" +msgstr "получатель не найден" -#: ../../mod/import.php:384 -msgid "File to Upload" -msgstr "Файл для загрузки" +#: ../../Zotlabs/Module/Dreport.php:122 +msgid "mail recalled" +msgstr "почта отозвана" -#: ../../mod/import.php:385 -msgid "Or provide the old server/hub details" -msgstr "" +#: ../../Zotlabs/Module/Dreport.php:125 +msgid "duplicate mail received" +msgstr "получено дублирующее сообщение" -#: ../../mod/import.php:386 -msgid "Your old identity address (xyz@example.com)" -msgstr "Ваш старый адрес идентичности (xyz@example.com)" +#: ../../Zotlabs/Module/Dreport.php:128 +msgid "mail delivered" +msgstr "почта доставлен" -#: ../../mod/import.php:387 -msgid "Your old login email address" -msgstr "Ваш старый адрес электронной почты" +#: ../../Zotlabs/Module/Dreport.php:148 +#, php-format +msgid "Delivery report for %1$s" +msgstr "Отчёт о доставке для %1$s" -#: ../../mod/import.php:388 -msgid "Your old login password" -msgstr "Ваш старый пароль" +#: ../../Zotlabs/Module/Dreport.php:152 +msgid "Redeliver" +msgstr "Доставить повторно" -#: ../../mod/import.php:389 -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/Network.php:116 +msgid "No such group" +msgstr "Нет такой группы" -#: ../../mod/import.php:390 -msgid "Make this hub my primary location" -msgstr "" +#: ../../Zotlabs/Module/Network.php:157 +msgid "No such channel" +msgstr "Нет такого канала" -#: ../../mod/invite.php:25 -msgid "Total invitation limit exceeded." -msgstr "" +#: ../../Zotlabs/Module/Network.php:242 +msgid "Privacy group is empty" +msgstr "Группа безопасности пуста" -#: ../../mod/invite.php:49 -#, php-format -msgid "%s : Not a valid email address." -msgstr "%s : Не действительный адрес электронной почты." +#: ../../Zotlabs/Module/Network.php:253 +msgid "Privacy group: " +msgstr "Группа безопасности:" -#: ../../mod/invite.php:76 -msgid "Please join us on Red" -msgstr "Пожалуйста, присоединяйтесь к нам в Red" +#: ../../Zotlabs/Module/Regmod.php:15 +msgid "Please login." +msgstr "Пожалуйста, войдите." -#: ../../mod/invite.php:87 -msgid "Invitation limit exceeded. Please contact your site administrator." -msgstr "" +#: ../../Zotlabs/Module/Service_limits.php:23 +msgid "No service class restrictions found." +msgstr "Ограничений класса обслуживание не найдено." -#: ../../mod/invite.php:92 -#, php-format -msgid "%s : Message delivery failed." -msgstr "%s : Доставка сообщения не удалась." +#: ../../Zotlabs/Module/Cards.php:99 +msgid "Add Card" +msgstr "Добавить карточку" -#: ../../mod/invite.php:96 -#, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "%d сообщение отправленно." -msgstr[1] "%d сообщения отправленно." -msgstr[2] "%d сообщений отправленно." +#: ../../Zotlabs/Module/Apporder.php:44 +msgid "Change Order of Pinned Navbar Apps" +msgstr "Изменить порядок приложений на панели навигации" -#: ../../mod/invite.php:115 -msgid "You have no more invitations available" -msgstr "У вас больше нет приглашений" +#: ../../Zotlabs/Module/Apporder.php:44 +msgid "Change Order of App Tray Apps" +msgstr "Изменить порядок приложений в лотке" -#: ../../mod/invite.php:141 -msgid "Send invitations" -msgstr "Послать приглашения" +#: ../../Zotlabs/Module/Apporder.php:45 +msgid "" +"Use arrows to move the corresponding app left (top) or right (bottom) in the " +"navbar" +msgstr "Используйте стрелки для перемещения приложения влево (вверх) или вправо (вниз) в панели навигации" -#: ../../mod/invite.php:142 -msgid "Enter email addresses, one per line:" -msgstr "Введите адреса электронной почты, по одному на строку:" +#: ../../Zotlabs/Module/Apporder.php:45 +msgid "Use arrows to move the corresponding app up or down in the app tray" +msgstr "Используйте стрелки для перемещения приложения вверх или вниз в лотке" -#: ../../mod/invite.php:143 ../../mod/mail.php:216 ../../mod/mail.php:328 -msgid "Your message:" -msgstr "Сообщение:" +#: ../../Zotlabs/Module/Register.php:49 +msgid "Maximum daily site registrations exceeded. Please try again tomorrow." +msgstr "Превышено максимальное количество регистраций на сегодня. Пожалуйста, попробуйте снова завтра." -#: ../../mod/invite.php:144 +#: ../../Zotlabs/Module/Register.php:55 msgid "" -"You are cordially invited to join me and some other close friends on the Red" -" Matrix - a revolutionary new decentralised communication and information " -"tool." -msgstr "" +"Please indicate acceptance of the Terms of Service. Registration failed." +msgstr "Просьба подтвердить согласие с \"Условиями обслуживания\". Регистрация не удалась." -#: ../../mod/invite.php:146 -msgid "You will need to supply this invitation code: $invite_code" -msgstr "" +#: ../../Zotlabs/Module/Register.php:89 +msgid "Passwords do not match." +msgstr "Пароли не совпадают." -#: ../../mod/invite.php:147 -msgid "Please visit my channel at" -msgstr "Пожалуйста, посетите мой канал на" +#: ../../Zotlabs/Module/Register.php:132 +msgid "Registration successful. Continue to create your first channel..." +msgstr "Регистрация завершена успешно. Для продолжения создайте свой первый канал..." -#: ../../mod/invite.php:151 +#: ../../Zotlabs/Module/Register.php:135 msgid "" -"Once you have registered (on ANY Hubzilla site - they are all inter-" -"connected), please connect with my Hubzilla channel address:" -msgstr "" +"Registration successful. Please check your email for validation instructions." +msgstr "Регистрация завершена успешно. Пожалуйста проверьте вашу электронную почту для подтверждения." -#: ../../mod/invite.php:153 -msgid "Click the [Register] link on the following page to join." -msgstr "" +#: ../../Zotlabs/Module/Register.php:142 +msgid "Your registration is pending approval by the site owner." +msgstr "Ваша регистрация ожидает одобрения администрации сайта." -#: ../../mod/invite.php:155 -msgid "" -"For more information about the Hubzilla Project and why it has the " -"potential to change the internet as we know it, please visit " -"http://getzot.com" -msgstr "Чтобы узнать больше о проекте Hubzilla, и чтобы узнать почему он имеет потенциал для изменения привычного нам Интернета, пожалуйста, посетите http://getzot.com" +#: ../../Zotlabs/Module/Register.php:145 +msgid "Your registration can not be processed." +msgstr "Ваша регистрация не может быть обработана." -#: ../../mod/item.php:147 -msgid "Unable to locate original post." -msgstr "Не удалось найти оригинал." +#: ../../Zotlabs/Module/Register.php:192 +msgid "Registration on this hub is disabled." +msgstr "Регистрация на этом хабе отключена." -#: ../../mod/item.php:372 -msgid "Empty post discarded." -msgstr "Отказаться от пустой почты." +#: ../../Zotlabs/Module/Register.php:201 +msgid "Registration on this hub is by approval only." +msgstr "Регистрация на этом хабе только по утверждению." -#: ../../mod/item.php:414 -msgid "Executable content type not permitted to this channel." -msgstr "" +#: ../../Zotlabs/Module/Register.php:202 ../../Zotlabs/Module/Register.php:211 +msgid "Register at another affiliated hub." +msgstr "Зарегистрироваться на другом хабе." -#: ../../mod/item.php:832 -msgid "System error. Post not saved." -msgstr "Системная ошибка. Сообщение не сохранено." +#: ../../Zotlabs/Module/Register.php:210 +msgid "Registration on this hub is by invitation only." +msgstr "Регистрация на этом хабе доступна только по приглашениям." -#: ../../mod/item.php:1275 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." -msgstr "" +#: ../../Zotlabs/Module/Register.php:221 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "Этот сайт превысил максимальное количество регистраций на сегодня. Пожалуйста, попробуйте снова завтра. " -#: ../../mod/item.php:1281 +#: ../../Zotlabs/Module/Register.php:247 #, php-format -msgid "You have reached your limit of %1$.0f webpages." -msgstr "" +msgid "I accept the %s for this website" +msgstr "Я принимаю %s для этого веб-сайта." -#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25 -#: ../../mod/update_network.php:23 ../../mod/update_search.php:46 -msgid "[Embedded content - reload page to view]" -msgstr "" +#: ../../Zotlabs/Module/Register.php:254 +#, php-format +msgid "I am over %s years of age and accept the %s for this website" +msgstr "Мой возраст превышает %s лет и я принимаю %s для этого веб-сайта." -#: ../../mod/layouts.php:62 -msgid "Help with this feature" -msgstr "" +#: ../../Zotlabs/Module/Register.php:259 +msgid "Your email address" +msgstr "Ваш адрес электронной почты" -#: ../../mod/layouts.php:84 -msgid "Layout Name" -msgstr "Название шаблона" +#: ../../Zotlabs/Module/Register.php:260 +msgid "Choose a password" +msgstr "Выберите пароль" -#: ../../mod/like.php:97 -msgid "thing" -msgstr "" +#: ../../Zotlabs/Module/Register.php:261 +msgid "Please re-enter your password" +msgstr "Пожалуйста, введите пароль еще раз" -#: ../../mod/lockview.php:30 ../../mod/lockview.php:36 -msgid "Remote privacy information not available." -msgstr "" +#: ../../Zotlabs/Module/Register.php:262 +msgid "Please enter your invitation code" +msgstr "Пожалуйста, введите Ваш код приглашения" -#: ../../mod/lockview.php:45 -msgid "Visible to:" -msgstr "Кому видно:" +#: ../../Zotlabs/Module/Register.php:263 +msgid "Your Name" +msgstr "Ваше имя" -#: ../../mod/viewconnections.php:58 -msgid "No connections." -msgstr "Никаких связей." +#: ../../Zotlabs/Module/Register.php:263 +msgid "Real names are preferred." +msgstr "Предпочтительны реальные имена." -#: ../../mod/viewconnections.php:70 +#: ../../Zotlabs/Module/Register.php:265 #, php-format -msgid "Visit %s's profile [%s]" -msgstr "Посетить %s's ​​профиль [%s]" - -#: ../../mod/viewconnections.php:85 -msgid "View Connnections" -msgstr "Просмотр контактов" - -#: ../../mod/lostpass.php:15 -msgid "No valid account found." -msgstr "Действительный аккаунт не найден." +msgid "" +"Your nickname will be used to create an easy to remember channel address e." +"g. nickname%s" +msgstr "Ваш псевдоним будет использован для создания легко запоминаемого адреса канала, напр. nickname %s" -#: ../../mod/lostpass.php:29 -msgid "Password reset request issued. Check your email." +#: ../../Zotlabs/Module/Register.php:266 +msgid "" +"Select a channel permission role for your usage needs and privacy " +"requirements." msgstr "" +"Выберите разрешения для канала в зависимости от ваших потребностей и требований " +"приватности." -#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 -#, php-format -msgid "Site Member (%s)" -msgstr "Участник сайта (%s)" +#: ../../Zotlabs/Module/Register.php:267 +msgid "no" +msgstr "нет" -#: ../../mod/lostpass.php:40 -#, php-format -msgid "Password reset requested at %s" -msgstr "Требуется сброс пароля на %s" +#: ../../Zotlabs/Module/Register.php:267 +msgid "yes" +msgstr "да" -#: ../../mod/lostpass.php:63 +#: ../../Zotlabs/Module/Register.php:295 msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." -msgstr "" +"This site requires email verification. After completing this form, please " +"check your email for further instructions." +msgstr "Этот сайт требует проверку адреса электронной почты. После заполнения этой формы, пожалуйста, проверьте ваш почтовый ящик для дальнейших инструкций." -#: ../../mod/lostpass.php:85 ../../boot.php:1475 -msgid "Password Reset" -msgstr "Сбросить пароль" +#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 +msgid "This setting requires special processing and editing has been blocked." +msgstr "Этот параметр требует специальной обработки и редактирования и был заблокирован." -#: ../../mod/lostpass.php:86 -msgid "Your password has been reset as requested." -msgstr "Ваш пароль в соответствии с просьбой сброшен." +#: ../../Zotlabs/Module/Pconfig.php:48 +msgid "Configuration Editor" +msgstr "Редактор конфигурации" -#: ../../mod/lostpass.php:87 -msgid "Your new password is" -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 "Предупреждение. Изменение некоторых настроек может привести к неработоспособности вашего канала. Пожалуйста, покиньте эту страницу, если вы точно не значете, как правильно использовать эту функцию." -#: ../../mod/lostpass.php:88 -msgid "Save or copy your new password - and then" -msgstr "" +#: ../../Zotlabs/Module/Article_edit.php:128 +msgid "Edit Article" +msgstr "Редактировать статью" -#: ../../mod/lostpass.php:89 -msgid "click here to login" -msgstr "нажмите здесь чтобы выйти" +#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:123 +msgid "Not found" +msgstr "Не найдено." -#: ../../mod/lostpass.php:90 -msgid "" -"Your password may be changed from the Settings page after " -"successful login." -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:124 +msgid "Error retrieving wiki" +msgstr "Ошибка при получении Wiki" -#: ../../mod/lostpass.php:107 -#, php-format -msgid "Your password has changed at %s" -msgstr "Пароль изменен на %s" +#: ../../Zotlabs/Module/Wiki.php:131 +msgid "Error creating zip file export folder" +msgstr "Ошибка при создании zip-файла при экспорте каталога" -#: ../../mod/lostpass.php:122 -msgid "Forgot your Password?" -msgstr "Забыли пароль или логин?" +#: ../../Zotlabs/Module/Wiki.php:182 +msgid "Error downloading wiki: " +msgstr "Ошибка загрузки Wiki:" -#: ../../mod/lostpass.php:123 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:203 +msgid "Download" +msgstr "Загрузить" -#: ../../mod/lostpass.php:124 -msgid "Email Address" -msgstr "Адрес электронной почты" +#: ../../Zotlabs/Module/Wiki.php:207 +msgid "Wiki name" +msgstr "Название Wiki" -#: ../../mod/lostpass.php:125 -msgid "Reset" -msgstr "Сброс" +#: ../../Zotlabs/Module/Wiki.php:208 +msgid "Content type" +msgstr "Тип содержимого" -#: ../../mod/magic.php:70 -msgid "Hub not found." -msgstr "Hub не найден." +#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:286 +msgid "Type" +msgstr "Тип" -#: ../../mod/vote.php:97 -msgid "Total votes" -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:211 +msgid "Any type" +msgstr "Любой тип" -#: ../../mod/vote.php:98 -msgid "Average Rating" -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:218 +msgid "Lock content type" +msgstr "Зафиксировать тип содержимого" -#: ../../mod/mail.php:33 -msgid "Unable to lookup recipient." -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:219 +msgid "Create a status post for this wiki" +msgstr "Создать публикацию о статусе этой Wiki" -#: ../../mod/mail.php:41 -msgid "Unable to communicate with requested channel." -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:220 +msgid "Edit Wiki Name" +msgstr "Редактировать наименование Wiki" -#: ../../mod/mail.php:48 -msgid "Cannot verify requested channel." -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:262 +msgid "Wiki not found" +msgstr "Wiki не найдена" -#: ../../mod/mail.php:74 -msgid "Selected channel has private message restrictions. Send failed." -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:286 +msgid "Rename page" +msgstr "Переименовать страницу" -#: ../../mod/mail.php:121 ../../mod/message.php:31 -msgid "Messages" -msgstr "Переписка" +#: ../../Zotlabs/Module/Wiki.php:307 +msgid "Error retrieving page content" +msgstr "Ошибка при получении содержимого страницы" -#: ../../mod/mail.php:132 -msgid "Message deleted." -msgstr "Сообщение удалено." +#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317 +msgid "New page" +msgstr "Новая страница" -#: ../../mod/mail.php:149 -msgid "Message recalled." -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:345 +msgid "Revision Comparison" +msgstr "Сравнение ревизий" -#: ../../mod/mail.php:206 -msgid "Send Private Message" -msgstr "Отправить личное сообщение" +#: ../../Zotlabs/Module/Wiki.php:346 +msgid "Revert" +msgstr "Вернуть" -#: ../../mod/mail.php:207 ../../mod/mail.php:323 -msgid "To:" -msgstr "Кому:" +#: ../../Zotlabs/Module/Wiki.php:353 +msgid "Short description of your changes (optional)" +msgstr "Краткое описание ваших изменений (необязательно)" -#: ../../mod/mail.php:212 ../../mod/mail.php:325 -msgid "Subject:" -msgstr "Тема:" +#: ../../Zotlabs/Module/Wiki.php:362 +msgid "Source" +msgstr "Источник" -#: ../../mod/mail.php:249 -msgid "Message not found." -msgstr "Сообщение не найдено." +#: ../../Zotlabs/Module/Wiki.php:372 +msgid "New page name" +msgstr "Новое имя страницы" -#: ../../mod/mail.php:292 ../../mod/message.php:72 -msgid "Delete message" -msgstr "Удалить сообщение" +#: ../../Zotlabs/Module/Wiki.php:377 +msgid "Embed image from photo albums" +msgstr "Встроить изображение из фотоальбома" -#: ../../mod/mail.php:293 -msgid "Recall message" -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:462 +msgid "Error creating wiki. Invalid name." +msgstr "Ошибка создания Wiki. Неверное имя." -#: ../../mod/mail.php:295 -msgid "Message has been recalled." -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:469 +msgid "A wiki with this name already exists." +msgstr "Wiki с таким именем уже существует." -#: ../../mod/mail.php:312 -msgid "Private Conversation" -msgstr "Личный разговор" +#: ../../Zotlabs/Module/Wiki.php:482 +msgid "Wiki created, but error creating Home page." +msgstr "Wiki создана, но возникла ошибка при создании домашней страницы" -#: ../../mod/mail.php:316 -msgid "Delete conversation" -msgstr "Удалить разговор" +#: ../../Zotlabs/Module/Wiki.php:489 +msgid "Error creating wiki" +msgstr "Ошибка при создании Wiki" -#: ../../mod/mail.php:318 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:512 +msgid "Error updating wiki. Invalid name." +msgstr "Ошибка при обновлении Wiki. Неверное имя." -#: ../../mod/mail.php:322 -msgid "Send Reply" -msgstr "Отправить снова" +#: ../../Zotlabs/Module/Wiki.php:532 +msgid "Error updating wiki" +msgstr "Ошибка при обновлении Wiki" -#: ../../mod/manage.php:64 -#, php-format -msgid "You have created %1$.0f of %2$.0f allowed channels." -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:547 +msgid "Wiki delete permission denied." +msgstr "Нет прав на удаление Wiki." -#: ../../mod/manage.php:72 -msgid "Create a new channel" -msgstr "Создать новый канал" +#: ../../Zotlabs/Module/Wiki.php:557 +msgid "Error deleting wiki" +msgstr "Ошибка удаления Wiki" -#: ../../mod/manage.php:77 -msgid "Channel Manager" -msgstr "Настройки канала" +#: ../../Zotlabs/Module/Wiki.php:590 +msgid "New page created" +msgstr "Создана новая страница" -#: ../../mod/manage.php:78 -msgid "Current Channel" -msgstr "Текущий канал" +#: ../../Zotlabs/Module/Wiki.php:711 +msgid "Cannot delete Home" +msgstr "Невозможно удалить домашнюю страницу" -#: ../../mod/manage.php:80 -msgid "Attach to one of your channels by selecting it." -msgstr "" +#: ../../Zotlabs/Module/Wiki.php:775 +msgid "Current Revision" +msgstr "Текущая ревизия" -#: ../../mod/manage.php:81 -msgid "Default Channel" -msgstr "Канал по умолчанию" +#: ../../Zotlabs/Module/Wiki.php:775 +msgid "Selected Revision" +msgstr "Выбранная ревизия" -#: ../../mod/manage.php:82 -msgid "Make Default" -msgstr "Сделать стандартным" +#: ../../Zotlabs/Module/Wiki.php:825 +msgid "You must be authenticated." +msgstr "Вы должны быть аутентифицированы." -#: ../../mod/wall_upload.php:34 -msgid "Wall Photos" -msgstr "Стена фотографий" +#: ../../Zotlabs/Module/Magic.php:76 +msgid "Hub not found." +msgstr "Узел не найден." -#: ../../mod/match.php:16 -msgid "Profile Match" -msgstr "Профиль Совпадение" +#: ../../Zotlabs/Module/Attach.php:13 +msgid "Item not available." +msgstr "Элемент недоступен." -#: ../../mod/match.php:24 -msgid "No keywords to match. Please add keywords to your default profile." -msgstr "" +#: ../../Zotlabs/Module/Group.php:35 +msgid "Privacy group created." +msgstr "Группа безопасности создана." -#: ../../mod/match.php:61 -msgid "is interested in:" -msgstr "заинтересован в:" +#: ../../Zotlabs/Module/Group.php:38 +msgid "Could not create privacy group." +msgstr "Не удалось создать группу безопасности." -#: ../../mod/match.php:69 -msgid "No matches" -msgstr "Нет соответствий" +#: ../../Zotlabs/Module/Group.php:67 +msgid "Privacy group updated." +msgstr "Группа безопасности обновлена." -#: ../../mod/menu.php:21 -msgid "Menu updated." -msgstr "Меню обновлено." +#: ../../Zotlabs/Module/Group.php:114 +msgid "Add Group" +msgstr "Добавить группу" -#: ../../mod/menu.php:25 -msgid "Unable to update menu." -msgstr "Невозможно обновление меню." +#: ../../Zotlabs/Module/Group.php:118 +msgid "Privacy group name" +msgstr "Имя группы безопасности" -#: ../../mod/menu.php:30 -msgid "Menu created." -msgstr "Меню создано." +#: ../../Zotlabs/Module/Group.php:119 ../../Zotlabs/Module/Group.php:220 +msgid "Members are visible to other channels" +msgstr "Участники канала видимые для остальных" -#: ../../mod/menu.php:34 -msgid "Unable to create menu." -msgstr "Невозможно создать меню." +#: ../../Zotlabs/Module/Group.php:151 +msgid "Privacy group removed." +msgstr "Группа безопасности удалена." -#: ../../mod/menu.php:57 -msgid "Manage Menus" -msgstr "Управление меню" +#: ../../Zotlabs/Module/Group.php:153 +msgid "Unable to remove privacy group." +msgstr "Ну удалось удалить группу безопасности." -#: ../../mod/menu.php:60 -msgid "Drop" -msgstr "Удалить" +#: ../../Zotlabs/Module/Group.php:215 +#, php-format +msgid "Privacy Group: %s" +msgstr "Группа безопасности: %s" -#: ../../mod/menu.php:62 -msgid "Create a new menu" -msgstr "Создать новое меню" +#: ../../Zotlabs/Module/Group.php:217 +msgid "Privacy group name: " +msgstr "Название группы безопасности:" -#: ../../mod/menu.php:63 -msgid "Delete this menu" -msgstr "Удалить это меню" +#: ../../Zotlabs/Module/Group.php:222 +msgid "Delete Group" +msgstr "Удалить группу" -#: ../../mod/menu.php:64 ../../mod/menu.php:109 -msgid "Edit menu contents" -msgstr "Редактировать содержание меню" +#: ../../Zotlabs/Module/Group.php:232 +msgid "Group members" +msgstr "Члены группы" -#: ../../mod/menu.php:65 -msgid "Edit this menu" -msgstr "Редактировать это меню" +#: ../../Zotlabs/Module/Group.php:234 +msgid "Not in this group" +msgstr "Не в этой группе" -#: ../../mod/menu.php:80 -msgid "New Menu" -msgstr "Новое меню" +#: ../../Zotlabs/Module/Group.php:266 +msgid "Click a channel to toggle membership" +msgstr "Нажмите на канал для просмотра членства" -#: ../../mod/menu.php:81 ../../mod/menu.php:110 -msgid "Menu name" -msgstr "Название меню" +#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184 +#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659 +msgid "Profile not found." +msgstr "Профиль не найден." -#: ../../mod/menu.php:81 ../../mod/menu.php:110 -msgid "Must be unique, only seen by you" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:44 +msgid "Profile deleted." +msgstr "Профиль удален." -#: ../../mod/menu.php:82 ../../mod/menu.php:111 -msgid "Menu title" -msgstr "Название меню" +#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105 +msgid "Profile-" +msgstr "Профиль -" -#: ../../mod/menu.php:82 ../../mod/menu.php:111 -msgid "Menu title as seen by others" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127 +msgid "New profile created." +msgstr "Новый профиль создан." -#: ../../mod/menu.php:83 ../../mod/menu.php:112 -msgid "Allow bookmarks" -msgstr "Разрешить закладки" +#: ../../Zotlabs/Module/Profiles.php:111 +msgid "Profile unavailable to clone." +msgstr "Профиль недоступен для клонирования." -#: ../../mod/menu.php:83 ../../mod/menu.php:112 -msgid "Menu may be used to store saved bookmarks" -msgstr "Меню может использоваться, чтобы сохранить закладки" +#: ../../Zotlabs/Module/Profiles.php:146 +msgid "Profile unavailable to export." +msgstr "Профиль недоступен для экспорта." -#: ../../mod/menu.php:98 -msgid "Menu deleted." -msgstr "Меню удалено." +#: ../../Zotlabs/Module/Profiles.php:252 +msgid "Profile Name is required." +msgstr "Требуется имя профиля." -#: ../../mod/menu.php:100 -msgid "Menu could not be deleted." -msgstr "Меню не может быть удален." +#: ../../Zotlabs/Module/Profiles.php:459 +msgid "Marital Status" +msgstr "Семейное положение" -#: ../../mod/menu.php:106 -msgid "Edit Menu" -msgstr "Редактировать меню" +#: ../../Zotlabs/Module/Profiles.php:463 +msgid "Romantic Partner" +msgstr "Романтический партнер" -#: ../../mod/menu.php:108 -msgid "Add or remove entries to this menu" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772 +msgid "Likes" +msgstr "Нравится" -#: ../../mod/message.php:41 -msgid "Conversation removed." -msgstr "Разговор удален." +#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773 +msgid "Dislikes" +msgstr "Не нравится" -#: ../../mod/message.php:56 -msgid "No messages." -msgstr "Нет сообщений." +#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780 +msgid "Work/Employment" +msgstr "Работа / Занятость" -#: ../../mod/message.php:74 -msgid "D, d M Y - g:i A" -msgstr "D, d M Y - g:i A" +#: ../../Zotlabs/Module/Profiles.php:478 +msgid "Religion" +msgstr "Религия" -#: ../../mod/new_channel.php:107 -msgid "Add a Channel" -msgstr "Добавить контакт" +#: ../../Zotlabs/Module/Profiles.php:482 +msgid "Political Views" +msgstr "Политические взгляды" -#: ../../mod/new_channel.php:108 -msgid "" -"A channel is your own collection of related web pages. A channel can be used" -" to hold social network profiles, blogs, conversation groups and forums, " -"celebrity pages, and much more. You may create as many channels as your " -"service provider allows." -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:490 +msgid "Sexual Preference" +msgstr "Сексуальная ориентация" -#: ../../mod/new_channel.php:111 -msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" " -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:494 +msgid "Homepage" +msgstr "Домашняя страница" -#: ../../mod/new_channel.php:112 -msgid "Choose a short nickname" -msgstr "Выберите короткий псевдоним" +#: ../../Zotlabs/Module/Profiles.php:498 +msgid "Interests" +msgstr "Интересы" -#: ../../mod/new_channel.php:113 -msgid "" -"Your nickname will be used to create an easily remembered channel address " -"(like an email address) which you can share with others." -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:594 +msgid "Profile updated." +msgstr "Профиль обновлен." -#: ../../mod/new_channel.php:114 -msgid "Or import an existing channel from another location" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:678 +msgid "Hide your connections list from viewers of this profile" +msgstr "Скрывать от просмотра ваш список контактов в этом профиле" -#: ../../mod/notifications.php:26 -msgid "Invalid request identifier." -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:722 +msgid "Edit Profile Details" +msgstr "Редактирование профиля" -#: ../../mod/notifications.php:35 -msgid "Discard" -msgstr "Отменить" +#: ../../Zotlabs/Module/Profiles.php:724 +msgid "View this profile" +msgstr "Посмотреть этот профиль" -#: ../../mod/notifications.php:94 ../../mod/notify.php:53 -msgid "No more system notifications." -msgstr "Новых оповещений системы пока нет." +#: ../../Zotlabs/Module/Profiles.php:726 +msgid "Profile Tools" +msgstr "Инструменты профиля" -#: ../../mod/notifications.php:98 ../../mod/notify.php:57 -msgid "System Notifications" -msgstr "Системные оповещения " +#: ../../Zotlabs/Module/Profiles.php:727 +msgid "Change cover photo" +msgstr "Изменить фотографию обложки" -#: ../../mod/oexchange.php:23 -msgid "Unable to find your hub." -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:729 +msgid "Create a new profile using these settings" +msgstr "Создать новый профиль со следующими настройками" -#: ../../mod/oexchange.php:37 -msgid "Post successful." -msgstr "Публикация прошла успешно." +#: ../../Zotlabs/Module/Profiles.php:730 +msgid "Clone this profile" +msgstr "Клонировать этот профиль" -#: ../../mod/zfinger.php:23 -msgid "invalid target signature" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:731 +msgid "Delete this profile" +msgstr "Удалить этот профиль" -#: ../../mod/openid.php:26 -msgid "OpenID protocol error. No ID returned." -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:732 +msgid "Add profile things" +msgstr "Добавить в профиль" -#: ../../mod/appman.php:28 ../../mod/appman.php:44 -msgid "App installed." -msgstr "Приложение установлено ." +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Relationship" +msgstr "Отношения" -#: ../../mod/appman.php:37 -msgid "Malformed app." -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:738 +msgid "Import profile from file" +msgstr "Импортировать профиль из файла" -#: ../../mod/appman.php:80 -msgid "Embed code" -msgstr "Код для вставки" +#: ../../Zotlabs/Module/Profiles.php:739 +msgid "Export profile to file" +msgstr "Экспортировать профиль в файл" -#: ../../mod/appman.php:86 -msgid "Edit App" -msgstr "Редактировать приложение" +#: ../../Zotlabs/Module/Profiles.php:740 +msgid "Your gender" +msgstr "Ваш пол" -#: ../../mod/appman.php:86 -msgid "Create App" -msgstr "Создать приложение" +#: ../../Zotlabs/Module/Profiles.php:741 +msgid "Marital status" +msgstr "Семейное положение" -#: ../../mod/appman.php:91 -msgid "Name of app" -msgstr "Название приложения" +#: ../../Zotlabs/Module/Profiles.php:742 +msgid "Sexual preference" +msgstr "Сексуальная ориентация" -#: ../../mod/appman.php:92 -msgid "Location (URL) of app" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:745 +msgid "Profile name" +msgstr "Имя профиля" -#: ../../mod/appman.php:94 -msgid "Photo icon URL" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:747 +msgid "This is your default profile." +msgstr "Это ваш профиль по умолчанию." -#: ../../mod/appman.php:94 -msgid "80 x 80 pixels - optional" -msgstr "80 x 80 pixels - необязательно" +#: ../../Zotlabs/Module/Profiles.php:749 +msgid "Your full name" +msgstr "Ваше полное имя" -#: ../../mod/appman.php:95 -msgid "Version ID" -msgstr "Версия ID" +#: ../../Zotlabs/Module/Profiles.php:750 +msgid "Title/Description" +msgstr "Заголовок / описание" -#: ../../mod/appman.php:96 -msgid "Price of app" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:753 +msgid "Street address" +msgstr "Улица, дом, квартира" -#: ../../mod/appman.php:97 -msgid "Location (URL) to purchase app" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:754 +msgid "Locality/City" +msgstr "Населенный пункт / город" -#: ../../view/theme/apw/php/config.php:202 -#: ../../view/theme/apw/php/config.php:236 -msgid "Schema Default" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:755 +msgid "Region/State" +msgstr "Регион / Область" -#: ../../view/theme/apw/php/config.php:203 -msgid "Sans-Serif" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:756 +msgid "Postal/Zip code" +msgstr "Почтовый индекс" -#: ../../view/theme/apw/php/config.php:204 -msgid "Monospace" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:762 +msgid "Who (if applicable)" +msgstr "Кто (если применимо)" -#: ../../view/theme/apw/php/config.php:259 -#: ../../view/theme/blogga/php/config.php:69 -#: ../../view/theme/blogga/view/theme/blog/config.php:69 -#: ../../view/theme/redbasic/php/config.php:102 -msgid "Theme settings" -msgstr "Настройки темы" +#: ../../Zotlabs/Module/Profiles.php:762 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Примеры: ivan1990, Ivan Petrov, ivan@example.com" -#: ../../view/theme/apw/php/config.php:260 -#: ../../view/theme/redbasic/php/config.php:103 -msgid "Set scheme" -msgstr "Установить схему" +#: ../../Zotlabs/Module/Profiles.php:763 +msgid "Since (date)" +msgstr "С (дата)" -#: ../../view/theme/apw/php/config.php:261 -#: ../../view/theme/redbasic/php/config.php:124 -msgid "Set font-size for posts and comments" -msgstr "Установить размер шрифта для сообщений и комментариев" +#: ../../Zotlabs/Module/Profiles.php:766 +msgid "Tell us about yourself" +msgstr "Расскажите нам о себе" -#: ../../view/theme/apw/php/config.php:262 -msgid "Set font face" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:768 +msgid "Hometown" +msgstr "Родной город" -#: ../../view/theme/apw/php/config.php:263 -msgid "Set iconset" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:769 +msgid "Political views" +msgstr "Политические взгляды" -#: ../../view/theme/apw/php/config.php:264 -msgid "Set big shadow size, default 15px 15px 15px" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:770 +msgid "Religious views" +msgstr "Религиозные взгляды" -#: ../../view/theme/apw/php/config.php:265 -msgid "Set small shadow size, default 5px 5px 5px" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:771 +msgid "Keywords used in directory listings" +msgstr "Ключевые слова для участия в каталоге" -#: ../../view/theme/apw/php/config.php:266 -msgid "Set shadow colour, default #000" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:771 +msgid "Example: fishing photography software" +msgstr "Например: fishing photography software" -#: ../../view/theme/apw/php/config.php:267 -msgid "Set radius size, default 5px" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:774 +msgid "Musical interests" +msgstr "Музыкальные интересы" -#: ../../view/theme/apw/php/config.php:268 -msgid "Set line-height for posts and comments" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:775 +msgid "Books, literature" +msgstr "Книги, литература" -#: ../../view/theme/apw/php/config.php:269 -msgid "Set background image" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:776 +msgid "Television" +msgstr "Телевидение" -#: ../../view/theme/apw/php/config.php:270 -msgid "Set background attachment" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:777 +msgid "Film/Dance/Culture/Entertainment" +msgstr "Кино / танцы / культура / развлечения" -#: ../../view/theme/apw/php/config.php:271 -msgid "Set background colour" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:778 +msgid "Hobbies/Interests" +msgstr "Хобби / интересы" -#: ../../view/theme/apw/php/config.php:272 -msgid "Set section background image" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:779 +msgid "Love/Romance" +msgstr "Любовь / романтические отношения" -#: ../../view/theme/apw/php/config.php:273 -msgid "Set section background colour" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:781 +msgid "School/Education" +msgstr "Школа / образование" -#: ../../view/theme/apw/php/config.php:274 -msgid "Set colour of items - use hex" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:782 +msgid "Contact information and social networks" +msgstr "Информация и социальные сети для связи" -#: ../../view/theme/apw/php/config.php:275 -msgid "Set colour of links - use hex" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:783 +msgid "My other channels" +msgstr "Мои другие контакты" -#: ../../view/theme/apw/php/config.php:276 -msgid "Set max-width for items. Default 400px" -msgstr "" +#: ../../Zotlabs/Module/Profiles.php:785 +msgid "Communications" +msgstr "Связи" -#: ../../view/theme/apw/php/config.php:277 -msgid "Set min-width for items. Default 240px" -msgstr "" +#: ../../Zotlabs/Module/Email_resend.php:30 +msgid "Email verification resent" +msgstr "Сообщение для проверки email отправлено повторно" -#: ../../view/theme/apw/php/config.php:278 -msgid "Set the generic content wrapper width. Default 48%" -msgstr "" +#: ../../Zotlabs/Module/Email_resend.php:33 +msgid "Unable to resend email verification message." +msgstr "Невозможно повторно отправить сообщение для проверки email" -#: ../../view/theme/apw/php/config.php:279 -msgid "Set colour of fonts - use hex" -msgstr "" +#: ../../Zotlabs/Module/Profile.php:93 +msgid "vcard" +msgstr "vCard" -#: ../../view/theme/apw/php/config.php:280 -msgid "Set background-size element" -msgstr "" +#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63 +msgid "Invalid profile identifier." +msgstr "Неверный идентификатор профиля" -#: ../../view/theme/apw/php/config.php:281 -msgid "Item opacity" -msgstr "" +#: ../../Zotlabs/Module/Profperm.php:111 +msgid "Profile Visibility Editor" +msgstr "Редактор видимости профиля" -#: ../../view/theme/apw/php/config.php:282 -msgid "Display post previews only" -msgstr "" +#: ../../Zotlabs/Module/Profperm.php:115 +msgid "Click on a contact to add or remove." +msgstr "Нажмите на контакт, чтобы добавить или удалить." -#: ../../view/theme/apw/php/config.php:283 -msgid "Display side bar on channel page" -msgstr "" +#: ../../Zotlabs/Module/Profperm.php:124 +msgid "Visible To" +msgstr "Видно" -#: ../../view/theme/apw/php/config.php:284 -msgid "Colour of the navigation bar" -msgstr "" +#: ../../Zotlabs/Module/Thing.php:120 +msgid "Thing updated" +msgstr "Обновлено" -#: ../../view/theme/apw/php/config.php:285 -msgid "Item float" -msgstr "" +#: ../../Zotlabs/Module/Thing.php:172 +msgid "Object store: failed" +msgstr "Хранлищие объектов: неудача" -#: ../../view/theme/apw/php/config.php:286 -msgid "Left offset of the section element" -msgstr "" +#: ../../Zotlabs/Module/Thing.php:176 +msgid "Thing added" +msgstr "Добавлено" -#: ../../view/theme/apw/php/config.php:287 -msgid "Right offset of the section element" +#: ../../Zotlabs/Module/Thing.php:202 +#, php-format +msgid "OBJ: %1$s %2$s %3$s" msgstr "" -#: ../../view/theme/apw/php/config.php:288 -msgid "Section width" -msgstr "" +#: ../../Zotlabs/Module/Thing.php:265 +msgid "Show Thing" +msgstr "Показать" -#: ../../view/theme/apw/php/config.php:289 -msgid "Left offset of the aside" -msgstr "" +#: ../../Zotlabs/Module/Thing.php:272 +msgid "item not found." +msgstr "Элемент не найден." -#: ../../view/theme/apw/php/config.php:290 -msgid "Right offset of the aside element" -msgstr "" +#: ../../Zotlabs/Module/Thing.php:305 +msgid "Edit Thing" +msgstr "Редактировать" -#: ../../view/theme/blogga/php/config.php:47 -#: ../../view/theme/blogga/view/theme/blog/config.php:47 -msgid "None" -msgstr "" +#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364 +msgid "Select a profile" +msgstr "Выбрать профиль" -#: ../../view/theme/blogga/php/config.php:70 -#: ../../view/theme/blogga/view/theme/blog/config.php:70 -msgid "Header image" -msgstr "Графика заголовока" +#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 +msgid "Post an activity" +msgstr "Опубликовать мероприятие" -#: ../../view/theme/blogga/php/config.php:71 -#: ../../view/theme/blogga/view/theme/blog/config.php:71 -msgid "Header image only on profile pages" -msgstr "" +#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 +msgid "Only sends to viewers of the applicable profile" +msgstr "Отправлять только подходящий профиль" -#: ../../view/theme/redbasic/php/config.php:104 -msgid "Narrow navbar" -msgstr "Узкая панель навигации" +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 +msgid "Name of thing e.g. something" +msgstr "Наименование, например \"нечто\"" -#: ../../view/theme/redbasic/php/config.php:105 -msgid "Navigation bar background colour" -msgstr "Панель навигации, цвет фона" +#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370 +msgid "URL of thing (optional)" +msgstr "URL (необязательно)" -#: ../../view/theme/redbasic/php/config.php:106 -msgid "Navigation bar gradient top colour" -msgstr "Панель навигации, цвет градиента вверху" +#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371 +msgid "URL for photo of thing (optional)" +msgstr "URL для фотографии (необязательно)" -#: ../../view/theme/redbasic/php/config.php:107 -msgid "Navigation bar gradient bottom colour" -msgstr "Панель навигации, цвет градиента внизу" +#: ../../Zotlabs/Module/Thing.php:362 +msgid "Add Thing to your Profile" +msgstr "Добавить к вашему профилю" -#: ../../view/theme/redbasic/php/config.php:108 -msgid "Navigation active button gradient top colour" -msgstr "Панель навигации, цвет градиента вверху активной кнопки" +#: ../../Zotlabs/Module/Display.php:394 +msgid "Article" +msgstr "Статья" -#: ../../view/theme/redbasic/php/config.php:109 -msgid "Navigation active button gradient bottom colour" -msgstr "Панель навигации, цвет градиента внизу активной кнопки" +#: ../../Zotlabs/Module/Display.php:446 +msgid "Item has been removed." +msgstr "Элемент был удалён." -#: ../../view/theme/redbasic/php/config.php:110 -msgid "Navigation bar border colour " -msgstr "Панель навигации, цвет границы" +#: ../../Zotlabs/Module/Home.php:92 +#, php-format +msgid "Welcome to %s" +msgstr "Добро пожаловать в %s" -#: ../../view/theme/redbasic/php/config.php:111 -msgid "Navigation bar icon colour " -msgstr "Панель навигации, цвет значков" +#: ../../Zotlabs/Module/Cloud.php:129 +msgid "Please refresh page" +msgstr "Пожалуйста обновите страницу" -#: ../../view/theme/redbasic/php/config.php:112 -msgid "Navigation bar active icon colour " -msgstr "Панель навигации, цвет активного значка" +#: ../../Zotlabs/Module/Cloud.php:132 +msgid "Unknown error" +msgstr "Неизвестная ошибка" -#: ../../view/theme/redbasic/php/config.php:113 -msgid "link colour" -msgstr "Цвет ссылок" +#: ../../Zotlabs/Module/Lostpass.php:19 +msgid "No valid account found." +msgstr "Действительный аккаунт не найден." -#: ../../view/theme/redbasic/php/config.php:114 -msgid "Set font-colour for banner" -msgstr "Цвет текста в шапке" +#: ../../Zotlabs/Module/Lostpass.php:33 +msgid "Password reset request issued. Check your email." +msgstr "Запрос на сброс пароля отправлен. Проверьте вашу электронную почту." -#: ../../view/theme/redbasic/php/config.php:115 -msgid "Set the background colour" -msgstr "Цвет фона на странице канала" +#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108 +#, php-format +msgid "Site Member (%s)" +msgstr "Участник сайта (%s)" -#: ../../view/theme/redbasic/php/config.php:116 -msgid "Set the background image" -msgstr "Фоновое изображение" +#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49 +#, php-format +msgid "Password reset requested at %s" +msgstr "Запроше сброс пароля на %s" -#: ../../view/theme/redbasic/php/config.php:117 -msgid "Set the background colour of items" -msgstr "Цвет фона для постов и других элементов" +#: ../../Zotlabs/Module/Lostpass.php:68 +msgid "" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." +msgstr "Запрос не может быть проверен. (Вы могли отправить его раньше). Сброс пароля не возможен." -#: ../../view/theme/redbasic/php/config.php:118 -msgid "Set the background colour of comments" -msgstr "Цвет фона для комментариев" +#: ../../Zotlabs/Module/Lostpass.php:92 +msgid "Your password has been reset as requested." +msgstr "Ваш пароль в соответствии с просьбой сброшен." -#: ../../view/theme/redbasic/php/config.php:119 -msgid "Set the border colour of comments" -msgstr "Цвет границы для области комментариев" +#: ../../Zotlabs/Module/Lostpass.php:93 +msgid "Your new password is" +msgstr "Ваш новый пароль" -#: ../../view/theme/redbasic/php/config.php:120 -msgid "Set the indent for comments" -msgstr "" +#: ../../Zotlabs/Module/Lostpass.php:94 +msgid "Save or copy your new password - and then" +msgstr "Сохраните ваш новый пароль и затем" -#: ../../view/theme/redbasic/php/config.php:121 -msgid "Set the basic colour for item icons" -msgstr "Основной цвет в иконках редактирования" +#: ../../Zotlabs/Module/Lostpass.php:95 +msgid "click here to login" +msgstr "нажмите здесь чтобы войти" -#: ../../view/theme/redbasic/php/config.php:122 -msgid "Set the hover colour for item icons" -msgstr "Цвет в иконках редактирования при наведении мыши" +#: ../../Zotlabs/Module/Lostpass.php:96 +msgid "" +"Your password may be changed from the Settings page after " +"successful login." +msgstr "Ваш пароль может быть изменён на странице Настройкипосле успешного входа." -#: ../../view/theme/redbasic/php/config.php:123 -msgid "Set font-size for the entire application" -msgstr "Установить размер шрифта для системы в целом" +#: ../../Zotlabs/Module/Lostpass.php:117 +#, php-format +msgid "Your password has changed at %s" +msgstr "Пароль был изменен на %s" -#: ../../view/theme/redbasic/php/config.php:125 -msgid "Set font-colour for posts and comments" -msgstr "Цвет шрифта для постов и комментариев" +#: ../../Zotlabs/Module/Lostpass.php:130 +msgid "Forgot your Password?" +msgstr "Забыли ваш пароль?" -#: ../../view/theme/redbasic/php/config.php:126 -msgid "Set radius of corners" -msgstr "Радиус скруглений" +#: ../../Zotlabs/Module/Lostpass.php:131 +msgid "" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." +msgstr "Введите ваш адрес электронной почты и нажмите отправить чтобы сбросить пароль. Затем проверьте ваш почтовый ящик для дальнейших инструкций. " -#: ../../view/theme/redbasic/php/config.php:127 -msgid "Set shadow depth of photos" -msgstr "" +#: ../../Zotlabs/Module/Lostpass.php:132 +msgid "Email Address" +msgstr "Адрес электронной почты" -#: ../../view/theme/redbasic/php/config.php:128 -msgid "Set maximum width of conversation regions" -msgstr "" +#: ../../Zotlabs/Module/Mood.php:136 +msgid "Set your current mood and tell your friends" +msgstr "Установить текущее настроение и рассказать друзьям" -#: ../../view/theme/redbasic/php/config.php:129 -msgid "Center conversation regions" -msgstr "" +#: ../../Zotlabs/Module/Import_items.php:93 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." +msgstr "Предупреждение: Версия базы данных отличается от %1$d обновления." -#: ../../view/theme/redbasic/php/config.php:130 -msgid "Set minimum opacity of nav bar - to hide it" -msgstr "Панель навигации, прозрачность" +#: ../../Zotlabs/Module/Import_items.php:108 +msgid "Import completed" +msgstr "Импорт завершён." -#: ../../view/theme/redbasic/php/config.php:131 -msgid "Set size of conversation author photo" -msgstr "" +#: ../../Zotlabs/Module/Import_items.php:125 +msgid "Import Items" +msgstr "Импортировать объекты" -#: ../../view/theme/redbasic/php/config.php:132 -msgid "Set size of followup author photos" -msgstr "" +#: ../../Zotlabs/Module/Import_items.php:126 +msgid "Use this form to import existing posts and content from an export file." +msgstr "Используйте эту форму для импорта существующих публикаций и содержимого из файла." -#: ../../view/theme/redbasic/php/config.php:133 -msgid "Sloppy photo albums" -msgstr "" +#: ../../Zotlabs/Module/Chanview.php:139 +msgid "toggle full screen mode" +msgstr "переключение полноэкранного режима" -#: ../../view/theme/redbasic/php/config.php:133 -msgid "Are you a clean desk or a messy desk person?" -msgstr "" +#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:289 +msgid "parent" +msgstr "источник" -#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:38 -msgid "Type" -msgstr "Тип" +#: ../../Zotlabs/Storage/Browser.php:134 +msgid "Principal" +msgstr "Субъект" -#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:40 -msgid "Size" -msgstr "Размер" +#: ../../Zotlabs/Storage/Browser.php:137 +msgid "Addressbook" +msgstr "Адресная книга" -#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:42 -msgid "Last modified" -msgstr "Последнее изменение" +#: ../../Zotlabs/Storage/Browser.php:143 +msgid "Schedule Inbox" +msgstr "План занятий входящий" -#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:85 -msgid "Are you sure you want to delete this item?" -msgstr "Вы уверены, что хотите удалить этот элемент?" +#: ../../Zotlabs/Storage/Browser.php:146 +msgid "Schedule Outbox" +msgstr "План занятий исходящий" -#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:103 +#: ../../Zotlabs/Storage/Browser.php:273 msgid "Total" msgstr "Всего" -#: ../../boot.php:1273 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "" +#: ../../Zotlabs/Storage/Browser.php:275 +msgid "Shared" +msgstr "Общие" -#: ../../boot.php:1276 -#, php-format -msgid "Update Error at %s" -msgstr "Ошибка обновления на %s" +#: ../../Zotlabs/Storage/Browser.php:277 +msgid "Add Files" +msgstr "Добавить файлы" -#: ../../boot.php:1440 -msgid "" -"Create an account to access services and applications within the Hubzilla" -msgstr "" +#: ../../Zotlabs/Storage/Browser.php:361 +#, php-format +msgid "You are using %1$s of your available file storage." +msgstr "Вы используете %1$s из доступного вам хранилища файлов." -#: ../../boot.php:1468 -msgid "Password" -msgstr "Пароль" +#: ../../Zotlabs/Storage/Browser.php:366 +#, php-format +msgid "You are using %1$s of %2$s available file storage. (%3$s%)" +msgstr "Вы используете %1$s из %2$s доступного хранилища файлов (%3$s%)." -#: ../../boot.php:1469 -msgid "Remember me" -msgstr "Запомнить" +#: ../../Zotlabs/Storage/Browser.php:377 +msgid "WARNING:" +msgstr "Предупреждение:" -#: ../../boot.php:1474 -msgid "Forgot your password?" -msgstr "Забыли пароль или логин?" +#: ../../Zotlabs/Storage/Browser.php:389 +msgid "Create new folder" +msgstr "Создать новую папку" -#: ../../boot.php:1539 -msgid "permission denied" -msgstr "доступ запрещен" +#: ../../Zotlabs/Storage/Browser.php:391 +msgid "Upload file" +msgstr "Загрузить файл" -#: ../../boot.php:1540 -msgid "Got Zot?" -msgstr "Got Zot?" +#: ../../Zotlabs/Storage/Browser.php:404 +msgid "Drop files here to immediately upload" +msgstr "Поместите файлы сюда для немедленной загрузки" -#: ../../boot.php:1970 -msgid "toggle mobile" -msgstr "мобильное подключение" -- cgit v1.2.3 From 26e20d35c221fde1099097e56ff7c6d4c4cca9a7 Mon Sep 17 00:00:00 2001 From: kostikov Date: Fri, 20 Jul 2018 10:25:03 +0200 Subject: Update hstrings.php (cherry picked from commit 790a9155d416d52387a1891417d8558ed490ea5d) --- view/ru/hstrings.php | 4779 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 3138 insertions(+), 1641 deletions(-) diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index 4e42df2fc..d97aa2c7f 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -2,568 +2,1129 @@ if(! function_exists("string_plural_select_ru")) { function string_plural_select_ru($n){ - return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<10 || $n%100>=20) ? 1 : 2);; + return ($n%10==1 && $n%100!=11 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : 2)); }} -; -App::$strings["Cannot locate DNS info for database server '%s'"] = ""; -App::$strings["Profile Photos"] = "Фотографии профиля"; -App::$strings["Image/photo"] = "Изображение / фото"; +App::$rtl = 0; +App::$strings["Source channel not found."] = "Канал-источник не найден."; +App::$strings["lonely"] = "одинокий"; +App::$strings["drunk"] = "пьяный"; +App::$strings["horny"] = "возбуждённый"; +App::$strings["stoned"] = "под кайфом"; +App::$strings["fucked up"] = "облажался"; +App::$strings["clusterfucked"] = "в полной заднице"; +App::$strings["crazy"] = "сумасшедший"; +App::$strings["hurt"] = "обиженный"; +App::$strings["sleepy"] = "сонный"; +App::$strings["grumpy"] = "сердитый"; +App::$strings["high"] = "кайфует"; +App::$strings["semi-conscious"] = "в полубезсознании"; +App::$strings["in love"] = "влюблённый"; +App::$strings["in lust"] = "похотливый"; +App::$strings["naked"] = "обнажённый"; +App::$strings["stinky"] = "вонючий"; +App::$strings["sweaty"] = "потный"; +App::$strings["bleeding out"] = "истекающий кровью"; +App::$strings["victorious"] = "победивший"; +App::$strings["defeated"] = "проигравший"; +App::$strings["envious"] = "завидует"; +App::$strings["jealous"] = "ревнует"; +App::$strings["Post to Dreamwidth"] = "Публиковать в Dreamwidth"; +App::$strings["Enable Dreamwidth Post Plugin"] = "Включить плагин публикаций Dreamwidth"; +App::$strings["No"] = "Нет"; +App::$strings["Yes"] = "Да"; +App::$strings["Dreamwidth username"] = "Имя пользователя Dreamwidth"; +App::$strings["Dreamwidth password"] = "Пароль Dreamwidth"; +App::$strings["Post to Dreamwidth by default"] = "Публиковать в Dreamwidth по умолчанию"; +App::$strings["Dreamwidth Post Settings"] = "Настройки публикаций в Dreamwidth"; +App::$strings["Submit"] = "Отправить"; +App::$strings["Markdown"] = "Разметка"; +App::$strings["Use markdown for editing posts"] = "Использовать язык разметки для редактирования публикаций"; +App::$strings["You're welcome."] = "Пожалуйста."; +App::$strings["Ah shucks..."] = "О, чёрт..."; +App::$strings["Don't mention it."] = "Не стоит благодарности."; +App::$strings["<blush>"] = "<краснею>"; +App::$strings["Send test email"] = "Отправить тестовый email"; +App::$strings["No recipients found."] = "Получателей не найдено."; +App::$strings["Mail sent."] = "Сообщение отправлено"; +App::$strings["Sending of mail failed."] = "Не удалось отправить сообщение."; +App::$strings["Mail Test"] = "Тестовое сообщение"; +App::$strings["Message subject"] = "Тема сообщения"; +App::$strings["Project Servers and Resources"] = "Серверы и ресурсы проекта"; +App::$strings["Project Creator and Tech Lead"] = "Создатель проекта и технический руководитель"; +App::$strings["Admin, developer, directorymin, support bloke"] = "Администратор, разработчик, администратор каталога, поддержка"; +App::$strings["And the hundreds of other people and organisations who helped make the Hubzilla possible."] = "И сотни других людей и организаций которые помогали в создании Hubzilla."; +App::$strings["The Redmatrix/Hubzilla projects are provided primarily by volunteers giving their time and expertise - and often paying out of pocket for services they share with others."] = "Проекты Redmatrix / Hubzilla предоставляются, в основном, добровольцами, которые предоставляют свое время и опыт и, часто, оплачивают из своего кармана услуги, которыми они делятся с другими."; +App::$strings["There is no corporate funding and no ads, and we do not collect and sell your personal information. (We don't control your personal information - you do.)"] = "Здесь нет корпоративного финансирования и рекламы, мы не собираем и не продаем вашу личную информацию. (Мы не контролируем вашу личную информацию - это делаете вы.)"; +App::$strings["Help support our ground-breaking work in decentralisation, web identity, and privacy."] = "Помогите поддержать нашу новаторскую работу в областях децентрализации, веб-идентификации и конфиденциальности."; +App::$strings["Your donations keep servers and services running and also helps us to provide innovative new features and continued development."] = "В ваших пожертвованиях поддерживают серверы и службы, а также помогают нам предоставлять новые возможности и продолжать развитие."; +App::$strings["Donate"] = "Пожертвовать"; +App::$strings["Choose a project, developer, or public hub to support with a one-time donation"] = "Выберите проект, разработчика или общедоступный узел для поддержки в форме единоразового пожертвования"; +App::$strings["Donate Now"] = "Пожертвовать сейчас"; +App::$strings["Or become a project sponsor (Hubzilla Project only)"] = "или станьте спонсором проекта (только для Hubzilla)"; +App::$strings["Please indicate if you would like your first name or full name (or nothing) to appear in our sponsor listing"] = "Пожалуйста, если желаете, укажите ваше имя для отображения в списке спонсоров."; +App::$strings["Sponsor"] = "Спонсор"; +App::$strings["Special thanks to: "] = "Особые благодарности:"; +App::$strings["Currently blocked"] = "В настоящее время заблокирован"; +App::$strings["No channels currently blocked"] = "В настоящее время никакие каналы не блокируются"; +App::$strings["Remove"] = "Удалить"; +App::$strings["Superblock Settings"] = "Настройки Superblock"; +App::$strings["Block Completely"] = "Заблокировать полностью"; +App::$strings["superblock settings updated"] = "Настройки Superblock обновлены."; +App::$strings["XMPP settings updated."] = "Настройки XMPP обновлены."; +App::$strings["Enable Chat"] = "Включить чат"; +App::$strings["Individual credentials"] = "Индивидуальные разрешения"; +App::$strings["Jabber BOSH server"] = "Сервер Jabber BOSH"; +App::$strings["XMPP Settings"] = "Настройки XMPP"; +App::$strings["Save Settings"] = "Сохранить настройки"; +App::$strings["Jabber BOSH host"] = "Узел Jabber BOSH"; +App::$strings["Use central userbase"] = "Использовать центральную базу данных"; +App::$strings["If enabled, members will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Если включено, участники автоматически войдут на сервер ejabberd, который должен быть установлен на этом компьютере с синхронизированными учетными данными через скрипт\"auth_ejabberd.php\"."; +App::$strings["Settings updated."] = "Настройки обновлены."; +App::$strings["Send email to all members"] = "Отправить email всем участникам"; +App::$strings["%s Administrator"] = "администратор %s"; +App::$strings["%1\$d of %2\$d messages sent."] = "%1\$dиз %2\$d сообщений отправлено."; +App::$strings["Send email to all hub members."] = "Отправить email всем участникам узла."; +App::$strings["Sender Email address"] = "Адрес электронной почты отправителя"; +App::$strings["Test mode (only send to hub administrator)"] = "Тестовый режим (отправка только администратору узла)"; +App::$strings["Report Bug"] = "Сообщить об ошибке"; +App::$strings["Post to Insanejournal"] = "Опубликовать в InsaneJournal"; +App::$strings["Enable InsaneJournal Post Plugin"] = "Включить плагин публикаций InsaneJournal"; +App::$strings["InsaneJournal username"] = "Имя пользователя InsaneJournal"; +App::$strings["InsaneJournal password"] = "Пароль InsaneJournal"; +App::$strings["Post to InsaneJournal by default"] = "Публиковать в InsaneJournal по умолчанию"; +App::$strings["InsaneJournal Post Settings"] = "Настройки публикаций в InsaneJournal"; +App::$strings["Insane Journal Settings saved."] = "Настройки InsaneJournal сохранены."; +App::$strings["Hubzilla Directory Stats"] = "Каталог статистики Hubzilla"; +App::$strings["Total Hubs"] = "Всего хабов"; +App::$strings["Hubzilla Hubs"] = "Хабы Hubzilla"; +App::$strings["Friendica Hubs"] = "Хабы Friendica"; +App::$strings["Diaspora Pods"] = "Стручки Diaspora"; +App::$strings["Hubzilla Channels"] = "Каналы Hubzilla"; +App::$strings["Friendica Channels"] = "Каналы Friendica"; +App::$strings["Diaspora Channels"] = "Каналы Diaspora"; +App::$strings["Aged 35 and above"] = "Возраст 35 и выше"; +App::$strings["Aged 34 and under"] = "Возраст 34 и ниже"; +App::$strings["Average Age"] = "Средний возраст"; +App::$strings["Known Chatrooms"] = "Известные чаты"; +App::$strings["Known Tags"] = "Известные теги"; +App::$strings["Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network. This also applies to chatrooms,"] = "166/500Обратите внимание, что статистика Diaspora и Friendica это только те, о которых ** этот каталог ** знает, а не все известные в сети. Это также относится и к чатам."; +App::$strings["Invalid game."] = "Недействительная игра"; +App::$strings["You are not a player in this game."] = "Вы не играете в эту игру."; +App::$strings["You must be a local channel to create a game."] = "Ваш канал должен быть локальным чтобы создать игру."; +App::$strings["You must select one opponent that is not yourself."] = "Вы должны выбрать противника который не является вами."; +App::$strings["Random color chosen."] = "Выбран случайный цвет."; +App::$strings["Error creating new game."] = "Ошибка создания новой игры."; +App::$strings["Requested channel is not available."] = "Запрошенный канал не доступен."; +App::$strings["You must select a local channel /chess/channelname"] = "Вы должны выбрать локальный канал /chess/channelname"; +App::$strings["You must be logged in to see this page."] = "Вы должны авторизоваться, чтобы увидеть эту страницу."; +App::$strings["Enable notifications"] = "Включить оповещения"; +App::$strings["Planets Settings updated."] = "Настройки Planets обновлены."; +App::$strings["Enable Planets Plugin"] = "Включить плагин Planets"; +App::$strings["Planets Settings"] = "Настройки Planets"; +App::$strings["Post to Libertree"] = "Опубликовать в Libertree"; +App::$strings["Enable Libertree Post Plugin"] = "Включить плагин публикаций Libertree"; +App::$strings["Libertree API token"] = "Токен Libertree API"; +App::$strings["Libertree site URL"] = "URL сайта Libertree"; +App::$strings["Post to Libertree by default"] = "Публиковать в Libertree по умолчанию"; +App::$strings["Libertree Post Settings"] = "Настройки публикаций в Libertree"; +App::$strings["Libertree Settings saved."] = "Настройки Libertree сохранены."; +App::$strings["Only authenticate automatically to sites of your friends"] = "Автоматически аутентифицироватся только на сайтах ваших друзей"; +App::$strings["By default you are automatically authenticated anywhere in the network"] = "По умолчанию вы автоматически аутентифицируетесь во всей сети"; +App::$strings["Authchoose Settings"] = "Настройки выбора аутентификации"; +App::$strings["Atuhchoose Settings updated."] = "Настройки выбора аутентификации обновлены."; +App::$strings["Logfile archive directory"] = "Каталог архивирования журнала"; +App::$strings["Directory to store rotated logs"] = "Каталог для хранения заархивированных журналов"; +App::$strings["Logfile size in bytes before rotating"] = "Размер файла журнала в байтах для архивирования"; +App::$strings["Number of logfiles to retain"] = "Количество сохраняемых файлов журналов"; +App::$strings["QR code"] = "QR-код"; +App::$strings["QR Generator"] = "Генератор QR-кодов"; +App::$strings["Enter some text"] = "Введите любой текст"; +App::$strings["text to include in all outgoing posts from this site"] = "текст, который будет добавлен во все исходящие публикации с этого сайта"; +App::$strings["file"] = "файл"; +App::$strings["Permission denied"] = "Доступ запрещен"; +App::$strings["Redmatrix File Storage Import"] = "Импорт файлового хранилища Redmatrix"; +App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Это позволит импортировать все ваши файлы в Redmatrix в этот канал."; +App::$strings["Redmatrix Server base URL"] = "Базовый URL сервера Redmatrix"; +App::$strings["Redmatrix Login Username"] = "Имя пользователя Redmatrix"; +App::$strings["Redmatrix Login Password"] = "Пароль Redmatrix"; +App::$strings["Deactivate the feature"] = "Деактивировать функцию"; +App::$strings["Hide the button and show the smilies directly."] = "Скрыть кнопку и сразу показывать смайлики."; +App::$strings["Smileybutton Settings"] = "Настройки кнопки смайликов"; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Этот плагин просматривает публикации для слов / текста, которые вы указываете ниже, и сворачивает любой контент, содержащий эти ключевые слова, поэтому он не отображается в неподходящее время, например, сексуальные инсинуации, которые могут быть неправильными в настройке работы. Например, мы рекомендуем отмечать любой контент, содержащий наготу, тегом #NSFW. Этот фильтр также способен реагировать на любое другое указанное вами слово / текст и может использоваться в качестве фильтра содержимого общего назначения."; +App::$strings["Enable Content filter"] = "Включить фильтрацию содержимого"; +App::$strings["Comma separated list of keywords to hide"] = "Список ключевых слов для скрытия, через запятую"; +App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "слово, /регулярное_выражение/, lang=xx, lang!=xx"; +App::$strings["Not Safe For Work Settings"] = "Настройка \"Not Safe For Work\""; +App::$strings["General Purpose Content Filter"] = "Фильтр содержимого общего назначения"; +App::$strings["NSFW Settings saved."] = "Настройки NSFW сохранены."; +App::$strings["Possible adult content"] = "Возможно содержимое для взрослых"; +App::$strings["%s - view"] = "%s - просмотр"; +App::$strings["Flattr this!"] = ""; +App::$strings["Flattr widget settings updated."] = "Настройки виджета Flattr обновлены."; +App::$strings["Flattr user"] = "Пользователь Flattr"; +App::$strings["URL of the Thing to flattr"] = "URL ccылки на Flattr"; +App::$strings["If empty channel URL is used"] = "Если пусто, то используется URL канала"; +App::$strings["Title of the Thing to flattr"] = "Заголовок вещи на Flattr"; +App::$strings["If empty \"channel name on The Hubzilla\" will be used"] = "Если пусто, то будет использовано \"Название канала Hubzilla\""; +App::$strings["Static or dynamic flattr button"] = "Статическая или динамическая кнопка Flattr"; +App::$strings["static"] = "статическая"; +App::$strings["dynamic"] = "динамическая"; +App::$strings["Alignment of the widget"] = "Выравнивание виджета"; +App::$strings["left"] = "слева"; +App::$strings["right"] = "справа"; +App::$strings["Enable Flattr widget"] = "Включить виджет Flattr"; +App::$strings["Flattr Widget Settings"] = "Настройки виджета Flattr"; +App::$strings["Permission denied."] = "Доступ запрещен."; +App::$strings["You are now authenticated to pumpio."] = "Вы аутентифицированы в Pump.io"; +App::$strings["return to the featured settings page"] = "Вернутся к странице настроек"; +App::$strings["Post to Pump.io"] = "Опубликовать в Pump.io"; +App::$strings["Pump.io servername"] = "Имя сервера Pump.io"; +App::$strings["Without \"http://\" or \"https://\""] = "Без \"http://\" или \"https://\""; +App::$strings["Pump.io username"] = "Имя пользователя Pump.io"; +App::$strings["Without the servername"] = "без имени сервера"; +App::$strings["You are not authenticated to pumpio"] = "Вы не аутентифицированы на Pump.io"; +App::$strings["(Re-)Authenticate your pump.io connection"] = "Аутентифицировать (повторно) ваше соединение с Pump.io"; +App::$strings["Enable pump.io Post Plugin"] = "Включить плагин публикаций Pump.io"; +App::$strings["Post to pump.io by default"] = "Публиковать в Pump.io по умолчанию"; +App::$strings["Should posts be public"] = "Публикации должны быть общедоступными"; +App::$strings["Mirror all public posts"] = "Отображать все общедоступные публикации"; +App::$strings["Pump.io Post Settings"] = "Настройки публикаций в Pump.io"; +App::$strings["PumpIO Settings saved."] = "Настройки публикаций в Pump.io сохранены."; +App::$strings["Save Bookmarks"] = "Сохранить закладки"; +App::$strings["Status:"] = "Статус:"; +App::$strings["Activate addon"] = "Активировать расширение"; +App::$strings["Hide Jappixmini Chat-Widget from the webinterface"] = "Скрыть виджет чата Jappixmini из веб-интерфейса"; +App::$strings["Jabber username"] = "Имя пользователя Jabber"; +App::$strings["Jabber server"] = "Сервер Jabber"; +App::$strings["Jabber BOSH host URL"] = "URL узла Jabber BOSH"; +App::$strings["Jabber password"] = "Пароль Jabber"; +App::$strings["Encrypt Jabber password with Hubzilla password"] = "Зашифровать пароль Jabber с помощью пароля Hubzilla"; +App::$strings["Recommended"] = "рекомендовано"; +App::$strings["Hubzilla password"] = "Пароль Hubzilla"; +App::$strings["Approve subscription requests from Hubzilla contacts automatically"] = "Утверждать запросы на подписку от контактов Hubzilla автоматически"; +App::$strings["Purge internal list of jabber addresses of contacts"] = "Очистить внутренний список адресов контактов Jabber"; +App::$strings["Configuration Help"] = "Помощь по конфигурации"; +App::$strings["Add Contact"] = "Добавить контакт"; +App::$strings["Jappix Mini Settings"] = "Настройки Jappix Mini"; +App::$strings["Post to LiveJournal"] = "Опубликовать в LiveJournal"; +App::$strings["Enable LiveJournal Post Plugin"] = "Включить плагин публикаций LiveJournal"; +App::$strings["LiveJournal username"] = "Имя пользователя LiveJournal"; +App::$strings["LiveJournal password"] = "Пароль LiveJournal"; +App::$strings["Post to LiveJournal by default"] = "Публиковать в LiveJournal по умолчанию"; +App::$strings["LiveJournal Post Settings"] = "Настройки публикаций в LiveJournal"; +App::$strings["LiveJournal Settings saved."] = "Настройки LiveJournal сохранены."; +App::$strings["Errors encountered deleting database table "] = "Возникшие при удалении таблицы базы данных ошибки"; +App::$strings["Submit Settings"] = "Отправить настройки"; +App::$strings["Drop tables when uninstalling?"] = "Удалить таблицы при деинсталляции?"; +App::$strings["If checked, the Rendezvous database tables will be deleted when the plugin is uninstalled."] = "Если включено, то таблицы базы данных Rendezvous будут удалены при удалении плагина."; +App::$strings["Mapbox Access Token"] = "Токен доступа к Mapbox"; +App::$strings["If you enter a Mapbox access token, it will be used to retrieve map tiles from Mapbox instead of the default OpenStreetMap tile server."] = "Если вы введете токен доступа к Mapbox, он будет использоваться для извлечения фрагментов карты из Mapbox вместо стандартного сервера OpenStreetMap."; +App::$strings["Rendezvous"] = ""; +App::$strings["This identity has been deleted by another member due to inactivity. Please press the \"New identity\" button or refresh the page to register a new identity. You may use the same name."] = "Этот идентификатор был удалён другим участником из-за неактивности. Пожалуйста нажмите кнопку \"Новый идентификатор\" для обновления страницы и получения нового идентификатора. Вы можете использовать то же имя."; +App::$strings["Welcome to Rendezvous!"] = "Добро пожаловать в Rendezvous!"; +App::$strings["Enter your name to join this rendezvous. To begin sharing your location with the other members, tap the GPS control. When your location is discovered, a red dot will appear and others will be able to see you on the map."] = "Введите ваше имя для вступления в это Rendezvous. Для того, чтобы делиться вашим положением с другими участниками, нажмите \"GPS control\". Когда ваше местоположение определно, красная точка появится и остальные смогут увидеть вас на карте."; +App::$strings["Let's meet here"] = "Давайте встретимся здесь"; +App::$strings["Name"] = "Имя"; +App::$strings["Description"] = "Описание"; +App::$strings["New marker"] = "Новый маркер"; +App::$strings["Edit marker"] = "Редактировать маркер"; +App::$strings["New identity"] = "Новый идентификатор"; +App::$strings["Delete marker"] = "Удалить маркер"; +App::$strings["Delete member"] = "Удалить участника"; +App::$strings["Edit proximity alert"] = "Изменить оповещение о близости"; +App::$strings["A proximity alert will be issued when this member is within a certain radius of you.

      Enter a radius in meters (0 to disable):"] = "Оповещение о близости будет произведено, если этот участник находится на определённом расстоянии от вас.

      Введите радиус в метрах (0 для отключения):"; +App::$strings["distance"] = "расстояние"; +App::$strings["Proximity alert distance (meters)"] = "Расстояние для уведомления о близости (метров)"; +App::$strings["A proximity alert will be issued when you are within a certain radius of the marker location.

      Enter a radius in meters (0 to disable):"] = "Оповещение о близости будет произведено, если вы находитесь на определённом расстоянии местоположения маркера.

      Введите радиус в метрах (0 для отключения):"; +App::$strings["Marker proximity alert"] = "Маркер уведомления о близости"; +App::$strings["Reminder note"] = "Напоминание"; +App::$strings["Enter a note to be displayed when you are within the specified proximity..."] = "Введите сообщение для отображения когда вы находитесь рядом"; +App::$strings["Add new rendezvous"] = "Добавить новое Rendezvous."; +App::$strings["Create a new rendezvous and share the access link with those you wish to invite to the group. Those who open the link become members of the rendezvous. They can view other member locations, add markers to the map, or share their own locations with the group."] = "Создайте новое Rendezvous и поделитесь ссылкой доступа с теми, кого вы хотите пригласить в группу. Тот, кто откроет эту ссылку, станет её участником. Участники могут видеть местоположение, добавлять маркеры на карту или делится своим собственным местоположением с группой."; +App::$strings["You have no rendezvous. Press the button above to create a rendezvous!"] = "У вас нет Rendezvous. Нажмите на кнопку ниже чтобы создать его!"; +App::$strings["Errors encountered creating database tables."] = "При создании базы данных возникли ошибки."; +App::$strings["View Larger"] = "Увеличить"; +App::$strings["Tile Server URL"] = "URL сервера Tile"; +App::$strings["A list of public tile servers"] = "Список общедоступных серверов"; +App::$strings["Nominatim (reverse geocoding) Server URL"] = "URL сервера Nominatim (обратное геокодирование)"; +App::$strings["A list of Nominatim servers"] = "Список серверов Nominatim"; +App::$strings["Default zoom"] = "Масштаб по умолчанию"; +App::$strings["The default zoom level. (1:world, 18:highest, also depends on tile server)"] = "Уровень размера по умолчанию (1 - весь мир, 18 - максимальный; зависит от сервера)."; +App::$strings["Include marker on map"] = "Включите маркер на карте"; +App::$strings["Include a marker on the map."] = "Включить маркер на карте"; +App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Мы столкнулись с проблемой входа с предоставленным вами OpenID. Пожалуйста, проверьте корректность его написания."; +App::$strings["The error message was:"] = "Сообщение об ошибке было:"; +App::$strings["OpenID protocol error. No ID returned."] = "Ошибка протокола OpenID. Идентификатор не возвращён."; +App::$strings["Welcome %s. Remote authentication successful."] = "Добро пожаловать %s. Удаленная аутентификация успешно завершена."; +App::$strings["Login failed."] = "Не удалось войти."; +App::$strings["First Name"] = "Имя"; +App::$strings["Last Name"] = "Фамилия"; +App::$strings["Nickname"] = "Псевдоним"; +App::$strings["Full Name"] = "Полное имя"; +App::$strings["Email"] = "Электронная почта"; +App::$strings["Profile Photo"] = "Фотография профиля"; +App::$strings["Profile Photo 16px"] = "Фотография профиля 16px"; +App::$strings["Profile Photo 32px"] = "Фотография профиля 32px"; +App::$strings["Profile Photo 48px"] = "Фотография профиля 48px"; +App::$strings["Profile Photo 64px"] = "Фотография профиля 64px"; +App::$strings["Profile Photo 80px"] = "Фотография профиля 80px"; +App::$strings["Profile Photo 128px"] = "Фотография профиля 128px"; +App::$strings["Timezone"] = "Часовой пояс"; +App::$strings["Homepage URL"] = "URL домашней страницы"; +App::$strings["Language"] = "Язык"; +App::$strings["Birth Year"] = "Год рождения"; +App::$strings["Birth Month"] = "Месяц рождения"; +App::$strings["Birth Day"] = "День рождения"; +App::$strings["Birthdate"] = "Дата рождения"; +App::$strings["Gender"] = "Гендер"; +App::$strings["Male"] = "Мужчина"; +App::$strings["Female"] = "Женщина"; +App::$strings["Your Webbie:"] = "Ваш Webbie:"; +App::$strings["Fontsize (px):"] = "Размер шрифта (px):"; +App::$strings["Link:"] = "Ссылка:"; +App::$strings["Like us on Hubzilla"] = "Нравится на Hubzilla"; +App::$strings["Embed:"] = "Встроить:"; +App::$strings["Extended Identity Sharing"] = "Расширенный обмен идентификацией"; +App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with \$Projectname sites."] = "Поделиться вашим идентификатором на всех веб-сайтах в Интернет. Если выключено, то идентификатор доступен только для сайтов \$Projectname."; +App::$strings["An account has been created for you."] = "Учётная запись, которая была для вас создана."; +App::$strings["Authentication successful but rejected: account creation is disabled."] = "Аутентификация выполнена успешно, но отклонена: создание учетной записи отключено."; +App::$strings["Post to Twitter"] = "Опубликовать в Twitter"; +App::$strings["Twitter settings updated."] = "Настройки Twitter обновлены"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Не найдено пары ключей для Twitter. Пожалуйста, свяжитесь с администратором сайта."; +App::$strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "В этой установке Hubzilla плагин Twitter был включён, однако пока он не подключён к вашему аккаунту в Twitter. Для этого нажмите на кнопку ниже для получения PIN-кода от Twitter который нужно скопировать в поле ввода и отправить форму. Только ваши общедоступные публикации будут опубликованы в Twitter."; +App::$strings["Log in with Twitter"] = "Войти в Twitter"; +App::$strings["Copy the PIN from Twitter here"] = "Скопируйте PIN-код из Twitter здесь"; +App::$strings["Currently connected to: "] = "В настоящее время подключён к:"; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Замечание: Из-за настроек конфиденциальности (скрыть данные своего профиля от неизвестных зрителей?) cсылка, потенциально включенная в общедоступные публикации, переданные в Twitter, приведет посетителя к пустой странице, информирующей его о том, что доступ к вашему профилю был ограничен."; +App::$strings["Allow posting to Twitter"] = "Разрешить публиковать в Twitter"; +App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Если включено, ваши общедоступные публикации будут опубликованы в связанной учётной записи Twitter"; +App::$strings["Twitter post length"] = "Длина публикации Twitter"; +App::$strings["Maximum tweet length"] = "Максимальная длина твита"; +App::$strings["Send public postings to Twitter by default"] = "Отправлять общедоступные публикации в Twitter по умолчанию"; +App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Если включено, ваши общедоступные публикации будут опубликованы в связанной учётной записи Twitter по умолчанию"; +App::$strings["Clear OAuth configuration"] = "Очистить конфигурацию OAuth"; +App::$strings["Twitter Post Settings"] = "Настройки публикаций в Twitter"; +App::$strings["Consumer Key"] = "Ключ клиента"; +App::$strings["Consumer Secret"] = "Код клиента"; +App::$strings["Flag Adult Photos"] = "Пометка фотографий для взрослых"; +App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Предоставьте возможность редактирования фотографий, чтобы скрыть неприемлемые фотографии из альбома по умолчанию"; +App::$strings["Unknown"] = "Неизвестный"; +App::$strings["ActivityPub"] = ""; +App::$strings["photo"] = "фото"; +App::$strings["status"] = "статус"; +App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s нравится %2\$s %3\$s"; +App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s не нравится %2\$s %3\$s"; +App::$strings["ActivityPub Protocol Settings updated."] = "Настройки протокола ActivityPub обновлены."; +App::$strings["The ActivityPub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Протокол ActivityPub не поддерживает независимость от расположения. Ваши контакты установленные в этой сети могут быть недоступны из альтернативных мест размещения канала. "; +App::$strings["Enable the ActivityPub protocol for this channel"] = "Включить протокол ActivityPub для этого канала"; +App::$strings["Deliver to ActivityPub recipients in privacy groups"] = "Доставить получателям ActivityPub в группах безопасности"; +App::$strings["May result in a large number of mentions and expose all the members of your privacy group"] = "Может привести к большому количеству упоминаний и раскрытию участников группы безопасности"; +App::$strings["Send multi-media HTML articles"] = "Отправить HTML статьи с мультимедиа"; +App::$strings["Not supported by some microblog services such as Mastodon"] = "Не поддерживается некоторыми микроблогами, например Mastodon"; +App::$strings["ActivityPub Protocol Settings"] = "Настройки протокола ActivityPub"; +App::$strings["No username found in import file."] = "Имя пользователя не найдено в файле для импорта."; +App::$strings["Unable to create a unique channel address. Import failed."] = "Не удалось создать уникальный адрес канала. Импорт не завершен."; +App::$strings["Import completed."] = "Импорт завершен."; +App::$strings["\$projectname"] = ""; +App::$strings["Diaspora Protocol Settings updated."] = "Настройки протокола Diaspora обновлены."; +App::$strings["The Diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Прокол Diaspora не поддерживает независимость от расположения. Ваши контакты установленные в этой сети могут быть недоступны из альтернативных мест размещения канала."; +App::$strings["Enable the Diaspora protocol for this channel"] = "Включить протокол Diaspora для этого канала"; +App::$strings["Allow any Diaspora member to comment on your public posts"] = "Разрешить любому участнику Diaspora комментировать ваши общедоступные публикации"; +App::$strings["Prevent your hashtags from being redirected to other sites"] = "Предотвратить перенаправление тегов на другие сайты"; +App::$strings["Sign and forward posts and comments with no existing Diaspora signature"] = "Подписывать и отправлять публикации и комментарии с несуществующей подписью Diaspora"; +App::$strings["Followed hashtags (comma separated, do not include the #)"] = "Отслеживаемые теги (через запятую, исключая #)"; +App::$strings["Diaspora Protocol Settings"] = "Настройки протокола Diaspora"; +App::$strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s посещает %2\$s%3\$s"; +App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s не посещает %2\$s%3\$s"; +App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s может посетить %2\$s%3\$s"; +App::$strings["System defaults:"] = "Системные по умолчанию:"; +App::$strings["Preferred Clipart IDs"] = "Предпочитаемый Clipart ID"; +App::$strings["List of preferred clipart ids. These will be shown first."] = "Список предпочитаемых Clipart ID. Эти будут показаны первыми."; +App::$strings["Default Search Term"] = "Условие поиска по умолчанию"; +App::$strings["The default search term. These will be shown second."] = "Условие поиска по умолчанию. Показываются во вторую очередь."; +App::$strings["Return After"] = "Вернуться после"; +App::$strings["Page to load after image selection."] = "Страница для загрузки после выбора изображения."; +App::$strings["View Profile"] = "Просмотреть профиль"; +App::$strings["Edit Profile"] = "Редактировать профиль"; +App::$strings["Profile List"] = "Список профилей"; +App::$strings["Order of Preferred"] = "Порядок предпочтения"; +App::$strings["Sort order of preferred clipart ids."] = "Порядок сортировки предпочитаемых Clipart ID. "; +App::$strings["Newest first"] = "Новое первым"; +App::$strings["As entered"] = "По мере ввода"; +App::$strings["Order of other"] = "Порядок других"; +App::$strings["Sort order of other clipart ids."] = "Порядок сортировки остальных Clipart ID."; +App::$strings["Most downloaded first"] = "Самое загружаемое первым"; +App::$strings["Most liked first"] = "Самое нравящееся первым"; +App::$strings["Preferred IDs Message"] = "Сообщение от предпочитаемых ID"; +App::$strings["Message to display above preferred results."] = "Отображаемое сообщение над предпочитаемыми результатами."; +App::$strings["Uploaded by: "] = "Загружено:"; +App::$strings["Drawn by: "] = "Нарисовано:"; +App::$strings["Use this image"] = "Использовать это изображение"; +App::$strings["Or select from a free OpenClipart.org image:"] = "Или выберите из бесплатных изображений на OpenClipart.org"; +App::$strings["Search Term"] = "Условие поиска"; +App::$strings["Unknown error. Please try again later."] = "Неизвестная ошибка. Пожалуйста, повторите попытку позже."; +App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Если новая фотография не отображается немедленно то нажмите Shift + \"Обновить\" для очистки кэша браузера"; +App::$strings["Profile photo updated successfully."] = "Фотография профиля обновлена успешно."; +App::$strings["Edit your profile and change settings."] = "Отредактировать ваш профиль и изменить настройки."; +App::$strings["Click here to see activity from your connections."] = "Нажмите сюда для отображения активности ваши контактов."; +App::$strings["Click here to see your channel home."] = "Нажмите сюда чтобы увидеть главную страницу вашего канала."; +App::$strings["You can access your private messages from here."] = "Вы можете получить доступ с личной переписке здесь."; +App::$strings["Create new events here."] = "Создать новое событие здесь."; +App::$strings["You can accept new connections and change permissions for existing ones here. You can also e.g. create groups of contacts."] = "Вы можете подключать новые контакты и менять разрешения для существующих здесь. Также вы можете создавать их группы."; +App::$strings["System notifications will arrive here"] = "Системные оповещения будут показываться здесь"; +App::$strings["Search for content and users"] = "Поиск пользователей и содержимого"; +App::$strings["Browse for new contacts"] = "Поиск новых контактов"; +App::$strings["Launch installed apps"] = "Запустить установленные приложения"; +App::$strings["Looking for help? Click here."] = "Нужна помощь? Нажмите сюда."; +App::$strings["New events have occurred in your network. Click here to see what has happened!"] = "Новые события произошли в вашей сети. Нажмите здесь для того, чтобы знать что случилось!"; +App::$strings["You have received a new private message. Click here to see from who!"] = "Вы получили новое личное сообщение. Нажмите чтобы увидеть от кого!"; +App::$strings["There are events this week. Click here too see which!"] = "На этой неделе есть события. Нажмите здесь чтобы увидеть какие!"; +App::$strings["You have received a new introduction. Click here to see who!"] = "Вы были представлены. Нажмите чтобы увидеть кому!"; +App::$strings["There is a new system notification. Click here to see what has happened!"] = "Это новое системное уведомление. Нажмите чтобы посмотреть что случилось!"; +App::$strings["Click here to share text, images, videos and sound."] = "Нажмите сюда чтобы поделиться текстом, изображениями, видео или треком."; +App::$strings["You can write an optional title for your update (good for long posts)."] = "Вы можете написать необязательный заголовок для вашей публикации (желательно для больших постов)."; +App::$strings["Entering some categories here makes it easier to find your post later."] = "Введите категории здесь чтобы было проще найти вашу публикацию позднее."; +App::$strings["Share photos, links, location, etc."] = "Поделиться фотографией, ссылками, местоположение и т.п."; +App::$strings["Only want to share content for a while? Make it expire at a certain date."] = "Хотите только поделиться временным содержимым? Установите срок его действия."; +App::$strings["You can password protect content."] = "Вы можете защитить содержимое паролем."; +App::$strings["Choose who you share with."] = "Выбрать с кем поделиться."; +App::$strings["Click here when you are done."] = "Нажмите здесь когда закончите."; +App::$strings["Adjust from which channels posts should be displayed."] = "Настройте из каких каналов должны отображаться публикации."; +App::$strings["Only show posts from channels in the specified privacy group."] = "Показывать только публикации из определённой группы безопасности."; +App::$strings["Easily find posts containing tags (keywords preceded by the \"#\" symbol)."] = "Лёгкий поиск сообщения, содержащего теги (ключевые слова, которым предшествует символ \"#\")."; +App::$strings["Easily find posts in given category."] = "Лёгкий поиск публикаций в данной категории."; +App::$strings["Easily find posts by date."] = "Лёгкий поиск публикаций по дате."; +App::$strings["Suggested users who have volounteered to be shown as suggestions, and who we think you might find interesting."] = "Рекомендуемые пользователи, которые были представлены в качестве предложений, и которые, по нашему мнению, могут оказаться интересными."; +App::$strings["Here you see channels you have connected to."] = "Здесь вы видите каналы, к которым вы подключились."; +App::$strings["Save your search so you can repeat it at a later date."] = "Сохраните ваш поиск с тем, чтобы повторить его позже."; +App::$strings["If you see this icon you can be sure that the sender is who it say it is. It is normal that it is not always possible to verify the sender, so the icon will be missing sometimes. There is usually no need to worry about that."] = "Если вы видите этот значок, вы можете быть уверены, что отправитель - это тот, кто это говорит. Это нормально, что не всегда можно проверить отправителя, поэтому значок иногда будет отсутствовать. Обычно об этом не нужно беспокоиться."; +App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "Опасность! Кажется, кто-то пытался подделать сообщение! Это сообщение не обязательно от того, от кого оно значится!"; +App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?

      You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.

      You can also advance by pressing the return key"] = "Добро пожаловать в Hubzilla! Желаете получить обзор пользовательского интерфейса?

      Вы можете его приостановаить и в любое время перезагрузив страницу или перейдя на другую.

      Также вы можете нажать клавишу \"Назад\""; +App::$strings["Some setting"] = "Некоторые настройки"; +App::$strings["A setting"] = "Настройка"; +App::$strings["Skeleton Settings"] = "Настройки скелета"; +App::$strings["Show Upload Limits"] = "Показать ограничения на загрузку"; +App::$strings["Hubzilla configured maximum size: "] = "Максимальный размер настроенный в Hubzilla:"; +App::$strings["PHP upload_max_filesize: "] = ""; +App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = ""; +App::$strings["GNU-Social Protocol Settings updated."] = "Настройки протокола GNU Social обновлены."; +App::$strings["The GNU-Social protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Прокол GNU Social не поддерживает независимость от расположения. Ваши контакты установленные в этой сети могут быть недоступны из альтернативных мест размещения канала."; +App::$strings["Enable the GNU-Social protocol for this channel"] = "Включить протокол GNU Social для этого канала"; +App::$strings["GNU-Social Protocol Settings"] = "Настройки протокола GNU Social"; +App::$strings["Follow"] = "Отслеживать"; +App::$strings["%1\$s is now following %2\$s"] = "%1\$s сейчас отслеживает %2\$s"; +App::$strings["Gallery"] = "Галерея"; +App::$strings["Photo Gallery"] = "Фотогалерея"; +App::$strings["Page to load after login"] = "Страница для загрузки после входа"; +App::$strings["Examples: "apps", "network?f=&gid=37" (privacy collection), "channel" or "notifications/system" (leave blank for default network page (grid)."] = "Примеры: "apps", "network?f=&gid=37" (privacy collection), "channel" or "notifications/system" (оставьте пустым для для страницы сети по умолчанию)."; +App::$strings["Startpage Settings"] = "Настройки стартовой страницы"; +App::$strings["Message to display on every page on this server"] = "Отображаемое сообщение на каждой странице на этом сервере."; +App::$strings["Pageheader Settings"] = "Настройки шапки страницы"; +App::$strings["pageheader Settings saved."] = "Настройки шапки страницы сохранены."; +App::$strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe в трёх измерениях"; +App::$strings["3D Tic-Tac-Toe"] = ""; +App::$strings["New game"] = "Новая игра"; +App::$strings["New game with handicap"] = "Новая игра с форой"; +App::$strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Трехмерный Tic-Tac-Toe похож на традиционную игру, за исключением того, что игра идёт на нескольких уровнях одновременно."; +App::$strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "Имеется три уровня. Вы выигрываете, получая три подряд на любом уровне, а также вверх, вниз и по диагонали на разных уровнях."; +App::$strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Игра с форой отключает центральную позицию на среднем уровне, потому что игрок, претендующий на этот квадрат, часто имеет несправедливое преимущество."; +App::$strings["You go first..."] = "Вы начинаете..."; +App::$strings["I'm going first this time..."] = "На этот раз начинаю я..."; +App::$strings["You won!"] = "Вы выиграли!"; +App::$strings["\"Cat\" game!"] = "Ничья!"; +App::$strings["I won!"] = "Я выиграл!"; +App::$strings["Fuzzloc Settings updated."] = "Настройки Fuzzloc обновлены."; +App::$strings["Fuzzloc allows you to blur your precise location if your channel uses browser location mapping."] = "Fuzzloc позволяет размыть ваше точное местоположение, если ваш канал использует сопоставление местоположений браузера."; +App::$strings["Enable Fuzzloc Plugin"] = "Включить плагин Fuzzloc"; +App::$strings["Minimum offset in meters"] = "Минимальное смещение в метрах"; +App::$strings["Maximum offset in meters"] = "Максимальное смещение в метрах"; +App::$strings["Fuzzloc Settings"] = "Настройки Fuzzloc"; +App::$strings["Post to Friendica"] = "Опубликовать в Friendica"; +App::$strings["rtof Settings saved."] = "Настройки rtof сохранены."; +App::$strings["Allow posting to Friendica"] = "Разрешить публиковать в Friendica"; +App::$strings["Send public postings to Friendica by default"] = "Отправлять общедоступные публикации во Friendica по умолчанию"; +App::$strings["Friendica API Path"] = "Путь к Friendica API"; +App::$strings["https://{sitename}/api"] = ""; +App::$strings["Friendica login name"] = "Имя входа Friendica"; +App::$strings["Friendica password"] = "Пароль Friendica"; +App::$strings["Hubzilla to Friendica Post Settings"] = "Настройки публикаций Hubzilla для Friendica"; +App::$strings["Post to GNU social"] = "Опубликовать в GNU Social"; +App::$strings["Please contact your site administrator.
      The provided API URL is not valid."] = "Пожалуйста свяжитесь с администратором сайта.
      Предоставленный URL API недействителен."; +App::$strings["We could not contact the GNU social API with the Path you entered."] = "Нам не удалось установить контакт с GNU Social API по введённому вами пути"; +App::$strings["GNU social settings updated."] = "Настройки GNU Social обновлены."; +App::$strings["Globally Available GNU social OAuthKeys"] = "Глобально доступные ключи OAuthKeys GNU Social"; +App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
      If not feel free to connect to any other GNU social instance (see below)."] = "Существуют предварительно настроенные пары ключей OAuth для некоторых доступных серверов GNU social. Если вы используете один из них, используйте эти учетные данные.
      Если вы не хотите подключаться к какому-либо другому серверу GNU social (см. ниже)."; +App::$strings["Provide your own OAuth Credentials"] = "Предоставьте ваши собственные регистрационные данные OAuth"; +App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
      Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Не найдена пользовательская пара ключей для GNU social. Зарегистрируйте свою учетную запись Hubzilla в качестве настольного клиента в своей учетной записи GNU social, скопируйте cюда пару ключей пользователя и введите корневой каталог базы API.
      Прежде чем регистрировать свою собственную пару ключей OAuth, спросите администратора, если ли уже пара ключей для этой установки Hubzilla в вашем GNU social."; +App::$strings["OAuth Consumer Key"] = "Ключ клиента OAuth"; +App::$strings["OAuth Consumer Secret"] = "Пароль клиента OAuth"; +App::$strings["Base API Path"] = "Основной путь к API"; +App::$strings["Remember the trailing /"] = "Запомнить закрывающий /"; +App::$strings["GNU social application name"] = "Имя приложения GNU social"; +App::$strings["To connect to your GNU social account click the button below to get a security code from GNU social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU social."] = "Чтобы подключиться к вашей учетной записи GNU social нажмите кнопку ниже для получения кода безопасности из GNU social, который вы должны скопировать в поле ввода ниже и отправить форму. Только ваши общедоступные сообщения будут опубликованы в GNU social."; +App::$strings["Log in with GNU social"] = "Войти с GNU social"; +App::$strings["Copy the security code from GNU social here"] = "Скопируйте код безопасности GNU social здесь"; +App::$strings["Cancel Connection Process"] = "Отменить процесс подключения"; +App::$strings["Current GNU social API is"] = "Текущий GNU social API"; +App::$strings["Cancel GNU social Connection"] = "Отменить подключение с GNU social"; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Замечание: Из-за настроек конфиденциальности (скрыть данные своего профиля от неизвестных зрителей?) cсылка, потенциально включенная в общедоступные публикации, переданные в GNU social, приведет посетителя к пустой странице, информирующей его о том, что доступ к вашему профилю был ограничен."; +App::$strings["Allow posting to GNU social"] = "Разрешить публиковать в GNU social"; +App::$strings["If enabled your public postings can be posted to the associated GNU-social account"] = "Если включено, ваши общедоступные публикации будут опубликованы в связанной учётной записи GNU social"; +App::$strings["Post to GNU social by default"] = "Публиковать в GNU social по умолчанию"; +App::$strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Если включено, ваши общедоступные публикации будут опубликованы в связанной учётной записи GNU social по умолчанию"; +App::$strings["GNU social Post Settings"] = "Настройки публикаций GNU social"; +App::$strings["Site name"] = "Название сайта"; +App::$strings["API URL"] = ""; +App::$strings["Application name"] = "Название приложения"; +App::$strings["Enable Rainbowtag"] = "Включить Rainbowtag"; +App::$strings["Rainbowtag Settings"] = "Настройки Rainbowtag"; +App::$strings["Rainbowtag Settings saved."] = "Настройки Rainbowtag сохранены."; +App::$strings["Friendica Photo Album Import"] = "Импортировать альбом фотографий Friendica"; +App::$strings["This will import all your Friendica photo albums to this Red channel."] = "Это позволит импортировать все ваши альбомы фотографий Friendica в этот канал."; +App::$strings["Friendica Server base URL"] = "Базовый URL сервера Friendica"; +App::$strings["Friendica Login Username"] = "Имя пользователя для входа Friendica"; +App::$strings["Friendica Login Password"] = "Пароль для входа Firendica"; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Этот сайт отслеживается с помощью инструментов аналитики Piwik."; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Если вы не хотите, чтобы ваши визиты регистрировались таким образом, вы можете отключить cookie с тем, чтобы Piwik не отслеживал дальнейшие посещения сайта."; +App::$strings["Piwik Base URL"] = "Базовый URL Piwik"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Абсолютный путь к вашей установке Piwik (без типа протокола, с начальным слэшем)"; +App::$strings["Site ID"] = "ID сайта"; +App::$strings["Show opt-out cookie link?"] = "Показывать ссылку на отказ от использования cookies?"; +App::$strings["Asynchronous tracking"] = "Асинхронное отслеживание"; +App::$strings["Enable frontend JavaScript error tracking"] = "Включить отслеживание ошибок JavaScript на фронтенде."; +App::$strings["This feature requires Piwik >= 2.2.0"] = "Эта функция требует версию Piwik >= 2.2.0"; +App::$strings["Photos imported"] = "Фотографии импортированы"; +App::$strings["Redmatrix Photo Album Import"] = "Импортировать альбом фотографий Redmatrix"; +App::$strings["This will import all your Redmatrix photo albums to this channel."] = "Это позволит импортировать все ваши альбомы фотографий Redmatrix в этот канал."; +App::$strings["Import just this album"] = "Импортировать только этот альбом"; +App::$strings["Leave blank to import all albums"] = "Оставьте пустым для импорта всех альбомов"; +App::$strings["Maximum count to import"] = "Максимальное количество для импорта"; +App::$strings["0 or blank to import all available"] = "0 или пусто для импорта всех доступных"; +App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Искать %1\$s (%2\$s)"; +App::$strings["__ctx:opensearch__ \$Projectname"] = ""; +App::$strings["\$Projectname"] = ""; +App::$strings["Search \$Projectname"] = "Поиск \$Projectname"; +App::$strings["Recent Channel/Profile Viewers"] = "Последние просмотры канала / профиля"; +App::$strings["This plugin/addon has not been configured."] = "Это расширение не было настроено."; +App::$strings["Please visit the Visage settings on %s"] = "Пожалуйста, посетите настройки Visage на %s"; +App::$strings["your feature settings page"] = "страница ваших установочных параметров"; +App::$strings["No entries."] = "Нет записей."; +App::$strings["Enable Visage Visitor Logging"] = "Включить журналирование посетителей Visage"; +App::$strings["Visage Settings"] = "Настройки Visage"; +App::$strings["Error: order mismatch. Please try again."] = "Ошибка: несоответствие заказа. Пожалуйста, попробуйте ещё раз"; +App::$strings["Manual payments are not enabled."] = "Ручные платежи не подключены."; +App::$strings["Order not found."] = "Заказ не найден."; +App::$strings["Finished"] = "Завершено"; +App::$strings["Invalid channel"] = "Недействительный канал"; +App::$strings["[cart] Item Added"] = "[cart] Элемент добавлен"; +App::$strings["Order already checked out."] = "Заказ уже проверен."; +App::$strings["Enable Shopping Cart"] = "Включить корзину"; +App::$strings["Enable Test Catalog"] = "Включить тестовый каталог"; +App::$strings["Enable Manual Payments"] = "Включить ручные платежи"; +App::$strings["Base Merchant Currency"] = "Основная торговая валюта"; +App::$strings["Cart - Base Settings"] = "Корзина - Основные настройки"; +App::$strings["Shop"] = "Магазин"; +App::$strings["Profile Unavailable."] = "Профиль недоступен."; +App::$strings["Order Not Found"] = "Заказ не найден"; +App::$strings["You must be logged into the Grid to shop."] = "Вы должны быть в сети для доступа к магазину"; +App::$strings["Cart Not Enabled (profile: "] = "Корзина не подключена (профиль:"; +App::$strings["Access denied."] = "Доступ запрещён."; +App::$strings["No Order Found"] = "Нет найденных заказов"; +App::$strings["An unknown error has occurred Please start again."] = "Произошла неизвестная ошибка. Пожалуйста, начните снова."; +App::$strings["Invalid Payment Type. Please start again."] = "Недействительный тип платежа. Пожалуйста, начните снова."; +App::$strings["Order not found"] = "Заказ не найден"; +App::$strings["Enable Paypal Button Module"] = "Включить модуль кнопки Paypal"; +App::$strings["Use Production Key"] = "Использовать ключ Production"; +App::$strings["Paypal Sandbox Client Key"] = "Ключ клиента Paypal Sandbox"; +App::$strings["Paypal Sandbox Secret Key"] = "Секретный ключ Paypal Sandbox"; +App::$strings["Paypal Production Client Key"] = "Ключ клиента Paypal Production"; +App::$strings["Paypal Production Secret Key"] = "Секретный ключ Paypal Production"; +App::$strings["Cart - Paypal Addon"] = "Корзина - Paypal плагин"; +App::$strings["Paypal button payments are not enabled."] = "Кнопка Paypal для платежей не включена."; +App::$strings["Paypal button payments are not properly configured. Please choose another payment option."] = "Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте другой вариант оплаты."; +App::$strings["Enable Hubzilla Services Module"] = "Включить модуль сервиса Hubzilla"; +App::$strings["Cart - Hubzilla Services Addon"] = "Корзина - плагин сервиса Hubzilla"; +App::$strings["New SKU"] = "Новый код"; +App::$strings["Cannot save edits to locked item."] = "Невозможно сохранить изменения заблокированной позиции."; +App::$strings["SKU not found."] = "Код не найден."; +App::$strings["Invalid Activation Directive."] = "Недействительная директива активации."; +App::$strings["Invalid Deactivation Directive."] = "Недействительная директива деактивации"; +App::$strings["Add to this privacy group"] = "Добавить в эту группу безопасности"; +App::$strings["Set user service class"] = "Установить класс обслуживания пользователя"; +App::$strings["You must be using a local account to purchase this service."] = "Вы должны использовать локальную учётноую запись для покупки этого сервиса."; +App::$strings["Changes Locked"] = "Изменения заблокированы"; +App::$strings["Item available for purchase."] = "Позиция доступна для приобретения."; +App::$strings["Price"] = "Цена"; +App::$strings["Add buyer to privacy group"] = "Добавить покупателя в группу безопасности"; +App::$strings["Add buyer as connection"] = "Добавить покупателя как контакт"; +App::$strings["Set Service Class"] = "Установить класс обслуживания"; +App::$strings["Access Denied."] = "Доступ запрещён."; +App::$strings["Access Denied"] = "Доступ запрещён"; +App::$strings["Invalid Item"] = "Недействительный элемент"; +App::$strings["Nsabait Settings updated."] = "Настройки Nsabait обновлены"; +App::$strings["Enable NSAbait Plugin"] = "Включить плагин NSAbait"; +App::$strings["NSAbait Settings"] = "Настройки Nsabait"; +App::$strings["Hubzilla File Storage Import"] = "Импорт файлового хранилища Hubzilla"; +App::$strings["This will import all your cloud files from another server."] = "Это позволит импортировать все ваши файлы с другого сервера."; +App::$strings["Hubzilla Server base URL"] = "Базовый URL сервера Hubzilla"; +App::$strings["Since modified date yyyy-mm-dd"] = "Начиная с даты изменений yyyy-mm-dd"; +App::$strings["Until modified date yyyy-mm-dd"] = "Заканчивая датой изменений yyyy-mm-dd"; +App::$strings["Federate"] = ""; +App::$strings["nofed Settings saved."] = "Настройки nofed сохранены."; +App::$strings["Allow Federation Toggle"] = "Разрешить переключение федерации"; +App::$strings["Federate posts by default"] = "Разрешить федерацию публикаций по умолчанию"; +App::$strings["NoFed Settings"] = "Настройки NoFed"; +App::$strings["generic profile image"] = "Стандартное изображение профиля"; +App::$strings["random geometric pattern"] = "Случайный геометрический рисунок"; +App::$strings["monster face"] = "Лицо чудовища"; +App::$strings["computer generated face"] = "Сгенерированное компьютером лицо"; +App::$strings["retro arcade style face"] = "Лицо в стиле старой аркадной игры"; +App::$strings["Hub default profile photo"] = "Фотография профиля по умолчанию"; +App::$strings["Information"] = "Информация"; +App::$strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
      The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Плагин Libravatar также установлен. Пожалуйста, отключите плагин Libravatar или этот плагин Gravatar. Если Плагин Libravatar ничего не найдёт, он вернётся в Gravatar."; +App::$strings["Default avatar image"] = "Изображение аватара по умолчанию"; +App::$strings["Select default avatar image if none was found at Gravatar. See README"] = "Выберите изображения аватар по умолчанию если ничего не было найдено в Gravatar (см. README)."; +App::$strings["Rating of images"] = "Оценки изображений"; +App::$strings["Select the appropriate avatar rating for your site. See README"] = "Выберите подходящую оценку аватара для вашего сайта (см. README)."; +App::$strings["Gravatar settings updated."] = "Настройки Gravatar обновлены."; +App::$strings["Post to Red"] = "Опубликовать в Red"; +App::$strings["Channel is required."] = "Необходим канал."; +App::$strings["Invalid channel."] = "Недействительный канал."; +App::$strings["redred Settings saved."] = "Настройки RedRed сохранены."; +App::$strings["Allow posting to another Hubzilla Channel"] = "Разрешить публиковать в другой канал Hubzilla"; +App::$strings["Send public postings to Hubzilla channel by default"] = "Отправлять общедоступные публикации в канал Hubzilla по умолчанию"; +App::$strings["Hubzilla API Path"] = "Путь к Hubzilla API"; +App::$strings["Hubzilla login name"] = "Имя входа Hubzilla"; +App::$strings["Hubzilla channel name"] = "Название канала Hubzilla"; +App::$strings["Hubzilla Crosspost Settings"] = "Настройки перекрёстных публикаций Hubzilla"; +App::$strings["This is a fairly comprehensive and complete guitar chord dictionary which will list most of the available ways to play a certain chord, starting from the base of the fingerboard up to a few frets beyond the twelfth fret (beyond which everything repeats). A couple of non-standard tunings are provided for the benefit of slide players, etc."] = ""; +App::$strings["Chord names start with a root note (A-G) and may include sharps (#) and flats (b). This software will parse most of the standard naming conventions such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."] = ""; +App::$strings["Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."] = "Примеры действительных включают A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."; +App::$strings["Guitar Chords"] = "Гитарные аккорды"; +App::$strings["The complete online chord dictionary"] = "Полный онлайн словарь аккордов"; +App::$strings["Tuning"] = "Настройка"; +App::$strings["Chord name: example: Em7"] = "Наименование аккорда - example: Em7"; +App::$strings["Show for left handed stringing"] = "Показывать струны для левшей"; +App::$strings["Quick Reference"] = "Быстрая ссылка"; +App::$strings["New registration"] = "Новая регистрация"; +App::$strings["%s : Message delivery failed."] = "%s : Доставка сообщения не удалась."; +App::$strings["Message sent to %s. New account registration: %s"] = "Сообщение отправлено в %s. Регистрация нового аккаунта: %s"; +App::$strings["Channels to auto connect"] = "Каналы для автоматического подключения"; +App::$strings["Comma separated list"] = "Список, разделённый запятыми"; +App::$strings["Popular Channels"] = "Популярные каналы"; +App::$strings["IRC Settings"] = "Настройки IRC"; +App::$strings["IRC settings saved."] = "Настройки IRC сохранены"; +App::$strings["IRC Chatroom"] = "Чат IRC"; +App::$strings["bitchslap"] = "дать леща"; +App::$strings["bitchslapped"] = "получил леща"; +App::$strings["shag"] = "вздрючить"; +App::$strings["shagged"] = "вздрюченный"; +App::$strings["patent"] = ""; +App::$strings["patented"] = ""; +App::$strings["hug"] = "обнять"; +App::$strings["hugged"] = "обнятый"; +App::$strings["murder"] = "убить"; +App::$strings["murdered"] = "убитый"; +App::$strings["worship"] = "почитать"; +App::$strings["worshipped"] = "почитаемый"; +App::$strings["kiss"] = "целовать"; +App::$strings["kissed"] = "поцелованный"; +App::$strings["tempt"] = "искушать"; +App::$strings["tempted"] = "искушённый"; +App::$strings["raise eyebrows at"] = ""; +App::$strings["raised their eyebrows at"] = ""; +App::$strings["insult"] = "оскорбить"; +App::$strings["insulted"] = "оскорблённый"; +App::$strings["praise"] = "хвалить"; +App::$strings["praised"] = "похваленный"; +App::$strings["be dubious of"] = "усомниться"; +App::$strings["was dubious of"] = "усомнился"; +App::$strings["eat"] = "есть"; +App::$strings["ate"] = "съел"; +App::$strings["giggle and fawn at"] = ""; +App::$strings["giggled and fawned at"] = ""; +App::$strings["doubt"] = "сомневаться"; +App::$strings["doubted"] = "сомневался"; +App::$strings["glare"] = ""; +App::$strings["glared at"] = ""; +App::$strings["fuck"] = "трахнуть"; +App::$strings["fucked"] = "трахнул"; +App::$strings["bonk"] = ""; +App::$strings["bonked"] = ""; +App::$strings["declare undying love for"] = ""; +App::$strings["declared undying love for"] = ""; +App::$strings["Post to WordPress"] = "Опубликовать в WordPress"; +App::$strings["Enable WordPress Post Plugin"] = "Включить плагин публикаций WordPress"; +App::$strings["WordPress username"] = "Имя пользователя WordPress"; +App::$strings["WordPress password"] = "Пароль WordPress"; +App::$strings["WordPress API URL"] = "URL API WordPress"; +App::$strings["Typically https://your-blog.tld/xmlrpc.php"] = "Обычно https://your-blog.tld/xmlrpc.php"; +App::$strings["WordPress blogid"] = ""; +App::$strings["For multi-user sites such as wordpress.com, otherwise leave blank"] = "Для многопользовательских сайтов, таких, как wordpress.com. В противном случае оставьте пустым"; +App::$strings["Post to WordPress by default"] = "Публиковать в WordPress по умолчанию"; +App::$strings["Forward comments (requires hubzilla_wp plugin)"] = "Пересылать комментарии (требуется плагин hubzilla_wp)"; +App::$strings["WordPress Post Settings"] = "Настройки публикации в WordPress"; +App::$strings["Wordpress Settings saved."] = "Настройки WordPress сохранены."; +App::$strings["Who likes me?"] = "Кому я нравлюсь?"; +App::$strings["Your account on %s will expire in a few days."] = "Ваш аккаунт на %s перестанет работать через несколько дней."; +App::$strings["Your $Productname test account is about to expire."] = "Тестовый период вашей учётной записи в $Productname истёк."; +App::$strings["Create an account to access services and applications"] = "Создайте аккаунт для доступа к службам и приложениям"; +App::$strings["Register"] = "Регистрация"; +App::$strings["Logout"] = "Выход"; +App::$strings["Login"] = "Войти"; +App::$strings["Remote Authentication"] = "Удаленная аутентификация"; +App::$strings["Login/Email"] = "Пользователь / email"; +App::$strings["Password"] = "Пароль"; +App::$strings["Remember me"] = "Запомнить меня"; +App::$strings["Forgot your password?"] = "Забыли пароль или логин?"; +App::$strings["Password Reset"] = "Сбросить пароль"; +App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] Ошибка SSL/TLS веб-сайта для %s"; +App::$strings["Website SSL certificate is not valid. Please correct."] = "SSL/TLS сертификат веб-сайт недействителен. Исправьте это."; +App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Задания Cron не запущены на %s"; +App::$strings["Cron/Scheduled tasks not running."] = "Задания Cron / планировщика не запущены."; +App::$strings["never"] = "никогд"; +App::$strings["Default"] = "По умолчанию"; +App::$strings["Focus (Hubzilla default)"] = "Фокус (по умолчанию Hubzilla)"; +App::$strings["Theme settings"] = "Настройки темы"; +App::$strings["Narrow navbar"] = "Узкая панель навигации"; +App::$strings["Navigation bar background color"] = "Панель навигации, цвет фона"; +App::$strings["Navigation bar icon color "] = "Панель навигации, цвет значков"; +App::$strings["Navigation bar active icon color "] = "Панель навигации, цвет активного значка"; +App::$strings["Link color"] = "цвет ссылок"; +App::$strings["Set font-color for banner"] = "Цвет текста в шапке"; +App::$strings["Set the background color"] = "Цвет фона"; +App::$strings["Set the background image"] = "Фоновое изображение"; +App::$strings["Set the background color of items"] = "Цвет фона элементов"; +App::$strings["Set the background color of comments"] = "Цвет фона комментариев"; +App::$strings["Set font-size for the entire application"] = "Установить системный размер шрифта"; +App::$strings["Examples: 1rem, 100%, 16px"] = "Например: 1rem, 100%, 16px"; +App::$strings["Set font-color for posts and comments"] = "Цвет шрифта для постов и комментариев"; +App::$strings["Set radius of corners"] = "Радиус скруглений"; +App::$strings["Example: 4px"] = "Например: 4px"; +App::$strings["Set shadow depth of photos"] = "Глубина теней фотографий"; +App::$strings["Set maximum width of content region in pixel"] = "Максимальная ширина содержания региона (в пикселях)"; +App::$strings["Leave empty for default width"] = "Оставьте пустым для ширины по умолчанию"; +App::$strings["Set size of conversation author photo"] = "Размер фотографии автора беседы"; +App::$strings["Set size of followup author photos"] = "Размер фотографий подписчиков"; +App::$strings["Image/photo"] = "Изображение / фотография"; App::$strings["Encrypted content"] = "Зашифрованное содержание"; -App::$strings["QR code"] = "QR код"; -App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s написал следующее %2\$s %3\$s"; -App::$strings["post"] = "сообщение"; +App::$strings["Install %1\$s element %2\$s"] = "Установить %1\$s элемент %2\$s"; +App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Эта публикация содержит устанавливаемый %s элемент, однако у вас нет разрешений для его установки на этом сайте."; +App::$strings["webpage"] = "веб-страница"; +App::$strings["layout"] = "шаблон"; +App::$strings["block"] = "заблокировать"; +App::$strings["menu"] = "меню"; +App::$strings["card"] = "карточка"; +App::$strings["article"] = "статья"; +App::$strings["post"] = "публикация"; +App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s была создана %2\$s %3\$s"; +App::$strings["Click to open/close"] = "Нажмите, чтобы открыть/закрыть"; +App::$strings["spoiler"] = "спойлер"; +App::$strings["View article"] = "Просмотр статей"; +App::$strings["View summary"] = "Просмотр резюме"; +App::$strings["Different viewers will see this text differently"] = "Различные зрители увидят этот текст по-разному"; App::$strings["$1 wrote:"] = "$1 писал:"; -App::$strings["Embedded content"] = "Внедренное содержание"; -App::$strings["Embedding disabled"] = "Внедрение отключенно"; -App::$strings["created a new post"] = "создал новое сообщение"; -App::$strings["commented on %s's post"] = "прокомментировал %s's сообщение"; -App::$strings["photo"] = "фото"; -App::$strings["event"] = "мероприятие"; +App::$strings["Not a valid email address"] = "Недействительный адрес электронной почты"; +App::$strings["Your email domain is not among those allowed on this site"] = "Домен электронной почты не входит в число тех, которые разрешены на этом сайте"; +App::$strings["Your email address is already registered at this site."] = "Ваш адрес электронной почты уже зарегистрирован на этом сайте."; +App::$strings["An invitation is required."] = "Требуется приглашение."; +App::$strings["Invitation could not be verified."] = "Не удалось проверить приглашение."; +App::$strings["Please enter the required information."] = "Пожалуйста, введите необходимую информацию."; +App::$strings["Failed to store account information."] = "Не удалось сохранить информацию аккаунта."; +App::$strings["Registration confirmation for %s"] = "Подтверждение регистрации для %s"; +App::$strings["Registration request at %s"] = "Запрос регистрации на %s"; +App::$strings["your registration password"] = "ваш пароль регистрации"; +App::$strings["Registration details for %s"] = "Регистрационные данные для %s"; +App::$strings["Account approved."] = "Аккаунт утвержден."; +App::$strings["Registration revoked for %s"] = "Регистрация отозвана для %s"; +App::$strings["Click here to upgrade."] = "Нажмите здесь для обновления."; +App::$strings["This action exceeds the limits set by your subscription plan."] = "Это действие превышает ограничения, установленные в вашем плане."; +App::$strings["This action is not available under your subscription plan."] = "Это действие невозможно из-за ограничений в вашем плане."; +App::$strings["Delegation session ended."] = "Делегированная сессия завершена."; +App::$strings["Logged out."] = "Вышел из системы."; +App::$strings["Email validation is incomplete. Please check your email."] = "Проверка email не завершена. Пожалуйста, проверьте вашу почту."; +App::$strings["Failed authentication"] = "Ошибка аутентификации"; +App::$strings["event"] = "событие"; App::$strings["channel"] = "канал"; -App::$strings["status"] = "статус"; App::$strings["comment"] = "комментарий"; -App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s нравится %2\$s's %3\$s"; -App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s не нравится %2\$s's %3\$s"; -App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s теперь соединен с %2\$s"; -App::$strings["%1\$s poked %2\$s"] = "%1\$s подпихнул %2\$s"; -App::$strings["poked"] = "подпихнул"; -App::$strings["__ctx:mood__ %1\$s is %2\$s"] = ""; +App::$strings["likes %1\$s's %2\$s"] = "Нравится %1\$s %2\$s"; +App::$strings["doesn't like %1\$s's %2\$s"] = "Не нравится %1\$s %2\$s"; +App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s теперь в контакте с %2\$s"; +App::$strings["%1\$s poked %2\$s"] = "%1\$s ткнул %2\$s"; +App::$strings["poked"] = "ткнут"; +App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s в %2\$s"; +App::$strings["This is an unsaved preview"] = "Это несохранённый просмотр"; +App::$strings["__ctx:title__ Likes"] = "Нравится"; +App::$strings["__ctx:title__ Dislikes"] = "Не нравится"; +App::$strings["__ctx:title__ Agree"] = "За"; +App::$strings["__ctx:title__ Disagree"] = "Против"; +App::$strings["__ctx:title__ Abstain"] = "Воздерживается"; +App::$strings["__ctx:title__ Attending"] = "Посещает"; +App::$strings["__ctx:title__ Not attending"] = "Не посещает"; +App::$strings["__ctx:title__ Might attend"] = "Может присутствовать"; App::$strings["Select"] = "Выбрать"; App::$strings["Delete"] = "Удалить"; +App::$strings["Toggle Star Status"] = "Переключить статус пометки"; App::$strings["Private Message"] = "Личное сообщение"; -App::$strings["Message is verified"] = "Сообщение проверено"; -App::$strings["View %s's profile @ %s"] = "Просмотр %s's профиля @ %s"; +App::$strings["Message signature validated"] = "Подпись сообщения проверена"; +App::$strings["Message signature incorrect"] = "Подпись сообщения неверная"; +App::$strings["Approve"] = "Утвердить"; +App::$strings["View %s's profile @ %s"] = "Просмотреть профиль %s @ %s"; App::$strings["Categories:"] = "Категории:"; App::$strings["Filed under:"] = "Хранить под:"; -App::$strings[" from %s"] = " от %s"; -App::$strings["last edited: %s"] = ""; -App::$strings["Expires: %s"] = ""; +App::$strings["from %s"] = "от %s"; +App::$strings["last edited: %s"] = "последнее редактирование: %s"; +App::$strings["Expires: %s"] = "Срок действия: %s"; App::$strings["View in context"] = "Показать в контексте"; App::$strings["Please wait"] = "Подождите пожалуйста"; App::$strings["remove"] = "удалить"; App::$strings["Loading..."] = "Загрузка..."; App::$strings["Delete Selected Items"] = "Удалить выбранные элементы"; -App::$strings["View Source"] = "Просмотр источника"; -App::$strings["Follow Thread"] = "Следовать теме"; -App::$strings["View Status"] = "Просмотр состояния"; -App::$strings["View Profile"] = "Просмотр профиля"; -App::$strings["View Photos"] = "Просмотр фотографий"; -App::$strings["Matrix Activity"] = "Активность матрицы"; -App::$strings["Edit Contact"] = "Редактировать контакт"; -App::$strings["Send PM"] = "Отправить личное сообщение"; -App::$strings["Poke"] = "Подпихнуть"; +App::$strings["View Source"] = "Просмотреть источник"; +App::$strings["Follow Thread"] = "Следить за темой"; +App::$strings["Unfollow Thread"] = "Прекратить отслеживать тему"; +App::$strings["Recent Activity"] = "Последние действия"; +App::$strings["Connect"] = "Подключить"; +App::$strings["Edit Connection"] = "Редактировать контакт"; +App::$strings["Message"] = "Сообщение"; +App::$strings["Ratings"] = "Оценки"; +App::$strings["Poke"] = "Ткнуть"; App::$strings["%s likes this."] = "%s нравится это."; App::$strings["%s doesn't like this."] = "%s не нравится это."; App::$strings["%2\$d people like this."] = array( - 0 => "%2\$d чел. нравится это.", - 1 => "%2\$d чел. нравится это.", - 2 => "%2\$d чел. нравится это.", + 0 => "", + 1 => "", ); App::$strings["%2\$d people don't like this."] = array( 0 => "", 1 => "", - 2 => "%2\$d чел. не нравится это.", ); App::$strings["and"] = "и"; App::$strings[", and %d other people"] = array( 0 => "", 1 => "", - 2 => ", и %d другие люди", ); App::$strings["%s like this."] = "%s нравится это."; App::$strings["%s don't like this."] = "%s не нравится это."; -App::$strings["Visible to everybody"] = "Видно для всех"; -App::$strings["Please enter a link URL:"] = "Пожалуйста, введите URL ссылки:"; -App::$strings["Please enter a video link/URL:"] = "Пожалуйста, введите URL видео-ссылки:"; -App::$strings["Please enter an audio link/URL:"] = "Пожалуйста, введите URL аудио-ссылки:"; +App::$strings["Set your location"] = "Задать своё местоположение"; +App::$strings["Clear browser location"] = "Очистить местоположение из браузера"; +App::$strings["Insert web link"] = "Вставить веб-ссылку"; +App::$strings["Embed (existing) photo from your photo albums"] = "Встроить (существующее) фото из вашего фотоальбома"; +App::$strings["Please enter a link URL:"] = "Пожалуйста введите URL ссылки:"; App::$strings["Tag term:"] = "Теги:"; -App::$strings["Save to Folder:"] = "Сохранить в папку:"; App::$strings["Where are you right now?"] = "Где вы сейчас?"; -App::$strings["Expires YYYY-MM-DD HH:MM"] = ""; +App::$strings["Choose images to embed"] = "Выбрать изображения для встраивания"; +App::$strings["Choose an album"] = "Выбрать альбом"; +App::$strings["Choose a different album..."] = "Выбрать другой альбом..."; +App::$strings["Error getting album list"] = "Ошибка получения списка альбомов"; +App::$strings["Error getting photo link"] = "Ошибка получения ссылки на фотографию"; +App::$strings["Error getting album"] = "Ошибка получения альбома"; +App::$strings["Comments enabled"] = "Комментарии включены"; +App::$strings["Comments disabled"] = "Комментарии отключены"; App::$strings["Preview"] = "Предварительный просмотр"; App::$strings["Share"] = "Поделиться"; -App::$strings["Page link title"] = "Ссылка заголовока страницы"; -App::$strings["Post as"] = ""; -App::$strings["Upload photo"] = "Загрузить фотографию"; -App::$strings["upload photo"] = "загрузить фотографию"; -App::$strings["Attach file"] = "Прикрепить файл"; -App::$strings["attach file"] = "прикрепить файл"; -App::$strings["Insert web link"] = "Вставить веб-ссылку"; -App::$strings["web link"] = "веб-ссылка"; -App::$strings["Insert video link"] = "Вставить видео-ссылку"; -App::$strings["video link"] = "видео-ссылка"; -App::$strings["Insert audio link"] = "Вставить аудио-ссылку"; -App::$strings["audio link"] = "аудио-ссылка"; -App::$strings["Set your location"] = "Указание своего расположения"; -App::$strings["set location"] = "указание расположения"; -App::$strings["Clear browser location"] = "Стереть указание расположения"; -App::$strings["clear location"] = "стереть указание расположения"; -App::$strings["Set title"] = "Заголовок"; -App::$strings["Categories (comma-separated list)"] = "Категории (список через запятую)"; -App::$strings["Permission settings"] = "Настройки разрешений"; -App::$strings["permissions"] = "разрешения"; -App::$strings["Public post"] = "Публичное сообщение"; -App::$strings["Example: bob@example.com, mary@example.com"] = "Пример: bob@example.com, mary@example.com"; -App::$strings["Set expiration date"] = ""; -App::$strings["Encrypt text"] = ""; -App::$strings["OK"] = "OK"; +App::$strings["Page link name"] = "Название ссылки на страницу "; +App::$strings["Post as"] = "Опубликовать как"; +App::$strings["Bold"] = "Жирный"; +App::$strings["Italic"] = "Курсив"; +App::$strings["Underline"] = "Подчеркнутый"; +App::$strings["Quote"] = "Цитата"; +App::$strings["Code"] = "Код"; +App::$strings["Attach/Upload file"] = "Прикрепить/загрузить файл"; +App::$strings["Embed an image from your albums"] = "Встроить изображение из ваших альбомов"; App::$strings["Cancel"] = "Отменить"; -App::$strings["Discover"] = "Обнаруженные"; -App::$strings["Imported public streams"] = ""; +App::$strings["OK"] = ""; +App::$strings["Toggle voting"] = "Подключить голосование"; +App::$strings["Disable comments"] = "Отключить комментарии"; +App::$strings["Toggle comments"] = "Переключить комментарии"; +App::$strings["Title (optional)"] = "Заголовок (необязательно)"; +App::$strings["Categories (optional, comma-separated list)"] = "Категории (необязательно, список через запятую)"; +App::$strings["Permission settings"] = "Настройки разрешений"; +App::$strings["Other networks and post services"] = "Другие сети и службы публикаций"; +App::$strings["Set expiration date"] = "Установить срок действия"; +App::$strings["Set publish date"] = "Установить дату публикации"; +App::$strings["Encrypt text"] = "Зашифровать текст"; App::$strings["Commented Order"] = "По комментариям"; -App::$strings["Sort by Comment Date"] = "Сортировка по дате создания комментариев"; -App::$strings["Posted Order"] = "По добавлениям"; -App::$strings["Sort by Post Date"] = "Сортировка по дате создания сообщения"; -App::$strings["Personal"] = "Личные"; -App::$strings["Posts that mention or involve you"] = "Сообщения, в которых упоминули или вовлекли вас"; +App::$strings["Sort by Comment Date"] = "Сортировать по дате комментария"; +App::$strings["Posted Order"] = "По публикациям"; +App::$strings["Sort by Post Date"] = "Сортировать по дате публикации"; +App::$strings["Personal"] = "Личное"; +App::$strings["Posts that mention or involve you"] = "Публикации, где вы были упомянуты или участвовали"; App::$strings["New"] = "Новые"; -App::$strings["Activity Stream - by date"] = "Лента активности - по дате"; -App::$strings["Starred"] = "Помеченные"; -App::$strings["Favourite Posts"] = "Фаворит-сообщения"; +App::$strings["Activity Stream - by date"] = "Поток активности - по дате"; +App::$strings["Starred"] = "Отмеченые"; +App::$strings["Favourite Posts"] = "Любимые публикации"; App::$strings["Spam"] = "Спам"; -App::$strings["Posts flagged as SPAM"] = "Как СПАМ помеченные сообщения"; +App::$strings["Posts flagged as SPAM"] = "Публикация помечена как спам"; App::$strings["Channel"] = "Канал"; -App::$strings["Status Messages and Posts"] = ""; +App::$strings["Status Messages and Posts"] = "Статусы и публикации"; App::$strings["About"] = "О себе"; -App::$strings["Profile Details"] = "Сведения о профиле"; +App::$strings["Profile Details"] = "Информация о профиле"; App::$strings["Photos"] = "Фотографии"; App::$strings["Photo Albums"] = "Фотоальбомы"; App::$strings["Files"] = "Файлы"; -App::$strings["Files and Storage"] = ""; +App::$strings["Files and Storage"] = "Файлы и хранилище"; +App::$strings["Events"] = "События"; App::$strings["Chatrooms"] = "Чаты"; App::$strings["Bookmarks"] = "Закладки"; App::$strings["Saved Bookmarks"] = "Сохранённые закладки"; +App::$strings["Cards"] = "Карточки"; +App::$strings["View Cards"] = "Просмотреть карточки"; +App::$strings["articles"] = "статьи"; +App::$strings["View Articles"] = "Просмотр статей"; App::$strings["Webpages"] = "Веб-страницы"; -App::$strings["Manage Webpages"] = "Управление веб-страниц"; -App::$strings["New Page"] = "Новая страница"; -App::$strings["Edit"] = "Редактировать"; -App::$strings["View"] = "Просмотр"; -App::$strings["Actions"] = ""; -App::$strings["Page Link"] = "Ссылка страницы"; -App::$strings["Title"] = "Заголовок"; -App::$strings["Created"] = "Создано"; -App::$strings["Edited"] = "Отредактирован"; -App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = ""; -App::$strings["Not a valid email address"] = "Не действительный адрес электронной почты"; -App::$strings["Your email domain is not among those allowed on this site"] = "Домен электронной почты не входит в число тех, которые разрешены на этом сайте"; -App::$strings["Your email address is already registered at this site."] = "Ваш адрес электронной почты уже зарегистрирован на этом сайте."; -App::$strings["An invitation is required."] = "Требуется приглашение."; -App::$strings["Invitation could not be verified."] = "Не удалось проверить приглашение."; -App::$strings["Please enter the required information."] = "Пожалуйста, введите необходимую информацию."; -App::$strings["Failed to store account information."] = "Не удалось сохранить информацию аккаунта."; -App::$strings["Registration request at %s"] = "Требуется регистрация на %s"; -App::$strings["Administrator"] = "Администратор"; -App::$strings["your registration password"] = "Ваш пароль регистрации"; -App::$strings["Registration details for %s"] = "Регистрационные данные для %s"; -App::$strings["Account approved."] = "Аккаунт утвержден."; -App::$strings["Registration revoked for %s"] = "Регистрация отозвана для %s"; -App::$strings["Permission denied."] = "Доступ запрещен."; -App::$strings["Image exceeds website size limit of %lu bytes"] = ""; -App::$strings["Image file is empty."] = "файл пуст."; -App::$strings["Unable to process image"] = "Не удается обработать изображение"; -App::$strings["Photo storage failed."] = "Ошибка в банке фотографий"; -App::$strings["Upload New Photos"] = "Загрузить новые фотографии"; -App::$strings["Visible to everybody"] = "Видно всем"; -App::$strings["Show"] = "Показывать"; -App::$strings["Don't show"] = "Не показывать"; -App::$strings["Permissions"] = "Разрешения"; -App::$strings["Close"] = "Закрыть"; -App::$strings[" and "] = "и"; -App::$strings["public profile"] = "Публичный профиль"; -App::$strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s изменил %2\$s на “%3\$s”"; -App::$strings["Visit %1\$s's %2\$s"] = "Посетить %1\$s's %2\$s"; -App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = ""; -App::$strings["Public Timeline"] = "Публичная шкала времени"; +App::$strings["View Webpages"] = "Просмотр веб-страниц"; +App::$strings["Wikis"] = ""; +App::$strings["Wiki"] = ""; +App::$strings["__ctx:noun__ Like"] = array( + 0 => "", + 1 => "", +); +App::$strings["__ctx:noun__ Dislike"] = array( + 0 => "", + 1 => "", +); +App::$strings["__ctx:noun__ Attending"] = array( + 0 => "", + 1 => "", +); +App::$strings["__ctx:noun__ Not Attending"] = array( + 0 => "", + 1 => "", +); +App::$strings["__ctx:noun__ Undecided"] = array( + 0 => "", + 1 => "", +); +App::$strings["__ctx:noun__ Agree"] = array( + 0 => "", + 1 => "", +); +App::$strings["__ctx:noun__ Disagree"] = array( + 0 => "", + 1 => "", +); +App::$strings["__ctx:noun__ Abstain"] = array( + 0 => "", + 1 => "", +); +App::$strings["Invalid data packet"] = "Неверный пакет данных"; +App::$strings["Unable to verify channel signature"] = "Невозможно проверить подпись канала"; +App::$strings["Unable to verify site signature for %s"] = "Невозможно проверить подпись сайта %s"; +App::$strings["invalid target signature"] = "недопустимая целевая подпись"; +App::$strings["l F d, Y \\@ g:i A"] = ""; +App::$strings["Starts:"] = "Начало:"; +App::$strings["Finishes:"] = "Окончание:"; +App::$strings["Location:"] = "Откуда:"; +App::$strings["This event has been added to your calendar."] = "Это событие было добавлено в ваш календарь."; +App::$strings["Not specified"] = "Не указано"; +App::$strings["Needs Action"] = "Требует действия"; +App::$strings["Completed"] = "Завершено"; +App::$strings["In Process"] = "В процессе"; +App::$strings["Cancelled"] = "Отменено"; +App::$strings["Mobile"] = "Мобильный"; +App::$strings["Home"] = "Домашний"; +App::$strings["Home, Voice"] = "Дом, голос"; +App::$strings["Home, Fax"] = "Дом, факс"; +App::$strings["Work"] = "Рабочий"; +App::$strings["Work, Voice"] = "Работа, голос"; +App::$strings["Work, Fax"] = "Работа, факс"; +App::$strings["Other"] = "Другой"; App::$strings["Item was not found."] = "Элемент не найден."; +App::$strings["Unknown error."] = "Неизвестная ошибка."; App::$strings["No source file."] = "Нет исходного файла."; -App::$strings["Cannot locate file to replace"] = "Не удается найти файл, чтобы заменить"; +App::$strings["Cannot locate file to replace"] = "Не удается найти файл для замены"; App::$strings["Cannot locate file to revise/update"] = "Не удается найти файл для пересмотра / обновления"; App::$strings["File exceeds size limit of %d"] = "Файл превышает предельный размер %d"; -App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = ""; +App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Вы достигли предела %1$.0f Мбайт для хранения вложений."; App::$strings["File upload failed. Possible system limit or action terminated."] = "Загрузка файла не удалась. Возможно система перегружена или попытка прекращена."; -App::$strings["Stored file could not be verified. Upload failed."] = "Файл для сохранения не проверен. Загрузка не удалась."; +App::$strings["Stored file could not be verified. Upload failed."] = "Файл для сохранения не может быть проверен. Загрузка не удалась."; App::$strings["Path not available."] = "Путь недоступен."; -App::$strings["Empty pathname"] = ""; -App::$strings["duplicate filename or path"] = ""; +App::$strings["Empty pathname"] = "Пустое имя пути"; +App::$strings["duplicate filename or path"] = "дублирующееся имя файла или пути"; App::$strings["Path not found."] = "Путь не найден."; -App::$strings["mkdir failed."] = "mkdir безуспешно."; -App::$strings["database storage failed."] = ""; -App::$strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; -App::$strings["Starts:"] = "Начало:"; -App::$strings["Finishes:"] = "\t\nКонец:"; -App::$strings["Location:"] = "Откуда:"; -App::$strings["Logout"] = "Выход"; +App::$strings["mkdir failed."] = "mkdir не удался"; +App::$strings["database storage failed."] = "ошибка при записи базы данных."; +App::$strings["Empty path"] = "Пустое имя пути"; +App::$strings["unknown"] = "неизвестный"; +App::$strings["%1\$s's bookmarks"] = "Закладки пользователя %1\$s"; +App::$strings["Directory Options"] = "Параметры каталога"; +App::$strings["Safe Mode"] = "Безопасный режим"; +App::$strings["Public Forums Only"] = "Только публичные форумы"; +App::$strings["This Website Only"] = "Только этот веб-сайт"; +App::$strings["view full size"] = "посмотреть в полный размер"; +App::$strings["Friendica"] = ""; +App::$strings["OStatus"] = ""; +App::$strings["GNU-Social"] = "GNU social"; +App::$strings["RSS/Atom"] = ""; +App::$strings["Diaspora"] = ""; +App::$strings["Facebook"] = ""; +App::$strings["Zot"] = ""; +App::$strings["LinkedIn"] = ""; +App::$strings["XMPP/IM"] = ""; +App::$strings["MySpace"] = ""; +App::$strings[" and "] = " и "; +App::$strings["public profile"] = "общедоступный профиль"; +App::$strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s изменил %2\$s на “%3\$s”"; +App::$strings["Visit %1\$s's %2\$s"] = "Посетить %1\$s %2\$s"; +App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s обновлено %2\$s, изменено %3\$s."; +App::$strings["Remote authentication"] = "Удаленная аутентификация"; +App::$strings["Click to authenticate to your home hub"] = "Нажмите, чтобы аутентифицировать себя на домашнем узле"; +App::$strings["Channel Manager"] = "Менеджер каналов"; +App::$strings["Manage your channels"] = "Управление вашими каналами"; +App::$strings["Privacy Groups"] = "Группы безопасности"; +App::$strings["Manage your privacy groups"] = "Управление вашим группами безопасности"; +App::$strings["Settings"] = "Настройки"; +App::$strings["Account/Channel Settings"] = "Настройки аккаунта / канала"; App::$strings["End this session"] = "Закончить эту сессию"; -App::$strings["Home"] = "Мой канал"; -App::$strings["Your posts and conversations"] = "Ваши сообщения и разговоры"; App::$strings["Your profile page"] = "Страницa вашего профиля"; App::$strings["Edit Profiles"] = "Редактирование профилей"; -App::$strings["Manage/Edit profiles"] = "Управление / Редактирование профилей"; -App::$strings["Your photos"] = "Ваши фотографии"; -App::$strings["Your files"] = "Ваши файлы"; -App::$strings["Chat"] = "Чат"; -App::$strings["Your chatrooms"] = "Ваши чаты"; -App::$strings["Your bookmarks"] = "Ваши закладки"; -App::$strings["Your webpages"] = "Ваши веб-страницы"; -App::$strings["Login"] = "Войти"; +App::$strings["Manage/Edit profiles"] = "Управление / редактирование профилей"; +App::$strings["Edit your profile"] = "Редактировать профиль"; App::$strings["Sign in"] = "Войти"; -App::$strings["%s - click to logout"] = "%s - нажмите чтобы выйти"; -App::$strings["Click to authenticate to your home hub"] = ""; -App::$strings["Home Page"] = "Моя страница"; -App::$strings["Register"] = "Регистрация"; +App::$strings["Take me home"] = "Домой"; +App::$strings["Log me out of this site"] = "Выйти с этого сайта"; App::$strings["Create an account"] = "Создать аккаунт"; App::$strings["Help"] = "Помощь"; App::$strings["Help and documentation"] = "Справочная информация и документация"; -App::$strings["Apps"] = "Приложения"; -App::$strings["Applications, utilities, links, games"] = ""; App::$strings["Search"] = "Поиск"; -App::$strings["Search site content"] = "Поиск по содержанию сайту"; -App::$strings["Directory"] = "Каталог"; -App::$strings["Channel Locator"] = "Локатор каналов"; -App::$strings["Matrix"] = "Матрица"; -App::$strings["Your matrix"] = "Собственная матрица"; -App::$strings["Mark all matrix notifications seen"] = "Пометить все оповещения матрицы как прочитанное"; -App::$strings["Channel Home"] = "Главная канала"; -App::$strings["Channel home"] = "Главная канала"; -App::$strings["Mark all channel notifications seen"] = "Пометить все оповещения канала как прочитанное"; -App::$strings["Connections"] = "Контакты"; -App::$strings["Notices"] = "Оповещения"; -App::$strings["Notifications"] = "Оповещения"; -App::$strings["See all notifications"] = "Просмотреть все оповещения"; -App::$strings["Mark all system notifications seen"] = "Пометить все оповещения как прочитанное"; -App::$strings["Mail"] = "Переписка"; -App::$strings["Private mail"] = "Ваша личная переписка"; -App::$strings["See all private messages"] = "Просмотреть все личные сообщения"; -App::$strings["Mark all private messages seen"] = "Пометить все личные сообщения как прочитанное"; -App::$strings["Inbox"] = "Входящие"; -App::$strings["Outbox"] = "Исходящие"; -App::$strings["New Message"] = "Новое личное сообщение"; -App::$strings["Events"] = "Мероприятия"; -App::$strings["Event Calendar"] = "Календарь мероприятий"; -App::$strings["See all events"] = "Показать все мероприятия"; -App::$strings["Mark all events seen"] = "Пометить все мероприятия как прочитанное"; -App::$strings["Channel Select"] = "Выбор каналов"; -App::$strings["Manage Your Channels"] = "Управление каналов"; -App::$strings["Settings"] = "Настройки"; -App::$strings["Account/Channel Settings"] = "Настройки аккаунта/канала"; -App::$strings["Admin"] = "Администрация"; +App::$strings["Search site @name, !forum, #tag, ?docs, content"] = "Искать на сайте @name, !forum, #tag, ?docs, содержимое"; +App::$strings["Admin"] = "Администрирование"; App::$strings["Site Setup and Configuration"] = "Установка и конфигурация сайта"; -App::$strings["Nothing new here"] = "Ничего нового здесь"; +App::$strings["Loading"] = "Загрузка"; +App::$strings["@name, !forum, #tag, ?doc, content"] = "@name, !forum, #tag, ?docs, содержимое"; App::$strings["Please wait..."] = "Подождите пожалуйста ..."; -App::$strings["%1\$s's bookmarks"] = "Закладки пользователя %1\$s"; -App::$strings["Missing room name"] = ""; -App::$strings["Duplicate room name"] = ""; -App::$strings["Invalid room specifier."] = ""; -App::$strings["Room not found."] = ""; -App::$strings["Room is full"] = ""; -App::$strings["Tags"] = "Тэги"; +App::$strings["Add Apps"] = "Добавить приложения"; +App::$strings["Arrange Apps"] = "Управление приложениями"; +App::$strings["Toggle System Apps"] = "Переключить системные приложения"; +App::$strings["Calendar"] = "Календарь"; +App::$strings["Articles"] = "Статьи"; +App::$strings["Help:"] = "Помощь:"; +App::$strings["Not Found"] = "Не найдено"; +App::$strings["Page not found."] = "Страница не найдена."; +App::$strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Удаленная группа с этим названием была восстановлена. Существующие разрешения пункт могут применяться к этой группе и к её будущих участников. Если это не то, чего вы хотели, пожалуйста, создайте другую группу с другим именем."; +App::$strings["Add new connections to this privacy group"] = "Добавить новые контакты в группу безопасности"; +App::$strings["edit"] = "редактировать"; +App::$strings["Edit group"] = "Редактировать группу"; +App::$strings["Add privacy group"] = "Добавить группу безопасности"; +App::$strings["Channels not in any privacy group"] = "Каналы не включены ни в одну группу безопасности"; +App::$strings["add"] = "добавить"; +App::$strings["Unable to import a removed channel."] = "Невозможно импортировать удалённый канал."; +App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Не удалось создать дублирующийся идентификатор канала. Импорт невозможен."; +App::$strings["Cloned channel not found. Import failed."] = "Клон канала не найден. Импорт невозможен."; +App::$strings["Profile Photos"] = "Фотографии профиля"; +App::$strings["Trending"] = "В тренде"; +App::$strings["Tags"] = "Теги"; +App::$strings["Categories"] = "Категории"; App::$strings["Keywords"] = "Ключевые слова"; App::$strings["have"] = "иметь"; App::$strings["has"] = "есть"; App::$strings["want"] = "хотеть"; -App::$strings["wants"] = "хочет"; +App::$strings["wants"] = "хотеть"; App::$strings["like"] = "нравится"; App::$strings["likes"] = "нравится"; -App::$strings["dislike"] = "не-нравится"; -App::$strings["dislikes"] = "не-нравится"; -App::$strings["__ctx:noun__ Like"] = array( - 0 => "нравится", - 1 => "нравится", - 2 => "нравится", -); -App::$strings["Default"] = "По умолчанию"; -App::$strings["Unknown | Not categorised"] = "Неизвестные | Без категории"; -App::$strings["Block immediately"] = "Немедленно заблокировать"; -App::$strings["Shady, spammer, self-marketer"] = ""; -App::$strings["Known to me, but no opinion"] = "Известныo мне, но нет своего мнения"; -App::$strings["OK, probably harmless"] = "OK, наверное безвредно"; -App::$strings["Reputable, has my trust"] = "Авторитетно, имеет мое доверие"; -App::$strings["Frequently"] = "Часто"; -App::$strings["Hourly"] = "Ежечасно"; -App::$strings["Twice daily"] = "Два раза в день"; -App::$strings["Daily"] = "Ежедневно"; -App::$strings["Weekly"] = "Еженедельно"; -App::$strings["Monthly"] = "Ежемесячно"; -App::$strings["Friendica"] = "Friendica"; -App::$strings["OStatus"] = "OStatus"; -App::$strings["RSS/Atom"] = "RSS/Atom"; -App::$strings["Email"] = "E-mail"; -App::$strings["Diaspora"] = "Diaspora"; -App::$strings["Facebook"] = "Facebook"; -App::$strings["Zot!"] = "Zot!"; -App::$strings["LinkedIn"] = "LinkedIn"; -App::$strings["XMPP/IM"] = "XMPP/IM"; -App::$strings["MySpace"] = "MySpace"; -App::$strings["%d invitation available"] = array( - 0 => "имеется %d приглашение", - 1 => "имеются %d приглашения", - 2 => "имеется %d приглашений", -); -App::$strings["Advanced"] = "Дополнительно"; -App::$strings["Find Channels"] = "Поиск контактов"; -App::$strings["Enter name or interest"] = "Впишите имя или интерес"; -App::$strings["Connect/Follow"] = "Подключить/следовать"; -App::$strings["Examples: Robert Morgenstein, Fishing"] = "Примеры: Владимир Ильич, Революционер"; -App::$strings["Find"] = "Поиск"; -App::$strings["Channel Suggestions"] = "Рекомендации каналов"; -App::$strings["Random Profile"] = "Случайные"; -App::$strings["Invite Friends"] = "Пригласить друзей"; -App::$strings["Exammple: name=fred and country=iceland"] = ""; -App::$strings["Advanced Find"] = "Расширенный поиск"; -App::$strings["Saved Folders"] = "Запомненные папки"; -App::$strings["Everything"] = "Все"; -App::$strings["Categories"] = "Категории"; -App::$strings["%d connection in common"] = array( - 0 => "%d совместный контакт", - 1 => "%d совместных контакта", - 2 => "%d совместных контактов", -); -App::$strings["show more"] = "показать все"; -App::$strings["This event has been added to your calendar."] = "Это событие было добавлено в календарь."; -App::$strings["Miscellaneous"] = "Прочее"; -App::$strings["year"] = "год"; -App::$strings["month"] = "месяц"; -App::$strings["day"] = "день"; -App::$strings["never"] = "никогда"; -App::$strings["less than a second ago"] = "менее чем одну секунду назад"; -App::$strings["years"] = "лет"; -App::$strings["months"] = "мес."; -App::$strings["week"] = "неделя"; -App::$strings["weeks"] = "недель"; -App::$strings["days"] = "дней"; -App::$strings["hour"] = "час"; -App::$strings["hours"] = "часов"; -App::$strings["minute"] = "минута"; -App::$strings["minutes"] = "мин."; -App::$strings["second"] = "секунда"; -App::$strings["seconds"] = "секунд"; -App::$strings["%1\$d %2\$s ago"] = "%1\$d %2\$s назад"; -App::$strings["%1\$s's birthday"] = "%1\$s's День Рождения"; -App::$strings["Happy Birthday %1\$s"] = "С Днем Рождения %1\$s"; -App::$strings["Sort Options"] = "Параметры сортировки"; -App::$strings["Alphabetic"] = "По алфавиту"; -App::$strings["Reverse Alphabetic"] = "По обратному алфавиту"; -App::$strings["Newest to Oldest"] = "От новых к старым"; -App::$strings["Enable Safe Search"] = ""; -App::$strings["Disable Safe Search"] = ""; -App::$strings["Safe Mode"] = "Безопасный режим"; -App::$strings["Hubzilla Notification"] = "Оповещения Red матрицы"; -App::$strings["hubzilla"] = "hubzilla"; -App::$strings["Thank You,"] = "Спасибо,"; -App::$strings["%s Administrator"] = "%s администратор"; -App::$strings["%s "] = "%s "; -App::$strings["[Red:Notify] New mail received at %s"] = "[Red:Уведомление] Получено новое сообщение в %s"; -App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = ""; -App::$strings["%1\$s sent you %2\$s."] = "%1\$s послал вам %2\$s."; -App::$strings["a private message"] = "личное сообщение"; -App::$strings["Please visit %s to view and/or reply to your private messages."] = "Пожалуйста, посетите %s для просмотра и/или ответа на ваши личные сообщения."; -App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = ""; -App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = ""; -App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = ""; -App::$strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Уведомление] Комментарий к разговору #%1\$d по %2\$s"; -App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = ""; -App::$strings["Please visit %s to view and/or reply to the conversation."] = "Пожалуйста, посетите %s для просмотра и/или ответа разговора."; -App::$strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Уведомление] %s добавил сообщениe на стену вашего профиля"; -App::$strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = ""; -App::$strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = ""; -App::$strings["[Red:Notify] %s tagged you"] = "[Red:Уведомление] %s добавил у вас тег"; -App::$strings["%1\$s, %2\$s tagged you at %3\$s"] = ""; -App::$strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = ""; -App::$strings["[Red:Notify] %1\$s poked you"] = "[Red:Уведомление] %1\$s подпихнул вас"; -App::$strings["%1\$s, %2\$s poked you at %3\$s"] = ""; -App::$strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = ""; -App::$strings["[Red:Notify] %s tagged your post"] = "[Red:Уведомление] %s добавил у вас в сообщении тег"; -App::$strings["%1\$s, %2\$s tagged your post at %3\$s"] = ""; -App::$strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = ""; -App::$strings["[Red:Notify] Introduction received"] = "[Red:Уведомление] введение получено"; -App::$strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = ""; -App::$strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = ""; -App::$strings["You may visit their profile at %s"] = "Вы можете посетить ​​профиль в %s"; -App::$strings["Please visit %s to approve or reject the connection request."] = ""; -App::$strings["[Red:Notify] Friend suggestion received"] = "[Red:Уведомление] Получено предложение дружить"; -App::$strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = ""; -App::$strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = ""; -App::$strings["Name:"] = "Имя:"; -App::$strings["Photo:"] = "Фото:"; -App::$strings["Please visit %s to approve or reject the suggestion."] = ""; -App::$strings["parent"] = ""; -App::$strings["Collection"] = "Коллекция"; -App::$strings["Principal"] = ""; -App::$strings["Addressbook"] = "Адресная книга"; -App::$strings["Calendar"] = "Календарь"; -App::$strings["Schedule Inbox"] = ""; -App::$strings["Schedule Outbox"] = ""; -App::$strings["%1\$s used"] = ""; -App::$strings["%1\$s used of %2\$s (%3\$s%)"] = ""; -App::$strings["Create new folder"] = "Создать новую папку"; -App::$strings["Create"] = "Создать"; -App::$strings["Upload file"] = "Загрузить файл"; -App::$strings["Upload"] = "Загрузка"; -App::$strings["General Features"] = "Главные функции"; -App::$strings["Content Expiration"] = ""; -App::$strings["Remove posts/comments and/or private messages at a future time"] = "Удалять посты/комментарии и/или личные сообщения"; -App::$strings["Multiple Profiles"] = "Несколько профилей"; -App::$strings["Ability to create multiple profiles"] = "Возможность создания нескольких профилей"; -App::$strings["Web Pages"] = "Веб-страницы"; -App::$strings["Provide managed web pages on your channel"] = ""; -App::$strings["Private Notes"] = "Личные заметки"; -App::$strings["Enables a tool to store notes and reminders"] = ""; -App::$strings["Extended Identity Sharing"] = "Расширенный обмен идентичности"; -App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = ""; -App::$strings["Expert Mode"] = "Экспертный режим"; -App::$strings["Enable Expert Mode to provide advanced configuration options"] = ""; -App::$strings["Premium Channel"] = "Премиум канал"; -App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = ""; -App::$strings["Post Composition Features"] = ""; -App::$strings["Richtext Editor"] = "Редактор RichText"; -App::$strings["Enable richtext editor"] = "Включить редактор RichText"; -App::$strings["Post Preview"] = "Предварительный просмотр сообщения"; -App::$strings["Allow previewing posts and comments before publishing them"] = "Разрешить предварительный просмотр сообщений и комментариев перед их публикацией"; -App::$strings["Channel Sources"] = "Источники канала"; -App::$strings["Automatically import channel content from other channels or feeds"] = ""; -App::$strings["Even More Encryption"] = "Еще больше шифрования"; -App::$strings["Allow optional encryption of content end-to-end with a shared secret key"] = ""; -App::$strings["Network and Stream Filtering"] = "Фильтрация сети и потока"; -App::$strings["Search by Date"] = "Поиск по дате"; -App::$strings["Ability to select posts by date ranges"] = "Возможность выбора сообщений по датам"; -App::$strings["Collections Filter"] = "Фильтр коллекций"; -App::$strings["Enable widget to display Network posts only from selected collections"] = ""; -App::$strings["Saved Searches"] = "Запомненные поиски"; -App::$strings["Save search terms for re-use"] = "Сохранять результаты поиска для повторного использования"; -App::$strings["Network Personal Tab"] = "Сеть - Личная вкладка"; -App::$strings["Enable tab to display only Network posts that you've interacted on"] = ""; -App::$strings["Network New Tab"] = "Сеть - Новая вкладка"; -App::$strings["Enable tab to display all new Network activity"] = ""; -App::$strings["Affinity Tool"] = "Инструмент сходства или соответствия"; -App::$strings["Filter stream activity by depth of relationships"] = ""; -App::$strings["Suggest Channels"] = ""; -App::$strings["Show channel suggestions"] = ""; -App::$strings["Post/Comment Tools"] = "Инструменты сообщений/комментарий "; -App::$strings["Edit Sent Posts"] = "Редактировать отправленные сообщения"; -App::$strings["Edit and correct posts and comments after sending"] = "Редактировать и исправлять сообщения и комментарии после отправки"; -App::$strings["Tagging"] = "Пометка"; -App::$strings["Ability to tag existing posts"] = "Возможность использовать теги"; -App::$strings["Post Categories"] = "Категории сообщения"; -App::$strings["Add categories to your posts"] = "Добавить категории для ваших сообщений"; -App::$strings["Ability to file posts under folders"] = ""; -App::$strings["Dislike Posts"] = "Сообщение не нравится"; -App::$strings["Ability to dislike posts/comments"] = "Возможность выбора нравится/не-нравится"; -App::$strings["Star Posts"] = "Помечать сообщения"; -App::$strings["Ability to mark special posts with a star indicator"] = ""; -App::$strings["Tag Cloud"] = "Облако тегов"; -App::$strings["Provide a personal tag cloud on your channel page"] = ""; +App::$strings["dislike"] = "не нравится"; +App::$strings["dislikes"] = "не нравится"; +App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s приветствует %2\$s"; +App::$strings["default"] = "по умолчанию"; +App::$strings["Select an alternate language"] = "Выбор дополнительного языка"; App::$strings["Channel is blocked on this site."] = "Канал блокируется на этом сайте."; App::$strings["Channel location missing."] = "Местоположение канала отсутствует."; -App::$strings["Response from remote channel was incomplete."] = ""; -App::$strings["Channel was deleted and no longer exists."] = ""; +App::$strings["Response from remote channel was incomplete."] = "Ответ удаленного канала неполный."; +App::$strings["Premium channel - please visit:"] = "Премимум-канал - пожалуйста посетите:"; +App::$strings["Channel was deleted and no longer exists."] = "Канал удален и больше не существует."; +App::$strings["Remote channel or protocol unavailable."] = "Удалённый канал или протокол недоступен."; App::$strings["Channel discovery failed."] = "Не удалось обнаружить канал."; -App::$strings["local account not found."] = "локальный аккаунт не найден."; +App::$strings["Protocol disabled."] = "Протокол отключен."; App::$strings["Cannot connect to yourself."] = "Нельзя подключиться к самому себе."; -App::$strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = ""; -App::$strings["Default privacy group for new contacts"] = "Группа конфиденциальности по умолчанию для новых контактов"; -App::$strings["All Channels"] = "Все каналы"; -App::$strings["edit"] = "редактировать"; -App::$strings["Collections"] = "Коллекции"; -App::$strings["Edit collection"] = "Редактировать коллекцию"; -App::$strings["Create a new collection"] = "Создать новую коллекцию"; -App::$strings["Channels not in any collection"] = "Контакты не в какой коллекции"; -App::$strings["add"] = "добавить"; -App::$strings["Unable to obtain identity information from database"] = "Невозможно получить идентификационную информацию из базы данных"; -App::$strings["Empty name"] = "Пустое имя"; -App::$strings["Name too long"] = "Слишком длинное имя"; -App::$strings["No account identifier"] = "идентификатор аккаунта отсутствует"; -App::$strings["Nickname is required."] = "Требуется псевдоним."; -App::$strings["Reserved nickname. Please choose another."] = ""; -App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Псевдоним имеет недопустимые символы или уже используется на этом сайте."; -App::$strings["Unable to retrieve created identity"] = ""; -App::$strings["Default Profile"] = "Профиль по умолчанию"; -App::$strings["Friends"] = "Друзья"; -App::$strings["Requested channel is not available."] = "Запрашиваемый канал не доступен."; -App::$strings["Requested profile is not available."] = "Запрашиваемый профиль не доступен."; -App::$strings["Connect"] = "Подключить"; -App::$strings["Change profile photo"] = "Изменить фотографию профиля"; -App::$strings["Profiles"] = "Профили"; -App::$strings["Manage/edit profiles"] = "Управление / Редактирование профилей"; -App::$strings["Create New Profile"] = "Создать новый профиль"; -App::$strings["Edit Profile"] = "Редактировать профиль"; -App::$strings["Profile Image"] = "Изображение профиля"; -App::$strings["visible to everybody"] = "видно всем"; -App::$strings["Edit visibility"] = "Редактировать видимость"; -App::$strings["Gender:"] = "Пол:"; -App::$strings["Status:"] = "Статус:"; -App::$strings["Homepage:"] = "Домашняя страница:"; -App::$strings["Online Now"] = "Сейчас в сети"; -App::$strings["g A l F d"] = "g A l F d"; -App::$strings["F d"] = "F d"; -App::$strings["[today]"] = "[сегодня]"; -App::$strings["Birthday Reminders"] = "Напоминания о Днях Рождения"; -App::$strings["Birthdays this week:"] = "Дни Рождения на этой неделе:"; -App::$strings["[No description]"] = "[без описания]"; -App::$strings["Event Reminders"] = "Напоминания мероприятий"; -App::$strings["Events this week:"] = "Мероприятия на этой неделе:"; -App::$strings["Profile"] = "Профиль"; -App::$strings["Full Name:"] = "Полное имя:"; -App::$strings["Like this channel"] = "нравиться этот канал"; -App::$strings["j F, Y"] = "j F, Y"; -App::$strings["j F"] = "j F"; -App::$strings["Birthday:"] = "День Рождения:"; -App::$strings["Age:"] = "Возраст:"; -App::$strings["for %1\$d %2\$s"] = "для %1\$d %2\$s"; -App::$strings["Sexual Preference:"] = "Сексуальная ориентация:"; -App::$strings["Hometown:"] = "Родной город:"; -App::$strings["Tags:"] = "Тэги:"; -App::$strings["Political Views:"] = "Политические взгляды:"; -App::$strings["Religion:"] = "Религия:"; -App::$strings["About:"] = "О себе:"; -App::$strings["Hobbies/Interests:"] = "Хобби / интересы:"; -App::$strings["Likes:"] = "Что вам нравится:"; -App::$strings["Dislikes:"] = "Что вам не нравится:"; -App::$strings["Contact information and Social Networks:"] = "Информация и социальные сети контакта:"; -App::$strings["My other channels:"] = "Мои другие каналы:"; -App::$strings["Musical interests:"] = "Музыкальные интересы:"; -App::$strings["Books, literature:"] = "Книги, литература:"; -App::$strings["Television:"] = "Телевидение:"; -App::$strings["Film/dance/culture/entertainment:"] = "Кино / танцы / культура / развлечения:"; -App::$strings["Love/Romance:"] = "Любовь / Романс:"; -App::$strings["Work/employment:"] = "Работа / Занятость:"; -App::$strings["School/education:"] = "Школа / образование:"; -App::$strings["Like this thing"] = "нравится этo"; -App::$strings["view full size"] = "посмотреть в полный размер"; +App::$strings["Visible to your default audience"] = "Видно вашей аудитории по умолчанию."; +App::$strings["__ctx:acl__ Profile"] = "Профиль"; +App::$strings["Only me"] = "Только мне"; +App::$strings["Who can see this?"] = "Кто может это видеть?"; +App::$strings["Custom selection"] = "Настраиваемый выбор"; +App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Нажмите \"Показать\" чтобы разрешить просмотр. \"Не показывать\" позволит вам переопределить и ограничить область показа."; +App::$strings["Show"] = "Показать"; +App::$strings["Don't show"] = "Не показывать"; +App::$strings["Permissions"] = "Разрешения"; +App::$strings["Close"] = "Закрыть"; +App::$strings["Post permissions %s cannot be changed %s after a post is shared.
      These permissions set who is allowed to view the post."] = "Разрешения публикации %s не могут быть изменены %s после того, как ею поделились. Эти разрешения устанавливают кому разрешено просматривать эту публикацию."; +App::$strings["Miscellaneous"] = "Прочее"; +App::$strings["Birthday"] = "День рождения"; +App::$strings["Age: "] = "Возраст:"; +App::$strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD или MM-DD"; +App::$strings["Required"] = "Требуется"; +App::$strings["less than a second ago"] = "менее чем одну секунду"; +App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s тому назад"; +App::$strings["__ctx:relative_date__ year"] = array( + 0 => "год", + 1 => "года", + 2 => "лет", +); +App::$strings["__ctx:relative_date__ month"] = array( + 0 => "месяц", + 1 => "месяца", + 2 => "месяцев", +); +App::$strings["__ctx:relative_date__ week"] = array( + 0 => "неделю", + 1 => "недели", + 2 => "недель", +); +App::$strings["__ctx:relative_date__ day"] = array( + 0 => "день", + 1 => "дня", + 2 => "дней", +); +App::$strings["__ctx:relative_date__ hour"] = array( + 0 => "час", + 1 => "часа", + 2 => "часов", +); +App::$strings["__ctx:relative_date__ minute"] = array( + 0 => "минуту", + 1 => "минуты", + 2 => "минут", +); +App::$strings["__ctx:relative_date__ second"] = array( + 0 => "секунду", + 1 => "секунды", + 2 => "секунд", +); +App::$strings["%1\$s's birthday"] = "У %1\$s День рождения"; +App::$strings["Happy Birthday %1\$s"] = "С Днем рождения %1\$s !"; +App::$strings["Cannot locate DNS info for database server '%s'"] = "Не удается найти DNS информацию для сервера базы данных '%s'"; App::$strings["prev"] = "предыдущий"; App::$strings["first"] = "первый"; App::$strings["last"] = "последний"; App::$strings["next"] = "следующий"; -App::$strings["older"] = "старший"; +App::$strings["older"] = "старше"; App::$strings["newer"] = "новее"; App::$strings["No connections"] = "Нет контактов"; -App::$strings["%d Connection"] = array( - 0 => "%d контакт", - 1 => "%d контакта", - 2 => "%d контактов", -); -App::$strings["View Connections"] = "Просмотр контактов"; +App::$strings["Connections"] = "Контакты"; +App::$strings["View all %s connections"] = "Просмотреть все %s контактов"; +App::$strings["Network: %s"] = "Сеть: %s"; App::$strings["Save"] = "Запомнить"; -App::$strings["poke"] = "подпихнуть"; -App::$strings["ping"] = "пинг - проверка связи"; -App::$strings["pinged"] = ""; -App::$strings["prod"] = ""; -App::$strings["prodded"] = ""; -App::$strings["slap"] = ""; -App::$strings["slapped"] = ""; -App::$strings["finger"] = ""; -App::$strings["fingered"] = ""; -App::$strings["rebuff"] = ""; -App::$strings["rebuffed"] = ""; +App::$strings["poke"] = "Ткнуть"; +App::$strings["ping"] = "Пингануть"; +App::$strings["pinged"] = "Отпингован"; +App::$strings["prod"] = "Подтолкнуть"; +App::$strings["prodded"] = "Подтолкнут"; +App::$strings["slap"] = "Шлёпнуть"; +App::$strings["slapped"] = "Шлёпнут"; +App::$strings["finger"] = "Указать"; +App::$strings["fingered"] = "Указан"; +App::$strings["rebuff"] = "Дать отпор"; +App::$strings["rebuffed"] = "Дан отпор"; App::$strings["happy"] = "счастливый"; App::$strings["sad"] = "грустный"; App::$strings["mellow"] = "спокойный"; App::$strings["tired"] = "усталый"; App::$strings["perky"] = "весёлый"; App::$strings["angry"] = "сердитый"; -App::$strings["stupified"] = "отупевший"; -App::$strings["puzzled"] = "недоумённый"; +App::$strings["stupefied"] = "отупевший"; +App::$strings["puzzled"] = "недоумевающий"; App::$strings["interested"] = "заинтересованный"; -App::$strings["bitter"] = "озлобленный"; +App::$strings["bitter"] = "едкий"; App::$strings["cheerful"] = "бодрый"; App::$strings["alive"] = "энергичный"; App::$strings["annoyed"] = "раздражённый"; @@ -571,7 +1132,7 @@ App::$strings["anxious"] = "обеспокоенный"; App::$strings["cranky"] = "капризный"; App::$strings["disturbed"] = "встревоженный"; App::$strings["frustrated"] = "разочарованный"; -App::$strings["depressed"] = ""; +App::$strings["depressed"] = "подавленный"; App::$strings["motivated"] = "мотивированный"; App::$strings["relaxed"] = "расслабленный"; App::$strings["surprised"] = "удивленный"; @@ -594,1272 +1155,2208 @@ App::$strings["September"] = "Сентябрь"; App::$strings["October"] = "Октябрь"; App::$strings["November"] = "Ноябрь"; App::$strings["December"] = "Декабрь"; -App::$strings["unknown.???"] = "неизвестный.???"; -App::$strings["bytes"] = "байт"; -App::$strings["remove category"] = ""; -App::$strings["remove from file"] = ""; -App::$strings["Click to open/close"] = "Нажмите, чтобы открыть/закрыть"; +App::$strings["Unknown Attachment"] = "Неизвестное вложение"; +App::$strings["Size"] = "Размер"; +App::$strings["remove category"] = "удалить категорию"; +App::$strings["remove from file"] = "удалить из файла"; +App::$strings["Download binary/encrypted content"] = "Загрузить двоичное / зашифрованное содержимое"; App::$strings["Link to Source"] = "Ссылка на источник"; -App::$strings["Select a page layout: "] = ""; -App::$strings["default"] = "по умолчанию"; -App::$strings["Page content type: "] = ""; -App::$strings["Select an alternate language"] = "Выбор альтернативного языка"; +App::$strings["Page layout"] = "Шаблон страницы"; +App::$strings["You can create your own with the layouts tool"] = "Вы можете создать свой собственный с помощью инструмента шаблонов"; +App::$strings["BBcode"] = ""; +App::$strings["HTML"] = ""; +App::$strings["Text"] = "Текст"; +App::$strings["Comanche Layout"] = "Шаблон Comanche"; +App::$strings["PHP"] = ""; +App::$strings["Page content type"] = "Тип содержимого страницы"; App::$strings["activity"] = "активность"; -App::$strings["Design"] = "Дизайн"; -App::$strings["Blocks"] = "Блоки"; +App::$strings["a-z, 0-9, -, and _ only"] = "Только a-z, 0-9, -, и _"; +App::$strings["Design Tools"] = "Инструменты дизайна"; +App::$strings["Blocks"] = "Блокировки"; App::$strings["Menus"] = "Меню"; App::$strings["Layouts"] = "Шаблоны"; App::$strings["Pages"] = "Страницы"; -App::$strings["Site Admin"] = "Админ сайта"; -App::$strings["Address Book"] = "Адресная книга"; -App::$strings["Mood"] = "Настроение"; -App::$strings["Probe"] = ""; -App::$strings["Suggest"] = ""; -App::$strings["Update"] = "Обновление"; -App::$strings["Install"] = "Установка"; -App::$strings["Purchase"] = ""; -App::$strings["Unknown"] = "Неизвестный"; -App::$strings["Invalid data packet"] = "Неверный пакет данных"; -App::$strings["Unable to verify channel signature"] = "Невозможно проверить сигнатуру канала"; -App::$strings["Unable to verify site signature for %s"] = ""; -App::$strings["No recipient provided."] = ""; -App::$strings["[no subject]"] = "[без темы]"; -App::$strings["Unable to determine sender."] = "Невозможно определить отправителя."; -App::$strings["Stored post could not be verified."] = ""; -App::$strings["Click here to upgrade."] = "Нажмите здесь, чтобы обновить."; -App::$strings["This action exceeds the limits set by your subscription plan."] = ""; -App::$strings["This action is not available under your subscription plan."] = ""; -App::$strings["System"] = "Система"; -App::$strings["Create Personal App"] = "Создать собственное приложение"; -App::$strings["Edit Personal App"] = "Редактировать собственное приложение"; -App::$strings["Ignore/Hide"] = "Игнорировать / Скрыть"; -App::$strings["Suggestions"] = "Рекомендации"; -App::$strings["See more..."] = "Просмотреть больше..."; -App::$strings["You have %1$.0f of %2$.0f allowed connections."] = ""; -App::$strings["Add New Connection"] = "Добавить новый контакт"; -App::$strings["Enter the channel address"] = "Введите адрес канала"; -App::$strings["Example: bob@example.com, http://example.com/barbara"] = "Пример: bob@example.com, http://example.com/barbara"; -App::$strings["Notes"] = "Заметки"; -App::$strings["Remove term"] = "Удалить термин"; -App::$strings["Archives"] = "Архивы"; -App::$strings["Refresh"] = "Обновить"; -App::$strings["Me"] = "Я"; -App::$strings["Best Friends"] = "Лучшие друзья"; -App::$strings["Co-workers"] = "Сотрудники"; -App::$strings["Former Friends"] = "Приятели"; -App::$strings["Acquaintances"] = "Знакомые"; -App::$strings["Everybody"] = "Все"; -App::$strings["Account settings"] = "Настройки аккаунта"; -App::$strings["Channel settings"] = "Настройки канала"; -App::$strings["Additional features"] = "Дополнительные функции"; -App::$strings["Feature settings"] = "Настройки компонентов"; -App::$strings["Display settings"] = "Настройки отображения"; -App::$strings["Connected apps"] = "Подключенные приложения"; -App::$strings["Export channel"] = "Экспорт канала"; -App::$strings["Automatic Permissions (Advanced)"] = "Автоматические разрешения (дополнительно)"; -App::$strings["Premium Channel Settings"] = "Настройки премиум канала"; -App::$strings["Check Mail"] = "Проверить снова"; -App::$strings["Chat Rooms"] = "Чаты"; -App::$strings["Bookmarked Chatrooms"] = "Закладки чатов"; -App::$strings["Suggested Chatrooms"] = "Рекомендуемые чаты"; -App::$strings["Save to Folder"] = "Сохранить в папку"; -App::$strings["View all"] = "Просмотреть все"; -App::$strings["__ctx:noun__ Dislike"] = array( - 0 => "не-нравится", - 1 => "не-нравится", - 2 => "не-нравится", -); -App::$strings["Add Star"] = "Добавить маркировку"; -App::$strings["Remove Star"] = "Удалить маркировку"; -App::$strings["Toggle Star Status"] = "Переключить статус маркировки"; -App::$strings["starred"] = "помеченные"; -App::$strings["Add Tag"] = "Добавить тег"; -App::$strings["I like this (toggle)"] = "мне это нравится (переключение)"; -App::$strings["I don't like this (toggle)"] = "мне это не нравится (переключение)"; -App::$strings["Share This"] = "Поделиться этим"; -App::$strings["share"] = "поделиться"; -App::$strings["View %s's profile - %s"] = "Просмотр %s's профиля - %s"; -App::$strings["to"] = "к"; -App::$strings["via"] = "через"; -App::$strings["Wall-to-Wall"] = "Стена-к-Стене"; -App::$strings["via Wall-To-Wall:"] = "через Стена-к-Стене:"; -App::$strings["Save Bookmarks"] = "Сохранить закладки"; -App::$strings["Add to Calendar"] = "Добавить в календарь"; -App::$strings["__ctx:noun__ Likes"] = "нравится"; -App::$strings["__ctx:noun__ Dislikes"] = "не-нравится"; -App::$strings["%d comment"] = array( - 0 => "%d комментарий", - 1 => "%d комментария", - 2 => "%d комментариев", +App::$strings["Import"] = "Импортировать"; +App::$strings["Import website..."] = "Импорт веб-сайта..."; +App::$strings["Select folder to import"] = "Выбрать каталог для импорта"; +App::$strings["Import from a zipped folder:"] = "Импортировать из каталога в zip-архиве:"; +App::$strings["Import from cloud files:"] = "Импортировать из сетевых файлов:"; +App::$strings["/cloud/channel/path/to/folder"] = ""; +App::$strings["Enter path to website files"] = "Введите путь к файлам веб-сайта"; +App::$strings["Select folder"] = "Выбрать каталог"; +App::$strings["Export website..."] = "Экспорт веб-сайта..."; +App::$strings["Export to a zip file"] = "Экспортировать в ZIP файл."; +App::$strings["website.zip"] = ""; +App::$strings["Enter a name for the zip file."] = "Введите имя для ZIP файла."; +App::$strings["Export to cloud files"] = "Эскпортировать в сетевые файлы:"; +App::$strings["/path/to/export/folder"] = ""; +App::$strings["Enter a path to a cloud files destination."] = "Введите путь к расположению сетевых файлов."; +App::$strings["Specify folder"] = "Указать каталог"; +App::$strings["Collection"] = "Коллекция"; +App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Не верный токен безопасности для формы. Вероятно, это произошло потому, что форма была открыта слишком долго (> 3-х часов) перед его отправкой."; +App::$strings["Edit"] = "Изменить"; +App::$strings["(Unknown)"] = "(Неизвестный)"; +App::$strings["Visible to anybody on the internet."] = "Виден всем в интернете."; +App::$strings["Visible to you only."] = "Видно только вам."; +App::$strings["Visible to anybody in this network."] = "Видно всем в этой сети."; +App::$strings["Visible to anybody authenticated."] = "Видно всем аутентифицированным."; +App::$strings["Visible to anybody on %s."] = "Видно всем в %s."; +App::$strings["Visible to all connections."] = "Видно всем контактам."; +App::$strings["Visible to approved connections."] = "Видно только одобренным контактам."; +App::$strings["Visible to specific connections."] = "Видно указанным контактам."; +App::$strings["Item not found."] = "Элемент не найден."; +App::$strings["Privacy group not found."] = "Группа безопасности не найдена."; +App::$strings["Privacy group is empty."] = "Группа безопасности пуста"; +App::$strings["Privacy group: %s"] = "Группа безопасности: %s"; +App::$strings["Connection: %s"] = "Контакт: %s"; +App::$strings["Connection not found."] = "Контакт не найден."; +App::$strings["female"] = "женщина"; +App::$strings["%1\$s updated her %2\$s"] = "%1\$s обновила её %2\$s"; +App::$strings["male"] = "мужчина"; +App::$strings["%1\$s updated his %2\$s"] = "%1\$s обновил его %2\$s"; +App::$strings["%1\$s updated their %2\$s"] = "%1\$s обновили их %2\$s"; +App::$strings["profile photo"] = "Фотография профиля"; +App::$strings["[Edited %s]"] = "[Отредактировано %s]"; +App::$strings["__ctx:edit_activity__ Post"] = "Публикация"; +App::$strings["__ctx:edit_activity__ Comment"] = "Комментарий"; +App::$strings["%d invitation available"] = array( + 0 => "", + 1 => "", ); -App::$strings["[+] show all"] = "[+] показать все"; -App::$strings["This is you"] = "Это вы"; -App::$strings["Comment"] = "Комментарий"; -App::$strings["Submit"] = "Отправить"; -App::$strings["Bold"] = "Жирный"; -App::$strings["Italic"] = "Курсив"; -App::$strings["Underline"] = "Подчеркнутый"; -App::$strings["Quote"] = "Цитата"; -App::$strings["Code"] = "Код"; -App::$strings["Image"] = "Изображение"; -App::$strings["Link"] = "Ссылка"; -App::$strings["Video"] = "Видео"; -App::$strings["Delete this item?"] = "Удалить этот элемент?"; -App::$strings["[-] show less"] = "[-] показать меньше"; -App::$strings["[+] expand"] = "[+] развернуть"; -App::$strings["[-] collapse"] = "[-] свернуть"; -App::$strings["Password too short"] = "Пароль слишком короткий"; -App::$strings["Passwords do not match"] = "Пароли не совпадают"; -App::$strings["everybody"] = "все"; -App::$strings["Secret Passphrase"] = "Тайный пароль"; -App::$strings["Passphrase hint"] = ""; -App::$strings["Notice: Permissions have changed but have not yet been submitted."] = ""; -App::$strings["close all"] = "закрыть все"; -App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo"; -App::$strings["timeago.prefixFromNow"] = "timeago.prefixFromNow"; -App::$strings["ago"] = "тому назад"; -App::$strings["from now"] = "с этого времени"; -App::$strings["less than a minute"] = "менее чем одну минуту назад"; -App::$strings["about a minute"] = "около минуты"; -App::$strings["%d minutes"] = "%d мин."; -App::$strings["about an hour"] = "около часа"; -App::$strings["about %d hours"] = "около %d час."; -App::$strings["a day"] = "день"; -App::$strings["%d days"] = "%d дн."; -App::$strings["about a month"] = "около месяца"; -App::$strings["%d months"] = "%d мес."; -App::$strings["about a year"] = "около года"; -App::$strings["%d years"] = "%d лет"; -App::$strings[" "] = " "; -App::$strings["timeago.numbers"] = "timeago.numbers"; -App::$strings["New window"] = "Новое окно"; -App::$strings["Open the selected location in a different window or browser tab"] = "Откройте выбранное местоположение в другом окне или вкладке браузера"; -App::$strings["Male"] = "Мужской"; -App::$strings["Female"] = "Женский"; +App::$strings["Advanced"] = "Дополнительно"; +App::$strings["Find Channels"] = "Поиск каналов"; +App::$strings["Enter name or interest"] = "Впишите имя или интерес"; +App::$strings["Connect/Follow"] = "Подключить / отслеживать"; +App::$strings["Examples: Robert Morgenstein, Fishing"] = "Примеры: Владимир Ильич, Революционер"; +App::$strings["Find"] = "Поиск"; +App::$strings["Channel Suggestions"] = "Рекомендации каналов"; +App::$strings["Random Profile"] = "Случайный профиль"; +App::$strings["Invite Friends"] = "Пригласить друзей"; +App::$strings["Advanced example: name=fred and country=iceland"] = "Расширенный пример: name=ivan and country=russia"; +App::$strings["Saved Folders"] = "Сохранённые каталоги"; +App::$strings["Everything"] = "Всё"; +App::$strings["Common Connections"] = "Общие контакты"; +App::$strings["View all %d common connections"] = "Просмотреть все %d общих контактов"; +App::$strings["Unable to obtain identity information from database"] = "Невозможно получить идентификационную информацию из базы данных"; +App::$strings["Empty name"] = "Пустое имя"; +App::$strings["Name too long"] = "Слишком длинное имя"; +App::$strings["No account identifier"] = "Идентификатор аккаунта отсутствует"; +App::$strings["Nickname is required."] = "Требуется псевдоним."; +App::$strings["Reserved nickname. Please choose another."] = "Зарезервированый псевдоним. Пожалуйста, выберите другой."; +App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Псевдоним имеет недопустимые символы или уже используется на этом сайте."; +App::$strings["Unable to retrieve created identity"] = "Не удается получить созданный идентификатор"; +App::$strings["Default Profile"] = "Профиль по умолчанию"; +App::$strings["Friends"] = "Друзья"; +App::$strings["Unable to retrieve modified identity"] = "Не удается найти изменённый идентификатор"; +App::$strings["Requested profile is not available."] = "Запрашиваемый профиль не доступен."; +App::$strings["Change profile photo"] = "Изменить фотографию профиля"; +App::$strings["Create New Profile"] = "Создать новый профиль"; +App::$strings["Profile Image"] = "Изображение профиля"; +App::$strings["Visible to everybody"] = "Видно всем"; +App::$strings["Edit visibility"] = "Редактировать видимость"; +App::$strings["Gender:"] = "Пол:"; +App::$strings["Homepage:"] = "Домашняя страница:"; +App::$strings["Online Now"] = "Сейчас в сети"; +App::$strings["Change your profile photo"] = "Изменить фотографию вашего профиля"; +App::$strings["Trans"] = "Трансексуал"; +App::$strings["Neuter"] = "Среднего рода"; +App::$strings["Non-specific"] = "Неспецифический"; +App::$strings["Full Name:"] = "Полное имя:"; +App::$strings["Like this channel"] = "нравится этот канал"; +App::$strings["j F, Y"] = ""; +App::$strings["j F"] = ""; +App::$strings["Birthday:"] = "День рождения:"; +App::$strings["Age:"] = "Возраст:"; +App::$strings["for %1\$d %2\$s"] = "для %1\$d %2\$s"; +App::$strings["Tags:"] = "Теги:"; +App::$strings["Sexual Preference:"] = "Сексуальные предпочтения:"; +App::$strings["Hometown:"] = "Родной город:"; +App::$strings["Political Views:"] = "Политические взгляды:"; +App::$strings["Religion:"] = "Религия:"; +App::$strings["About:"] = "О себе:"; +App::$strings["Hobbies/Interests:"] = "Хобби / интересы:"; +App::$strings["Likes:"] = "Что вам нравится:"; +App::$strings["Dislikes:"] = "Что вам не нравится:"; +App::$strings["Contact information and Social Networks:"] = "Контактная информация и социальные сети:"; +App::$strings["My other channels:"] = "Мои другие каналы:"; +App::$strings["Musical interests:"] = "Музыкальные интересы:"; +App::$strings["Books, literature:"] = "Книги, литература:"; +App::$strings["Television:"] = "Телевидение:"; +App::$strings["Film/dance/culture/entertainment:"] = "Кино / танцы / культура / развлечения:"; +App::$strings["Love/Romance:"] = "Любовь / романтика:"; +App::$strings["Work/employment:"] = "Работа / занятость:"; +App::$strings["School/education:"] = "Школа / образование:"; +App::$strings["Profile"] = "Профиль"; +App::$strings["Like this thing"] = "нравится этo"; +App::$strings["Export"] = "Экспорт"; +App::$strings["cover photo"] = "фотография обложки"; +App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Введите адрес вашего канала (например: channel@example.com)"; +App::$strings["Authenticate"] = "Проверка подлинности"; +App::$strings["Account '%s' deleted"] = "Аккаунт '%s' удален"; +App::$strings["General Features"] = "Главные функции"; +App::$strings["New Member Links"] = "Ссылки для новичков"; +App::$strings["Display new member quick links menu"] = "Показать меню быстрых ссылок для новых участников"; +App::$strings["Advanced Profiles"] = "Расширенные профили"; +App::$strings["Additional profile sections and selections"] = "Дополнительные секции и выборы профиля"; +App::$strings["Profile Import/Export"] = "Импорт / экспорт профиля"; +App::$strings["Save and load profile details across sites/channels"] = "Сохранение и загрузка настроек профиля на всех сайтах / каналах"; +App::$strings["Web Pages"] = "Веб-страницы"; +App::$strings["Provide managed web pages on your channel"] = "Предоставлять управляемые веб-страницы на Вашем канале"; +App::$strings["Provide a wiki for your channel"] = "Предоставьте Wiki для вашего канала"; +App::$strings["Private Notes"] = "Личные заметки"; +App::$strings["Enables a tool to store notes and reminders (note: not encrypted)"] = "Включает инструмент для хранения заметок и напоминаний (прим.: не зашифровано)"; +App::$strings["Create personal planning cards"] = "Создать личные карточки планирования"; +App::$strings["Create interactive articles"] = "Создать интерактивные статьи"; +App::$strings["Navigation Channel Select"] = "Выбор канала навигации"; +App::$strings["Change channels directly from within the navigation dropdown menu"] = "Изменить канал напрямую из выпадающего меню"; +App::$strings["Photo Location"] = "Местоположение фотографии"; +App::$strings["If location data is available on uploaded photos, link this to a map."] = "Если данные о местоположении доступны на загруженных фотографий, связать их с картой."; +App::$strings["Access Controlled Chatrooms"] = "Получить доступ к контролируемым чатам"; +App::$strings["Provide chatrooms and chat services with access control."] = "Предоставлять чаты и их службы с контролем доступа."; +App::$strings["Smart Birthdays"] = "\"Умные\" Дни рождений"; +App::$strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "Сделать уведомления о днях рождения зависимыми от часового пояса в том случае, если ваши друзья разбросаны по планете."; +App::$strings["Event Timezone Selection"] = "Выбор часового пояса события"; +App::$strings["Allow event creation in timezones other than your own."] = "Разрешить создание события в часовой зоне отличной от вашей"; +App::$strings["Premium Channel"] = "Премиум-канал"; +App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Позволяет установить ограничения и условия для подключающихся к вашему каналу"; +App::$strings["Advanced Directory Search"] = "Расширенный поиск в каталоге"; +App::$strings["Allows creation of complex directory search queries"] = "Позволяет создание сложных поисковых запросов в каталоге"; +App::$strings["Advanced Theme and Layout Settings"] = "Расширенный настройки темы и отображения"; +App::$strings["Allows fine tuning of themes and page layouts"] = "Разрешает тонкую настройку тем и шаблонов страниц"; +App::$strings["Access Control and Permissions"] = "Управление доступом и разрешениями"; +App::$strings["Enable management and selection of privacy groups"] = "Включить управление и выбор групп безопасности"; +App::$strings["Multiple Profiles"] = "Несколько профилей"; +App::$strings["Ability to create multiple profiles"] = "Возможность создания нескольких профилей"; +App::$strings["Permission Categories"] = "Категории разрешений"; +App::$strings["Create custom connection permission limits"] = "Создать пользовательские ограничения на доступ к подключению"; +App::$strings["OAuth1 Clients"] = "Клиенты OAuth1"; +App::$strings["Manage OAuth1 authenticatication tokens for mobile and remote apps."] = "Управлять токенами аутентификации OAuth1 для мобильных и удалённых приложений."; +App::$strings["OAuth2 Clients"] = "Клиенты OAuth2"; +App::$strings["Manage OAuth2 authenticatication tokens for mobile and remote apps."] = "Управлять токенами аутентификации OAuth2 для мобильных и удалённых приложений."; +App::$strings["Access Tokens"] = "Токены доступа"; +App::$strings["Create access tokens so that non-members can access private content."] = "Создать токены доступа для доступа к приватному содержимому."; +App::$strings["Post Composition Features"] = "Функции создания публикаций"; +App::$strings["Large Photos"] = "Большие фотографии"; +App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Включить большие (1024px) миниатюры изображений в публикациях. Если не включено, использовать маленькие (640px) миниатюры."; +App::$strings["Channel Sources"] = "Источники канала"; +App::$strings["Automatically import channel content from other channels or feeds"] = "Автоматический импорт контента из других каналов или лент"; +App::$strings["Even More Encryption"] = "Еще больше шифрования"; +App::$strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Разрешить дополнительное end-to-end шифрование содержимого с общим секретным ключом"; +App::$strings["Enable Voting Tools"] = "Включить инструменты голосования"; +App::$strings["Provide a class of post which others can vote on"] = "Предоставь класс публикаций с возможностью голосования"; +App::$strings["Disable Comments"] = "Отключить комментарии"; +App::$strings["Provide the option to disable comments for a post"] = "Предоставить возможность отключать комментарии для публикаций"; +App::$strings["Delayed Posting"] = "Задержанная публикация"; +App::$strings["Allow posts to be published at a later date"] = "Разрешить размешать публикации следующими датами"; +App::$strings["Content Expiration"] = "Истечение срока действия содержимого"; +App::$strings["Remove posts/comments and/or private messages at a future time"] = "Удалять публикации / комментарии и / или личные сообщения"; +App::$strings["Suppress Duplicate Posts/Comments"] = "Подавлять дублирующие публикации / комментарии"; +App::$strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Предотвращает появление публикаций с одинаковым содержимым если интервал между ними менее 2 минут"; +App::$strings["Auto-save drafts of posts and comments"] = "Автоматически сохранять черновики публикаций и комментариев"; +App::$strings["Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions"] = "Автоматически сохраняет черновики публикаций и комментариев в локальном хранилище браузера для предотвращения их случайной утраты"; +App::$strings["Network and Stream Filtering"] = "Фильтрация сети и потока"; +App::$strings["Search by Date"] = "Поиск по дате"; +App::$strings["Ability to select posts by date ranges"] = "Возможность выбора сообщений по диапазонам дат"; +App::$strings["Saved Searches"] = "Сохранённые поиски"; +App::$strings["Save search terms for re-use"] = "Сохранять результаты поиска для повторного использования"; +App::$strings["Alternate Stream Order"] = "Отображение потока"; +App::$strings["Ability to order the stream by last post date, last comment date or unthreaded activities"] = "Возможность показывать поток по дате последнего сообщения, последнего комментария или по дате публикации"; +App::$strings["Contact Filter"] = "Фильтр контактов"; +App::$strings["Ability to display only posts of a selected contact"] = "Возможность показа публикаций только от выбранных контактов"; +App::$strings["Forum Filter"] = "Фильтр по форумам"; +App::$strings["Ability to display only posts of a specific forum"] = "Возможность показа публикаций только определённого форума"; +App::$strings["Personal Posts Filter"] = "Персональный фильтр публикаций"; +App::$strings["Ability to display only posts that you've interacted on"] = "Возможность показа только тех публикаций с которыми вы взаимодействовали"; +App::$strings["Affinity Tool"] = "Инструмент сходства / соответствия"; +App::$strings["Filter stream activity by depth of relationships"] = "Фильтровать потоки активности по глубине отношений"; +App::$strings["Suggest Channels"] = "Предлагаемые каналы"; +App::$strings["Show friend and connection suggestions"] = "Показать предложения в друзья"; +App::$strings["Connection Filtering"] = "Фильтрация контактов"; +App::$strings["Filter incoming posts from connections based on keywords/content"] = "Фильтр входящих сообщений от контактов на основе ключевых слов / контента"; +App::$strings["Post/Comment Tools"] = "Инструменты публикаций / комментариев"; +App::$strings["Community Tagging"] = "Отметки сообщества"; +App::$strings["Ability to tag existing posts"] = "Возможность помечать тегами существующие публикации"; +App::$strings["Post Categories"] = "Категории публикаций"; +App::$strings["Add categories to your posts"] = "Добавить категории для ваших публикаций"; +App::$strings["Emoji Reactions"] = "Реакции Emoji"; +App::$strings["Add emoji reaction ability to posts"] = "Возможность добавлять реакции Emoji к публикациям"; +App::$strings["Ability to file posts under folders"] = "Возможность размещать публикации в каталогах"; +App::$strings["Dislike Posts"] = "Не нравящиеся публикации"; +App::$strings["Ability to dislike posts/comments"] = "Возможность отмечать не нравящиеся публикации / комментарии"; +App::$strings["Star Posts"] = "Помечать сообщения"; +App::$strings["Ability to mark special posts with a star indicator"] = "Возможность отметить специальные сообщения индикатором-звёздочкой"; +App::$strings["Tag Cloud"] = "Облако тегов"; +App::$strings["Provide a personal tag cloud on your channel page"] = "Показывает личное облако тегов на странице канала"; +App::$strings["Unable to determine sender."] = "Невозможно определить отправителя."; +App::$strings["No recipient provided."] = "Получатель не предоставлен."; +App::$strings["[no subject]"] = "[без темы]"; +App::$strings["Stored post could not be verified."] = "Сохранённая публикация не может быть проверена."; +App::$strings["Frequently"] = "Часто"; +App::$strings["Hourly"] = "Ежечасно"; +App::$strings["Twice daily"] = "Дважды в день"; +App::$strings["Daily"] = "Ежедневно"; +App::$strings["Weekly"] = "Еженедельно"; +App::$strings["Monthly"] = "Ежемесячно"; App::$strings["Currently Male"] = "В настоящее время мужской"; App::$strings["Currently Female"] = "В настоящее время женский"; App::$strings["Mostly Male"] = "В основном мужской"; App::$strings["Mostly Female"] = "В основном женский"; -App::$strings["Transgender"] = "Транссексуал"; -App::$strings["Intersex"] = "Intersex"; +App::$strings["Transgender"] = "Трансгендер"; +App::$strings["Intersex"] = "Интерсексуал"; App::$strings["Transsexual"] = "Транссексуал"; App::$strings["Hermaphrodite"] = "Гермафродит"; -App::$strings["Neuter"] = "Среднего рода"; -App::$strings["Non-specific"] = "Неспецифический"; -App::$strings["Other"] = "Другой"; -App::$strings["Undecided"] = "Нерешительный"; -App::$strings["Males"] = "Самец"; -App::$strings["Females"] = "Самка"; +App::$strings["Undecided"] = "Не решил"; +App::$strings["Males"] = "Мужчины"; +App::$strings["Females"] = "Женщины"; App::$strings["Gay"] = "Гей"; App::$strings["Lesbian"] = "Лесбиянка"; App::$strings["No Preference"] = "Без предпочтений"; -App::$strings["Bisexual"] = "Двуполый"; -App::$strings["Autosexual"] = "Autosexual"; -App::$strings["Abstinent"] = "Воздержанный"; -App::$strings["Virgin"] = "Девственница"; +App::$strings["Bisexual"] = "Бисексуал"; +App::$strings["Autosexual"] = "Автосексуал"; +App::$strings["Abstinent"] = "Воздержание"; +App::$strings["Virgin"] = "Девственник"; App::$strings["Deviant"] = "Отклоняющийся от нормы"; -App::$strings["Fetish"] = "Фетиш"; +App::$strings["Fetish"] = "Фетишист"; App::$strings["Oodles"] = "Множественный"; -App::$strings["Nonsexual"] = "Несексуальный"; -App::$strings["Single"] = "Одинок"; -App::$strings["Lonely"] = "Уединенный"; -App::$strings["Available"] = "Доступный"; -App::$strings["Unavailable"] = "Недоступный"; -App::$strings["Has crush"] = "Столкновение"; -App::$strings["Infatuated"] = "Влюбленный"; -App::$strings["Dating"] = "Датировка"; +App::$strings["Nonsexual"] = "Асексуал"; +App::$strings["Single"] = "Одиночка"; +App::$strings["Lonely"] = "Одинокий"; +App::$strings["Available"] = "Свободен"; +App::$strings["Unavailable"] = "Занят"; +App::$strings["Has crush"] = "Влюблён"; +App::$strings["Infatuated"] = "без ума"; +App::$strings["Dating"] = "Встречаюсь"; App::$strings["Unfaithful"] = "Неверный"; -App::$strings["Sex Addict"] = "Секс наркоман"; -App::$strings["Friends/Benefits"] = "Друзья / Преимущества"; -App::$strings["Casual"] = "Случайный"; -App::$strings["Engaged"] = "Помолвленный"; -App::$strings["Married"] = "Женат"; -App::$strings["Imaginarily married"] = "Мысленно женат"; -App::$strings["Partners"] = "Партнеры"; +App::$strings["Sex Addict"] = "Эротоман"; +App::$strings["Friends/Benefits"] = "Друзья / Выгоды"; +App::$strings["Casual"] = "Легкомысленный"; +App::$strings["Engaged"] = "Помолвлен"; +App::$strings["Married"] = "В браке"; +App::$strings["Imaginarily married"] = "В воображаемом браке"; +App::$strings["Partners"] = "Партнёрство"; App::$strings["Cohabiting"] = "Сожительствующие"; -App::$strings["Common law"] = ""; -App::$strings["Happy"] = "Счастливый"; +App::$strings["Common law"] = "Гражданский брак"; +App::$strings["Happy"] = "Счастлив"; App::$strings["Not looking"] = "Не нуждаюсь"; -App::$strings["Swinger"] = ""; -App::$strings["Betrayed"] = ""; -App::$strings["Separated"] = ""; -App::$strings["Unstable"] = "Колеблющийся"; -App::$strings["Divorced"] = "Разведенный"; -App::$strings["Imaginarily divorced"] = "Мысленно разведенный"; -App::$strings["Widowed"] = "Овдовевший"; +App::$strings["Swinger"] = "Свингер"; +App::$strings["Betrayed"] = "Предан"; +App::$strings["Separated"] = "Разделён"; +App::$strings["Unstable"] = "Нестабильно"; +App::$strings["Divorced"] = "В разводе"; +App::$strings["Imaginarily divorced"] = "В воображаемом разводе"; +App::$strings["Widowed"] = "Вдовец / вдова"; App::$strings["Uncertain"] = "Неопределенный"; App::$strings["It's complicated"] = "Это сложно"; -App::$strings["Don't care"] = "Не заботьтесь"; +App::$strings["Don't care"] = "Всё равно"; App::$strings["Ask me"] = "Спроси меня"; -App::$strings["Logged out."] = "Вышел из системы."; -App::$strings["Failed authentication"] = "Ошибка аутентификации"; -App::$strings["Login failed."] = "Не удалось войти."; -App::$strings["Permission denied"] = "Доступ запрещен"; -App::$strings["(Unknown)"] = "(Неизвестный)"; -App::$strings["Item not found."] = "Элемент не найден."; -App::$strings["Collection not found."] = "Коллекция не найдена."; -App::$strings["Collection is empty."] = "Коллекция пуста."; -App::$strings["Collection: %s"] = "Коллекции: %s"; -App::$strings["Connection: %s"] = "Контакты: %s"; -App::$strings["Connection not found."] = "Контакт не найден."; -App::$strings["Can view my \"public\" stream and posts"] = "Может просматривать мои \"публичные\" поток и сообщения"; -App::$strings["Can view my \"public\" channel profile"] = "Может просматривать мой \"публичный\" профиль канала"; -App::$strings["Can view my \"public\" photo albums"] = "Может просматривать мои \"публичные\" фотоальбомы"; -App::$strings["Can view my \"public\" address book"] = "Может просматривать мою \"публичную\" адресную книгу"; -App::$strings["Can view my \"public\" file storage"] = "Может просматривать мои \"публичные\" файлы"; -App::$strings["Can view my \"public\" pages"] = "Может просматривать мои \"публичные\" страницы"; -App::$strings["Can send me their channel stream and posts"] = "Может прислать мне свои потоки и сообщения"; -App::$strings["Can post on my channel page (\"wall\")"] = "Может публиковать на моей странице канала (\"стена\")"; -App::$strings["Can comment on my posts"] = "Может комментировать мои сообщения"; +App::$strings["Delete this item?"] = "Удалить этот элемент?"; +App::$strings["Comment"] = "Комментарий"; +App::$strings["%s show all"] = "%s показать всё"; +App::$strings["%s show less"] = "%s показать меньше"; +App::$strings["%s expand"] = "%s развернуть"; +App::$strings["%s collapse"] = "%s свернуть"; +App::$strings["Password too short"] = "Пароль слишком короткий"; +App::$strings["Passwords do not match"] = "Пароли не совпадают"; +App::$strings["everybody"] = "все"; +App::$strings["Secret Passphrase"] = "Тайный пароль"; +App::$strings["Passphrase hint"] = "Подсказка для пароля"; +App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Уведомление: Права доступа изменились, но до сих пор не сохранены."; +App::$strings["close all"] = "закрыть все"; +App::$strings["Nothing new here"] = "Здесь нет ничего нового"; +App::$strings["Rate This Channel (this is public)"] = "Оценкa этoго канала (общедоступно)"; +App::$strings["Rating"] = "Оценка"; +App::$strings["Describe (optional)"] = "Охарактеризовать (необязательно)"; +App::$strings["Please enter a link URL"] = "Пожалуйста, введите URL ссылки"; +App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Есть несохраненные изменения. Вы уверены, что хотите покинуть эту страницу?"; +App::$strings["Location"] = "Место"; +App::$strings["lovely"] = "прекрасно"; +App::$strings["wonderful"] = "замечательно"; +App::$strings["fantastic"] = "фантастично"; +App::$strings["great"] = "отлично"; +App::$strings["Your chosen nickname was either already taken or not valid. Please use our suggestion ("] = "Выбранный вами псевдоним уже используется или недействителен. Попробуйте использовать наше предложение ("; +App::$strings[") or enter a new one."] = ") или введите новый."; +App::$strings["Thank you, this nickname is valid."] = "Спасибо, этот псевдоним может быть использован."; +App::$strings["A channel name is required."] = "Требуется название канала."; +App::$strings["This is a "] = "Это "; +App::$strings[" channel name"] = " название канала"; +App::$strings["timeago.prefixAgo"] = ""; +App::$strings["timeago.prefixFromNow"] = ""; +App::$strings["timeago.suffixAgo"] = "назад"; +App::$strings["timeago.suffixFromNow"] = ""; +App::$strings["less than a minute"] = "менее чем одну минуту"; +App::$strings["about a minute"] = "около минуты"; +App::$strings["%d minutes"] = "%d минут"; +App::$strings["about an hour"] = "около часа"; +App::$strings["about %d hours"] = "около %d часов"; +App::$strings["a day"] = "день"; +App::$strings["%d days"] = "%d дней"; +App::$strings["about a month"] = "около месяца"; +App::$strings["%d months"] = "%d месяцев"; +App::$strings["about a year"] = "около года"; +App::$strings["%d years"] = "%d лет"; +App::$strings[" "] = " "; +App::$strings["timeago.numbers"] = ""; +App::$strings["__ctx:long__ May"] = "Май"; +App::$strings["Jan"] = "Янв"; +App::$strings["Feb"] = "Фев"; +App::$strings["Mar"] = "Мар"; +App::$strings["Apr"] = "Апр"; +App::$strings["__ctx:short__ May"] = "Май"; +App::$strings["Jun"] = "Июн"; +App::$strings["Jul"] = "Июл"; +App::$strings["Aug"] = "Авг"; +App::$strings["Sep"] = "Сен"; +App::$strings["Oct"] = "Окт"; +App::$strings["Nov"] = "Ноя"; +App::$strings["Dec"] = "Дек"; +App::$strings["Sun"] = "Вск"; +App::$strings["Mon"] = "Пон"; +App::$strings["Tue"] = "Вт"; +App::$strings["Wed"] = "Ср"; +App::$strings["Thu"] = "Чет"; +App::$strings["Fri"] = "Пят"; +App::$strings["Sat"] = "Суб"; +App::$strings["__ctx:calendar__ today"] = "сегодня"; +App::$strings["__ctx:calendar__ month"] = "месяц"; +App::$strings["__ctx:calendar__ week"] = "неделя"; +App::$strings["__ctx:calendar__ day"] = "день"; +App::$strings["__ctx:calendar__ All day"] = "Весь день"; +App::$strings["View PDF"] = "Просмотреть PDF"; +App::$strings[" by "] = " по "; +App::$strings[" on "] = " на "; +App::$strings["Embedded content"] = "Встроенное содержимое"; +App::$strings["Embedding disabled"] = "Встраивание отключено"; +App::$strings["Image exceeds website size limit of %lu bytes"] = "Файл превышает предельный размер для сайта в %lu байт"; +App::$strings["Image file is empty."] = "Файл изображения пуст."; +App::$strings["Unable to process image"] = "Не удается обработать изображение"; +App::$strings["Photo storage failed."] = "Ошибка хранилища фотографий."; +App::$strings["a new photo"] = "новая фотография"; +App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s опубликовал %2\$s к %3\$s"; +App::$strings["Recent Photos"] = "Последние фотографии"; +App::$strings["Upload New Photos"] = "Загрузить новые фотографии"; +App::$strings["New window"] = "Новое окно"; +App::$strings["Open the selected location in a different window or browser tab"] = "Открыть выбранное местоположение в другом окне или вкладке браузера"; +App::$strings["Wiki updated successfully"] = "Wiki успешно обновлена"; +App::$strings["Wiki files deleted successfully"] = "Wiki успешно удалена"; +App::$strings["0. Beginner/Basic"] = "Начинающий / Базовый"; +App::$strings["1. Novice - not skilled but willing to learn"] = "1. Новичок - не опытный, но желающий учиться"; +App::$strings["2. Intermediate - somewhat comfortable"] = "2. Промежуточный - более удобный"; +App::$strings["3. Advanced - very comfortable"] = "3. Продвинутый - очень удобный"; +App::$strings["4. Expert - I can write computer code"] = "4. Эксперт - я умею программировать"; +App::$strings["5. Wizard - I probably know more than you do"] = "5. Волшебник - возможно я знаю больше чем ты"; +App::$strings["Public"] = "Общедоступно"; +App::$strings["Anybody in the \$Projectname network"] = "Любому в сети \$Projectname"; +App::$strings["Any account on %s"] = "Любой аккаунт в %s"; +App::$strings["Any of my connections"] = "Любой из моих контактов"; +App::$strings["Only connections I specifically allow"] = "Только те контакты, кому я дам разрешение"; +App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Любой аутентифицированный (может включать посетителей их других сетей)"; +App::$strings["Any connections including those who haven't yet been approved"] = "Любые контакты включая те, которые вы ещё не одобрили"; +App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Это настройка по умолчанию для аудитории ваших обычных потоков и публикаций"; +App::$strings["This is your default setting for who can view your default channel profile"] = "Это настройка по умолчанию для тех, кто может просматривать профиль вашего основного канала"; +App::$strings["This is your default setting for who can view your connections"] = "Это настройка по умолчанию для тех, кто может просматривать ваши контакты"; +App::$strings["This is your default setting for who can view your file storage and photos"] = "Это настройка по умолчанию для тех, кто может просматривать ваше хранилище файлов и фотографий"; +App::$strings["This is your default setting for the audience of your webpages"] = "Это настройка по умолчанию для аудитории ваших веб-страниц"; +App::$strings["Admin Delete"] = "Удалено администратором"; +App::$strings["Save to Folder"] = "Сохранить в каталог"; +App::$strings["I will attend"] = "Я буду присутствовать"; +App::$strings["I will not attend"] = "Я не буду присутствовать"; +App::$strings["I might attend"] = "Я возможно буду присутствовать"; +App::$strings["I agree"] = "Я согласен"; +App::$strings["I disagree"] = "Я не согласен"; +App::$strings["I abstain"] = "Я воздержался"; +App::$strings["View all"] = "Просмотреть все"; +App::$strings["Add Tag"] = "Добавить тег"; +App::$strings["I like this (toggle)"] = "мне это нравится (переключение)"; +App::$strings["I don't like this (toggle)"] = "мне это не нравится (переключение)"; +App::$strings["Share This"] = "Поделиться этим"; +App::$strings["share"] = "поделиться"; +App::$strings["Delivery Report"] = "Отчёт о доставке"; +App::$strings["%d comment"] = array( + 0 => "", + 1 => "", +); +App::$strings["View %s's profile - %s"] = "Просмотр %s профиля - %s"; +App::$strings["to"] = "к"; +App::$strings["via"] = "через"; +App::$strings["Wall-to-Wall"] = "Стена-к-Стене"; +App::$strings["via Wall-To-Wall:"] = "через Стена-к-Стене:"; +App::$strings["Attend"] = "Посетить"; +App::$strings["Attendance Options"] = "Параметры посещаемости"; +App::$strings["Vote"] = "Голосовать"; +App::$strings["Voting Options"] = "Параметры голосования"; +App::$strings["Add to Calendar"] = "Добавить в календарь"; +App::$strings["Mark all seen"] = "Отметить как просмотренное"; +App::$strings["__ctx:noun__ Likes"] = "Нравится"; +App::$strings["__ctx:noun__ Dislikes"] = "Не нравится"; +App::$strings["This is you"] = "Это вы"; +App::$strings["Image"] = "Изображение"; +App::$strings["Insert Link"] = "Вставить ссылку"; +App::$strings["Video"] = "Видео"; +App::$strings["Your full name (required)"] = "Ваше полное имя (требуется)"; +App::$strings["Your email address (required)"] = "Ваш адрес электронной почты (требуется)"; +App::$strings["Your website URL (optional)"] = "URL вашего вебсайта (необязательно)"; +App::$strings["Apps"] = "Приложения"; +App::$strings["Site Admin"] = "Администратор сайта"; +App::$strings["View Bookmarks"] = "Просмотреть закадки"; +App::$strings["My Chatrooms"] = "Мои чаты"; +App::$strings["Remote Diagnostics"] = "Удалённая диагностика"; +App::$strings["Activity"] = "Активность"; +App::$strings["Channel Home"] = "Главная канала"; +App::$strings["Directory"] = "Каталог"; +App::$strings["Mail"] = "Переписка"; +App::$strings["Mood"] = "Настроение"; +App::$strings["Chat"] = "Чат"; +App::$strings["Probe"] = "Проба"; +App::$strings["Suggest"] = "Предложить"; +App::$strings["Random Channel"] = "Случайный канал"; +App::$strings["Invite"] = "Пригласить"; +App::$strings["Features"] = "Функции"; +App::$strings["Post"] = "Публикация"; +App::$strings["Update"] = "Обновить"; +App::$strings["Install"] = "Установить"; +App::$strings["Purchase"] = "Купить"; +App::$strings["Undelete"] = "Восстановить"; +App::$strings["Add to app-tray"] = "Добавить в app-tray"; +App::$strings["Remove from app-tray"] = "Удалить из app-tray"; +App::$strings["Pin to navbar"] = "Добавить на панель навигации"; +App::$strings["Unpin from navbar"] = "Удалить с панели навигации"; +App::$strings["\$Projectname Notification"] = "Оповещение \$Projectname "; +App::$strings["Thank You,"] = "Спасибо,"; +App::$strings["This email was sent by %1\$s at %2\$s."] = "Это письмо было отправлено %1\$s на %2\$s."; +App::$strings["To stop receiving these messages, please adjust your Notification Settings at %s"] = "Чтобы прекратить получать эти сообщения, настройте параметры уведомлений в %s"; +App::$strings["To stop receiving these messages, please adjust your %s."] = "Чтобы прекратить получать эти сообщения, пожалуйста настройте ваш %s."; +App::$strings["Notification Settings"] = "Настройки уведомлений"; +App::$strings["%s "] = ""; +App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Notify] Получено новое сообщение в %s"; +App::$strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s отправил вам новое личное сообщение в %2\$s."; +App::$strings["%1\$s sent you %2\$s."] = "%1\$s послал вам %2\$s."; +App::$strings["a private message"] = "личное сообщение"; +App::$strings["Please visit %s to view and/or reply to your private messages."] = "Пожалуйста, посетите %s для просмотра и/или ответа на ваши личные сообщения."; +App::$strings["commented on"] = " прокомментировал в"; +App::$strings["liked"] = "понравилось"; +App::$strings["disliked"] = "не понравилось"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = ""; +App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = ""; +App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s%2\$s [zrl=%3\$s]ваш %4\$s[/zrl]"; +App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notify] Отмодерирован комментарий к беседе #%1\$d по %2\$s"; +App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notify] Комментарий к беседе #%1\$d по %2\$s"; +App::$strings["%1\$s commented on an item/conversation you have been following."] = "%1\$s прокомментировал тему / беседу за которым вы следите."; +App::$strings["Please visit %s to view and/or reply to the conversation."] = "Пожалуйста, посетите %s для просмотра и / или ответа в беседе."; +App::$strings["Please visit %s to approve or reject this comment."] = "Пожалуйста посетитет %s для одобрения и отклонения комментария."; +App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = "%1\$s понравился [zrl=%2\$s]ваш %3\$s[/zrl]"; +App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notify] Беседа получила отметку \"нравится\" #%1\$d от %2\$s"; +App::$strings["%1\$s liked an item/conversation you created."] = "%1\$s нравится тема / беседа которую вы создали."; +App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = "[\$Projectname:Notify] %s сделал публикацию на стене вашего профиля"; +App::$strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s сделал публикацию на стене вашего профиля в %2\$s"; +App::$strings["%1\$s posted to [zrl=%2\$s]your wall[/zrl]"] = "%1\$s опубликовал на [zrl=%2\$s]вашей стене[/zrl]"; +App::$strings["[\$Projectname:Notify] %s tagged you"] = "[\$Projectname:Notify] %s отметил вас"; +App::$strings["%1\$s tagged you at %2\$s"] = "%1\$s отметил вас в %2\$s"; +App::$strings["%1\$s [zrl=%2\$s]tagged you[/zrl]."] = "%1\$s [zrl=%2\$s]отметил вас[/zrl]."; +App::$strings["[\$Projectname:Notify] %1\$s poked you"] = "[\$Projectname:Notify] %1\$s ткнул вас"; +App::$strings["%1\$s poked you at %2\$s"] = "%1\$s ткнул вас в %2\$s"; +App::$strings["%1\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s [zrl=%2\$s]ткнул вас[/zrl]."; +App::$strings["[\$Projectname:Notify] %s tagged your post"] = "[\$Projectname:Notify] %s отметил вашу публикацию"; +App::$strings["%1\$s tagged your post at %2\$s"] = "%1\$s отметил вашу публикацию на %2\$s"; +App::$strings["%1\$s tagged [zrl=%2\$s]your post[/zrl]"] = "%1\$s отметил [zrl=%2\$s]вашу публикацию[/zrl]"; +App::$strings["[\$Projectname:Notify] Introduction received"] = "[\$Projectname:Notify] Получено приглашение"; +App::$strings["You've received an new connection request from '%1\$s' at %2\$s"] = "Вы получили новый запрос контакта от '%1\$s' в %2\$s"; +App::$strings["You've received [zrl=%1\$s]a new connection request[/zrl] from %2\$s."] = "Вы получили [zrl=%1\$s]новый запрос контакта[/zrl] от %2\$s."; +App::$strings["You may visit their profile at %s"] = "Вы можете увидеть его профиль по ссылке %s"; +App::$strings["Please visit %s to approve or reject the connection request."] = "Пожалуйста, посетите %s, чтобы одобрить или отклонить запрос контакта."; +App::$strings["[\$Projectname:Notify] Friend suggestion received"] = "[\$Projectname:Notify] Получено предложение дружить"; +App::$strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Вы получили предложение дружить от '%1\$s' в %2\$s"; +App::$strings["You've received [zrl=%1\$s]a friend suggestion[/zrl] for %2\$s from %3\$s."] = "Вы получили [zrl=%1\$s]предложение дружить[/zrl] для %2\$s от %3\$s."; +App::$strings["Name:"] = "Имя:"; +App::$strings["Photo:"] = "Фото:"; +App::$strings["Please visit %s to approve or reject the suggestion."] = "Пожалуйста, посетите %s, чтобы одобрить или отклонить предложение."; +App::$strings["[\$Projectname:Notify]"] = ""; +App::$strings["created a new post"] = "создал новую публикацию"; +App::$strings["commented on %s's post"] = "прокомментировал публикацию %s"; +App::$strings["edited a post dated %s"] = "отредактировал публикацию датированную %s"; +App::$strings["edited a comment dated %s"] = "отредактировал комментарий датированный %s"; +App::$strings["(No Title)"] = "(нет заголовка)"; +App::$strings["Wiki page create failed."] = "Не удалось создать страницу Wiki."; +App::$strings["Wiki not found."] = "Wiki не найдена."; +App::$strings["Destination name already exists"] = "Имя назначения уже существует"; +App::$strings["Page not found"] = "Страница не найдена."; +App::$strings["Error reading page content"] = "Ошибка чтения содержимого страницы"; +App::$strings["Error reading wiki"] = "Ошибка чтения Wiki"; +App::$strings["Page update failed."] = "Не удалось обновить страницу."; +App::$strings["Nothing deleted"] = "Ничего не удалено"; +App::$strings["Compare: object not found."] = "Сравнение: объект не найден."; +App::$strings["Page updated"] = "Страница обновлена"; +App::$strings["Untitled"] = "Не озаглавлено"; +App::$strings["Wiki resource_id required for git commit"] = "Требуется resource_id Wiki для отправки в Git"; +App::$strings["__ctx:wiki_history__ Message"] = "Сообщение"; +App::$strings["__ctx:permcat__ default"] = "по умолчанию"; +App::$strings["__ctx:permcat__ follower"] = "поклонник"; +App::$strings["__ctx:permcat__ contributor"] = "участник"; +App::$strings["__ctx:permcat__ publisher"] = "издатель"; +App::$strings["Update Error at %s"] = "Ошибка обновления на %s"; +App::$strings["Update %s failed. See error logs."] = "Выполнение %s неудачно. Проверьте системный журнал."; +App::$strings["Missing room name"] = "Отсутствует название комнаты"; +App::$strings["Duplicate room name"] = "Название комнаты дублируется"; +App::$strings["Invalid room specifier."] = "Неверный указатель комнаты."; +App::$strings["Room not found."] = "Комната не найдена."; +App::$strings["Room is full"] = "Комната переполнена"; +App::$strings["Commented Date"] = "По комментариям"; +App::$strings["Order by last commented date"] = "Сортировка по дате последнего комментария"; +App::$strings["Posted Date"] = "По публикациям"; +App::$strings["Order by last posted date"] = "Сортировка по дате последней публикации"; +App::$strings["Date Unthreaded"] = "По порядку"; +App::$strings["Order unthreaded by date"] = "Сортировка в порядке поступления"; +App::$strings["Activity Order"] = "Сортировка по активности"; +App::$strings["Site"] = "Сайт"; +App::$strings["Accounts"] = "Учётные записи"; +App::$strings["Member registrations waiting for confirmation"] = "Регистрации участников, ожидающие подверждения"; +App::$strings["Channels"] = "Каналы"; +App::$strings["Security"] = "Безопасность"; +App::$strings["Addons"] = "Расширения"; +App::$strings["Themes"] = "Темы"; +App::$strings["Inspect queue"] = "Просмотр очереди"; +App::$strings["Profile Fields"] = "Поля профиля"; +App::$strings["DB updates"] = "Обновление базы данных"; +App::$strings["Logs"] = "Журналы"; +App::$strings["Addon Features"] = "Настройки расширений"; +App::$strings["Tasks"] = "Задачи"; +App::$strings["Ignore/Hide"] = "Игнорировать / cкрыть"; +App::$strings["Suggestions"] = "Рекомендации"; +App::$strings["See more..."] = "Просмотреть больше..."; +App::$strings["Received Messages"] = "Полученные сообщения"; +App::$strings["Sent Messages"] = "Отправленные сообщения"; +App::$strings["Conversations"] = "Беседы"; +App::$strings["No messages."] = "Сообщений нет."; +App::$strings["Delete conversation"] = "Удалить беседу"; +App::$strings["Select Channel"] = "Выбрать канал"; +App::$strings["Read-write"] = "Чтение-запись"; +App::$strings["Read-only"] = "Только чтение"; +App::$strings["My Calendars"] = "Мои календари"; +App::$strings["Shared Calendars"] = "Общие календари"; +App::$strings["Share this calendar"] = "Поделиться этим календарём"; +App::$strings["Calendar name and color"] = "Имя и цвет календаря"; +App::$strings["Create new calendar"] = "Создать новый календарь"; +App::$strings["Create"] = "Создать"; +App::$strings["Calendar Name"] = "Имя календаря"; +App::$strings["Calendar Tools"] = "Инструменты календаря"; +App::$strings["Import calendar"] = "Импортировать календарь"; +App::$strings["Select a calendar to import to"] = "Выбрать календарь для импорта в"; +App::$strings["Upload"] = "Загрузка"; +App::$strings["Addressbooks"] = "Адресные книги"; +App::$strings["Addressbook name"] = "Имя адресной книги"; +App::$strings["Create new addressbook"] = "Создать новую адресную книгу"; +App::$strings["Addressbook Name"] = "Имя адресной книги"; +App::$strings["Addressbook Tools"] = "Инструменты адресной книги"; +App::$strings["Import addressbook"] = "Импортировать адресную книгу"; +App::$strings["Select an addressbook to import to"] = "Выбрать адресную книгу для импорта в"; +App::$strings["__ctx:widget__ Activity"] = "Активность"; +App::$strings["HQ Control Panel"] = "Панель управления HQ"; +App::$strings["Create a new post"] = "Создать новую публикацию"; +App::$strings["Add new page"] = "Добавить новую страницу"; +App::$strings["Options"] = "Параметры"; +App::$strings["Wiki Pages"] = "Wiki страницы"; +App::$strings["Page name"] = "Название страницы"; +App::$strings["Private Mail Menu"] = "Меню личной переписки"; +App::$strings["Combined View"] = "Комбинированный вид"; +App::$strings["Inbox"] = "Входящие"; +App::$strings["Outbox"] = "Исходящие"; +App::$strings["New Message"] = "Новое сообщение"; +App::$strings["photo/image"] = "фотография / изображение"; +App::$strings["Archives"] = "Архивы"; +App::$strings["Events Tools"] = "Инструменты для событий"; +App::$strings["Export Calendar"] = "Экспортировать календарь"; +App::$strings["Import Calendar"] = "Импортировать календарь"; +App::$strings["Wiki List"] = "Список Wiki"; +App::$strings["Account settings"] = "Настройки аккаунта"; +App::$strings["Channel settings"] = "Выбор канала"; +App::$strings["Additional features"] = "Дополнительные функции"; +App::$strings["Addon settings"] = "Настройки расширений"; +App::$strings["Display settings"] = "Настройки отображения"; +App::$strings["Manage locations"] = "Управление местоположением"; +App::$strings["Export channel"] = "Экспортировать канал"; +App::$strings["OAuth1 apps"] = "Приложения OAuth1"; +App::$strings["OAuth2 apps"] = "Приложения OAuth2"; +App::$strings["Guest Access Tokens"] = "Токен гостевого доступа"; +App::$strings["Connection Default Permissions"] = "Разрешения по умолчанию для контакта"; +App::$strings["Premium Channel Settings"] = "Настройки премиум-канала"; +App::$strings["View Photo"] = "Посмотреть фотографию"; +App::$strings["Edit Album"] = "Редактировать Фотоальбом"; +App::$strings["Public Hubs"] = "Публичные хабы"; +App::$strings["Notes"] = "Заметки"; +App::$strings["Overview"] = "Обзор"; +App::$strings["App Collections"] = "Коллекции приложений"; +App::$strings["Available Apps"] = "Доступные приложения"; +App::$strings["Installed apps"] = "Установленные приложения"; +App::$strings["Bookmarked Chatrooms"] = "Закладки чатов"; +App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "У вас есть %1$.0f из %2$.0f разрешенных контактов."; +App::$strings["Add New Connection"] = "Добавить новый контакт"; +App::$strings["Enter channel address"] = "Введите адрес канала"; +App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Пример: ivan@example.com, http://example.com/ivan"; +App::$strings["Chat Members"] = "Участники чата"; +App::$strings["Suggested Chatrooms"] = "Рекомендуемые чаты"; +App::$strings["Rating Tools"] = "Инструменты оценки"; +App::$strings["Rate Me"] = "Оценить меня"; +App::$strings["View Ratings"] = "Просмотр оценок"; +App::$strings["Remove term"] = "Удалить термин"; +App::$strings["Me"] = "Я"; +App::$strings["Family"] = "Семья"; +App::$strings["Acquaintances"] = "Знакомые"; +App::$strings["All"] = "Все"; +App::$strings["Refresh"] = "Обновить"; +App::$strings["Personal Posts"] = "Личные публикации"; +App::$strings["Show posts that mention or involve me"] = "Показывать публикации где вы были упомянуты или привлечены"; +App::$strings["Starred Posts"] = "Отмеченные публикации"; +App::$strings["Show posts that I have starred"] = "Показывать публикации которые я отметил"; +App::$strings["Show posts related to the %s privacy group"] = "Показывать публикации относящиеся к группе безопасности %s"; +App::$strings["Show my privacy groups"] = "Показывать мои группы безопасности"; +App::$strings["Show posts to this forum"] = "Показывать публикации этого форума"; +App::$strings["Forums"] = "Форумы"; +App::$strings["Show forums"] = "Показывать форумы"; +App::$strings["Show posts that I have filed to %s"] = "Показывать публикации которые я добавил в %s"; +App::$strings["Show filed post categories"] = "Показывать категории добавленных публикаций"; +App::$strings["Panel search"] = "Панель поиска"; +App::$strings["Filter by name"] = "Отфильтровать по имени"; +App::$strings["Remove active filter"] = "Удалить активный фильтр"; +App::$strings["Activity Filters"] = "Фильтры активности"; +App::$strings["Click to show more"] = "Нажмите чтобы показать больше"; +App::$strings["New Network Activity"] = "Новая сетевая активность"; +App::$strings["New Network Activity Notifications"] = "Новые уведомления о сетевой активности"; +App::$strings["View your network activity"] = "Просмотреть вашу сетевую активность"; +App::$strings["Mark all notifications read"] = "Пометить уведомления как прочитанные"; +App::$strings["Show new posts only"] = "Показывать только новые публикации"; +App::$strings["New Home Activity"] = "Новая локальная активность"; +App::$strings["New Home Activity Notifications"] = "Новые уведомления локальной активности"; +App::$strings["View your home activity"] = "Просмотреть локальную активность"; +App::$strings["Mark all notifications seen"] = "Пометить уведомления как просмотренные"; +App::$strings["New Mails"] = "Новая переписка"; +App::$strings["New Mails Notifications"] = "Уведомления о новой переписке"; +App::$strings["View your private mails"] = "Просмотреть вашу личную переписку"; +App::$strings["Mark all messages seen"] = "Пометить сообщения как просмотренные"; +App::$strings["New Events"] = "Новые события"; +App::$strings["New Events Notifications"] = "Уведомления о новых событиях"; +App::$strings["View events"] = "Просмотреть события"; +App::$strings["Mark all events seen"] = "Пометить все события как просмотренные"; +App::$strings["New Connections"] = "Новые контакты"; +App::$strings["New Connections Notifications"] = "Уведомления о новых контактах"; +App::$strings["View all connections"] = "Просмотр всех контактов"; +App::$strings["New Files"] = "Новые файлы"; +App::$strings["New Files Notifications"] = "Уведомления о новых файлах"; +App::$strings["Notices"] = "Оповещения"; +App::$strings["View all notices"] = "Просмотреть все оповещения"; +App::$strings["Mark all notices seen"] = "Пометить все оповещения как просмотренные"; +App::$strings["New Registrations"] = "Новые регистрации"; +App::$strings["New Registrations Notifications"] = "Уведомления о новых регистрациях"; +App::$strings["Public Stream"] = "Публичный поток"; +App::$strings["Public Stream Notifications"] = "Уведомления публичного потока"; +App::$strings["View the public stream"] = "Просмотреть публичный поток"; +App::$strings["Sorry, you have got no notifications at the moment"] = "Извините, но сейчас у вас нет уведомлений"; +App::$strings["Profile Creation"] = "Создание профиля"; +App::$strings["Upload profile photo"] = "Загрузить фотографию профиля"; +App::$strings["Upload cover photo"] = "Загрузить фотографию обложки"; +App::$strings["Find and Connect with others"] = "Найти и вступить в контакт"; +App::$strings["View the directory"] = "Просмотреть каталог"; +App::$strings["View friend suggestions"] = "Просмотр рекомендуемых друзей"; +App::$strings["Manage your connections"] = "Управлять вашими контактами"; +App::$strings["Communicate"] = "Связаться"; +App::$strings["View your channel homepage"] = "Домашняя страница канала"; +App::$strings["View your network stream"] = "Просмотреть ваш сетевой поток"; +App::$strings["Documentation"] = "Документация"; +App::$strings["View public stream"] = "Просмотреть публичный поток"; +App::$strings["Social Networking"] = "Социальная Сеть"; +App::$strings["Social - Federation"] = "Социальная - Федерация"; +App::$strings["Social - Mostly Public"] = "Социальная - В основном общественный"; +App::$strings["Social - Restricted"] = "Социальная - Ограниченный"; +App::$strings["Social - Private"] = "Социальная - Частный"; +App::$strings["Community Forum"] = "Форум сообщества"; +App::$strings["Forum - Mostly Public"] = "Форум - В основном общественный"; +App::$strings["Forum - Restricted"] = "Форум - Ограниченный"; +App::$strings["Forum - Private"] = "Форум - Частный"; +App::$strings["Feed Republish"] = "Публиковать ленты новостей"; +App::$strings["Feed - Mostly Public"] = "Ленты новостей - В основном общественный"; +App::$strings["Feed - Restricted"] = "Ленты новостей - Ограниченный"; +App::$strings["Special Purpose"] = "Спец. назначение"; +App::$strings["Special - Celebrity/Soapbox"] = "Спец. назначение - Знаменитость/Soapbox"; +App::$strings["Special - Group Repository"] = "Спец. назначение - Групповой репозиторий"; +App::$strings["Custom/Expert Mode"] = "Экспертный режим"; +App::$strings["Can view my channel stream and posts"] = "Может просматривать мою ленту и сообщения"; +App::$strings["Can send me their channel stream and posts"] = "Может присылать мне свои потоки и сообщения"; +App::$strings["Can view my default channel profile"] = "Может просматривать мой стандартный профиль канала"; +App::$strings["Can view my connections"] = "Может просматривать мои контакты"; +App::$strings["Can view my file storage and photos"] = "Может просматривать мое хранилище файлов"; +App::$strings["Can upload/modify my file storage and photos"] = "Может загружать/изменять мои файлы и фотографии в хранилище"; +App::$strings["Can view my channel webpages"] = "Может просматривать мои веб-страницы"; +App::$strings["Can view my wiki pages"] = "Может просматривать мои вики-страницы"; +App::$strings["Can create/edit my channel webpages"] = "Может редактировать мои веб-страницы"; +App::$strings["Can write to my wiki pages"] = "Может редактировать мои вики-страницы"; +App::$strings["Can post on my channel (wall) page"] = "Может публиковать на моей странице канала (\"стена\")"; +App::$strings["Can comment on or like my posts"] = "Может прокомментировать или отмечать как понравившиеся мои посты"; App::$strings["Can send me private mail messages"] = "Может отправлять мне личные сообщения по эл. почте"; -App::$strings["Can post photos to my photo albums"] = "Может публиковать фотографии в мои фотоальбомы"; -App::$strings["Can forward to all my channel contacts via post @mentions"] = ""; -App::$strings["Advanced - useful for creating group forum channels"] = ""; -App::$strings["Can chat with me (when available)"] = "Можете общаться со мной в чате (при наличии)"; -App::$strings["Can write to my \"public\" file storage"] = "Может писать в моё \"публичное\" хранилище файлов"; -App::$strings["Can edit my \"public\" pages"] = "Может редактировать мои \"публичные\" страницы"; -App::$strings["Can source my \"public\" posts in derived channels"] = ""; -App::$strings["Somewhat advanced - very useful in open communities"] = ""; -App::$strings["Can administer my channel resources"] = "Может администрировать мои ресурсы канала"; -App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = ""; -App::$strings["Set your current mood and tell your friends"] = ""; -App::$strings["Menu not found."] = "Меню не найдено."; -App::$strings["Menu element updated."] = "Меню обновлено."; -App::$strings["Unable to update menu element."] = ""; -App::$strings["Menu element added."] = "Элемент меню добавлен."; -App::$strings["Unable to add menu element."] = "Невозможно добавить элемент меню."; -App::$strings["Not found."] = "Не найдено."; -App::$strings["Manage Menu Elements"] = "Управление элементов меню"; -App::$strings["Edit menu"] = "Редактировать меню"; -App::$strings["Edit element"] = "Редактировать элемент"; -App::$strings["Drop element"] = "Удалить элемент"; -App::$strings["New element"] = "Новый элемент"; -App::$strings["Edit this menu container"] = ""; -App::$strings["Add menu element"] = "Добавить элемент меню"; -App::$strings["Delete this menu item"] = "Удалить элемент меню"; -App::$strings["Edit this menu item"] = "Редактировать элемент меню"; -App::$strings["New Menu Element"] = "Новый элемент меню"; -App::$strings["Menu Item Permissions"] = ""; -App::$strings["(click to open/close)"] = "(нажмите, чтобы открыть / закрыть)"; -App::$strings["Link text"] = "Текст ссылки"; -App::$strings["URL of link"] = "URL ссылки"; -App::$strings["Use Red magic-auth if available"] = ""; -App::$strings["Open link in new window"] = "Открыть ссылку в новом окне"; -App::$strings["Order in list"] = ""; -App::$strings["Higher numbers will sink to bottom of listing"] = ""; -App::$strings["Menu item not found."] = "Элемент меню не найден."; -App::$strings["Menu item deleted."] = "Элемент меню удален."; -App::$strings["Menu item could not be deleted."] = ""; -App::$strings["Edit Menu Element"] = "Редактировать элемент меню"; -App::$strings["Modify"] = "Изменить"; -App::$strings["sent you a private message"] = "отправил вам личное сообщение"; -App::$strings["added your channel"] = "добавил ваш канал"; -App::$strings["posted an event"] = ""; +App::$strings["Can like/dislike profiles and profile things"] = "Может комментировать или отмечать как нравится/ненравится мой профиль"; +App::$strings["Can forward to all my channel connections via ! mentions in posts"] = "Может отправлять всем подписчикам моего канала через использование ! в публикациях"; +App::$strings["Can chat with me"] = "Может общаться со мной в чате"; +App::$strings["Can source my public posts in derived channels"] = "Может использовать мои публичные сообщения в клонированных лентах сообщений"; +App::$strings["Can administer my channel"] = "Может администрировать мой канал"; +App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Удалённая аутентификация заблокирована. Вы вошли на этот сайт локально. Пожалуйста, выйдите и попробуйте ещё раз."; +App::$strings["App installed."] = "Приложение установлено."; +App::$strings["Malformed app."] = "Неработающее приложение."; +App::$strings["Embed code"] = "Встроить код"; +App::$strings["Edit App"] = "Редактировать приложение"; +App::$strings["Create App"] = "Создать приложение"; +App::$strings["Name of app"] = "Наименование приложения"; +App::$strings["Location (URL) of app"] = "Местоположение (URL) приложения"; +App::$strings["Photo icon URL"] = "URL пиктограммы"; +App::$strings["80 x 80 pixels - optional"] = "80 x 80 пикселей - необязательно"; +App::$strings["Categories (optional, comma separated list)"] = "Категории (необязательно, список через запятую)"; +App::$strings["Version ID"] = "ID версии"; +App::$strings["Price of app"] = "Цена приложения"; +App::$strings["Location (URL) to purchase app"] = "Ссылка (URL) для покупки приложения"; App::$strings["network"] = "сеть"; -App::$strings["Name is required"] = "Необходимо имя"; -App::$strings["Key and Secret are required"] = ""; -App::$strings["Passwords do not match. Password unchanged."] = "Пароли не совпадают. Пароль не изменён."; -App::$strings["Empty passwords are not allowed. Password unchanged."] = "Пустые пароли не допускаются. Пароль не изменён."; -App::$strings["Password changed."] = "Пароль изменен."; -App::$strings["Password update failed. Please try again."] = "Изменение пароля закончилось неуспешно. Пожалуйста, попробуйте еще раз."; -App::$strings["Not valid email."] = "Не действительный адрес электронной почты."; -App::$strings["Protected email address. Cannot change to that email."] = "Защищенный адрес электронной почты. Нельзя изменить."; -App::$strings["System failure storing new email. Please try again."] = ""; -App::$strings["Settings updated."] = "Настройки обновленны."; -App::$strings["Add application"] = "Добавить приложения"; -App::$strings["Name"] = "Имя"; -App::$strings["Name of application"] = "Название приложения"; -App::$strings["Consumer Key"] = "Ключ клиента"; -App::$strings["Automatically generated - change if desired. Max length 20"] = ""; -App::$strings["Consumer Secret"] = "Секрет клиента"; -App::$strings["Redirect"] = "Перенаправление"; -App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = ""; -App::$strings["Icon url"] = "URL-адрес значка"; -App::$strings["Optional"] = "Необязательно"; -App::$strings["You can't edit this application."] = "Вы не можете редактировать это приложение."; -App::$strings["Connected Apps"] = "Подключенные приложения"; -App::$strings["Client key starts with"] = ""; -App::$strings["No name"] = "Без названия"; -App::$strings["Remove authorization"] = "Удалить разрешение"; -App::$strings["No feature settings configured"] = "Параметры функций не настроены"; -App::$strings["Feature Settings"] = "Настройки функции"; -App::$strings["Account Settings"] = "Настройки аккаунта"; -App::$strings["Password Settings"] = "Настройки пароля"; -App::$strings["New Password:"] = "Новый пароль:"; -App::$strings["Confirm:"] = "Подтверждение:"; -App::$strings["Leave password fields blank unless changing"] = "Оставьте поля пустыми, если не меняется"; -App::$strings["Email Address:"] = "Адрес электронной почты:"; -App::$strings["Remove Account"] = "Удалить аккаунт"; -App::$strings["Warning: This action is permanent and cannot be reversed."] = ""; -App::$strings["Off"] = "Выкл."; -App::$strings["On"] = "Вкл."; -App::$strings["Additional Features"] = "Дополнительные функции"; -App::$strings["Connector Settings"] = "Настройки соединителя"; -App::$strings["No special theme for mobile devices"] = "Нет специальной темы для мобильных устройств"; -App::$strings["%s - (Experimental)"] = "%s - (экспериментальный)"; -App::$strings["Display Settings"] = "Настройки отображения"; -App::$strings["Display Theme:"] = "Тема отображения:"; -App::$strings["Mobile Theme:"] = "Мобильная тема отображения:"; -App::$strings["Update browser every xx seconds"] = "Обновление браузера каждые ХХ секунд"; -App::$strings["Minimum of 10 seconds, no maximum"] = "Минимум 10 секунд, без максимума"; -App::$strings["Maximum number of conversations to load at any time:"] = ""; -App::$strings["Maximum of 100 items"] = "Максимум 100 элементов"; -App::$strings["Don't show emoticons"] = "Не показывать emoticons"; -App::$strings["System Page Layout Editor - (advanced)"] = ""; -App::$strings["Nobody except yourself"] = "Никто, кроме вас"; -App::$strings["Only those you specifically allow"] = "Только комы вы разрешили"; -App::$strings["Approved connections"] = "Утвержденные контакты"; -App::$strings["Any connections"] = "Все контакты"; -App::$strings["Anybody on this website"] = "Любой на этом веб-сайте"; -App::$strings["Anybody in this network"] = "Любой в этой сети"; -App::$strings["Anybody authenticated"] = ""; -App::$strings["Anybody on the internet"] = "Любой в интернете"; -App::$strings["Publish your default profile in the network directory"] = "Публикация вашего профиля по умолчанию в каталоге сети"; -App::$strings["No"] = "Нет"; -App::$strings["Yes"] = "Да"; -App::$strings["Allow us to suggest you as a potential friend to new members?"] = ""; -App::$strings["or"] = "или"; -App::$strings["Your channel address is"] = "Адрес канала:"; -App::$strings["Channel Settings"] = "Настройки канала"; -App::$strings["Basic Settings"] = "Основные настройки"; -App::$strings["Your Timezone:"] = "Часовой пояс:"; -App::$strings["Default Post Location:"] = "Откуда по умолчанию:"; -App::$strings["Geographical location to display on your posts"] = ""; -App::$strings["Use Browser Location:"] = "Использовать указание браузерa:"; -App::$strings["Adult Content"] = "Содержимое для взрослых"; -App::$strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = ""; -App::$strings["Security and Privacy Settings"] = "Параметры безопасности и конфиденциальности"; -App::$strings["Hide my online presence"] = "Скрыть мое присутствие"; -App::$strings["Prevents displaying in your profile that you are online"] = "Предотвращает показ в вашем профиле, что вы онлайн"; -App::$strings["Simple Privacy Settings:"] = "Быстрые настройки:"; -App::$strings["Very Public - extremely permissive (should be used with caution)"] = ""; -App::$strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = ""; -App::$strings["Private - default private, never open or public"] = ""; -App::$strings["Blocked - default blocked to/from everybody"] = ""; -App::$strings["Allow others to tag your posts"] = "Разрешить другим помечать сообщения"; -App::$strings["Often used by the community to retro-actively flag inappropriate content"] = ""; -App::$strings["Advanced Privacy Settings"] = "Дополнительные настройки"; -App::$strings["Expire other channel content after this many days"] = ""; -App::$strings["0 or blank prevents expiration"] = ""; -App::$strings["Maximum Friend Requests/Day:"] = ""; -App::$strings["May reduce spam activity"] = "Может уменьшить активность спам"; -App::$strings["Default Post Permissions"] = "Настройки по умолчанию"; -App::$strings["Maximum private messages per day from unknown people:"] = "Максимальное количество личных сообщений от незнакомых людей:"; -App::$strings["Useful to reduce spamming"] = "Полезно для уменьшения активности спам"; -App::$strings["Notification Settings"] = "Настройки уведомлений"; -App::$strings["By default post a status message when:"] = ""; -App::$strings["accepting a friend request"] = ""; -App::$strings["joining a forum/community"] = ""; -App::$strings["making an interesting profile change"] = ""; -App::$strings["Send a notification email when:"] = "Отправить уведомление по электронной почте, если:"; -App::$strings["You receive a connection request"] = ""; -App::$strings["Your connections are confirmed"] = ""; -App::$strings["Someone writes on your profile wall"] = ""; -App::$strings["Someone writes a followup comment"] = ""; -App::$strings["You receive a private message"] = "Вы получили личное сообщение"; -App::$strings["You receive a friend suggestion"] = "Вы получили предложение дружить"; -App::$strings["You are tagged in a post"] = ""; -App::$strings["You are poked/prodded/etc. in a post"] = ""; -App::$strings["Advanced Account/Page Type Settings"] = ""; -App::$strings["Change the behaviour of this account for special situations"] = ""; -App::$strings["Please enable expert mode (in Settings > Additional features) to adjust!"] = ""; -App::$strings["Miscellaneous Settings"] = "Дополнительные настройки"; -App::$strings["Personal menu to display in your channel pages"] = ""; -App::$strings["Poke/Prod"] = ""; -App::$strings["poke, prod or do other things to somebody"] = ""; -App::$strings["Recipient"] = "Получатель"; -App::$strings["Choose what you wish to do to recipient"] = ""; -App::$strings["Make this post private"] = "Сделать это сообщение личным"; -App::$strings["Authorize application connection"] = ""; -App::$strings["Return to your app and insert this Securty Code:"] = ""; -App::$strings["Please login to continue."] = "Пожалуйста, войдите, чтобы продолжить."; -App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = ""; -App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = ""; -App::$strings["Welcome %s. Remote authentication successful."] = "Добро пожаловать %s. Удаленная аутентификация успешно завершена."; -App::$strings["Item not available."] = "Элемент недоступен."; -App::$strings["Fetching URL returns error: %1\$s"] = ""; -App::$strings["Invalid item."] = "Недействительный элемент."; -App::$strings["Channel not found."] = "Канал не найден."; -App::$strings["Page not found."] = "Страница не найдена."; -App::$strings["Image uploaded but image cropping failed."] = ""; -App::$strings["Image resize failed."] = "Изменение размера изображения не удалось."; -App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = ""; -App::$strings["Image exceeds size limit of %d"] = ""; -App::$strings["Unable to process image."] = "Невозможно обработать изображение."; -App::$strings["Photo not available."] = "Фотография не доступна."; -App::$strings["Upload File:"] = "Загрузить файл:"; -App::$strings["Select a profile:"] = "Выберите профиль:"; -App::$strings["Upload Profile Photo"] = "Загрузить фотографию профиля"; -App::$strings["skip this step"] = "пропустить этот шаг"; -App::$strings["select a photo from your photo albums"] = ""; -App::$strings["Crop Image"] = "Обрезать изображение"; -App::$strings["Please adjust the image cropping for optimum viewing."] = ""; -App::$strings["Done Editing"] = "Закончить редактирование"; -App::$strings["Image uploaded successfully."] = "Загрузка изображениея прошла успешно."; -App::$strings["Image upload failed."] = "Загрузка изображениея прошла безуспешно."; -App::$strings["Image size reduction [%s] failed."] = ""; -App::$strings["Block Name"] = "Название блока"; -App::$strings["Profile not found."] = "Профиль не найден."; -App::$strings["Profile deleted."] = "Профиль удален."; -App::$strings["Profile-"] = "Профиль-"; -App::$strings["New profile created."] = "Новый профиль создан."; -App::$strings["Profile unavailable to clone."] = "Профиль недоступен для клонирования."; -App::$strings["Profile Name is required."] = "Имя профиля требуется."; -App::$strings["Marital Status"] = "Семейное положение"; -App::$strings["Romantic Partner"] = "Романтический партнер"; -App::$strings["Likes"] = "нравится"; -App::$strings["Dislikes"] = "не-нравится"; -App::$strings["Work/Employment"] = "Работа / Занятость"; -App::$strings["Religion"] = "Религия"; -App::$strings["Political Views"] = "Политические взгляды"; -App::$strings["Gender"] = "Пол"; -App::$strings["Sexual Preference"] = "Сексуальная ориентация"; -App::$strings["Homepage"] = "Домашняя страница"; -App::$strings["Interests"] = "Интересы"; +App::$strings["INVALID EVENT DISMISSED!"] = "НЕДЕЙСТВИТЕЛЬНОЕ СОБЫТИЕ ОТКЛОНЕНО!"; +App::$strings["Summary: "] = "Резюме:"; +App::$strings["Date: "] = "Дата:"; +App::$strings["Reason: "] = "Причина:"; +App::$strings["INVALID CARD DISMISSED!"] = "НЕДЕЙСТВИТЕЛЬНАЯ КАРТОЧКА ОТКЛОНЕНА!"; +App::$strings["Name: "] = "Имя:"; +App::$strings["Event title"] = "Наименование события"; +App::$strings["Start date and time"] = "Дата и время начала"; +App::$strings["Example: YYYY-MM-DD HH:mm"] = "Пример: YYYY-MM-DD HH:mm"; +App::$strings["End date and time"] = "Дата и время окончания"; +App::$strings["Previous"] = "Предыдущая"; +App::$strings["Next"] = "Следующая"; +App::$strings["Today"] = "Сегодня"; +App::$strings["Month"] = "Месяц"; +App::$strings["Week"] = "Неделя"; +App::$strings["Day"] = "День"; +App::$strings["List month"] = "Просмотреть месяц"; +App::$strings["List week"] = "Просмотреть неделю"; +App::$strings["List day"] = "Просмотреть день"; +App::$strings["More"] = "Больше"; +App::$strings["Less"] = "Меньше"; +App::$strings["Select calendar"] = "Выбрать календарь"; +App::$strings["Delete all"] = "Удалить всё"; +App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "Простите, но редактирование повторяющихся событий пока не реализовано."; +App::$strings["Organisation"] = "Организация"; +App::$strings["Title"] = "Наименование"; +App::$strings["Phone"] = "Телефон"; +App::$strings["Instant messenger"] = "Мессенджер"; +App::$strings["Website"] = "Веб-сайт"; App::$strings["Address"] = "Адрес"; -App::$strings["Location"] = "Место"; -App::$strings["Profile updated."] = "Профиль обновлен."; -App::$strings["Hide your contact/friend list from viewers of this profile?"] = "Скрывать от просмотра ваш список контактов/друзей в этом профиле?"; -App::$strings["Edit Profile Details"] = "Редактирование профиля"; -App::$strings["View this profile"] = "Посмотреть этот профиль"; -App::$strings["Change Profile Photo"] = "Изменить фотографию профиля"; -App::$strings["Create a new profile using these settings"] = "Создайте новый профиль со следующими настройками"; -App::$strings["Clone this profile"] = "Клонировать этот профиль"; -App::$strings["Delete this profile"] = "Удалить этот профиль"; -App::$strings["Profile Name:"] = "Имя профиля:"; -App::$strings["Your Full Name:"] = "Ваше полное имя:"; -App::$strings["Title/Description:"] = "Название / Описание:"; -App::$strings["Your Gender:"] = "Ваш пол:"; -App::$strings["Birthday (%s):"] = "Ваш День Рождения (%s):"; -App::$strings["Street Address:"] = "Улица:"; -App::$strings["Locality/City:"] = "Населенный пункт / город:"; -App::$strings["Postal/Zip Code:"] = "Почтовый индекс:"; -App::$strings["Country:"] = "Страна:"; -App::$strings["Region/State:"] = "Регион / Область:"; -App::$strings["♥ Marital Status:"] = ""; -App::$strings["Who: (if applicable)"] = "Кто: (если это применимо)"; -App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Примеры: cathy123, Cathy Williams, cathy@example.com"; -App::$strings["Since [date]:"] = "С тех пор [date]:"; -App::$strings["Homepage URL:"] = "URL-адрес домашней страницы:"; -App::$strings["Religious Views:"] = "Религиозные взгляды:"; -App::$strings["Keywords:"] = "Ключевые слова:"; -App::$strings["Example: fishing photography software"] = "Пример: fishing photography software"; -App::$strings["Used in directory listings"] = ""; -App::$strings["Tell us about yourself..."] = "Расскажите нам о себе ..."; -App::$strings["Hobbies/Interests"] = "Хобби / интересы"; -App::$strings["Contact information and Social Networks"] = "Информация и социальные сети контакта"; -App::$strings["My other channels"] = "Мои другие контакты"; -App::$strings["Musical interests"] = "Музыкальные интересы"; -App::$strings["Books, literature"] = "Книги, литература"; -App::$strings["Television"] = "Телевидение"; -App::$strings["Film/dance/culture/entertainment"] = "Кино / танцы / культура / развлечения"; -App::$strings["Love/romance"] = "Любовь / Романс"; -App::$strings["Work/employment"] = "Работа / Занятость"; -App::$strings["School/education"] = "Школа / образование"; -App::$strings["This is your public profile.
      It may be visible to anybody using the internet."] = ""; -App::$strings["Age: "] = "Возраст:"; -App::$strings["Edit/Manage Profiles"] = "Редактирование / Управление профилей"; -App::$strings["Add profile things"] = ""; -App::$strings["Include desirable objects in your profile"] = ""; -App::$strings["Bookmark added"] = "Закладка добавлена"; -App::$strings["My Bookmarks"] = "Мои закладки"; -App::$strings["My Connections Bookmarks"] = "Закладки моих контактов"; -App::$strings["Invalid profile identifier."] = ""; -App::$strings["Profile Visibility Editor"] = "Редактор видимости профиля"; -App::$strings["Click on a contact to add or remove."] = "Нажмите на канал, чтобы добавить или удалить."; -App::$strings["Visible To"] = "Видно"; -App::$strings["All Connections"] = "Все контакты"; -App::$strings["Public Sites"] = "Публичные сайты"; -App::$strings["The listed sites allow public registration into the Hubzilla. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links may provide additional details."] = ""; -App::$strings["Site URL"] = "URL веб-сайта"; +App::$strings["Note"] = "Заметка"; +App::$strings["Add Field"] = "Добавить поле"; +App::$strings["P.O. Box"] = "абонентский ящик"; +App::$strings["Additional"] = "Дополнительно"; +App::$strings["Street"] = "Улица"; +App::$strings["Locality"] = "Населённый пункт"; +App::$strings["Region"] = "Регион"; +App::$strings["ZIP Code"] = "Индекс"; +App::$strings["Country"] = "Страна"; +App::$strings["Default Calendar"] = "Календарь по умолчанию"; +App::$strings["Default Addressbook"] = "Адресная книга по умолчанию"; +App::$strings["This page is available only to site members"] = "Эта страница доступна только для подписчиков сайта"; +App::$strings["Welcome"] = "Добро пожаловать"; +App::$strings["What would you like to do?"] = "Что бы вы хотели сделать?"; +App::$strings["Please bookmark this page if you would like to return to it in the future"] = "Пожалуйста, запомните эту страницу если вы хотите вернуться на неё в будущем"; +App::$strings["Upload a profile photo"] = "Загрузить фотографию профиля"; +App::$strings["Upload a cover photo"] = "Загрузить фотографию обложки"; +App::$strings["Edit your default profile"] = "Редактировать ваш профиль по умолчанию"; +App::$strings["View the channel directory"] = "Просмотр каталога каналов"; +App::$strings["View/edit your channel settings"] = "Просмотреть / редактировать настройки вашего канала"; +App::$strings["View the site or project documentation"] = "Просмотр документации сайта / проекта"; +App::$strings["Visit your channel homepage"] = "Посетить страницу вашего канала"; +App::$strings["View your connections and/or add somebody whose address you already know"] = "Просмотреть ваши контакты и / или добавить кого-то чей адрес в уже знаете"; +App::$strings["View your personal stream (this may be empty until you add some connections)"] = "Ваш персональный поток (может быть пуст пока вы не добавите контакты)"; +App::$strings["View the public stream. Warning: this content is not moderated"] = "Просмотр публичного потока. Предупреждение: этот контент не модерируется"; +App::$strings["Page owner information could not be retrieved."] = "Информация о владельце страницы не может быть получена."; +App::$strings["Album not found."] = "Альбом не найден."; +App::$strings["Delete Album"] = "Удалить альбом"; +App::$strings["Delete Photo"] = "Удалить фотографию"; +App::$strings["Public access denied."] = "Общественный доступ запрещен."; +App::$strings["No photos selected"] = "Никакие фотографии не выбраны"; +App::$strings["Access to this item is restricted."] = "Доступ к этому элементу ограничен."; +App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Вы использовали %1$.2f мегабайт из %2$.2f для хранения фото."; +App::$strings["%1$.2f MB photo storage used."] = "Вы использовали %1$.2f мегабайт для хранения фото."; +App::$strings["Upload Photos"] = "Загрузить фотографии"; +App::$strings["Enter an album name"] = "Введите название альбома"; +App::$strings["or select an existing album (doubleclick)"] = "или выберите существующий альбом (двойной щелчок)"; +App::$strings["Create a status post for this upload"] = "Сделать публикацию о статусе для этой загрузки"; +App::$strings["Description (optional)"] = "Описание (необязательно)"; +App::$strings["Show Newest First"] = "Показать новые первыми"; +App::$strings["Show Oldest First"] = "Показать старые первыми"; +App::$strings["Add Photos"] = "Добавить фотографии"; +App::$strings["Permission denied. Access to this item may be restricted."] = "Доступ запрещен. Доступ к этому элементу может быть ограничен."; +App::$strings["Photo not available"] = "Фотография не доступна"; +App::$strings["Use as profile photo"] = "Использовать в качестве фотографии профиля"; +App::$strings["Use as cover photo"] = "Использовать в качестве фотографии обложки"; +App::$strings["Private Photo"] = "Личная фотография"; +App::$strings["View Full Size"] = "Посмотреть в полный размер"; +App::$strings["Edit photo"] = "Редактировать фотографию"; +App::$strings["Rotate CW (right)"] = "Повернуть CW (направо)"; +App::$strings["Rotate CCW (left)"] = "Повернуть CCW (налево)"; +App::$strings["Move photo to album"] = "Переместить фотографию в альбом"; +App::$strings["Enter a new album name"] = "Введите новое название альбома"; +App::$strings["or select an existing one (doubleclick)"] = "или выбрать существующую (двойной щелчок)"; +App::$strings["Add a Tag"] = "Добавить тег"; +App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Пример: @bob, @Barbara_Jensen, @jim@example.com"; +App::$strings["Flag as adult in album view"] = "Пометить как альбом \"для взрослых\""; +App::$strings["Photo Tools"] = "Фото-Инструменты"; +App::$strings["In This Photo:"] = "На этой фотографии:"; +App::$strings["Map"] = "Карта"; +App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself may provide additional details."] = "Указанные хабы разрешают публичную регистрацию для сети \$Projectname. Все хабы в сети взаимосвязаны, поэтому членство в любом из них передает членство во всю сеть. Некоторым хабам может потребоваться подписка или предоставление многоуровневых планов обслуживания. Сам хаб может предоставить дополнительные сведения."; +App::$strings["Hub URL"] = "URL сервера"; App::$strings["Access Type"] = "Тип доступа"; -App::$strings["Registration Policy"] = "Правила регистрации"; -App::$strings["You must be logged in to see this page."] = "Вы должны авторизоваться, чтобы увидеть эту страницу."; -App::$strings["Insufficient permissions. Request redirected to profile page."] = ""; -App::$strings["Select a bookmark folder"] = ""; -App::$strings["Save Bookmark"] = "Сохранить закладки"; -App::$strings["URL of bookmark"] = ""; -App::$strings["Description"] = "Описание"; -App::$strings["Or enter new bookmark folder name"] = ""; -App::$strings["Room not found"] = ""; -App::$strings["Leave Room"] = ""; -App::$strings["Delete This Room"] = ""; -App::$strings["I am away right now"] = ""; -App::$strings["I am online"] = "Я в сети"; -App::$strings["Bookmark this room"] = ""; -App::$strings["New Chatroom"] = "Новый чат"; -App::$strings["Chatroom Name"] = "Название чата"; -App::$strings["%1\$s's Chatrooms"] = "Чаты пользователя %1\$s"; -App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = ""; -App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = ""; -App::$strings["Passwords do not match."] = "Пароли не совпадают."; -App::$strings["Registration successful. Please check your email for validation instructions."] = ""; -App::$strings["Your registration is pending approval by the site owner."] = ""; -App::$strings["Your registration can not be processed."] = "Ваша регистрация не может быть обработана."; -App::$strings["Registration on this site/hub is by approval only."] = ""; -App::$strings["Register at another affiliated site/hub"] = ""; -App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = ""; -App::$strings["Terms of Service"] = "Условия предоставления услуг"; -App::$strings["I accept the %s for this website"] = ""; -App::$strings["I am over 13 years of age and accept the %s for this website"] = ""; -App::$strings["Registration"] = "Регистрация"; -App::$strings["Membership on this site is by invitation only."] = ""; -App::$strings["Please enter your invitation code"] = "Пожалуйста, введите Ваш код приглашения"; -App::$strings["Your email address"] = "Ваш адрес электронной почты"; -App::$strings["Choose a password"] = "Выберите пароль"; -App::$strings["Please re-enter your password"] = "Пожалуйста, введите пароль еще раз"; -App::$strings["Away"] = "Нет на месте"; -App::$strings["Online"] = "Сейчас в сети"; -App::$strings["Please login."] = "Войдите пожалуйста."; -App::$strings["Hubzilla - Guests: Username: {your email address}, Password: +++"] = ""; -App::$strings["Remove This Channel"] = "Удалить этот канал"; -App::$strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = ""; -App::$strings["Please enter your password for verification:"] = "Пожалуйста, введите пароль для проверки:"; -App::$strings["Remove this channel and all its clones from the network"] = "Удалить этот канал и все его клоны из сети"; -App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = ""; -App::$strings["Remove Channel"] = "Удалить канал"; -App::$strings["No channel."] = "Не канал."; -App::$strings["Common connections"] = "Общие контакты"; -App::$strings["No connections in common."] = "Общих контактов нет."; -App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = ""; -App::$strings["The error message was:"] = "Сообщение об ошибке было:"; -App::$strings["Authentication failed."] = "Ошибка проверки подлинности."; -App::$strings["Remote Authentication"] = "Удаленная аутентификация"; -App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Введите адрес вашего канала (например: channel@example.com)"; -App::$strings["Authenticate"] = "Проверка подлинности"; +App::$strings["Registration Policy"] = "Политика регистрации"; +App::$strings["Stats"] = "Статистика"; +App::$strings["Software"] = "Программное обеспечение"; +App::$strings["Rate"] = "Оценка"; +App::$strings["View"] = "Просмотр"; App::$strings["Continue"] = "Продолжить"; App::$strings["Premium Channel Setup"] = "Установка премиум канала"; -App::$strings["Enable premium channel connection restrictions"] = ""; -App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = ""; -App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = ""; -App::$strings["Potential connections will then see the following text before proceeding:"] = ""; -App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = ""; -App::$strings["(No specific instructions have been provided by the channel owner.)"] = ""; +App::$strings["Enable premium channel connection restrictions"] = "Включить ограничения для премиум канала"; +App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Пожалуйста введите ваши ограничения или условия, такие, как оплата PayPal, правила использования и т.п."; +App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Этот канал до подключения может требовать дополнительных шагов или подтверждений следующих условий:"; +App::$strings["Potential connections will then see the following text before proceeding:"] = "Потенциальные соединения будут видеть следующий предварительный текст:"; +App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Продолжая, я подтверждаю что я выполнил все условия представленные на данной странице."; +App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Владельцем канала не было представлено никаких специальных инструкций.)"; App::$strings["Restricted or Premium Channel"] = "Ограниченный или Премиум канал"; -App::$strings["No such group"] = "Нет такой группы"; -App::$strings["Search Results For:"] = "Результаты поиска для:"; -App::$strings["Collection is empty"] = "Коллекция пуста"; -App::$strings["Collection: "] = "Коллекции: "; -App::$strings["Connection: "] = "Контакты: "; -App::$strings["Invalid connection."] = ""; -App::$strings["Could not access contact record."] = ""; -App::$strings["Could not locate selected profile."] = ""; -App::$strings["Connection updated."] = "Связи обновленны."; -App::$strings["Failed to update connection record."] = ""; -App::$strings["Blocked"] = "Заблокированные"; -App::$strings["Ignored"] = "Игнорируемые"; -App::$strings["Hidden"] = "Скрытые"; -App::$strings["Archived"] = "Зархивированные"; -App::$strings["All"] = "Все"; -App::$strings["Unconnected"] = "Неприсоединенные"; -App::$strings["Suggest new connections"] = "Предлагать новые контакты"; -App::$strings["New Connections"] = "Новые контакты"; -App::$strings["Show pending (new) connections"] = "Просмотр (новых) ждущих контактов"; -App::$strings["Show all connections"] = "Просмотр всех контактов"; -App::$strings["Unblocked"] = "Разрешенные"; -App::$strings["Only show unblocked connections"] = "Показать только разрешенные контакты"; +App::$strings["Poke somebody"] = "Ткнуть кого-нибудь"; +App::$strings["Poke/Prod"] = "Толкнуть / подтолкнуть"; +App::$strings["Poke, prod or do other things to somebody"] = "Толкнуть, подтолкнуть или сделать что-то ещё с кем-то"; +App::$strings["Recipient"] = "Получатель"; +App::$strings["Choose what you wish to do to recipient"] = "Выбрать что вы хотите сделать с получателем"; +App::$strings["Make this post private"] = "Сделать эту публикацию приватной"; +App::$strings["Unable to find your hub."] = "Невозможно найти ваш сервер"; +App::$strings["Post successful."] = "Успешно опубликовано."; +App::$strings["%s element installed"] = "%s элемент установлен"; +App::$strings["%s element installation failed"] = "%sустановка элемента неудачна."; +App::$strings["sent you a private message"] = "отправил вам личное сообщение"; +App::$strings["added your channel"] = "добавил ваш канал"; +App::$strings["requires approval"] = "Требуется подтверждение"; +App::$strings["g A l F d"] = "g A l F d"; +App::$strings["[today]"] = "[сегодня]"; +App::$strings["posted an event"] = "событие опубликовано"; +App::$strings["shared a file with you"] = "с вами поделились файлом"; +App::$strings["Private forum"] = "Частный форум"; +App::$strings["Public forum"] = "Публичный форум"; +App::$strings["Some blurb about what to do when you're new here"] = "Некоторые предложения о том, что делать, если вы здесь новичок "; +App::$strings["Active"] = "Активен"; +App::$strings["Blocked"] = "Заблокирован"; +App::$strings["Ignored"] = "Игнорируется"; +App::$strings["Hidden"] = "Скрыт"; +App::$strings["Archived/Unreachable"] = "Заархивировано / недоступно"; +App::$strings["Active Connections"] = "Активные контакты"; +App::$strings["Show active connections"] = "Показать активные контакты"; +App::$strings["Show pending (new) connections"] = "Просмотр (новых) ожидающих контактов"; App::$strings["Only show blocked connections"] = "Показать только заблокированные контакты"; App::$strings["Only show ignored connections"] = "Показать только проигнорированные контакты"; -App::$strings["Only show archived connections"] = "Показать только архивированные контакты"; +App::$strings["Only show archived/unreachable connections"] = "Показать только заархивированные / недоступные контакты"; App::$strings["Only show hidden connections"] = "Показать только скрытые контакты"; -App::$strings["Only show one-way connections"] = ""; -App::$strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]"; -App::$strings["Edit contact"] = "Редактировать контакт"; -App::$strings["Search your connections"] = "Поиск ваших связей"; -App::$strings["Finding: "] = "Поиск:"; +App::$strings["All Connections"] = "Все контакты"; +App::$strings["Show all connections"] = "Просмотр всех контактов"; +App::$strings["Pending approval"] = "Ожидающие подтверждения"; +App::$strings["Archived"] = "Зархивирован"; +App::$strings["Not connected at this location"] = "Не подключено в этом месте"; +App::$strings["%1\$s [%2\$s]"] = ""; +App::$strings["Edit connection"] = "Редактировать контакт"; +App::$strings["Delete connection"] = "Удалить контакт"; +App::$strings["Channel address"] = "Адрес канала"; +App::$strings["Network"] = "Сеть"; +App::$strings["Call"] = "Вызов"; +App::$strings["Status"] = "Статус"; +App::$strings["Connected"] = "Подключено"; +App::$strings["Approve connection"] = "Утвердить контакт"; +App::$strings["Ignore connection"] = "Игнорировать контакт"; +App::$strings["Ignore"] = "Игнорировать"; +App::$strings["Recent activity"] = "Последние действия"; +App::$strings["Search your connections"] = "Поиск ваших контактов"; +App::$strings["Connections search"] = "Поиск контаков"; +App::$strings["Unable to locate original post."] = "Не удалось найти оригинальную публикацию."; +App::$strings["Empty post discarded."] = "Пустая публикация отклонена."; +App::$strings["Duplicate post suppressed."] = "Подавлена дублирующаяся публикация."; +App::$strings["System error. Post not saved."] = "Системная ошибка. Публикация не сохранена."; +App::$strings["Your comment is awaiting approval."] = "Ваш комментарий ожидает одобрения."; +App::$strings["Unable to obtain post information from database."] = "Невозможно получить информацию о публикации из базы данных"; +App::$strings["You have reached your limit of %1$.0f top level posts."] = "Вы достигли вашего ограничения в %1$.0f публикаций высокого уровня."; +App::$strings["You have reached your limit of %1$.0f webpages."] = "Вы достигли вашего ограничения в %1$.0f страниц."; +App::$strings["Calendar entries imported."] = "События календаря импортированы."; +App::$strings["No calendar entries found."] = "Не найдено событий в календаре."; +App::$strings["Event can not end before it has started."] = "Событие не может завершиться до его начала."; +App::$strings["Unable to generate preview."] = "Невозможно создать предварительный просмотр."; +App::$strings["Event title and start time are required."] = "Требуются наименование события и время начала."; +App::$strings["Event not found."] = "Событие не найдено."; +App::$strings["Edit event title"] = "Редактировать наименование события"; +App::$strings["Categories (comma-separated list)"] = "Категории (список через запятую)"; +App::$strings["Edit Category"] = "Редактировать категорию"; +App::$strings["Category"] = "Категория"; +App::$strings["Edit start date and time"] = "Редактировать дату и время начала"; +App::$strings["Finish date and time are not known or not relevant"] = "Дата и время окончания неизвестны или неприменимы"; +App::$strings["Edit finish date and time"] = "Редактировать дату и время окончания"; +App::$strings["Finish date and time"] = "Дата и время окончания"; +App::$strings["Adjust for viewer timezone"] = "Настройте просмотр часовых поясов"; +App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Важно для событий, которые происходят в определённом месте. Не подходит для всеобщих праздников."; +App::$strings["Edit Description"] = "Редактировать описание"; +App::$strings["Edit Location"] = "Редактировать местоположение"; +App::$strings["Timezone:"] = "Часовой пояс:"; +App::$strings["Advanced Options"] = "Дополнительные настройки"; +App::$strings["l, F j"] = ""; +App::$strings["Edit event"] = "Редактировать событие"; +App::$strings["Delete event"] = "Удалить событие"; +App::$strings["calendar"] = "календарь"; +App::$strings["Edit Event"] = "Редактировать событие"; +App::$strings["Create Event"] = "Создать событие"; +App::$strings["Event removed"] = "Событие удалено"; +App::$strings["Failed to remove event"] = "Не удалось удалить событие"; +App::$strings["Layout Name"] = "Название шаблона"; +App::$strings["Layout Description (Optional)"] = "Описание шаблона (необязательно)"; +App::$strings["Comanche page description language help"] = "Помощь по языку описания страниц Comanche "; +App::$strings["Layout Description"] = "Описание шаблона"; +App::$strings["Created"] = "Создано"; +App::$strings["Edited"] = "Отредактировано"; +App::$strings["Download PDL file"] = "Загрузить PDL файл"; +App::$strings["No more system notifications."] = "Нет новых оповещений системы."; +App::$strings["System Notifications"] = "Системные оповещения "; +App::$strings["Layout updated."] = "Шаблон обновлен."; +App::$strings["Feature disabled."] = "Функция отключена."; +App::$strings["Edit System Page Description"] = "Редактировать описание системной страницы"; +App::$strings["(modified)"] = "(изменено)"; +App::$strings["Reset"] = "Сбросить"; +App::$strings["Layout not found."] = "Шаблон не найден."; +App::$strings["Module Name:"] = "Имя модуля:"; +App::$strings["Layout Help"] = "Помощь к шаблону"; +App::$strings["Edit another layout"] = "Редактировать другой шаблон"; +App::$strings["System layout"] = "Системный шаблон"; +App::$strings["Unable to lookup recipient."] = "Не удалось найти получателя."; +App::$strings["Unable to communicate with requested channel."] = "Не удалось установить связь с запрашиваемым каналом."; +App::$strings["Cannot verify requested channel."] = "Не удалось установить подлинность требуемого канала."; +App::$strings["Selected channel has private message restrictions. Send failed."] = "Выбранный канал ограничивает частные сообщения. Отправка не удалась."; +App::$strings["Messages"] = "Сообщения"; +App::$strings["message"] = "сообщение"; +App::$strings["Message recalled."] = "Сообщение отозванно."; +App::$strings["Conversation removed."] = "Разговор удален."; +App::$strings["Expires YYYY-MM-DD HH:MM"] = "Истекает YYYY-MM-DD HH:MM"; +App::$strings["Requested channel is not in this network"] = "Запрашиваемый канал не доступен."; +App::$strings["Send Private Message"] = "Отправить личное сообщение"; +App::$strings["To:"] = "Кому:"; +App::$strings["Subject:"] = "Тема:"; +App::$strings["Your message:"] = "Сообщение:"; +App::$strings["Attach file"] = "Прикрепить файл"; +App::$strings["Send"] = "Отправить"; +App::$strings["Delete message"] = "Удалить сообщение"; +App::$strings["Delivery report"] = "Отчёт о доставке"; +App::$strings["Recall message"] = "Отозвать сообщение"; +App::$strings["Message has been recalled."] = "Сообщение отозванно"; +App::$strings["Delete Conversation"] = "Удалить разговор"; +App::$strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Безопасная связь недоступна. Вы можете попытаться ответить со страницы профиля отправителя."; +App::$strings["Send Reply"] = "Отправить ответ"; +App::$strings["Your message for %s (%s):"] = "Ваше сообщение для %s (%s):"; +App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Удаление канала не разрешается в течении 48 часов после смены пароля у аккаунта."; +App::$strings["Remove This Channel"] = "Удалить этот канал"; +App::$strings["WARNING: "] = "ПРЕДУПРЕЖДЕНИЕ:"; +App::$strings["This channel will be completely removed from the network. "] = "Этот канал будет полностью удалён из сети."; +App::$strings["This action is permanent and can not be undone!"] = "Это действие необратимо и не может быть отменено!"; +App::$strings["Please enter your password for verification:"] = "Пожалуйста, введите ваш пароль для проверки:"; +App::$strings["Remove this channel and all its clones from the network"] = "Удалить этот канал и все его клоны из сети"; +App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "По умолчанию только представление канала расположенное на данном хабе будет удалено из сети"; +App::$strings["Remove Channel"] = "Удаление канала"; +App::$strings["Reset form"] = "Очистить форму"; +App::$strings["Welcome to Hubzilla!"] = "Добро пожаловать в Hubzilla!"; +App::$strings["You have got no unseen posts..."] = "У вас нет видимых публикаций..."; +App::$strings["Item not found"] = "Элемент не найден"; +App::$strings["Channel not found."] = "Канал не найден."; +App::$strings["Edit Card"] = "Редактировать карточку"; +App::$strings["Xchan Lookup"] = "Поиск Xchan"; +App::$strings["Lookup xchan beginning with (or webbie): "] = "Запрос Xchan начинается с (или webbie):"; +App::$strings["Not found."] = "Не найдено."; +App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Нет предложений. Если это новый сайт, повторите попытку через 24 часа."; +App::$strings["Posts and comments"] = "Публикации и комментарии"; +App::$strings["Only posts"] = "Только публикации"; +App::$strings["Insufficient permissions. Request redirected to profile page."] = "Недостаточно прав. Запрос перенаправлен на страницу профиля."; +App::$strings["Search Results For:"] = "Результаты поиска для:"; +App::$strings["Documentation Search"] = "Поиск документации"; +App::$strings["Members"] = "Участники"; +App::$strings["Administrators"] = "Администраторы"; +App::$strings["Developers"] = "Разработчики"; +App::$strings["Tutorials"] = "Руководства"; +App::$strings["\$Projectname Documentation"] = "\$Projectname Документация"; +App::$strings["Contents"] = "Содержимое"; +App::$strings["This site is not a directory server"] = "Этот сайт не является сервером каталога"; +App::$strings["Export Channel"] = "Экспорт канала"; +App::$strings["Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Экспортировать основную информацию из канала в файл. Служит в качестве резервной копии ваших контактов, основных данных и профиля, однако не включает содержимое. Может быть использовано для импорта ваши данных на новый сервер."; +App::$strings["Export Content"] = "Экспортировать содержимое"; +App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin."] = "Экспортировать информацию из вашего канала и его содержимое в резервную копию в формате JSON которая может быть использована для восстановления или импорта на другом сервере. Сохраняет все ваши контакты, разрешения, данные профиля и публикации за несколько месяцев. Файл может иметь очень большой размер. Пожалуйста, будьте терпеливы и подождите несколько минут пока не начнётся загрузка."; +App::$strings["Export your posts from a given year."] = "Экспортировать ваши публикации за данный год."; +App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Вы также можете экспортировать ваши публикации и беседы за определённый месяц или год. Выберите дату в панели местоположения в браузере. Если экспорт будет неудачным (это возможно, например, из-за исчерпания памяти на сервере), повторите попытку, выбрав меньший диапазон дат."; +App::$strings["To select all posts for a given year, such as this year, visit %2\$s"] = "Для выбора всех публикаций заданного года, например текущего, посетите %2\$s"; +App::$strings["To select all posts for a given month, such as January of this year, visit %2\$s"] = "Для выбора всех публикаций заданного месяца, например за январь сего года, посетите %2\$s"; +App::$strings["These content files may be imported or restored by visiting %2\$s on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Данные файлы с содержимым могут быть импортированы и восстановлены на любом содержащем ваш канал сайте. Посетите %2\$s. Для лучших результатов пожалуйста производите импорт и восстановление в порядке датировки (старые сначала)."; +App::$strings["Away"] = "Нет на месте"; +App::$strings["Online"] = "В сети"; +App::$strings["Invalid item."] = "Недействительный элемент."; +App::$strings["Authorize application connection"] = "Авторизовать подключение приложения"; +App::$strings["Return to your app and insert this Security Code:"] = "Вернитесь к своему приложению и вставьте этот код безопасности:"; +App::$strings["Please login to continue."] = "Пожалуйста, войдите, чтобы продолжить."; +App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Вы хотите авторизовать это приложение для доступа к вашим публикациям и контактам и / или созданию новых публикаций?"; +App::$strings["item"] = "пункт"; +App::$strings["No ratings"] = "Оценок нет"; +App::$strings["Rating: "] = "Оценкa:"; +App::$strings["Website: "] = "Веб-сайт:"; +App::$strings["Description: "] = "Описание:"; +App::$strings["Failed to create source. No channel selected."] = "Не удалось создать источник. Канал не выбран."; +App::$strings["Source created."] = "Источник создан."; +App::$strings["Source updated."] = "Источник обновлен."; +App::$strings["*"] = ""; +App::$strings["Manage remote sources of content for your channel."] = "Управлять удалённым источниками содержимого для вашего канала"; +App::$strings["New Source"] = "Новый источник"; +App::$strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Импортировать всё или выбранное содержимое из следующего канала в этот канал и распределить его в соответствии с вашими настройками."; +App::$strings["Only import content with these words (one per line)"] = "Импортировать содержимое только с этим текстом (построчно)"; +App::$strings["Leave blank to import all public content"] = "Оставьте пустым для импорта всего общедоступного содержимого"; +App::$strings["Channel Name"] = "Название канала"; +App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "Добавить следующие категории к импортированным публикациям из этого источника (через запятые)"; +App::$strings["Optional"] = "Необязательно"; +App::$strings["Resend posts with this channel as author"] = "Отправить публикации в этот канал повторно как автор"; +App::$strings["Copyrights may apply"] = "Могут применяться авторские права"; +App::$strings["Source not found."] = "Источник не найден."; +App::$strings["Edit Source"] = "Редактировать источник"; +App::$strings["Delete Source"] = "Удалить источник"; +App::$strings["Source removed"] = "Источник удален"; +App::$strings["Unable to remove source."] = "Невозможно удалить источник."; +App::$strings["About this site"] = "Об этом сайте"; +App::$strings["Site Name"] = "Название сайта"; +App::$strings["Site Information"] = "Информация о сайте"; +App::$strings["Administrator"] = "Администратор"; +App::$strings["Terms of Service"] = "Условия предоставления услуг"; +App::$strings["Software and Project information"] = "Информация о программном обеспечении и проекте"; +App::$strings["This site is powered by \$Projectname"] = "Этот сайт работает на \$Projectname"; +App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "Объединенные и децентрализованные сети и службы идентификациии обеспечиваются Zot"; +App::$strings["Additional federated transport protocols:"] = "Дополнительные федеративные транспортные протоколы:"; +App::$strings["Version %s"] = "Версия %s"; +App::$strings["Project homepage"] = "Домашняя страница проекта"; +App::$strings["Developer homepage"] = "Домашняя страница разработчика"; +App::$strings["Image uploaded but image cropping failed."] = "Изображение загружено но обрезка не удалась."; +App::$strings["Image resize failed."] = "Не удалось изменить размер изображения."; +App::$strings["Image upload failed."] = "Загрузка изображения не удалась."; +App::$strings["Unable to process image."] = "Невозможно обработать изображение."; +App::$strings["Photo not available."] = "Фотография недоступна."; +App::$strings["Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile"] = "Фотография вашего профиля по умолчанию видна всем в Интернете. Фотографияпрофиля для альтернативных профилей наследуют разрешения текущего профиля"; +App::$strings["Your profile photo is visible to anybody on the internet and may be distributed to other websites."] = "Фотография вашего профиля видна всем в Интернете и может быть отправлена на другие сайты."; +App::$strings["Upload File:"] = "Загрузить файл:"; +App::$strings["Select a profile:"] = "Выбрать профиль:"; +App::$strings["Use Photo for Profile"] = "Использовать фотографию для профиля"; +App::$strings["Change Profile Photo"] = "Изменить фотографию профиля"; +App::$strings["Use"] = "Использовать"; +App::$strings["Use a photo from your albums"] = "Использовать фотографию из ваших альбомов"; +App::$strings["Choose a different album"] = "Выбрать другой альбом"; +App::$strings["Select existing photo"] = "Выбрать существующую фотографию"; +App::$strings["Crop Image"] = "Обрезать изображение"; +App::$strings["Please adjust the image cropping for optimum viewing."] = "Пожалуйста настройте обрезку изображения для оптимального просмотра."; +App::$strings["Done Editing"] = "Закончить редактирование"; +App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s отслеживает %2\$s's %3\$s"; +App::$strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s прекратил отслеживать %2\$s's %3\$s"; +App::$strings["No channel."] = "Канала нет."; +App::$strings["No connections in common."] = "Общих контактов нет."; +App::$strings["View Common Connections"] = "Просмотр общий контактов"; +App::$strings["Permission Denied."] = "Доступ запрещен."; +App::$strings["File not found."] = "Файл не найден."; +App::$strings["Edit file permissions"] = "Редактировать разрешения файла"; +App::$strings["Set/edit permissions"] = "Редактировать разрешения"; +App::$strings["Include all files and sub folders"] = "Включить все файлы и подкаталоги"; +App::$strings["Return to file list"] = "Вернутся к списку файлов"; +App::$strings["Copy/paste this code to attach file to a post"] = "Копировать / вставить этот код для прикрепления файла к публикации"; +App::$strings["Copy/paste this URL to link file from a web page"] = "Копировать / вставить эту URL для ссылки на файл со страницы"; +App::$strings["Share this file"] = "Поделиться этим файлом"; +App::$strings["Show URL to this file"] = "Показать URL этого файла"; +App::$strings["Show in your contacts shared folder"] = "Показать общий каталог в ваших контактах"; +App::$strings["Post not found."] = "Публикация не найдена"; +App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s отметил тегом %2\$s %3\$s с %4\$s"; +App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Бля бля бля Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; +App::$strings["Block Name"] = "Название блока"; +App::$strings["Edit Block"] = "Редактировать блок"; +App::$strings["Item is not editable"] = "Элемент нельзя редактировать"; App::$strings["Edit post"] = "Редактировать сообщение"; -App::$strings["Could not access address book record."] = ""; -App::$strings["Refresh failed - channel is currently unavailable."] = ""; -App::$strings["Channel has been unblocked"] = "Канал разблокирован"; -App::$strings["Channel has been blocked"] = "Канал заблокирован"; -App::$strings["Unable to set address book parameters."] = ""; -App::$strings["Channel has been unignored"] = "Канал не проигнорирован"; -App::$strings["Channel has been ignored"] = "Канал проигнорирован"; -App::$strings["Channel has been unarchived"] = "Канал разархивирован"; -App::$strings["Channel has been archived"] = "Канал заархивирован"; -App::$strings["Channel has been unhidden"] = "Канал открыт"; -App::$strings["Channel has been hidden"] = "Канал скрыт"; -App::$strings["Channel has been approved"] = "Канал одобрен"; -App::$strings["Channel has been unapproved"] = "Канал не одобрен"; -App::$strings["Connection has been removed."] = "Соединение было удалено."; -App::$strings["View %s's profile"] = "Просмотр %s's профиля"; +App::$strings["Tag removed"] = "Тег удалён"; +App::$strings["Remove Item Tag"] = "Удалить тег элемента"; +App::$strings["Select a tag to remove: "] = "Выбрать тег для удаления:"; +App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Удаление канала не разрешается в течении 48 часов после смены пароля у аккаунта."; +App::$strings["Remove This Account"] = "Удалить этот аккаунт"; +App::$strings["This account and all its channels will be completely removed from the network. "] = "Этот аккаунт и все его каналы будут полностью удалены из сети."; +App::$strings["Remove this account, all its channels and all its channel clones from the network"] = "Удалить этот аккаунт, все его каналы и их клоны из сети."; +App::$strings["By default only the instances of the channels located on this hub will be removed from the network"] = "По умолчанию только представление канала расположенное на данном хабе будет удалено из сети"; +App::$strings["Remove Account"] = "Удалить аккаунт"; +App::$strings["Blocked accounts"] = "Заблокированные аккаунты"; +App::$strings["Expired accounts"] = "Просроченные аккаунты"; +App::$strings["Expiring accounts"] = "Близкие к просрочке аккаунты"; +App::$strings["Primary"] = "Основной"; +App::$strings["Clones"] = "Клоны"; +App::$strings["Message queues"] = "Очередь сообщений"; +App::$strings["Your software should be updated"] = "Ваше программное обеспечение должно быть обновлено"; +App::$strings["Administration"] = "Администрирование"; +App::$strings["Summary"] = "Резюме"; +App::$strings["Registered accounts"] = "Зарегистрированные аккаунты"; +App::$strings["Pending registrations"] = "Ждут утверждения"; +App::$strings["Registered channels"] = "Зарегистрированные каналы"; +App::$strings["Active addons"] = "Активные расширения"; +App::$strings["Version"] = "Версия системы"; +App::$strings["Repository version (master)"] = "Версия репозитория (master)"; +App::$strings["Repository version (dev)"] = "Версия репозитория (dev)"; +App::$strings["Could not access contact record."] = "Не удалось получить доступ к записи контакта."; +App::$strings["Could not locate selected profile."] = "Не удалось обнаружить выбранный профиль."; +App::$strings["Connection updated."] = "Контакты обновлены."; +App::$strings["Failed to update connection record."] = "Не удалось обновить запись контакта."; +App::$strings["is now connected to"] = "теперь подключён к"; +App::$strings["Could not access address book record."] = "Не удалось получить доступ к записи адресной книги."; +App::$strings["Refresh failed - channel is currently unavailable."] = "Обновление невозможно - в настоящее время канал недоступен."; +App::$strings["Unable to set address book parameters."] = "Не удалось получить доступ к параметрам адресной книги."; +App::$strings["Connection has been removed."] = "Контакт был удалён."; +App::$strings["View %s's profile"] = "Просмотр %s профиля"; App::$strings["Refresh Permissions"] = "Обновить разрешения"; -App::$strings["Fetch updated permissions"] = ""; -App::$strings["Recent Activity"] = ""; -App::$strings["View recent posts and comments"] = ""; -App::$strings["Unblock"] = "Разрешить"; -App::$strings["Block"] = "Заблокировать"; -App::$strings["Block or Unblock this connection"] = "Запретить или разрешить этот канал"; +App::$strings["Fetch updated permissions"] = "Получить обновлённые разрешения"; +App::$strings["Refresh Photo"] = "Обновить фотографию"; +App::$strings["Fetch updated photo"] = "Получить обновлённую фотографию"; +App::$strings["View recent posts and comments"] = "Просмотреть последние публикации и комментарии"; +App::$strings["Unblock"] = "Разблокировать"; +App::$strings["Block"] = "Блокировать"; +App::$strings["Block (or Unblock) all communications with this connection"] = "Блокировать (или разблокировать) связи с этим контактом"; +App::$strings["This connection is blocked!"] = "Этот контакт заблокирован!"; App::$strings["Unignore"] = "Не игнорировать"; -App::$strings["Ignore"] = "Игнорировать"; -App::$strings["Ignore or Unignore this connection"] = "Игнорировать или не игнорировать этот канал"; +App::$strings["Ignore (or Unignore) all inbound communications from this connection"] = "Игнорировать (или не игнорировать) все связи для этого контакта"; +App::$strings["This connection is ignored!"] = "Этот контакт игнорируется!"; App::$strings["Unarchive"] = "Разархивировать"; App::$strings["Archive"] = "Заархивировать"; -App::$strings["Archive or Unarchive this connection"] = " Заархивировать или разархивировать этот канал"; -App::$strings["Unhide"] = "Показать"; -App::$strings["Hide"] = "Скрыть"; -App::$strings["Hide or Unhide this connection"] = "Скрыть или показывать этот канал"; -App::$strings["Delete this connection"] = "Удалить этот контакт"; -App::$strings["Approve this connection"] = "Утвердить этот контакт"; -App::$strings["Accept connection to allow communication"] = ""; -App::$strings["Automatic Permissions Settings"] = "Настройки автоматических разрешений"; -App::$strings["Connections: settings for %s"] = ""; -App::$strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = ""; -App::$strings["Slide to adjust your degree of friendship"] = ""; -App::$strings["inherited"] = "унаследованный"; -App::$strings["Connection has no individual permissions!"] = ""; -App::$strings["This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."] = ""; -App::$strings["Profile Visibility"] = "Видимость профиля"; -App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = ""; -App::$strings["Contact Information / Notes"] = "Информация / Примечания о канале"; -App::$strings["Edit contact notes"] = "Редактировать примечания канала"; -App::$strings["Their Settings"] = "Их настройки"; -App::$strings["My Settings"] = "Мои настройки"; -App::$strings["Clear/Disable Automatic Permissions"] = ""; -App::$strings["Forum Members"] = "Участники форума"; -App::$strings["Soapbox"] = "Soapbox"; -App::$strings["Full Sharing (typical social network permissions)"] = ""; -App::$strings["Cautious Sharing "] = ""; -App::$strings["Follow Only"] = "Только следовать"; -App::$strings["Individual Permissions"] = "Индивидуальные разрешения"; -App::$strings["Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = ""; -App::$strings["Advanced Permissions"] = "Дополнительные разрешения"; -App::$strings["Simple Permissions (select one and submit)"] = ""; -App::$strings["Visit %s's profile - %s"] = "Посетить %s's ​​профиль - %s"; -App::$strings["Block/Unblock contact"] = "Запретить/разрешить контакт"; -App::$strings["Ignore contact"] = "Игнорировать контакт"; -App::$strings["Repair URL settings"] = "Ремонт настройки URL"; -App::$strings["View conversations"] = "Просмотр разговоров"; -App::$strings["Delete contact"] = "Удалить контакт"; -App::$strings["Last update:"] = "Последнее обновление:"; -App::$strings["Update public posts"] = "Обновить публичные сообщения"; -App::$strings["Update now"] = "Обновить сейчас"; -App::$strings["Currently blocked"] = "В настоящее время заблокирован"; -App::$strings["Currently ignored"] = "В настоящее время игнорируются"; -App::$strings["Currently archived"] = "В настоящее время зархивированны"; -App::$strings["Currently pending"] = "В настоящее время в ожидании"; -App::$strings["Hide this contact from others"] = "Скрыть этот канал от других"; -App::$strings["Replies/likes to your public posts may still be visible"] = ""; -App::$strings["No potential page delegates located."] = ""; -App::$strings["Delegate Page Management"] = ""; -App::$strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = ""; -App::$strings["Existing Page Managers"] = ""; -App::$strings["Existing Page Delegates"] = ""; -App::$strings["Potential Delegates"] = ""; -App::$strings["Remove"] = "Удалить"; -App::$strings["Add"] = "Добавить"; -App::$strings["No entries."] = "Нет записей."; -App::$strings["Public access denied."] = "Общественный доступ запрещен."; -App::$strings["Gender: "] = "Пол:"; -App::$strings["Finding:"] = "Поиск:"; -App::$strings["next page"] = "следующая страница"; -App::$strings["previous page"] = "предыдущая страница"; -App::$strings["No entries (some entries may be hidden)."] = ""; -App::$strings["Status: "] = "Статус:"; -App::$strings["Sexual Preference: "] = "Сексуальная ориентация:"; -App::$strings["Homepage: "] = "Домашняя страница:"; -App::$strings["Hometown: "] = "Город проживания:"; -App::$strings["About: "] = "О себе:"; -App::$strings["Keywords: "] = "Ключевые слова:"; -App::$strings["This site is not a directory server"] = "Этот сайт не является сервером каталога"; -App::$strings["Hubzilla - "The Network""] = ""; -App::$strings["Welcome to %s"] = "Добро пожаловать в %s"; -App::$strings["Hubzilla Server - Setup"] = "Hubzilla Сервер - Установка"; +App::$strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Заархивировать (или разархивировать) этот контакт - пометить канал отключённым но сохранить содержимое"; +App::$strings["This connection is archived!"] = "Этот контакт заархивирован!"; +App::$strings["Unhide"] = "Показать"; +App::$strings["Hide"] = "Скрыть"; +App::$strings["Hide or Unhide this connection from your other connections"] = "Скрыть или показать этот контакт от / для остальных"; +App::$strings["This connection is hidden!"] = "Этот контакт скрыт!"; +App::$strings["Delete this connection"] = "Удалить этот контакт"; +App::$strings["Fetch Vcard"] = "Получить vCard"; +App::$strings["Fetch electronic calling card for this connection"] = "Получить электронную телефонную карточку для этого контакта"; +App::$strings["Open Individual Permissions section by default"] = "Открывать раздел \"Индивидуальные разрешения\" по умолчанию"; +App::$strings["Affinity"] = "Сходство"; +App::$strings["Open Set Affinity section by default"] = "Открыть секцию установления сходства по умолчанию"; +App::$strings["Filter"] = "Фильтр"; +App::$strings["Open Custom Filter section by default"] = "Открывать секцию \"Настраиваемый фильтр\" по умолчанию"; +App::$strings["Approve this connection"] = "Утвердить этот контакт"; +App::$strings["Accept connection to allow communication"] = "Принять контакт чтобы разрешить связь"; +App::$strings["Set Affinity"] = "Установить сходство"; +App::$strings["Set Profile"] = "Установить профиль"; +App::$strings["Set Affinity & Profile"] = "Установить сходство и профиль"; +App::$strings["This connection is unreachable from this location."] = "Этот контакт недоступен для данного местоположения"; +App::$strings["This connection may be unreachable from other channel locations."] = "Этот контакт может быть недоступен из других мест размещения канала"; +App::$strings["Location independence is not supported by their network."] = "Независимое местоположение не поддерживается их сетью."; +App::$strings["This connection is unreachable from this location. Location independence is not supported by their network."] = "Этот контакт недоступен из данного местоположения. Независимое местоположение не поддерживается их сетью."; +App::$strings["Apply these permissions automatically"] = "Применить эти разрешения автоматически"; +App::$strings["Connection requests will be approved without your interaction"] = "Запросы контактов будут одобрены без вашего участия"; +App::$strings["Permission role"] = "Роль разрешения"; +App::$strings["Add permission role"] = "Добавить роль разрешения"; +App::$strings["This connection's primary address is"] = "Главный адрес это контакта"; +App::$strings["Available locations:"] = "Доступные расположения:"; +App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Разрешения, указанные на этой странице, будут применяться ко всем новым соединениям."; +App::$strings["Connection Tools"] = "Инструменты контактов"; +App::$strings["Slide to adjust your degree of friendship"] = "Прокрутить для настройки степени дружбы"; +App::$strings["Slide to adjust your rating"] = "Прокрутить для настройки оценки"; +App::$strings["Optionally explain your rating"] = "Объясните свою оценку (не обязательно)"; +App::$strings["Custom Filter"] = "Настраиваемый фильтр"; +App::$strings["Only import posts with this text"] = "Импортировать публикации только с этим текстом"; +App::$strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "слова по одному в строку, #тег, /шаблон/ или lang=xxl; оставьте пустым для импорта всех публикаций"; +App::$strings["Do not import posts with this text"] = "Не импортировать публикации с этим текстом"; +App::$strings["This information is public!"] = "Эта информация общедоступна!"; +App::$strings["Connection Pending Approval"] = "Ожидающие подтверждения контактов"; +App::$strings["inherited"] = "наследуется"; +App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Пожалуйста, выберите профиль который вы хотит показывать в %s при безопасном просмотре."; +App::$strings["Their Settings"] = "Их настройки"; +App::$strings["My Settings"] = "Мои настройки"; +App::$strings["Individual Permissions"] = "Индивидуальные разрешения"; +App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can not change those settings here."] = "Некоторые разрешения могут наследовать из настроек приватности ваших каналов которые могут иметь более высокий приоритет чем индивидуальные. Вы не можете менять эти настройки здесь."; +App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Некоторые разрешения могут быть унаследованы из настроек приватности вашего канала, которые могут иметь более высокий приоритет чем индивидуальные. Вы можете изменить эти настройки, однако они не будут применены до изменения переданных по наследству настроек."; +App::$strings["Last update:"] = "Последнее обновление:"; +App::$strings["Details"] = "Сведения"; +App::$strings["Import Webpage Elements"] = "Импортировать части веб-страницы"; +App::$strings["Import selected"] = "Импортировать выбранное"; +App::$strings["Export Webpage Elements"] = "Экспортировать часть веб-страницы"; +App::$strings["Export selected"] = "Экспортировать выбранное"; +App::$strings["Actions"] = "Действия"; +App::$strings["Page Link"] = "Ссылка страницы"; +App::$strings["Page Title"] = "Заголовок страницы"; +App::$strings["Invalid file type."] = "Неверный тип файла."; +App::$strings["Error opening zip file"] = "Ошибка открытия ZIP файла"; +App::$strings["Invalid folder path."] = "Неверный путь к каталогу."; +App::$strings["No webpage elements detected."] = "Не обнаружено частей веб-страницы."; +App::$strings["Import complete."] = "Импорт завершен."; +App::$strings["Page link"] = "Ссылка страницы"; +App::$strings["Edit Webpage"] = "Редактировать веб-страницу"; +App::$strings["Edit Layout"] = "Редактировать шаблон"; +App::$strings["This directory server requires an access token"] = "Для доступа к этому серверу каталогов требуется токен"; +App::$strings["Comment approved"] = "Комментарий одобрен"; +App::$strings["Comment deleted"] = "Комментарий удалён"; +App::$strings["Add Article"] = "Добавить статью"; +App::$strings["Bookmark added"] = "Закладка добавлена"; +App::$strings["My Bookmarks"] = "Мои закладки"; +App::$strings["My Connections Bookmarks"] = "Закладки моих контактов"; +App::$strings["Files: shared with me"] = "Файлы: поделились со мной"; +App::$strings["NEW"] = "НОВОЕ"; +App::$strings["Last Modified"] = "Последнее изменение"; +App::$strings["Remove all files"] = "Удалить все файлы"; +App::$strings["Remove this file"] = "Удалить этот файл"; +App::$strings["Select a bookmark folder"] = "Выбрать каталог для закладок"; +App::$strings["Save Bookmark"] = "Сохранить закладку"; +App::$strings["URL of bookmark"] = "URL закладки"; +App::$strings["Or enter new bookmark folder name"] = "или введите новое имя каталога закладок"; +App::$strings["Permissions denied."] = "Доступ запрещен."; +App::$strings["Unknown App"] = "Неизвестное приложение"; +App::$strings["Authorize"] = "Авторизовать"; +App::$strings["Do you authorize the app %s to access your channel data?"] = "Авторизуете ли вы приложение %s для доступа к данным вашего канала?"; +App::$strings["Allow"] = "Разрешить"; +App::$strings["Deny"] = "Запретить"; +App::$strings["Items tagged with: %s"] = "Объекты помечены как: %s"; +App::$strings["Search results for: %s"] = "Результаты поиска для: %s"; +App::$strings["\$Projectname Server - Setup"] = "\$Projectname сервер - Установка"; App::$strings["Could not connect to database."] = "Не удалось подключиться к серверу баз данных."; -App::$strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = ""; +App::$strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Не удалось подключиться к указанному URL. Вероятно проблема с SSL сертификатом или DNS."; App::$strings["Could not create table."] = "Не удалось создать таблицу."; App::$strings["Your site database has been installed."] = "Ваша база данных установлена."; -App::$strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = ""; +App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Вам может понадобится импортировать файл \"install/schema_xxx.sql\" вручную используя клиент базы данных."; App::$strings["Please see the file \"install/INSTALL.txt\"."] = "Пожалуйста, обратитесь к файлу \"install/INSTALL.txt\"."; App::$strings["System check"] = "Проверка системы"; -App::$strings["Next"] = "Следующая"; -App::$strings["Check again"] = "Проверить снова"; +App::$strings["Check again"] = "Перепроверить"; App::$strings["Database connection"] = "Подключение к базе данных"; -App::$strings["In order to install Hubzilla we need to know how to connect to your database."] = ""; -App::$strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = ""; -App::$strings["The database you specify below should already exist. If it does not, please create it before continuing."] = ""; -App::$strings["Database Server Name"] = "Имя сервера базы данных"; -App::$strings["Default is localhost"] = "По умолчанию localhost"; -App::$strings["Database Port"] = "Порт базы данных"; +App::$strings["In order to install \$Projectname we need to know how to connect to your database."] = "Для установки \$Projectname необходимо знать как подключиться к ваше базе данных."; +App::$strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Пожалуйста, свяжитесь с вашим хостинг провайдером или администрацией сайта если у вас есть вопросы об этих настройках."; +App::$strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Указанная ниже база данных должна существовать. Если это не так, пожалуйста, создайте её перед тем, как продолжить."; +App::$strings["Database Server Name"] = "Имя сервера баз данных"; +App::$strings["Default is 127.0.0.1"] = "По умолчанию 127.0.0.1"; +App::$strings["Database Port"] = "Порт сервера баз данных"; App::$strings["Communication port number - use 0 for default"] = "Порт коммуникации - используйте 0 по умолчанию"; App::$strings["Database Login Name"] = "Имя для подключения к базе данных"; App::$strings["Database Login Password"] = "Пароль для подключения к базе данных"; App::$strings["Database Name"] = "Имя базы данных"; +App::$strings["Database Type"] = "Тип базы данных"; App::$strings["Site administrator email address"] = "Адрес электронной почты администратора сайта"; -App::$strings["Your account email address must match this in order to use the web admin panel."] = ""; +App::$strings["Your account email address must match this in order to use the web admin panel."] = "Ваш адрес электронной почты должен соответствовать этому для использования веб-панели администратора."; App::$strings["Website URL"] = "URL веб-сайта"; App::$strings["Please use SSL (https) URL if available."] = "Пожалуйста, используйте SSL (https) URL если возможно."; App::$strings["Please select a default timezone for your website"] = "Пожалуйста, выберите часовой пояс по умолчанию для вашего сайта"; App::$strings["Site settings"] = "Настройки сайта"; -App::$strings["Could not find a command line version of PHP in the web server PATH."] = ""; -App::$strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = ""; -App::$strings["PHP executable path"] = "PHP executable путь"; -App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = ""; -App::$strings["Command line PHP"] = "Command line PHP"; -App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = ""; -App::$strings["This is required for message delivery to work."] = "Это требуется для доставки сообщений."; -App::$strings["PHP register_argc_argv"] = "PHP register_argc_argv"; -App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = ""; +App::$strings["PHP version 5.5 or greater is required."] = "Требуется PHP версии 5.5 или выше"; +App::$strings["PHP version"] = "Версия PHP"; +App::$strings["Could not find a command line version of PHP in the web server PATH."] = "Не удалось найти консольную версию PHP в путях переменной PATH веб-сервера."; +App::$strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Если у вас на сервере не установлена консольная версия PHP вы не сможете запустить фоновый опрос через cron. "; +App::$strings["PHP executable path"] = "Пусть к исполняемому модулю PHP"; +App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Введите полный путь к исполняемому модулю PHP. Вы можете оставить его пустым для продолжения установки."; +App::$strings["Command line PHP"] = "Командная строка PHP"; +App::$strings["Unable to check command line PHP, as shell_exec() is disabled. This is required."] = "Невозможно проверить командную строку PHP поскольку требуемая функция shell_exec() отключена."; +App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "В консольной версии PHP в вашей системе отключена опция \"register_argc_argv\". "; +App::$strings["This is required for message delivery to work."] = "Это необходимо для функционирования доставки сообщений."; +App::$strings["PHP register_argc_argv"] = ""; +App::$strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "Максимально разрешённый общий размер загрузок установлен в %s. Максимальный размер одной загрузки установлен в %s. Вам разрешено загружать до %d файлов за один приём."; +App::$strings["You can adjust these settings in the server php.ini file."] = "Вы можете изменить эти настройки в файле php.ini на сервере."; +App::$strings["PHP upload limits"] = "Максимальный размер загрузки в PHP"; +App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Ошибка: функция \"openssl_pkey_new\" не может сгенерировать ключи шифрования"; App::$strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Если работаете под Windows, см. \"http://www.php.net/manual/en/openssl.installation.php\"."; App::$strings["Generate encryption keys"] = "Генерация ключей шифрования"; -App::$strings["libCurl PHP module"] = "libCurl PHP модуль"; -App::$strings["GD graphics PHP module"] = "GD graphics PHP модуль"; -App::$strings["OpenSSL PHP module"] = "OpenSSL PHP модуль"; -App::$strings["mysqli PHP module"] = "mysqli PHP модуль"; -App::$strings["mb_string PHP module"] = "mb_string PHP модуль"; -App::$strings["mcrypt PHP module"] = "mcrypt PHP модуль"; -App::$strings["Apache mod_rewrite module"] = "Apache mod_rewrite модуль"; -App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Ошибка: Apache веб-сервер модуль mod-rewrite требуется, но не установлен."; -App::$strings["proc_open"] = "proc_open"; -App::$strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Ошибка: proc_open требуется, но не установлен или отключен в php.ini"; -App::$strings["Error: libCURL PHP module required but not installed."] = "Ошибка: Модуль libCURL PHP требуется, но не установлен."; -App::$strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Ошибка: GD graphics PHP модуль с поддержкой JPEG требуется, но не установлен."; -App::$strings["Error: openssl PHP module required but not installed."] = "Ошибка: openssl PHP модуль требуется, но не установлен."; -App::$strings["Error: mysqli PHP module required but not installed."] = "Ошибка: mysqli PHP модуль требуется, но не установлен."; -App::$strings["Error: mb_string PHP module required but not installed."] = "Ошибка: mb_string PHP модуль требуется, но не установлен."; -App::$strings["Error: mcrypt PHP module required but not installed."] = "Ошибка: mcrypt PHP модуль требуется, но не установлен."; -App::$strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Веб-установщик должен быть в состоянии создать файл с именем \".htconfig.php\" в верхней папке вашего веб-сервера, но он не в состоянии сделать это."; +App::$strings["libCurl PHP module"] = ""; +App::$strings["GD graphics PHP module"] = ""; +App::$strings["OpenSSL PHP module"] = ""; +App::$strings["PDO database PHP module"] = ""; +App::$strings["mb_string PHP module"] = ""; +App::$strings["xml PHP module"] = ""; +App::$strings["zip PHP module"] = ""; +App::$strings["Apache mod_rewrite module"] = ""; +App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Ошибка: требуемый модуль mod_rewrite веб-сервера Apache не установлен."; +App::$strings["exec"] = ""; +App::$strings["Error: exec is required but is either not installed or has been disabled in php.ini"] = ""; +App::$strings["shell_exec"] = ""; +App::$strings["Error: shell_exec is required but is either not installed or has been disabled in php.ini"] = ""; +App::$strings["Error: libCURL PHP module required but not installed."] = ""; +App::$strings["Error: GD graphics PHP module with JPEG support required but not installed."] = ""; +App::$strings["Error: openssl PHP module required but not installed."] = ""; +App::$strings["Error: PDO database PHP module required but not installed."] = ""; +App::$strings["Error: mb_string PHP module required but not installed."] = ""; +App::$strings["Error: xml PHP module required for DAV but not installed."] = ""; +App::$strings["Error: zip PHP module required but not installed."] = ""; +App::$strings[".htconfig.php is writable"] = ""; +App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = ""; App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = ""; -App::$strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = ""; -App::$strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Вы можете пропустить эту процедуру и выполнить установку вручную. Обратитесь к файлу \"install/INSTALL.txt\" для получения инструкций."; -App::$strings[".htconfig.php is writable"] = ".htconfig.php доступен для записи"; -App::$strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = ""; -App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory view/tpl/smarty3/ under the Red top level folder."] = ""; +App::$strings["Please see install/INSTALL.txt for additional information."] = ""; +App::$strings["This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = ""; +App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = ""; App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = ""; -App::$strings["Note: as a security measure, you should give the web server write access to view/tpl/smarty3/ only--not the template files (.tpl) that it contains."] = ""; -App::$strings["view/tpl/smarty3 is writable"] = "view/tpl/smarty3 доступен для записи"; -App::$strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = ""; -App::$strings["store is writable"] = ""; +App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = ""; +App::$strings["%s is writable"] = "%s доступен для записи"; +App::$strings["This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"] = "Эта программа использует каталог хранения для загруженных файлов. Для веб-сервера требуется доступ на запись начиная с верхнего уровня каталога хранения."; +App::$strings["store is writable"] = "хранилище доступно для записи"; App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = ""; App::$strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = ""; -App::$strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = ""; -App::$strings["If your certificate is not recognised, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = ""; +App::$strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Эти ограничения приняты поскольку ваши общедоступные публикации могут, например, содержать ссылки на изображения на вашем собственном хабе."; +App::$strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = ""; App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = ""; App::$strings["Providers are available that issue free certificates which are browser-valid."] = ""; -App::$strings["SSL certificate validation"] = "проверка сертификата SSL"; -App::$strings["Url rewrite in .htaccess is not working. Check your server configuration."] = ""; -App::$strings["Url rewrite is working"] = "Url rewrite работает"; +App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = ""; +App::$strings["SSL certificate validation"] = ""; +App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = ""; +App::$strings["Url rewrite is working"] = "Перезапись URL работает"; App::$strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = ""; -App::$strings["Errors encountered creating database tables."] = ""; -App::$strings["

      What next

      "] = "

      Что дальше

      "; -App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = ""; -App::$strings["Item not found"] = "Элемент не найден"; -App::$strings["Edit Block"] = "Редактировать блок"; -App::$strings["Delete block?"] = "Удалить блок?"; -App::$strings["Insert YouTube video"] = "Вставить YouTube видео"; -App::$strings["Insert Vorbis [.ogg] video"] = "Вставить Vorbis [.ogg] видео"; -App::$strings["Insert Vorbis [.ogg] audio"] = "Вставить Vorbis [.ogg] музыку"; -App::$strings["Delete Block"] = "Удалить блок"; -App::$strings["Layout updated."] = "Шаблон обновлен."; -App::$strings["Edit System Page Description"] = ""; -App::$strings["Layout not found."] = "Шаблон не найден"; -App::$strings["Module Name:"] = "Имя модуля:"; -App::$strings["Layout Help"] = "Помощь к шаблону"; -App::$strings["Edit Layout"] = "Редактировать шаблон"; -App::$strings["Delete layout?"] = "Удалить шаблон?"; -App::$strings["Delete Layout"] = "Удалить шаблон"; -App::$strings["Item is not editable"] = "Элемент нельзя редактировать"; -App::$strings["Delete item?"] = "Удалить элемент?"; -App::$strings["Edit Webpage"] = "Редактировать веб-страницу"; -App::$strings["Delete webpage?"] = "Удалить веб-страницу?"; -App::$strings["Delete Webpage"] = "Удалить веб-страницу"; -App::$strings["Version %s"] = "Версия %s"; -App::$strings["Installed plugins/addons/apps:"] = ""; -App::$strings["No installed plugins/addons/apps"] = ""; -App::$strings["Red"] = "Red"; -App::$strings["This is a hub of the Hubzilla - a global cooperative network of decentralised privacy enhanced websites."] = ""; -App::$strings["Running at web location"] = ""; -App::$strings["Please visit GetZot.com to learn more about the Hubzilla."] = "Пожалуйста посетите GetZot.com чтобы узнать больше о Hubzilla."; -App::$strings["Bug reports and issues: please visit"] = ""; -App::$strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = ""; -App::$strings["Site Administrators"] = "Администратор сайта"; -App::$strings["Page owner information could not be retrieved."] = ""; -App::$strings["Album not found."] = "Альбом не найден."; -App::$strings["Delete Album"] = "Удалить альбом"; -App::$strings["Delete Photo"] = "Удалить фотографию"; -App::$strings["No photos selected"] = "Никакие фотографии не выбраны"; -App::$strings["Access to this item is restricted."] = "Доступ к этому элементу ограничен."; -App::$strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Вы использовали %1$.2f мегабайт из %2$.2f для хранения фото."; -App::$strings["You have used %1$.2f Mbytes of photo storage."] = "Вы использовали %1$.2f мегабайт для хранения фото."; -App::$strings["Upload Photos"] = "Загрузить фотографии"; -App::$strings["New album name: "] = "Название нового альбома:"; -App::$strings["or existing album name: "] = "или существующий альбом:"; -App::$strings["Do not show a status post for this upload"] = "Не показывать пост о состоянии этой загрузки"; -App::$strings["Contact Photos"] = "Фотографии контакта"; -App::$strings["Edit Album"] = "Редактировать Фотоальбом"; -App::$strings["Show Newest First"] = "Показать новые первыми"; -App::$strings["Show Oldest First"] = "Показать старые первыми"; -App::$strings["View Photo"] = "Посмотреть фотографию"; -App::$strings["Permission denied. Access to this item may be restricted."] = ""; -App::$strings["Photo not available"] = "Фотография не доступна"; -App::$strings["Use as profile photo"] = "Использовать в качестве фотографии профиля"; -App::$strings["View Full Size"] = "Посмотреть в полный размер"; -App::$strings["Edit photo"] = "Редактировать фотографию"; -App::$strings["Rotate CW (right)"] = "Повернуть CW (направо)"; -App::$strings["Rotate CCW (left)"] = "Повернуть CCW (налево)"; -App::$strings["New album name"] = "Новое название альбома:"; -App::$strings["Caption"] = "Подпись"; -App::$strings["Add a Tag"] = "Добавить тег"; -App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Например: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"; -App::$strings["In This Photo:"] = ""; -App::$strings["View Album"] = "Посмотреть фотоальбом"; -App::$strings["Recent Photos"] = "Последние фотографии"; -App::$strings["Failed to create source. No channel selected."] = ""; -App::$strings["Source created."] = "Источник создан"; -App::$strings["Source updated."] = "Источник обновлен."; -App::$strings["*"] = "*"; -App::$strings["Manage remote sources of content for your channel."] = ""; -App::$strings["New Source"] = "Новый источник"; -App::$strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = ""; -App::$strings["Only import content with these words (one per line)"] = ""; -App::$strings["Leave blank to import all public content"] = ""; -App::$strings["Channel Name"] = "Имя канала"; -App::$strings["Source not found."] = "Источник не найден."; -App::$strings["Edit Source"] = "Редактировать источник"; -App::$strings["Delete Source"] = "Удалить источник"; -App::$strings["Source removed"] = "Источник удален"; -App::$strings["Unable to remove source."] = ""; -App::$strings["- select -"] = "- выбрать -"; -App::$strings["Event title and start time are required."] = "Название события и время начала требуется."; -App::$strings["l, F j"] = "l, F j"; -App::$strings["Edit event"] = "Редактировать мероприятие"; -App::$strings["Create New Event"] = "Создать новое мероприятие"; -App::$strings["Previous"] = "Предыдущая"; -App::$strings["hour:minute"] = "часы:минуты"; -App::$strings["Event details"] = "Детали мероприятия"; -App::$strings["Format is %s %s. Starting date and Title are required."] = "Формат: %s %s. Дата начала и название необходимы."; -App::$strings["Event Starts:"] = "Начало мероприятия:"; -App::$strings["Required"] = "Необходимо"; -App::$strings["Finish date/time is not known or not relevant"] = "Дата окончания или время окончания не известно / не релевантно."; -App::$strings["Event Finishes:"] = "\t\nКонец мероприятий:"; -App::$strings["Adjust for viewer timezone"] = "Отрегулируйте для просмотра часовых поясов"; -App::$strings["Description:"] = "Описание:"; -App::$strings["Title:"] = "Заголовок:"; -App::$strings["Share this event"] = "Поделиться этим мероприятием"; -App::$strings["Permission Denied."] = "Доступ запрещен."; -App::$strings["File not found."] = "Файл не найден."; -App::$strings["Edit file permissions"] = "Редактировать разрешения файла"; -App::$strings["Set/edit permissions"] = ""; -App::$strings["Include all files and sub folders"] = ""; -App::$strings["Return to file list"] = ""; -App::$strings["Copy/paste this code to attach file to a post"] = ""; -App::$strings["Copy/paste this URL to link file from a web page"] = ""; -App::$strings["Channel added."] = "Контакт добавлен."; -App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s следит %2\$s's %3\$s"; -App::$strings["Contact not found."] = "Контакт не найден."; -App::$strings["Friend suggestion sent."] = "Предложение дружить отправлено."; -App::$strings["Suggest Friends"] = "Пригласить друзей"; -App::$strings["Suggest a friend for %s"] = ""; -App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = ""; -App::$strings["Collection created."] = "Коллекция создана."; -App::$strings["Could not create collection."] = "Не удалось создать коллекцию."; -App::$strings["Collection updated."] = ""; -App::$strings["Create a collection of channels."] = "Создать коллекцию контактов"; -App::$strings["Collection Name: "] = "Название коллекции:"; -App::$strings["Members are visible to other channels"] = "Пользователи могут видеть другие каналы"; -App::$strings["Collection removed."] = "Коллекция удалена."; -App::$strings["Unable to remove collection."] = "Невозможно удалить коллекцию."; -App::$strings["Collection Editor"] = "Редактор коллекций"; -App::$strings["Members"] = "Участники"; -App::$strings["All Connected Channels"] = "Все подключенные контакы"; -App::$strings["Click on a channel to add or remove."] = "Нажмите на канал, чтобы добавить или удалить."; -App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = ""; -App::$strings["Help:"] = "Помощь:"; -App::$strings["Not Found"] = "Не найдено"; -App::$strings["Tag removed"] = "Тег удален"; -App::$strings["Remove Item Tag"] = "Удалить Тег"; -App::$strings["Select a tag to remove: "] = "Выбрать тег для удаления: "; -App::$strings["Theme settings updated."] = "Настройки темы обновленны."; -App::$strings["Site"] = "Сайт"; -App::$strings["Accounts"] = "Пользователи"; -App::$strings["Channels"] = "Каналы"; -App::$strings["Plugins"] = "Плагины"; -App::$strings["Themes"] = "Темы"; -App::$strings["Server"] = "Серверы"; -App::$strings["DB updates"] = "Обновление базы данных"; -App::$strings["Logs"] = "Журналы"; -App::$strings["Plugin Features"] = "Функции плагинов"; -App::$strings["User registrations waiting for confirmation"] = "Регистрации пользователей, которые ждут подтверждения"; -App::$strings["Message queues"] = "Очередь недоставленных сообщений"; -App::$strings["Administration"] = "Администрация"; -App::$strings["Summary"] = "Резюме"; -App::$strings["Registered users"] = "Всего пользователeй"; -App::$strings["Pending registrations"] = "Ждут утверждения"; -App::$strings["Version"] = "Версия системы"; -App::$strings["Active plugins"] = "Активные плагины"; +App::$strings["

      What next?

      "] = "

      Что дальше?

      "; +App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "Вам понадобится [вручную] настроить запланированную задачу для опрашивателя."; +App::$strings["Remote privacy information not available."] = "Удаленная информация о конфиденциальности недоступна."; +App::$strings["Visible to:"] = "Видимо для:"; +App::$strings["Connection added."] = "Контакт добавлен."; +App::$strings["Menu not found."] = "Меню не найдено"; +App::$strings["Unable to create element."] = "Невозможно создать элемент."; +App::$strings["Unable to update menu element."] = "Невозможно обновить элемент меню."; +App::$strings["Unable to add menu element."] = "Невозможно добавить элемент меню."; +App::$strings["Menu Item Permissions"] = "Разрешения на пункт меню"; +App::$strings["(click to open/close)"] = "(нажмите чтобы открыть/закрыть)"; +App::$strings["Link Name"] = "Имя ссылки"; +App::$strings["Link or Submenu Target"] = "Ссылка или цель подменю"; +App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Введите URL ссылки или выберите имя меню для создания подменю"; +App::$strings["Use magic-auth if available"] = "Использовать magic-auth если возможно"; +App::$strings["Open link in new window"] = "Открыть ссылку в новом окне"; +App::$strings["Order in list"] = "Порядок в списке"; +App::$strings["Higher numbers will sink to bottom of listing"] = "Большие значения в конце списка"; +App::$strings["Submit and finish"] = "Отправить и завершить"; +App::$strings["Submit and continue"] = "Отправить и продолжить"; +App::$strings["Menu:"] = "Меню:"; +App::$strings["Link Target"] = "Цель ссылки"; +App::$strings["Edit menu"] = "Редактировать меню"; +App::$strings["Edit element"] = "Редактировать элемент"; +App::$strings["Drop element"] = "Удалить элемент"; +App::$strings["New element"] = "Новый элемент"; +App::$strings["Edit this menu container"] = "Редактировать контейнер меню"; +App::$strings["Add menu element"] = "Добавить элемент меню"; +App::$strings["Delete this menu item"] = "Удалить этот элемент меню"; +App::$strings["Edit this menu item"] = "Редактировать этот элемент меню"; +App::$strings["Menu item not found."] = "Элемент меню не найден."; +App::$strings["Menu item deleted."] = "Элемент меню удалён."; +App::$strings["Menu item could not be deleted."] = "Невозможно удалить элемент меню."; +App::$strings["Edit Menu Element"] = "Редактировать элемент меню"; +App::$strings["Link text"] = "Текст ссылки"; +App::$strings["Plugin %s disabled."] = "Плагин %s отключен."; +App::$strings["Plugin %s enabled."] = "Плагин %s включен."; +App::$strings["Disable"] = "Запретить"; +App::$strings["Enable"] = "Разрешить"; +App::$strings["Toggle"] = "Переключить"; +App::$strings["Author: "] = "Автор: "; +App::$strings["Maintainer: "] = "Сопровождающий:"; +App::$strings["Minimum project version: "] = "Минимальная версия проекта:"; +App::$strings["Maximum project version: "] = "Максимальная версия проекта:"; +App::$strings["Minimum PHP version: "] = "Минимальная версия PHP:"; +App::$strings["Compatible Server Roles: "] = "Совместимые роли сервера:"; +App::$strings["Requires: "] = "Необходимо:"; +App::$strings["Disabled - version incompatibility"] = "Отключено - несовместимость версий"; +App::$strings["Enter the public git repository URL of the addon repo."] = "Введите URL публичного репозитория расширений git"; +App::$strings["Addon repo git URL"] = "URL репозитория расширений git"; +App::$strings["Custom repo name"] = "Пользовательское имя репозитория"; +App::$strings["(optional)"] = "(необязательно)"; +App::$strings["Download Addon Repo"] = "Загрузить репозиторий расширений"; +App::$strings["Install new repo"] = "Установить новый репозиторий"; +App::$strings["Manage Repos"] = "Управление репозиториями"; +App::$strings["Installed Addon Repositories"] = "Установленные репозитории расширений"; +App::$strings["Install a New Addon Repository"] = "Установить новый репозиторий расширений"; +App::$strings["Switch branch"] = "Переключить ветку"; App::$strings["Site settings updated."] = "Настройки сайта обновлены."; -App::$strings["No special theme for accessibility"] = ""; -App::$strings["Yes - with approval"] = ""; -App::$strings["My site is not a public server"] = ""; -App::$strings["My site has paid access only"] = ""; -App::$strings["My site has free access only"] = ""; -App::$strings["My site offers free accounts with optional paid upgrades"] = ""; +App::$strings["%s - (Incompatible)"] = "%s - (несовместимо)"; +App::$strings["mobile"] = "мобильный"; +App::$strings["experimental"] = "экспериментальный"; +App::$strings["unsupported"] = "неподдерживаемый"; +App::$strings["Yes - with approval"] = "Да - требует подтверждения"; +App::$strings["My site is not a public server"] = "Мой сайт не является публичным сервером"; +App::$strings["My site has paid access only"] = "Мой сайт доступен только с оплатой "; +App::$strings["My site has free access only"] = "На моём сайте разрешён свободный доступ"; +App::$strings["My site offers free accounts with optional paid upgrades"] = "На моём сайте разрешены бесплатные аккаунты с дополнительными платными услугами"; +App::$strings["Beginner/Basic"] = "Начинающий/Базовый"; +App::$strings["Novice - not skilled but willing to learn"] = "Новичок - не опытный, но желающий учиться"; +App::$strings["Intermediate - somewhat comfortable"] = "Промежуточный - более удобный"; +App::$strings["Advanced - very comfortable"] = "Продвинутый - очень удобный"; +App::$strings["Expert - I can write computer code"] = "Эксперт - я умею программировать"; +App::$strings["Wizard - I probably know more than you do"] = "Волшебник - возможно я знаю больше чем ты"; +App::$strings["Default permission role for new accounts"] = "Разрешения по умолчанию для новых аккаунтов"; +App::$strings["This role will be used for the first channel created after registration."] = "Эта роль будет использоваться для первого канала, созданного после регистрации."; +App::$strings["Registration"] = "Регистрация"; App::$strings["File upload"] = "Загрузка файла"; App::$strings["Policies"] = "Правила"; -App::$strings["Site name"] = "Название сайта"; +App::$strings["Site default technical skill level"] = "Уровень технических навыков на сайте по умолчанию"; +App::$strings["Used to provide a member experience matched to technical comfort level"] = "Используется чтобы обеспечить удобство на уровне технических навыков пользователя"; +App::$strings["Lock the technical skill level setting"] = "Заблокировать уровень технических навыков"; +App::$strings["Members can set their own technical comfort level by default"] = "Участники могут выбрать уровень своих технических навыков по умолчанию"; App::$strings["Banner/Logo"] = "Баннер / логотип"; +App::$strings["Unfiltered HTML/CSS/JS is allowed"] = "Разрешён нефильтруемый HTML/CSS/JS"; App::$strings["Administrator Information"] = "Информация об администраторе"; -App::$strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = ""; +App::$strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Контактная информация для администраторов сайта. Показывается на информационной странице сайта. Можно использовать BBCode."; +App::$strings["Publicly visible description of this site. Displayed on siteinfo page. BBCode can be used here"] = "Публичное видимое описание сайта. Показывается на информационной странице сайта. Можно использовать BBCode."; App::$strings["System language"] = "Язык системы"; -App::$strings["System theme"] = "Тема системы"; -App::$strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = ""; -App::$strings["Mobile system theme"] = "Мобильная тема системы"; -App::$strings["Theme for mobile devices"] = "Тема для мобильных устройств"; -App::$strings["Accessibility system theme"] = ""; -App::$strings["Accessibility theme"] = ""; -App::$strings["Channel to use for this website's static pages"] = ""; -App::$strings["Site Channel"] = "Канал сайта"; -App::$strings["Maximum image size"] = "Максимальный размер"; -App::$strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = ""; -App::$strings["Does this site allow new member registration?"] = ""; -App::$strings["Which best describes the types of account offered by this hub?"] = ""; +App::$strings["System theme"] = "Системная тема"; +App::$strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Системная тема по умолчанию - может быть изменена в профиле пользователя - изменить параметры темы."; +App::$strings["Allow Feeds as Connections"] = "Разрешить ленты новостей как контакты"; +App::$strings["(Heavy system resource usage)"] = "(Высокое использование системных ресурсов)"; +App::$strings["Maximum image size"] = "Максимальный размер изображения"; +App::$strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Максимальный размер загруженных изображений в байтах. По умолчанию 0 или без ограничений."; +App::$strings["Does this site allow new member registration?"] = "Разрешается ли регистрация новых пользователей на этом сайте?"; +App::$strings["Invitation only"] = "Только по приглашениям"; +App::$strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Регистрация пользователей разрешается только по приглашениям. Вышеуказанная политика регистрация должны быть установлена в \"Да\"."; +App::$strings["Minimum age"] = "Минимальный возраст"; +App::$strings["Minimum age (in years) for who may register on this site."] = "Минимальный возраст (в годах) для регистрации на этом сайте."; +App::$strings["Which best describes the types of account offered by this hub?"] = "Как лучше описать тип учётных записей предлагаемых на этом хабе?"; App::$strings["Register text"] = "Текст регистрации"; -App::$strings["Will be displayed prominently on the registration page."] = ""; -App::$strings["Accounts abandoned after x days"] = ""; -App::$strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = ""; +App::$strings["Will be displayed prominently on the registration page."] = "Будет отображаться на странице регистрации на видном месте."; +App::$strings["Site homepage to show visitors (default: login box)"] = "Домашняя страница, которая будет показываться посетителям сайт (по умочанию - форма входа)."; +App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "например: 'public' для показа публичного потока, 'page/sys/home' показывает системную страницу home или 'include:home.html' для подключения файла."; +App::$strings["Preserve site homepage URL"] = "Сохранить URL главной страницы сайта"; +App::$strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Показывать домашнюю страницу сайта во фрейме вместо стандартной переадресации"; +App::$strings["Accounts abandoned after x days"] = "Аккаунты считаются заброшенными после N дней"; +App::$strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Системные ресурсы не будут расходоваться для опроса внешних сайтов для заброшенных аккаунтов. Введите 0 для отсутствия ограничений."; App::$strings["Allowed friend domains"] = "Разрешенные домены друзей"; -App::$strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = ""; -App::$strings["Allowed email domains"] = "Разрешенные домены электронной почты"; -App::$strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = ""; -App::$strings["Block public"] = "Блокировать публичный доступ"; -App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = ""; -App::$strings["Force publish"] = "Заставить публиковать"; -App::$strings["Check to force all profiles on this site to be listed in the site directory."] = ""; -App::$strings["Disable discovery tab"] = "Отключить вкладку \"обнаруженные\""; -App::$strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = ""; -App::$strings["No login on Homepage"] = ""; -App::$strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = ""; -App::$strings["Proxy user"] = "Proxy пользователь"; -App::$strings["Proxy URL"] = "Proxy URL"; +App::$strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Список разделённых запятыми доменов с которыми разрешено устанавливать дружеские отношения на этом сайте. Wildcards разрешены. Пусто означает разрешены любые домены."; +App::$strings["Verify Email Addresses"] = "Проверка адреса электронной почты"; +App::$strings["Check to verify email addresses used in account registration (recommended)."] = "Включите для проверки адреса электронной почты использованного при регистрации (рекомендуется)."; +App::$strings["Force publish"] = "Принудительно публиковать"; +App::$strings["Check to force all profiles on this site to be listed in the site directory."] = "Включите для принудительного включения всех учётных записей на данном сайте в каталог."; +App::$strings["Import Public Streams"] = "Импортированные публичные потоки"; +App::$strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Импортировать и разрешить публичный доступ к загружаемым с других сайтов потоков. Внимание - этот контент не может модерироваться."; +App::$strings["Site only Public Streams"] = "Публичные потоки только с сайта"; +App::$strings["Allow access to public content originating only from this site if Imported Public Streams are disabled."] = "Разрешить доступ к общедоступному контенту, исходящему только с этого сайта, если импортированные публичные потоки отключены."; +App::$strings["Allow anybody on the internet to access the Public streams"] = "Разрешить всем доступ к публичным потокам"; +App::$strings["Disable to require authentication before viewing. Warning: this content is unmoderated."] = "Отключите если для просмотра требуется аутентификация. Внимание - этот контент не может модерироваться."; +App::$strings["Only import Public stream posts with this text"] = "Импортировать только публичные потоки с этим текстом"; +App::$strings["Do not import Public stream posts with this text"] = "Не импортировать публичные потоки с этим текстом"; +App::$strings["Login on Homepage"] = "Вход на домашней странице"; +App::$strings["Present a login box to visitors on the home page if no other content has been configured."] = "Предоставлять форму входа для посетителей на домашней странице если другого содержимого не настроено."; +App::$strings["Enable context help"] = "Включить контекстную помощь"; +App::$strings["Display contextual help for the current page when the help button is pressed."] = "Показывать контекстную помощь для текущей странице при нажатии на кнопку \"Помощь\"."; +App::$strings["Reply-to email address for system generated email."] = "Адрес email Reply-to для генерируемых системой сообщений."; +App::$strings["Sender (From) email address for system generated email."] = "Адрес email отправителя (From) для генерируемых системой сообщений."; +App::$strings["Name of email sender for system generated email."] = "Имя отправителя для генерируемых системой сообщений."; +App::$strings["Directory Server URL"] = "URL сервера каталогов"; +App::$strings["Default directory server"] = "Сервер каталогов по умолчанию"; +App::$strings["Proxy user"] = "Имя пользователя proxy-сервера"; +App::$strings["Proxy URL"] = "URL proxy-сервера"; App::$strings["Network timeout"] = "Время ожидания сети"; -App::$strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = ""; +App::$strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Значение в секундах. Если установлен в 0 - без ограничений (не рекомендуется)."; App::$strings["Delivery interval"] = "Интервал доставки"; -App::$strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = ""; +App::$strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Значение задержки фоновых процессов доставки в секундах для снижения нагрузки на систему. Рекомендуется 4-5 для серверов совместного использования, 2-3 для частных виртуальных и 0-1 для выделенных серверов."; +App::$strings["Deliveries per process"] = "Доставок на процесс"; +App::$strings["Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5."] = "Количество доставок для одного процесса. Настройте в соответствии с производительностью системы. Рекомендуется 1-5."; +App::$strings["Queue Threshold"] = "Порог очереди"; +App::$strings["Always defer immediate delivery if queue contains more than this number of entries."] = "Всегда откладывать немедленную доставку, если в очереди содержится большее количество записей, чем это."; App::$strings["Poll interval"] = "Интервал опроса"; -App::$strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = ""; -App::$strings["Maximum Load Average"] = ""; -App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = ""; -App::$strings["No server found"] = "Сервер не найден"; -App::$strings["ID"] = "ID"; -App::$strings["for channel"] = "для канала"; -App::$strings["on server"] = "на сервере"; -App::$strings["Status"] = "Статус"; -App::$strings["Update has been marked successful"] = ""; -App::$strings["Executing %s failed. Check system logs."] = ""; -App::$strings["Update %s was successfully applied."] = ""; -App::$strings["Update %s did not return a status. Unknown if it succeeded."] = ""; -App::$strings["Update function %s could not be found."] = ""; -App::$strings["No failed updates."] = "Ошибок обновлений нет."; -App::$strings["Failed Updates"] = "Обновления с ошибками"; -App::$strings["Mark success (if update was manually applied)"] = ""; -App::$strings["Attempt to execute this update step automatically"] = ""; -App::$strings["%s user blocked/unblocked"] = array( +App::$strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Задержка фоновых процессов опроса на указанное количество секунд для снижения нагрузки на систему. Если 0 - использовать интервал доставки."; +App::$strings["Path to ImageMagick convert program"] = "Путь к ImageMagick"; +App::$strings["If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert"] = "При установке эта программа генерирует миниатюры изображений для больших файлов (свыше 4000 в любом измерении) для предотвращения утечки памяти. Пример: /usr/bin/convert"; +App::$strings["Allow SVG thumbnails in file browser"] = "Разрешить SVG миниатюры в просмотрщике файлов"; +App::$strings["WARNING: SVG images may contain malicious code."] = "Внимание: изображения SVG могут содержать вредоносный код."; +App::$strings["Maximum Load Average"] = "Максимальная средняя нагрузка"; +App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Максимальная нагрузка системы для откладывания процессов опроса и доставки - по умолчанию 50."; +App::$strings["Expiration period in days for imported (grid/network) content"] = "Срок хранения в днях для импортированного содержимого (из матрицы / сети)."; +App::$strings["0 for no expiration of imported content"] = "0 для постоянного хранения импортированного содержимого"; +App::$strings["Do not expire any posts which have comments less than this many days ago"] = "Продлевать строк хранения для любых публикаций, которые имею комментарии возрастом менее этого значения"; +App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Публичные серверы: необязательная маркетинговая лэндинг-страница для новых пользователей"; +App::$strings["Create this page first. Default is %s/register"] = "Создать эту страницу первой. По умолчанию %s/register"; +App::$strings["Page to display after creating a new channel"] = "Страница для показа после создания нового канала"; +App::$strings["Default: profiles"] = "По умолчанию: профили"; +App::$strings["Optional: site location"] = "Необязательно: место размещения сайта"; +App::$strings["Region or country"] = "Регион или страна"; +App::$strings["Log settings updated."] = "Настройки журнала обновлены."; +App::$strings["Clear"] = "Очистить"; +App::$strings["Debugging"] = "Отладка"; +App::$strings["Log file"] = "Файл журнала"; +App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "Должен быть доступен для записи веб-сервером. Пусть относителен основного каталога веб-сайта."; +App::$strings["Log level"] = "Уровень журнала"; +App::$strings["%s account blocked/unblocked"] = array( 0 => "", 1 => "", - 2 => "", ); -App::$strings["%s user deleted"] = array( - 0 => "%s канал удален", - 1 => "%s канала удалены", - 2 => "%s каналов удалено", +App::$strings["%s account deleted"] = array( + 0 => "", + 1 => "", ); App::$strings["Account not found"] = "Аккаунт не найден"; -App::$strings["User '%s' deleted"] = "Пользователь '%s' удален"; -App::$strings["User '%s' unblocked"] = "Пользователь '%s' разрешен"; -App::$strings["User '%s' blocked"] = "Пользователь '%s' заблокирован"; -App::$strings["Users"] = "Пользователи"; +App::$strings["Account '%s' blocked"] = "Аккаунт '%s' заблокирован"; +App::$strings["Account '%s' unblocked"] = "Аккаунт '%s' разблокирован"; App::$strings["select all"] = "выбрать все"; -App::$strings["User registrations waiting for confirm"] = "Регистрации пользователей ждут подтверждения"; +App::$strings["Registrations waiting for confirm"] = "Регистрации ждут подтверждения"; App::$strings["Request date"] = "Дата запроса"; -App::$strings["No registrations."] = "Новых регистраций пока нет."; -App::$strings["Approve"] = "Утвердить"; -App::$strings["Deny"] = "Запретить"; +App::$strings["No registrations."] = "Нет новых регистраций."; +App::$strings["ID"] = ""; +App::$strings["All Channels"] = "Все каналы"; App::$strings["Register date"] = "Дата регистрации"; App::$strings["Last login"] = "Последний вход"; -App::$strings["Expires"] = ""; -App::$strings["Service Class"] = "Класс службы"; -App::$strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = ""; -App::$strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = ""; +App::$strings["Expires"] = "Срок действия"; +App::$strings["Service Class"] = "Класс обслуживания"; +App::$strings["Selected accounts will be deleted!\\n\\nEverything these accounts had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Выбранные учётные записи будут удалены!\\n\\nВсё что было ими опубликовано на этом сайте будет удалено навсегда!\\n\\nВы уверены?"; +App::$strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Этот аккаунт {0} будет удалён!\\n\\nВсё что им было опубликовано на этом сайте будет удалено навсегда!\\n\\nВы уверены?"; +App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "По умолчанию, HTML без фильтрации доступен во встраиваемых медиа. Это небезопасно."; +App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Рекомендуется настроить разрешения использовать HTML без фильтрации только для следующих сайтов:"; +App::$strings["https://youtube.com/
      https://www.youtube.com/
      https://youtu.be/
      https://vimeo.com/
      https://soundcloud.com/
      "] = ""; +App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = "се остальные встроенные материалы будут отфильтрованы, если встроенное содержимое с этого сайта явно заблокировано."; +App::$strings["Block public"] = "Блокировать публичный доступ"; +App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "Установите флажок для блокировки публичного доступа ко всем другим общедоступным страницам на этом сайте, если вы в настоящее время не аутентифицированы."; +App::$strings["Provide a cloud root directory"] = "Предоставить корневой каталог в облаке"; +App::$strings["The cloud root directory lists all channel names which provide public files"] = "В корневом каталоге облака показываются все имена каналов, которые предоставляют общедоступные файлы"; +App::$strings["Show total disk space available to cloud uploads"] = "Показывать общее доступное для загрузок место в хранилище"; +App::$strings["Set \"Transport Security\" HTTP header"] = "Установить HTTP-заголовок \"Transport Security\""; +App::$strings["Set \"Content Security Policy\" HTTP header"] = "Установить HTTP-заголовок \"Content Security Policy\""; +App::$strings["Allowed email domains"] = "Разрешённые домены email"; +App::$strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Список разделённых запятыми доменов для которых разрешена регистрация на этом сайте. Wildcards разрешены. Если пусто то разрешены любые домены."; +App::$strings["Not allowed email domains"] = "Запрещённые домены email"; +App::$strings["Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined."] = "Список разделённых запятыми доменов для которых запрещена регистрация на этом сайте. Wildcards разрешены. Если пусто то разрешены любые домены до тех пор, пока разрешённые домены не будут указаны."; +App::$strings["Allow communications only from these sites"] = "Разрешить связь только с этими сайтами"; +App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Один сайт на строку. Оставьте пустым для разрешения взаимодействия без ограничений (по умочанию)."; +App::$strings["Block communications from these sites"] = "Блокировать связь с этими сайтами"; +App::$strings["Allow communications only from these channels"] = "Разрешить связь только для этих каналов"; +App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = "Один канал (или его хэш) на строку. Оставьте пустым для разрешения взаимодействия с любым каналом (по умолчанию)."; +App::$strings["Block communications from these channels"] = "Блокировать связь с этими каналами"; +App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Разрешать встраивание только для безопасных (SSL/TLS) сайтов и ссылок."; +App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Разрешить встраивать нефильтруемое HTML-содержимое только для этих доменов"; +App::$strings["One site per line. By default embedded content is filtered."] = "Один сайт на строку. По умолчанию встраиваемое содержимое фильтруется."; +App::$strings["Block embedded HTML from these domains"] = "Блокировать встраивание HTML-содержимого для этих доменов"; +App::$strings["Update has been marked successful"] = "Обновление было помечено как успешное"; +App::$strings["Executing %s failed. Check system logs."] = "Выполнение %s неудачно. Проверьте системный журнал."; +App::$strings["Update %s was successfully applied."] = "Обновление %sбыло успешно применено."; +App::$strings["Update %s did not return a status. Unknown if it succeeded."] = "Обновление %s не вернуло статус. Неизвестно было ли оно успешным."; +App::$strings["Update function %s could not be found."] = "Функция обновления %sне может быть найдена."; +App::$strings["Failed Updates"] = "Обновления с ошибками"; +App::$strings["Mark success (if update was manually applied)"] = "Пометить успешным (если обновление было применено вручную)"; +App::$strings["Attempt to execute this update step automatically"] = "Попытаться применить это обновление автоматически"; +App::$strings["No failed updates."] = "Ошибок обновлений нет."; +App::$strings["New Profile Field"] = "Поле нового профиля"; +App::$strings["Field nickname"] = "Псевдоним поля"; +App::$strings["System name of field"] = "Системное имя поля"; +App::$strings["Input type"] = "Тип ввода"; +App::$strings["Field Name"] = "Имя поля"; +App::$strings["Label on profile pages"] = "Метка на странице профиля"; +App::$strings["Help text"] = "Текст подсказки"; +App::$strings["Additional info (optional)"] = "Дополнительная информация (необязательно)"; +App::$strings["Field definition not found"] = "Определения поля не найдено"; +App::$strings["Edit Profile Field"] = "Редактировать поле профиля"; +App::$strings["Basic Profile Fields"] = "Основные поля профиля"; +App::$strings["Advanced Profile Fields"] = "Дополнительные поля профиля"; +App::$strings["(In addition to basic fields)"] = "(к основым полям)"; +App::$strings["All available fields"] = "Все доступные поля"; +App::$strings["Custom Fields"] = "Настраиваемые поля"; +App::$strings["Create Custom Field"] = "Создать настраиваемое поле"; +App::$strings["Theme settings updated."] = "Настройки темы обновленны."; +App::$strings["No themes found."] = "Темы не найдены."; +App::$strings["Screenshot"] = "Снимок экрана"; +App::$strings["[Experimental]"] = "[экспериментальный]"; +App::$strings["[Unsupported]"] = "[неподдерживаемый]"; +App::$strings["Off"] = "Выкл."; +App::$strings["On"] = "Вкл."; +App::$strings["Lock feature %s"] = "Функция блокировки \"%s\""; +App::$strings["Manage Additional Features"] = "Управлять дополнительными функциями"; +App::$strings["Queue Statistics"] = "Статистика очереди"; +App::$strings["Total Entries"] = "Всего записей"; +App::$strings["Priority"] = "Приоритет"; +App::$strings["Destination URL"] = "Конечный URL-адрес"; +App::$strings["Mark hub permanently offline"] = "Пометить хаб как постоянно отключенный"; +App::$strings["Empty queue for this hub"] = "Освободить очередь для этого хаба"; +App::$strings["Last known contact"] = "Последний известный контакт"; +App::$strings["Password changed for account %d."] = "Пароль для аккаунта %d изменён."; +App::$strings["Account settings updated."] = "Настройки аккаунта обновлены."; +App::$strings["Account not found."] = "Учётная запись не найдена."; +App::$strings["Account Edit"] = "Редактировать аккаунт"; +App::$strings["New Password"] = "Новый пароль"; +App::$strings["New Password again"] = "Повторите новый пароль"; +App::$strings["Technical skill level"] = "Уровень технических навыков"; +App::$strings["Account language (for emails)"] = "Язык сообщения для email"; +App::$strings["Service class"] = "Класс обслуживания"; App::$strings["%s channel censored/uncensored"] = array( 0 => "", 1 => "", - 2 => "", +); +App::$strings["%s channel code allowed/disallowed"] = array( + 0 => "", + 1 => "", ); App::$strings["%s channel deleted"] = array( - 0 => "%s канал удален", - 1 => "%s канала удалены", - 2 => "%s каналы удалены", + 0 => "", + 1 => "", ); App::$strings["Channel not found"] = "Канал не найден"; -App::$strings["Channel '%s' deleted"] = "Канал '%s' удален"; -App::$strings["Channel '%s' uncensored"] = ""; -App::$strings["Channel '%s' censored"] = ""; -App::$strings["Censor"] = ""; -App::$strings["Uncensor"] = ""; -App::$strings["UID"] = "UID"; -App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = ""; -App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = ""; -App::$strings["Plugin %s disabled."] = "Плагин %s отключен."; -App::$strings["Plugin %s enabled."] = "Плагин %s включен."; -App::$strings["Disable"] = "Запретить"; -App::$strings["Enable"] = "Разрешить"; -App::$strings["Toggle"] = "Переключить"; -App::$strings["Author: "] = "Автор: "; -App::$strings["Maintainer: "] = "Обслуживающий: "; -App::$strings["No themes found."] = "Темы не найдены."; -App::$strings["Screenshot"] = "Скриншот"; -App::$strings["[Experimental]"] = "[экспериментальный]"; -App::$strings["[Unsupported]"] = "[неподдерживаемый]"; -App::$strings["Log settings updated."] = "Настройки журнала обновленны."; -App::$strings["Clear"] = "Очистить"; -App::$strings["Debugging"] = "Включить/Выключить"; -App::$strings["Log file"] = "Файл журнала"; -App::$strings["Must be writable by web server. Relative to your Red top-level directory."] = "Должна быть доступна для записи веб-сервером. Относительно верхнего уровня веб-сайта."; -App::$strings["Log level"] = "Уровень журнала"; -App::$strings["Thing updated"] = ""; -App::$strings["Object store: failed"] = ""; -App::$strings["Thing added"] = ""; -App::$strings["OBJ: %1\$s %2\$s %3\$s"] = ""; -App::$strings["Show Thing"] = ""; -App::$strings["item not found."] = "Элемент не найден."; -App::$strings["Edit Thing"] = ""; -App::$strings["Select a profile"] = "Выберите профиль"; -App::$strings["Post an activity"] = ""; -App::$strings["Only sends to viewers of the applicable profile"] = ""; -App::$strings["Name of thing e.g. something"] = ""; -App::$strings["URL of thing (optional)"] = ""; -App::$strings["URL for photo of thing (optional)"] = ""; -App::$strings["Add Thing to your Profile"] = ""; +App::$strings["Channel '%s' deleted"] = "Канал '%s' удалён"; +App::$strings["Channel '%s' censored"] = "Канал '%s' цензурируется"; +App::$strings["Channel '%s' uncensored"] = "Канал '%s' нецензурируется"; +App::$strings["Channel '%s' code allowed"] = "Код в канале '%s' разрешён"; +App::$strings["Channel '%s' code disallowed"] = "Код в канале '%s' запрещён"; +App::$strings["Censor"] = "Цензурировать"; +App::$strings["Uncensor"] = "Нецензурировать"; +App::$strings["Allow Code"] = "Разрешить код"; +App::$strings["Disallow Code"] = "Запретить код"; +App::$strings["UID"] = ""; +App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Выбранные каналы будут удалены!\\n\\nВсё что было опубликовано в этих каналах на этом сайте будет удалено навсегда!\\n\\nВы уверены?"; +App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Канал {0} будет удалён!\\n\\nВсё что было опубликовано в этом канале на этом сайте будет удалено навсегда!\\n\\nВы уверены?"; +App::$strings["Token verification failed."] = "Не удалось выполнить проверку токена."; +App::$strings["Email Verification Required"] = "Требуется проверка адреса email"; +App::$strings["A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message."] = "Проверочный токен был выслн на ваш адрес электронной почты {%s]. Введите этот токен здесь для завершения этапа проверки учётной записи. Пожалуйста, подождите несколько минут для завершения доставки и проверьте вашу папку \"Спам\" если вы не видите письма."; +App::$strings["Resend Email"] = "Выслать повторно"; +App::$strings["Validation token"] = "Проверочный токен"; +App::$strings["Total invitation limit exceeded."] = "Превышено общее количество приглашений."; +App::$strings["%s : Not a valid email address."] = "%s : Недействительный адрес электронной почты."; +App::$strings["Please join us on \$Projectname"] = "Присоединятесь к \$Projectname !"; +App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Превышен лимит приглашений. Пожалуйста, свяжитесь с администрацией сайта."; +App::$strings["%d message sent."] = array( + 0 => "", + 1 => "", +); +App::$strings["You have no more invitations available"] = "У вас больше нет приглашений"; +App::$strings["Send invitations"] = "Отправить приглашение"; +App::$strings["Enter email addresses, one per line:"] = "Введите адреса электронной почты, по одному в строке:"; +App::$strings["Please join my community on \$Projectname."] = "Присоединятесь к нашему сообществу \$Projectname !"; +App::$strings["You will need to supply this invitation code:"] = "Вам нужно предоставит этот код приглашения:"; +App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Зарегистрируйтесь на любом из серверов \$Projectname"; +App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Введите сетевой адрес \$Projectname в поисковой строке сайта"; +App::$strings["or visit"] = "или посетите"; +App::$strings["3. Click [Connect]"] = "Нажать [Подключиться]"; +App::$strings["Block Title"] = "Заблокировать заголовок"; +App::$strings["Cover Photos"] = "Фотографии обложки"; +App::$strings["Your cover photo may be visible to anybody on the internet"] = "Ваше фото обложки может быть видно кому угодно в Интернете"; +App::$strings["Change Cover Photo"] = "Изменить фотографию обложки"; +App::$strings["Like/Dislike"] = "Нравится / не нравится"; +App::$strings["This action is restricted to members."] = "Это действие доступно только участникам."; +App::$strings["Please login with your \$Projectname ID or register as a new \$Projectname member to continue."] = "Пожалуйста, для продолжения войдите с вашим \$Projectname ID или зарегистрируйтесь как новый участник \$Projectname."; +App::$strings["Invalid request."] = "Неверный запрос."; +App::$strings["thing"] = "предмет"; +App::$strings["Channel unavailable."] = "Канал недоступен."; +App::$strings["Previous action reversed."] = "Предыдущее действие отменено."; +App::$strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s согласен с %2\$s %3\$s"; +App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s не согласен с %2\$s %3\$s"; +App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s воздерживается от решения по %2\$s%3\$s"; +App::$strings["Action completed."] = "Действие завершено."; +App::$strings["Thank you."] = "Спасибо."; +App::$strings["If enabled, connection requests will be approved without your interaction"] = "Если включено, запросы контактов будут одобрены без вашего участия"; +App::$strings["Automatic approval settings"] = "Настройки автоматического одобрения"; +App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "Некоторые индивидуальные разрешения могут быть предустановлены или заблокированы на основании типа вашего канала и настроек приватности."; +App::$strings["Unable to update menu."] = "Невозможно обновить меню."; +App::$strings["Unable to create menu."] = "Невозможно создать меню."; +App::$strings["Menu Name"] = "Название меню"; +App::$strings["Unique name (not visible on webpage) - required"] = "Уникальное название (не видимо на странице) - требуется"; +App::$strings["Menu Title"] = "Заголовок меню"; +App::$strings["Visible on webpage - leave empty for no title"] = "Видимость на странице - оставьте пустым если не хотите иметь заголовок"; +App::$strings["Allow Bookmarks"] = "Разрешить закладки"; +App::$strings["Menu may be used to store saved bookmarks"] = "Меню может использоваться, чтобы сохранить закладки"; +App::$strings["Submit and proceed"] = "Отправить и обработать"; +App::$strings["Drop"] = "Удалить"; +App::$strings["Bookmarks allowed"] = "Закладки разрешены"; +App::$strings["Delete this menu"] = "Удалить это меню"; +App::$strings["Edit menu contents"] = "Редактировать содержание меню"; +App::$strings["Edit this menu"] = "Редактировать это меню"; +App::$strings["Menu could not be deleted."] = "Меню не может быть удалено."; +App::$strings["Edit Menu"] = "Редактировать меню"; +App::$strings["Add or remove entries to this menu"] = "Добавить или удалить пункты этого меню"; +App::$strings["Menu name"] = "Название меню"; +App::$strings["Must be unique, only seen by you"] = "Должно быть уникальным (видно только вам)"; +App::$strings["Menu title"] = "Заголовок меню"; +App::$strings["Menu title as seen by others"] = "Видимый другими заголовок меню"; +App::$strings["Allow bookmarks"] = "Разрешить закладки"; +App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Вы создали %1$.0f из %2$.0f возможных каналов."; +App::$strings["Create a new channel"] = "Создать новый канал"; +App::$strings["Create New"] = "Создать новый"; +App::$strings["Current Channel"] = "Текущий канал"; +App::$strings["Switch to one of your channels by selecting it."] = "Выбрать и переключиться на один из ваших каналов"; +App::$strings["Default Channel"] = "Основной канал"; +App::$strings["Make Default"] = "Сделать основным"; +App::$strings["%d new messages"] = "%d новых сообщений"; +App::$strings["%d new introductions"] = "%d новых представлений"; +App::$strings["Delegated Channel"] = "Делегированный канал"; +App::$strings["Channel name changes are not allowed within 48 hours of changing the account password."] = "Изменение названия канала не разрешается в течении 48 часов после смены пароля у аккаунта."; +App::$strings["Change channel nickname/address"] = "Изменить псевдоним / адрес канала"; +App::$strings["Any/all connections on other networks will be lost!"] = "Любые / все контакты в других сетях будут утеряны!"; +App::$strings["New channel address"] = "Новый адрес канала"; +App::$strings["Rename Channel"] = "Переименовать канал"; +App::$strings["Additional Features"] = "Дополнительные функции"; +App::$strings["Your technical skill level"] = "Ваш уровень технических навыков"; +App::$strings["Used to provide a member experience and additional features consistent with your comfort level"] = "Используется чтобы обеспечить соответствие опыта пользователя и функций на комфортном для вас уровне"; +App::$strings["Nobody except yourself"] = "Никто кроме вас"; +App::$strings["Only those you specifically allow"] = "Только персонально разрешённые"; +App::$strings["Approved connections"] = "Одобренные контакты"; +App::$strings["Any connections"] = "Любые контакты"; +App::$strings["Anybody on this website"] = "Любой на этом сайте"; +App::$strings["Anybody in this network"] = "Любой в этой сети"; +App::$strings["Anybody authenticated"] = "Любой аутентифицированный"; +App::$strings["Anybody on the internet"] = "Любой в интернете"; +App::$strings["Publish your default profile in the network directory"] = "Публиковать ваш профиль по умолчанию в сетевом каталоге"; +App::$strings["Allow us to suggest you as a potential friend to new members?"] = "Разрешить предлагать вас как потенциального друга для новых пользователей?"; +App::$strings["or"] = "или"; +App::$strings["Your channel address is"] = "Адрес вашего канала"; +App::$strings["Your files/photos are accessible via WebDAV at"] = "Ваши файы / фотографии доступны через WebDAV по"; +App::$strings["Automatic membership approval"] = "Членство одобрено автоматически"; +App::$strings["Channel Settings"] = "Выбор канала"; +App::$strings["Basic Settings"] = "Основные настройки"; +App::$strings["Email Address:"] = "Адрес email:"; +App::$strings["Your Timezone:"] = "Часовой пояс:"; +App::$strings["Default Post Location:"] = "Расположение по умолчанию:"; +App::$strings["Geographical location to display on your posts"] = "Показывать географическое положение в ваших публикациях"; +App::$strings["Use Browser Location:"] = "Определять расположение из браузера"; +App::$strings["Adult Content"] = "Содержимое для взрослых"; +App::$strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Этот канал часто или регулярно публикует содержимое для взрослых. Пожалуйста, помечайте любой такой материал тегом #NSFW"; +App::$strings["Security and Privacy Settings"] = "Безопасность и настройки приватности"; +App::$strings["Your permissions are already configured. Click to view/adjust"] = "Ваши разрешения уже настроены. Нажмите чтобы просмотреть или изменить"; +App::$strings["Hide my online presence"] = "Скрывать моё присутствие онлайн"; +App::$strings["Prevents displaying in your profile that you are online"] = "Предотвращает отображения статуса \"в сети\" в вашем профиле"; +App::$strings["Simple Privacy Settings:"] = "Простые настройки безопасности:"; +App::$strings["Very Public - extremely permissive (should be used with caution)"] = "Полностью открытый - сверхлиберальный (должен использоваться с осторожностью)"; +App::$strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Обычный - открытый по умолчанию, приватность по желанию (как в социальных сетях, но с улучшенными настройками)"; +App::$strings["Private - default private, never open or public"] = "Частный - частный по умочанию, не открытый и не публичный"; +App::$strings["Blocked - default blocked to/from everybody"] = "Закрытый - заблокированный по умолчанию от / для всех"; +App::$strings["Allow others to tag your posts"] = "Разрешить другим отмечать ваши публикации"; +App::$strings["Often used by the community to retro-actively flag inappropriate content"] = "Часто используется сообществом для маркировки неподобающего содержания"; +App::$strings["Channel Permission Limits"] = "Ограничения разрешений канала"; +App::$strings["Expire other channel content after this many days"] = "Храненить содержимое других каналов, дней"; +App::$strings["0 or blank to use the website limit."] = "0 или пусто - использовать настройки сайта."; +App::$strings["This website expires after %d days."] = "Срок хранения содержимого этого сайта истекает через %d дней"; +App::$strings["This website does not expire imported content."] = "Срок хранения импортированного содержимого этого сайта не ограничен."; +App::$strings["The website limit takes precedence if lower than your limit."] = "Ограничение сайта имеет приоритет если ниже вашего значения."; +App::$strings["Maximum Friend Requests/Day:"] = "Запросов в друзья в день:"; +App::$strings["May reduce spam activity"] = "Может ограничить спам активность"; +App::$strings["Default Privacy Group"] = "Группа конфиденциальности по умолчанию"; +App::$strings["Use my default audience setting for the type of object published"] = "Использовать настройки аудитории по умолчанию для типа опубликованного объекта"; +App::$strings["Profile to assign new connections"] = "Назначить профиль для новых контактов"; +App::$strings["Channel role and privacy"] = "Роль и конфиденциальность канала"; +App::$strings["Default Permissions Group"] = "Группа разрешений по умолчанию"; +App::$strings["Maximum private messages per day from unknown people:"] = "Максимально количество сообщений от незнакомых людей, в день:"; +App::$strings["Useful to reduce spamming"] = "Полезно для сокращения количества спама"; +App::$strings["By default post a status message when:"] = "По умолчанию публиковать новый статус при:"; +App::$strings["accepting a friend request"] = "одобрении запроса в друзья"; +App::$strings["joining a forum/community"] = "вступлении в сообщество / форум"; +App::$strings["making an interesting profile change"] = "интересном изменении профиля"; +App::$strings["Send a notification email when:"] = "Отправить уведомление по email когда:"; +App::$strings["You receive a connection request"] = "вы получили новый запрос контакта"; +App::$strings["Your connections are confirmed"] = "ваш запрос контакта был одобрен"; +App::$strings["Someone writes on your profile wall"] = "кто-то написал на стене вашего профиля"; +App::$strings["Someone writes a followup comment"] = "кто-то пишет комментарий"; +App::$strings["You receive a private message"] = "вы получили личное сообщение"; +App::$strings["You receive a friend suggestion"] = "вы получили предложение друзей"; +App::$strings["You are tagged in a post"] = "вы были отмечены в публикации"; +App::$strings["You are poked/prodded/etc. in a post"] = "вас толкнули, подтолкнули и т.п. в публикации"; +App::$strings["Someone likes your post/comment"] = "кому-то нравится ваша публикация / комментарий"; +App::$strings["Show visual notifications including:"] = "Показывать визуальные оповещения включая:"; +App::$strings["Unseen grid activity"] = "невидимую сетевую активность"; +App::$strings["Unseen channel activity"] = "невидимую активность в канале"; +App::$strings["Unseen private messages"] = "невидимое личное сообщение"; +App::$strings["Upcoming events"] = "грядущие события"; +App::$strings["Events today"] = "события сегодня"; +App::$strings["Upcoming birthdays"] = "грядущие дни рождения"; +App::$strings["Not available in all themes"] = "не доступно во всех темах"; +App::$strings["System (personal) notifications"] = "системные (личные) уведомления"; +App::$strings["System info messages"] = "сообщения с системной информацией"; +App::$strings["System critical alerts"] = "критические уведомления системы"; +App::$strings["New connections"] = "новые контакты"; +App::$strings["System Registrations"] = "системные регистрации"; +App::$strings["Unseen shared files"] = "невидимые общие файлы"; +App::$strings["Unseen public activity"] = "невидимая публичная активность"; +App::$strings["Unseen likes and dislikes"] = "невидимые лайки и дислайки"; +App::$strings["Unseen forum posts"] = "Невидимые публикации на форуме"; +App::$strings["Email notification hub (hostname)"] = "Центр уведомлений по email (имя хоста)"; +App::$strings["If your channel is mirrored to multiple hubs, set this to your preferred location. This will prevent duplicate email notifications. Example: %s"] = "Если ваш канал зеркалируется в нескольких местах, это ваше предпочтительное местоположение. Это должно предотвратить дублировать уведомлений по email. Например: %s"; +App::$strings["Show new wall posts, private messages and connections under Notices"] = "Показать новые сообщения на стене, личные сообщения и контакты в \"Уведомлениях\""; +App::$strings["Notify me of events this many days in advance"] = "Уведомлять меня о событиях заранее, дней"; +App::$strings["Must be greater than 0"] = "Должно быть больше 0"; +App::$strings["Advanced Account/Page Type Settings"] = "Дополнительные настройки учётной записи / страницы"; +App::$strings["Change the behaviour of this account for special situations"] = "Изменить поведение этого аккаунта в особых ситуациях"; +App::$strings["Miscellaneous Settings"] = "Дополнительные настройки"; +App::$strings["Default photo upload folder"] = "Каталог загрузки фотографий по умолчанию"; +App::$strings["%Y - current year, %m - current month"] = "%Y - текущий год, %y - текущий месяц"; +App::$strings["Default file upload folder"] = "Каталог загрузки файлов по умолчанию"; +App::$strings["Personal menu to display in your channel pages"] = "Персональное меню для отображения на странице вашего канала"; +App::$strings["Remove this channel."] = "Удалить этот канал."; +App::$strings["Firefox Share \$Projectname provider"] = ""; +App::$strings["Start calendar week on Monday"] = "Начинать календарную неделю с понедельника"; +App::$strings["Affinity Slider settings updated."] = "Обновлены настройки слайдера cходства."; +App::$strings["No feature settings configured"] = "Параметры функций не настроены"; +App::$strings["Default maximum affinity level"] = "Максимальный уровень сходства по умолчанию."; +App::$strings["0-99 default 99"] = "0-99 (по умолчанию 99)"; +App::$strings["Default minimum affinity level"] = "Минимальный уровень сходства по умолчанию."; +App::$strings["0-99 - default 0"] = "0-99 (по умолчанию 0)"; +App::$strings["Affinity Slider Settings"] = "Настройки слайдера сходства"; +App::$strings["Addon Settings"] = "Настройки расширений"; +App::$strings["Please save/submit changes to any panel before opening another."] = "Пожалуйста сохраните / отправьте изменения на панели прежде чем открывать другую."; +App::$strings["Not valid email."] = "Не действительный адрес email."; +App::$strings["Protected email address. Cannot change to that email."] = "Защищенный адрес электронной почты. Нельзя изменить."; +App::$strings["System failure storing new email. Please try again."] = "Системная ошибка сохранения email. Пожалуйста попробуйте ещё раз."; +App::$strings["Technical skill level updated"] = "Уровень технических навыков обновлён"; +App::$strings["Password verification failed."] = "Не удалось выполнить проверку пароля."; +App::$strings["Passwords do not match. Password unchanged."] = "Пароли не совпадают. Пароль не изменён."; +App::$strings["Empty passwords are not allowed. Password unchanged."] = "Пустые пароли не допускаются. Пароль не изменён."; +App::$strings["Password changed."] = "Пароль изменен."; +App::$strings["Password update failed. Please try again."] = "Изменение пароля не удалось. Пожалуйста, попробуйте ещё раз."; +App::$strings["Account Settings"] = "Настройки аккаунта"; +App::$strings["Current Password"] = "Текущий пароль"; +App::$strings["Enter New Password"] = "Введите новый пароль:"; +App::$strings["Confirm New Password"] = "Подтвердите новый пароль:"; +App::$strings["Leave password fields blank unless changing"] = "Оставьте поля пустыми до измнения"; +App::$strings["Remove this account including all its channels"] = "Удалить этот аккаунт включая все каналы"; +App::$strings["%s - (Experimental)"] = "%s - (экспериментальный)"; +App::$strings["Display Settings"] = "Настройки отображения"; +App::$strings["Theme Settings"] = "Настройки темы"; +App::$strings["Custom Theme Settings"] = "Дополнительные настройки темы"; +App::$strings["Content Settings"] = "Настройки содержимого"; +App::$strings["Display Theme:"] = "Тема отображения:"; +App::$strings["Select scheme"] = "Выбрать схему"; +App::$strings["Preload images before rendering the page"] = "Предзагрузка изображений перед обработкой страницы"; +App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "Субъективное время загрузки страницы будет длиннее, но страница будет готова при отображении"; +App::$strings["Enable user zoom on mobile devices"] = "Включить масштабирование на мобильных устройствах"; +App::$strings["Update browser every xx seconds"] = "Обновление браузера каждые N секунд"; +App::$strings["Minimum of 10 seconds, no maximum"] = "Минимум 10 секунд, без максимума"; +App::$strings["Maximum number of conversations to load at any time:"] = "Максимальное количество бесед для загрузки одновременно:"; +App::$strings["Maximum of 100 items"] = "Максимум 100 элементов"; +App::$strings["Show emoticons (smilies) as images"] = "Показывать эмотиконы (смайлики) как изображения"; +App::$strings["Provide channel menu in navigation bar"] = "Показывать меню канала в панели навигации"; +App::$strings["Default: channel menu located in app menu"] = "По умолчанию каналы расположены в меню приложения"; +App::$strings["Manual conversation updates"] = "Обновление бесед вручную"; +App::$strings["Default is on, turning this off may increase screen jumping"] = "Включено по умолчанию, выключение может привести к рывкам в отображении"; +App::$strings["Link post titles to source"] = "Ссылки на источник заголовков публикаций"; +App::$strings["System Page Layout Editor - (advanced)"] = "Системный редактор макета страницы - (продвинутый)"; +App::$strings["Use blog/list mode on channel page"] = "Использовать режим блога / списка на странице канала"; +App::$strings["(comments displayed separately)"] = "(комментарии отображаются отдельно)"; +App::$strings["Use blog/list mode on grid page"] = "Использовать режим блога / списка на странице матрицы"; +App::$strings["Channel page max height of content (in pixels)"] = "Максимальная высота содержания канала (в пикселях)"; +App::$strings["click to expand content exceeding this height"] = "нажмите, чтобы увеличить содержимое, превышающее эту высоту"; +App::$strings["Grid page max height of content (in pixels)"] = "Максимальная высота содержания на страницах матрицы (в пикселях)"; +App::$strings["Permission Name is required."] = "Требуется имя разрешения"; +App::$strings["Permission category saved."] = "Категория разрешения сохранена."; +App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Используйте эту форму для создания правил разрешений для различных групп людей и контактов."; +App::$strings["Permission Name"] = "Имя разрешения"; +App::$strings["Name and Secret are required"] = "Требуются имя и код"; +App::$strings["Add OAuth2 application"] = "Добавить приложение OAuth2"; +App::$strings["Name of application"] = "Название приложения"; +App::$strings["Automatically generated - change if desired. Max length 20"] = "Сгенерирован автоматические - измените если требуется. Макс. длина 20"; +App::$strings["Redirect"] = "Перенаправление"; +App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI перенаправления - оставьте пустыми до тех пока ваше приложение не требует этого"; +App::$strings["Grant Types"] = "Разрешить типы"; +App::$strings["leave blank unless your application sepcifically requires this"] = "оставьте пустыми до тех пока ваше приложение не требует этого"; +App::$strings["Authorization scope"] = "Область полномочий"; +App::$strings["OAuth2 Application not found."] = "Приложение OAuth2 не найдено."; +App::$strings["Add application"] = "Добавить приложение"; +App::$strings["Connected OAuth2 Apps"] = "Подключённые приложения OAuth2"; +App::$strings["Client key starts with"] = "Ключ клиента начинаетя с"; +App::$strings["No name"] = "Без названия"; +App::$strings["Remove authorization"] = "Удалить разрешение"; +App::$strings["Name is required"] = "Необходимо имя"; +App::$strings["Key and Secret are required"] = "Требуются ключ и код"; +App::$strings["Icon url"] = "URL значка"; +App::$strings["Application not found."] = "Приложение не найдено."; +App::$strings["Connected Apps"] = "Подключенные приложения"; +App::$strings["This channel is limited to %d tokens"] = "Этот канал ограничен %d токенами"; +App::$strings["Name and Password are required."] = "Требуются имя и пароль."; +App::$strings["Token saved."] = "Токен сохранён."; +App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content."] = "Используйте эту форму для создания идентификаторов временного доступа для сторонних пользователей. Эти идентификаторы могут использоваться в списках контроля доступа, и посетители могут использовать эти учетные данные для доступа к частному контенту."; +App::$strings["You may also provide dropbox style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "Вы также можете предоставить доступ в стиле dropbox для друзей и коллег, добавив имя и пароль для входа на любой URL-адрес сайта. Например:"; +App::$strings["Login Name"] = "Имя"; +App::$strings["Login Password"] = "Пароль"; +App::$strings["Expires (yyyy-mm-dd)"] = "Срок действия (yyyy-mm-dd)"; +App::$strings["Room not found"] = "Комната не найдена"; +App::$strings["Leave Room"] = "Покинуть комнату"; +App::$strings["Delete Room"] = "Удалить комнату"; +App::$strings["I am away right now"] = "Я сейчас отошёл"; +App::$strings["I am online"] = "Я на связи"; +App::$strings["Bookmark this room"] = "Запомнить эту комнату"; +App::$strings["New Chatroom"] = "Новый чат"; +App::$strings["Chatroom name"] = "Название чата"; +App::$strings["Expiration of chats (minutes)"] = "Завершение чатов (минут)"; +App::$strings["%1\$s's Chatrooms"] = "Чаты пользователя %1\$s"; +App::$strings["No chatrooms available"] = "Нет доступных чатов"; +App::$strings["Expiration"] = "Срок действия"; +App::$strings["min"] = "мин."; +App::$strings["Website:"] = "Веб-сайт:"; +App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Удалённый канал [%s] (пока неизвестен на этом сайте)"; +App::$strings["Rating (this information is public)"] = "Оценка (эта информация общедоступна)"; +App::$strings["Optionally explain your rating (this information is public)"] = "Объясните свою оценку (необязательно; эта информация общедоступна)"; +App::$strings["Fetching URL returns error: %1\$s"] = "Загрузка URL возвращает ошибку: %1\$s"; +App::$strings["Location not found."] = "Местоположение не найдено"; +App::$strings["Location lookup failed."] = "Поиск местоположения не удался"; +App::$strings["Please select another location to become primary before removing the primary location."] = "Пожалуйста, выберите другое местоположение в качестве основного прежде чем удалить предыдущее"; +App::$strings["Syncing locations"] = "Синхронизировать местоположение"; +App::$strings["No locations found."] = "Местоположений не найдено"; +App::$strings["Manage Channel Locations"] = "Управление местоположением канала"; +App::$strings["Sync Now"] = "Синхронизировать"; +App::$strings["Please wait several minutes between consecutive operations."] = "Пожалуйста, подождите несколько минут между последовательными операциями."; +App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "По возможности, очистите местоположение, войдя на этот веб-сайт / хаб и удалив свой канал."; +App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Используйте эту форму, чтобы удалить местоположение, если хаб больше не функционирует."; App::$strings["Nothing to import."] = "Ничего импортировать."; -App::$strings["Unable to download data from old server"] = "Невозможно загрузить данные из старого сервера"; +App::$strings["Unable to download data from old server"] = "Невозможно загрузить данные со старого сервера"; App::$strings["Imported file is empty."] = "Импортированный файл пуст."; -App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = ""; -App::$strings["Channel clone failed. Import failed."] = ""; -App::$strings["Cloned channel not found. Import failed."] = ""; -App::$strings["Import completed."] = "Импорт завершен."; +App::$strings["Your service plan only allows %d channels."] = "Ваш класс обслуживания разрешает только %d каналов."; +App::$strings["No channel. Import failed."] = "Канала нет. Импорт невозможен."; App::$strings["You must be logged in to use this feature."] = "Вы должны войти в систему, чтобы использовать эту функцию."; -App::$strings["Import Channel"] = "Импорт канала"; -App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = ""; +App::$strings["Import Channel"] = "Импортировать канал"; +App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Используйте эту форм для импорта существующего канала с другого сервера / хаба. Вы можете получить идентификационные данные канала со старого сервера / хаба через сеть или предоставить файл экспорта."; App::$strings["File to Upload"] = "Файл для загрузки"; -App::$strings["Or provide the old server/hub details"] = ""; +App::$strings["Or provide the old server/hub details"] = "или предоставьте данные старого сервера"; App::$strings["Your old identity address (xyz@example.com)"] = "Ваш старый адрес идентичности (xyz@example.com)"; App::$strings["Your old login email address"] = "Ваш старый адрес электронной почты"; App::$strings["Your old login password"] = "Ваш старый пароль"; -App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = ""; -App::$strings["Make this hub my primary location"] = ""; -App::$strings["Total invitation limit exceeded."] = ""; -App::$strings["%s : Not a valid email address."] = "%s : Не действительный адрес электронной почты."; -App::$strings["Please join us on Red"] = "Пожалуйста, присоединяйтесь к нам в Red"; -App::$strings["Invitation limit exceeded. Please contact your site administrator."] = ""; -App::$strings["%s : Message delivery failed."] = "%s : Доставка сообщения не удалась."; -App::$strings["%d message sent."] = array( - 0 => "%d сообщение отправленно.", - 1 => "%d сообщения отправленно.", - 2 => "%d сообщений отправленно.", +App::$strings["Import a few months of posts if possible (limited by available memory"] = "Импортировать несколько месяцев публикаций если возможно (ограничено доступной памятью)"; +App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Для любого варианта, пожалуйста, выберите, следует ли сделать этот хаб вашим новым основным адресом, или ваше прежнее местоположение должно продолжить выполнять эту роль. Вы сможете отправлять сообщения из любого местоположения, но только одно может быть помечено как основное место для файлов, фотографий и мультимедиа."; +App::$strings["Make this hub my primary location"] = "Сделать этот хаб главным"; +App::$strings["Move this channel (disable all previous locations)"] = "Переместить это канал (отключить все предыдущие месторасположения)"; +App::$strings["Use this channel nickname instead of the one provided"] = "Использовать псевдоним этого канала вместо предоставленного"; +App::$strings["Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site."] = "Оставьте пустым для сохранения существующего псевдонима канала. Вам будет случайным образом назначен похожий псевдоним если такое имя уже выделено на этом сайте."; +App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Процесс может занять несколько минут. Пожалуйста, отправьте форму только один раз и оставьте эту страницу открытой до завершения."; +App::$strings["No connections."] = "Контактов нет."; +App::$strings["Visit %s's profile [%s]"] = "Посетить %s ​​профиль [%s]"; +App::$strings["View Connections"] = "Просмотр контактов"; +App::$strings["Authentication failed."] = "Ошибка аутентификации."; +App::$strings["Your real name is recommended."] = "Рекомендуется использовать ваше настоящее имя."; +App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Примеры: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""; +App::$strings["This will be used to create a unique network address (like an email address)."] = "Это будет использовано для создания уникального сетевого адреса (наподобие email)."; +App::$strings["Allowed characters are a-z 0-9, - and _"] = "Разрешённые символы a-z 0-9, - и _"; +App::$strings["Channel name"] = "Название канала"; +App::$strings["Choose a short nickname"] = "Выберите короткий псевдоним"; +App::$strings["Select a channel permission role compatible with your usage needs and privacy requirements."] = "Выберите разрешения для канала в соответствии с вашими потребностями и требованиями безопасности."; +App::$strings["Read more about channel permission roles"] = "Прочитать больше о разрешениях для каналов"; +App::$strings["Create a Channel"] = "Создать канал"; +App::$strings["A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things."] = "Канал это уникальная сетевая идентичность. Он может представлять человека (профиль в социальной сети), форум или группу, бизнес или страницу знаменитости, новостную ленту и многие другие вещи."; +App::$strings["or import an existing channel from another location."] = "или импортировать существующий канал из другого места."; +App::$strings["Validate"] = "Проверить"; +App::$strings["Manage apps"] = "Управление приложениями"; +App::$strings["Create new app"] = "Создать новое приложение"; +App::$strings["No default suggestions were found."] = "Предложений по умолчанию не найдено."; +App::$strings["%d rating"] = array( + 0 => "%d оценка", + 1 => "%d оценки", + 2 => "%d оценок", ); -App::$strings["You have no more invitations available"] = "У вас больше нет приглашений"; -App::$strings["Send invitations"] = "Послать приглашения"; -App::$strings["Enter email addresses, one per line:"] = "Введите адреса электронной почты, по одному на строку:"; -App::$strings["Your message:"] = "Сообщение:"; -App::$strings["You are cordially invited to join me and some other close friends on the Hubzilla - a revolutionary new decentralised communication and information tool."] = ""; -App::$strings["You will need to supply this invitation code: \$invite_code"] = ""; -App::$strings["Please visit my channel at"] = "Пожалуйста, посетите мой канал на"; -App::$strings["Once you have registered (on ANY Hubzilla site - they are all inter-connected), please connect with my Hubzilla channel address:"] = ""; -App::$strings["Click the [Register] link on the following page to join."] = ""; -App::$strings["For more information about the Hubzilla Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Чтобы узнать больше о проекте Hubzilla, и чтобы узнать почему он имеет потенциал для изменения привычного нам Интернета, пожалуйста, посетите http://getzot.com"; -App::$strings["Unable to locate original post."] = "Не удалось найти оригинал."; -App::$strings["Empty post discarded."] = "Отказаться от пустой почты."; -App::$strings["Executable content type not permitted to this channel."] = ""; -App::$strings["System error. Post not saved."] = "Системная ошибка. Сообщение не сохранено."; -App::$strings["You have reached your limit of %1$.0f top level posts."] = ""; -App::$strings["You have reached your limit of %1$.0f webpages."] = ""; -App::$strings["[Embedded content - reload page to view]"] = ""; -App::$strings["Help with this feature"] = ""; -App::$strings["Layout Name"] = "Название шаблона"; -App::$strings["thing"] = ""; -App::$strings["Remote privacy information not available."] = ""; -App::$strings["Visible to:"] = "Кому видно:"; -App::$strings["No connections."] = "Никаких связей."; -App::$strings["Visit %s's profile [%s]"] = "Посетить %s's ​​профиль [%s]"; -App::$strings["View Connnections"] = "Просмотр контактов"; +App::$strings["Gender: "] = "Пол:"; +App::$strings["Status: "] = "Статус:"; +App::$strings["Homepage: "] = "Домашняя страница:"; +App::$strings["Description:"] = "Описание:"; +App::$strings["Public Forum:"] = "Публичный форум:"; +App::$strings["Keywords: "] = "Ключевые слова:"; +App::$strings["Don't suggest"] = "Не предлагать"; +App::$strings["Common connections (estimated):"] = "Общие контакты (оценочно):"; +App::$strings["Global Directory"] = "Глобальный каталог"; +App::$strings["Local Directory"] = "Локальный каталог"; +App::$strings["Finding:"] = "Поиск:"; +App::$strings["next page"] = "следующая страница"; +App::$strings["previous page"] = "предыдущая страница"; +App::$strings["Sort options"] = "Параметры сортировки"; +App::$strings["Alphabetic"] = "По алфавиту"; +App::$strings["Reverse Alphabetic"] = "Против алфавита"; +App::$strings["Newest to Oldest"] = "От новых к старым"; +App::$strings["Oldest to Newest"] = "От старых к новым"; +App::$strings["No entries (some entries may be hidden)."] = "Нет записей (некоторые записи могут быть скрыты)."; +App::$strings["Enter a folder name"] = "Введите название каталога"; +App::$strings["or select an existing folder (doubleclick)"] = "или выберите существующий каталог (двойной щелчок)"; +App::$strings["Invalid message"] = "Неверное сообщение"; +App::$strings["no results"] = "Ничего не найдено."; +App::$strings["channel sync processed"] = "синхронизация канала завершена"; +App::$strings["queued"] = "в очереди"; +App::$strings["posted"] = "опубликовано"; +App::$strings["accepted for delivery"] = "принято к доставке"; +App::$strings["updated"] = "обновлено"; +App::$strings["update ignored"] = "обновление игнорируется"; +App::$strings["permission denied"] = "доступ запрещен"; +App::$strings["recipient not found"] = "получатель не найден"; +App::$strings["mail recalled"] = "почта отозвана"; +App::$strings["duplicate mail received"] = "получено дублирующее сообщение"; +App::$strings["mail delivered"] = "почта доставлен"; +App::$strings["Delivery report for %1\$s"] = "Отчёт о доставке для %1\$s"; +App::$strings["Redeliver"] = "Доставить повторно"; +App::$strings["No such group"] = "Нет такой группы"; +App::$strings["No such channel"] = "Нет такого канала"; +App::$strings["Privacy group is empty"] = "Группа безопасности пуста"; +App::$strings["Privacy group: "] = "Группа безопасности:"; +App::$strings["Please login."] = "Пожалуйста, войдите."; +App::$strings["No service class restrictions found."] = "Ограничений класса обслуживание не найдено."; +App::$strings["Add Card"] = "Добавить карточку"; +App::$strings["Change Order of Pinned Navbar Apps"] = "Изменить порядок приложений на панели навигации"; +App::$strings["Change Order of App Tray Apps"] = "Изменить порядок приложений в лотке"; +App::$strings["Use arrows to move the corresponding app left (top) or right (bottom) in the navbar"] = "Используйте стрелки для перемещения приложения влево (вверх) или вправо (вниз) в панели навигации"; +App::$strings["Use arrows to move the corresponding app up or down in the app tray"] = "Используйте стрелки для перемещения приложения вверх или вниз в лотке"; +App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Превышено максимальное количество регистраций на сегодня. Пожалуйста, попробуйте снова завтра."; +App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Просьба подтвердить согласие с \"Условиями обслуживания\". Регистрация не удалась."; +App::$strings["Passwords do not match."] = "Пароли не совпадают."; +App::$strings["Registration successful. Continue to create your first channel..."] = "Регистрация завершена успешно. Для продолжения создайте свой первый канал..."; +App::$strings["Registration successful. Please check your email for validation instructions."] = "Регистрация завершена успешно. Пожалуйста проверьте вашу электронную почту для подтверждения."; +App::$strings["Your registration is pending approval by the site owner."] = "Ваша регистрация ожидает одобрения администрации сайта."; +App::$strings["Your registration can not be processed."] = "Ваша регистрация не может быть обработана."; +App::$strings["Registration on this hub is disabled."] = "Регистрация на этом хабе отключена."; +App::$strings["Registration on this hub is by approval only."] = "Регистрация на этом хабе только по утверждению."; +App::$strings["Register at another affiliated hub."] = "Зарегистрироваться на другом хабе."; +App::$strings["Registration on this hub is by invitation only."] = "Регистрация на этом хабе доступна только по приглашениям."; +App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Этот сайт превысил максимальное количество регистраций на сегодня. Пожалуйста, попробуйте снова завтра. "; +App::$strings["I accept the %s for this website"] = "Я принимаю %s для этого веб-сайта."; +App::$strings["I am over %s years of age and accept the %s for this website"] = "Мой возраст превышает %s лет и я принимаю %s для этого веб-сайта."; +App::$strings["Your email address"] = "Ваш адрес электронной почты"; +App::$strings["Choose a password"] = "Выберите пароль"; +App::$strings["Please re-enter your password"] = "Пожалуйста, введите пароль еще раз"; +App::$strings["Please enter your invitation code"] = "Пожалуйста, введите Ваш код приглашения"; +App::$strings["Your Name"] = "Ваше имя"; +App::$strings["Real names are preferred."] = "Предпочтительны реальные имена."; +App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Ваш псевдоним будет использован для создания легко запоминаемого адреса канала, напр. nickname %s"; +App::$strings["Select a channel permission role for your usage needs and privacy requirements."] = "Выберите разрешения для канала в зависимости от ваших потребностей и требований приватности."; +App::$strings["no"] = "нет"; +App::$strings["yes"] = "да"; +App::$strings["This site requires email verification. After completing this form, please check your email for further instructions."] = "Этот сайт требует проверку адреса электронной почты. После заполнения этой формы, пожалуйста, проверьте ваш почтовый ящик для дальнейших инструкций."; +App::$strings["This setting requires special processing and editing has been blocked."] = "Этот параметр требует специальной обработки и редактирования и был заблокирован."; +App::$strings["Configuration Editor"] = "Редактор конфигурации"; +App::$strings["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."] = "Предупреждение. Изменение некоторых настроек может привести к неработоспособности вашего канала. Пожалуйста, покиньте эту страницу, если вы точно не значете, как правильно использовать эту функцию."; +App::$strings["Edit Article"] = "Редактировать статью"; +App::$strings["Not found"] = "Не найдено."; +App::$strings["Error retrieving wiki"] = "Ошибка при получении Wiki"; +App::$strings["Error creating zip file export folder"] = "Ошибка при создании zip-файла при экспорте каталога"; +App::$strings["Error downloading wiki: "] = "Ошибка загрузки Wiki:"; +App::$strings["Download"] = "Загрузить"; +App::$strings["Wiki name"] = "Название Wiki"; +App::$strings["Content type"] = "Тип содержимого"; +App::$strings["Type"] = "Тип"; +App::$strings["Any type"] = "Любой тип"; +App::$strings["Lock content type"] = "Зафиксировать тип содержимого"; +App::$strings["Create a status post for this wiki"] = "Создать публикацию о статусе этой Wiki"; +App::$strings["Edit Wiki Name"] = "Редактировать наименование Wiki"; +App::$strings["Wiki not found"] = "Wiki не найдена"; +App::$strings["Rename page"] = "Переименовать страницу"; +App::$strings["Error retrieving page content"] = "Ошибка при получении содержимого страницы"; +App::$strings["New page"] = "Новая страница"; +App::$strings["Revision Comparison"] = "Сравнение ревизий"; +App::$strings["Revert"] = "Вернуть"; +App::$strings["Short description of your changes (optional)"] = "Краткое описание ваших изменений (необязательно)"; +App::$strings["Source"] = "Источник"; +App::$strings["New page name"] = "Новое имя страницы"; +App::$strings["Embed image from photo albums"] = "Встроить изображение из фотоальбома"; +App::$strings["Error creating wiki. Invalid name."] = "Ошибка создания Wiki. Неверное имя."; +App::$strings["A wiki with this name already exists."] = "Wiki с таким именем уже существует."; +App::$strings["Wiki created, but error creating Home page."] = "Wiki создана, но возникла ошибка при создании домашней страницы"; +App::$strings["Error creating wiki"] = "Ошибка при создании Wiki"; +App::$strings["Error updating wiki. Invalid name."] = "Ошибка при обновлении Wiki. Неверное имя."; +App::$strings["Error updating wiki"] = "Ошибка при обновлении Wiki"; +App::$strings["Wiki delete permission denied."] = "Нет прав на удаление Wiki."; +App::$strings["Error deleting wiki"] = "Ошибка удаления Wiki"; +App::$strings["New page created"] = "Создана новая страница"; +App::$strings["Cannot delete Home"] = "Невозможно удалить домашнюю страницу"; +App::$strings["Current Revision"] = "Текущая ревизия"; +App::$strings["Selected Revision"] = "Выбранная ревизия"; +App::$strings["You must be authenticated."] = "Вы должны быть аутентифицированы."; +App::$strings["Hub not found."] = "Узел не найден."; +App::$strings["Item not available."] = "Элемент недоступен."; +App::$strings["Privacy group created."] = "Группа безопасности создана."; +App::$strings["Could not create privacy group."] = "Не удалось создать группу безопасности."; +App::$strings["Privacy group updated."] = "Группа безопасности обновлена."; +App::$strings["Add Group"] = "Добавить группу"; +App::$strings["Privacy group name"] = "Имя группы безопасности"; +App::$strings["Members are visible to other channels"] = "Участники канала видимые для остальных"; +App::$strings["Privacy group removed."] = "Группа безопасности удалена."; +App::$strings["Unable to remove privacy group."] = "Ну удалось удалить группу безопасности."; +App::$strings["Privacy Group: %s"] = "Группа безопасности: %s"; +App::$strings["Privacy group name: "] = "Название группы безопасности:"; +App::$strings["Delete Group"] = "Удалить группу"; +App::$strings["Group members"] = "Члены группы"; +App::$strings["Not in this group"] = "Не в этой группе"; +App::$strings["Click a channel to toggle membership"] = "Нажмите на канал для просмотра членства"; +App::$strings["Profile not found."] = "Профиль не найден."; +App::$strings["Profile deleted."] = "Профиль удален."; +App::$strings["Profile-"] = "Профиль -"; +App::$strings["New profile created."] = "Новый профиль создан."; +App::$strings["Profile unavailable to clone."] = "Профиль недоступен для клонирования."; +App::$strings["Profile unavailable to export."] = "Профиль недоступен для экспорта."; +App::$strings["Profile Name is required."] = "Требуется имя профиля."; +App::$strings["Marital Status"] = "Семейное положение"; +App::$strings["Romantic Partner"] = "Романтический партнер"; +App::$strings["Likes"] = "Нравится"; +App::$strings["Dislikes"] = "Не нравится"; +App::$strings["Work/Employment"] = "Работа / Занятость"; +App::$strings["Religion"] = "Религия"; +App::$strings["Political Views"] = "Политические взгляды"; +App::$strings["Sexual Preference"] = "Сексуальная ориентация"; +App::$strings["Homepage"] = "Домашняя страница"; +App::$strings["Interests"] = "Интересы"; +App::$strings["Profile updated."] = "Профиль обновлен."; +App::$strings["Hide your connections list from viewers of this profile"] = "Скрывать от просмотра ваш список контактов в этом профиле"; +App::$strings["Edit Profile Details"] = "Редактирование профиля"; +App::$strings["View this profile"] = "Посмотреть этот профиль"; +App::$strings["Profile Tools"] = "Инструменты профиля"; +App::$strings["Change cover photo"] = "Изменить фотографию обложки"; +App::$strings["Create a new profile using these settings"] = "Создать новый профиль со следующими настройками"; +App::$strings["Clone this profile"] = "Клонировать этот профиль"; +App::$strings["Delete this profile"] = "Удалить этот профиль"; +App::$strings["Add profile things"] = "Добавить в профиль"; +App::$strings["Relationship"] = "Отношения"; +App::$strings["Import profile from file"] = "Импортировать профиль из файла"; +App::$strings["Export profile to file"] = "Экспортировать профиль в файл"; +App::$strings["Your gender"] = "Ваш пол"; +App::$strings["Marital status"] = "Семейное положение"; +App::$strings["Sexual preference"] = "Сексуальная ориентация"; +App::$strings["Profile name"] = "Имя профиля"; +App::$strings["This is your default profile."] = "Это ваш профиль по умолчанию."; +App::$strings["Your full name"] = "Ваше полное имя"; +App::$strings["Title/Description"] = "Заголовок / описание"; +App::$strings["Street address"] = "Улица, дом, квартира"; +App::$strings["Locality/City"] = "Населенный пункт / город"; +App::$strings["Region/State"] = "Регион / Область"; +App::$strings["Postal/Zip code"] = "Почтовый индекс"; +App::$strings["Who (if applicable)"] = "Кто (если применимо)"; +App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Примеры: ivan1990, Ivan Petrov, ivan@example.com"; +App::$strings["Since (date)"] = "С (дата)"; +App::$strings["Tell us about yourself"] = "Расскажите нам о себе"; +App::$strings["Hometown"] = "Родной город"; +App::$strings["Political views"] = "Политические взгляды"; +App::$strings["Religious views"] = "Религиозные взгляды"; +App::$strings["Keywords used in directory listings"] = "Ключевые слова для участия в каталоге"; +App::$strings["Example: fishing photography software"] = "Например: fishing photography software"; +App::$strings["Musical interests"] = "Музыкальные интересы"; +App::$strings["Books, literature"] = "Книги, литература"; +App::$strings["Television"] = "Телевидение"; +App::$strings["Film/Dance/Culture/Entertainment"] = "Кино / танцы / культура / развлечения"; +App::$strings["Hobbies/Interests"] = "Хобби / интересы"; +App::$strings["Love/Romance"] = "Любовь / романтические отношения"; +App::$strings["School/Education"] = "Школа / образование"; +App::$strings["Contact information and social networks"] = "Информация и социальные сети для связи"; +App::$strings["My other channels"] = "Мои другие контакты"; +App::$strings["Communications"] = "Связи"; +App::$strings["Email verification resent"] = "Сообщение для проверки email отправлено повторно"; +App::$strings["Unable to resend email verification message."] = "Невозможно повторно отправить сообщение для проверки email"; +App::$strings["vcard"] = "vCard"; +App::$strings["Invalid profile identifier."] = "Неверный идентификатор профиля"; +App::$strings["Profile Visibility Editor"] = "Редактор видимости профиля"; +App::$strings["Click on a contact to add or remove."] = "Нажмите на контакт, чтобы добавить или удалить."; +App::$strings["Visible To"] = "Видно"; +App::$strings["Thing updated"] = "Обновлено"; +App::$strings["Object store: failed"] = "Хранлищие объектов: неудача"; +App::$strings["Thing added"] = "Добавлено"; +App::$strings["OBJ: %1\$s %2\$s %3\$s"] = ""; +App::$strings["Show Thing"] = "Показать"; +App::$strings["item not found."] = "Элемент не найден."; +App::$strings["Edit Thing"] = "Редактировать"; +App::$strings["Select a profile"] = "Выбрать профиль"; +App::$strings["Post an activity"] = "Опубликовать мероприятие"; +App::$strings["Only sends to viewers of the applicable profile"] = "Отправлять только подходящий профиль"; +App::$strings["Name of thing e.g. something"] = "Наименование, например \"нечто\""; +App::$strings["URL of thing (optional)"] = "URL (необязательно)"; +App::$strings["URL for photo of thing (optional)"] = "URL для фотографии (необязательно)"; +App::$strings["Add Thing to your Profile"] = "Добавить к вашему профилю"; +App::$strings["Article"] = "Статья"; +App::$strings["Item has been removed."] = "Элемент был удалён."; +App::$strings["Welcome to %s"] = "Добро пожаловать в %s"; +App::$strings["Please refresh page"] = "Пожалуйста обновите страницу"; +App::$strings["Unknown error"] = "Неизвестная ошибка"; App::$strings["No valid account found."] = "Действительный аккаунт не найден."; -App::$strings["Password reset request issued. Check your email."] = ""; +App::$strings["Password reset request issued. Check your email."] = "Запрос на сброс пароля отправлен. Проверьте вашу электронную почту."; App::$strings["Site Member (%s)"] = "Участник сайта (%s)"; -App::$strings["Password reset requested at %s"] = "Требуется сброс пароля на %s"; -App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = ""; -App::$strings["Password Reset"] = "Сбросить пароль"; +App::$strings["Password reset requested at %s"] = "Запроше сброс пароля на %s"; +App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Запрос не может быть проверен. (Вы могли отправить его раньше). Сброс пароля не возможен."; App::$strings["Your password has been reset as requested."] = "Ваш пароль в соответствии с просьбой сброшен."; App::$strings["Your new password is"] = "Ваш новый пароль"; -App::$strings["Save or copy your new password - and then"] = ""; -App::$strings["click here to login"] = "нажмите здесь чтобы выйти"; -App::$strings["Your password may be changed from the Settings page after successful login."] = ""; -App::$strings["Your password has changed at %s"] = "Пароль изменен на %s"; -App::$strings["Forgot your Password?"] = "Забыли пароль или логин?"; -App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = ""; +App::$strings["Save or copy your new password - and then"] = "Сохраните ваш новый пароль и затем"; +App::$strings["click here to login"] = "нажмите здесь чтобы войти"; +App::$strings["Your password may be changed from the Settings page after successful login."] = "Ваш пароль может быть изменён на странице Настройкипосле успешного входа."; +App::$strings["Your password has changed at %s"] = "Пароль был изменен на %s"; +App::$strings["Forgot your Password?"] = "Забыли ваш пароль?"; +App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Введите ваш адрес электронной почты и нажмите отправить чтобы сбросить пароль. Затем проверьте ваш почтовый ящик для дальнейших инструкций. "; App::$strings["Email Address"] = "Адрес электронной почты"; -App::$strings["Reset"] = "Сброс"; -App::$strings["Hub not found."] = "Hub не найден."; -App::$strings["Total votes"] = ""; -App::$strings["Average Rating"] = ""; -App::$strings["Unable to lookup recipient."] = ""; -App::$strings["Unable to communicate with requested channel."] = ""; -App::$strings["Cannot verify requested channel."] = ""; -App::$strings["Selected channel has private message restrictions. Send failed."] = ""; -App::$strings["Messages"] = "Переписка"; -App::$strings["Message deleted."] = "Сообщение удалено."; -App::$strings["Message recalled."] = ""; -App::$strings["Send Private Message"] = "Отправить личное сообщение"; -App::$strings["To:"] = "Кому:"; -App::$strings["Subject:"] = "Тема:"; -App::$strings["Message not found."] = "Сообщение не найдено."; -App::$strings["Delete message"] = "Удалить сообщение"; -App::$strings["Recall message"] = ""; -App::$strings["Message has been recalled."] = ""; -App::$strings["Private Conversation"] = "Личный разговор"; -App::$strings["Delete conversation"] = "Удалить разговор"; -App::$strings["No secure communications available. You may be able to respond from the sender's profile page."] = ""; -App::$strings["Send Reply"] = "Отправить снова"; -App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = ""; -App::$strings["Create a new channel"] = "Создать новый канал"; -App::$strings["Channel Manager"] = "Настройки канала"; -App::$strings["Current Channel"] = "Текущий канал"; -App::$strings["Attach to one of your channels by selecting it."] = ""; -App::$strings["Default Channel"] = "Канал по умолчанию"; -App::$strings["Make Default"] = "Сделать стандартным"; -App::$strings["Wall Photos"] = "Стена фотографий"; -App::$strings["Profile Match"] = "Профиль Совпадение"; -App::$strings["No keywords to match. Please add keywords to your default profile."] = ""; -App::$strings["is interested in:"] = "заинтересован в:"; -App::$strings["No matches"] = "Нет соответствий"; -App::$strings["Menu updated."] = "Меню обновлено."; -App::$strings["Unable to update menu."] = "Невозможно обновление меню."; -App::$strings["Menu created."] = "Меню создано."; -App::$strings["Unable to create menu."] = "Невозможно создать меню."; -App::$strings["Manage Menus"] = "Управление меню"; -App::$strings["Drop"] = "Удалить"; -App::$strings["Create a new menu"] = "Создать новое меню"; -App::$strings["Delete this menu"] = "Удалить это меню"; -App::$strings["Edit menu contents"] = "Редактировать содержание меню"; -App::$strings["Edit this menu"] = "Редактировать это меню"; -App::$strings["New Menu"] = "Новое меню"; -App::$strings["Menu name"] = "Название меню"; -App::$strings["Must be unique, only seen by you"] = ""; -App::$strings["Menu title"] = "Название меню"; -App::$strings["Menu title as seen by others"] = ""; -App::$strings["Allow bookmarks"] = "Разрешить закладки"; -App::$strings["Menu may be used to store saved bookmarks"] = "Меню может использоваться, чтобы сохранить закладки"; -App::$strings["Menu deleted."] = "Меню удалено."; -App::$strings["Menu could not be deleted."] = "Меню не может быть удален."; -App::$strings["Edit Menu"] = "Редактировать меню"; -App::$strings["Add or remove entries to this menu"] = ""; -App::$strings["Conversation removed."] = "Разговор удален."; -App::$strings["No messages."] = "Нет сообщений."; -App::$strings["D, d M Y - g:i A"] = "D, d M Y - g:i A"; -App::$strings["Add a Channel"] = "Добавить контакт"; -App::$strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = ""; -App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = ""; -App::$strings["Choose a short nickname"] = "Выберите короткий псевдоним"; -App::$strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = ""; -App::$strings["Or import an existing channel from another location"] = ""; -App::$strings["Invalid request identifier."] = ""; -App::$strings["Discard"] = "Отменить"; -App::$strings["No more system notifications."] = "Новых оповещений системы пока нет."; -App::$strings["System Notifications"] = "Системные оповещения "; -App::$strings["Unable to find your hub."] = ""; -App::$strings["Post successful."] = "Публикация прошла успешно."; -App::$strings["invalid target signature"] = ""; -App::$strings["OpenID protocol error. No ID returned."] = ""; -App::$strings["App installed."] = "Приложение установлено ."; -App::$strings["Malformed app."] = ""; -App::$strings["Embed code"] = "Код для вставки"; -App::$strings["Edit App"] = "Редактировать приложение"; -App::$strings["Create App"] = "Создать приложение"; -App::$strings["Name of app"] = "Название приложения"; -App::$strings["Location (URL) of app"] = ""; -App::$strings["Photo icon URL"] = ""; -App::$strings["80 x 80 pixels - optional"] = "80 x 80 pixels - необязательно"; -App::$strings["Version ID"] = "Версия ID"; -App::$strings["Price of app"] = ""; -App::$strings["Location (URL) to purchase app"] = ""; -App::$strings["Schema Default"] = ""; -App::$strings["Sans-Serif"] = ""; -App::$strings["Monospace"] = ""; -App::$strings["Theme settings"] = "Настройки темы"; -App::$strings["Set scheme"] = "Установить схему"; -App::$strings["Set font-size for posts and comments"] = "Установить размер шрифта для сообщений и комментариев"; -App::$strings["Set font face"] = ""; -App::$strings["Set iconset"] = ""; -App::$strings["Set big shadow size, default 15px 15px 15px"] = ""; -App::$strings["Set small shadow size, default 5px 5px 5px"] = ""; -App::$strings["Set shadow colour, default #000"] = ""; -App::$strings["Set radius size, default 5px"] = ""; -App::$strings["Set line-height for posts and comments"] = ""; -App::$strings["Set background image"] = ""; -App::$strings["Set background attachment"] = ""; -App::$strings["Set background colour"] = ""; -App::$strings["Set section background image"] = ""; -App::$strings["Set section background colour"] = ""; -App::$strings["Set colour of items - use hex"] = ""; -App::$strings["Set colour of links - use hex"] = ""; -App::$strings["Set max-width for items. Default 400px"] = ""; -App::$strings["Set min-width for items. Default 240px"] = ""; -App::$strings["Set the generic content wrapper width. Default 48%"] = ""; -App::$strings["Set colour of fonts - use hex"] = ""; -App::$strings["Set background-size element"] = ""; -App::$strings["Item opacity"] = ""; -App::$strings["Display post previews only"] = ""; -App::$strings["Display side bar on channel page"] = ""; -App::$strings["Colour of the navigation bar"] = ""; -App::$strings["Item float"] = ""; -App::$strings["Left offset of the section element"] = ""; -App::$strings["Right offset of the section element"] = ""; -App::$strings["Section width"] = ""; -App::$strings["Left offset of the aside"] = ""; -App::$strings["Right offset of the aside element"] = ""; -App::$strings["None"] = ""; -App::$strings["Header image"] = "Графика заголовока"; -App::$strings["Header image only on profile pages"] = ""; -App::$strings["Narrow navbar"] = "Узкая панель навигации"; -App::$strings["Navigation bar background colour"] = "Панель навигации, цвет фона"; -App::$strings["Navigation bar gradient top colour"] = "Панель навигации, цвет градиента вверху"; -App::$strings["Navigation bar gradient bottom colour"] = "Панель навигации, цвет градиента внизу"; -App::$strings["Navigation active button gradient top colour"] = "Панель навигации, цвет градиента вверху активной кнопки"; -App::$strings["Navigation active button gradient bottom colour"] = "Панель навигации, цвет градиента внизу активной кнопки"; -App::$strings["Navigation bar border colour "] = "Панель навигации, цвет границы"; -App::$strings["Navigation bar icon colour "] = "Панель навигации, цвет значков"; -App::$strings["Navigation bar active icon colour "] = "Панель навигации, цвет активного значка"; -App::$strings["link colour"] = "Цвет ссылок"; -App::$strings["Set font-colour for banner"] = "Цвет текста в шапке"; -App::$strings["Set the background colour"] = "Цвет фона на странице канала"; -App::$strings["Set the background image"] = "Фоновое изображение"; -App::$strings["Set the background colour of items"] = "Цвет фона для постов и других элементов"; -App::$strings["Set the background colour of comments"] = "Цвет фона для комментариев"; -App::$strings["Set the border colour of comments"] = "Цвет границы для области комментариев"; -App::$strings["Set the indent for comments"] = ""; -App::$strings["Set the basic colour for item icons"] = "Основной цвет в иконках редактирования"; -App::$strings["Set the hover colour for item icons"] = "Цвет в иконках редактирования при наведении мыши"; -App::$strings["Set font-size for the entire application"] = "Установить размер шрифта для системы в целом"; -App::$strings["Set font-colour for posts and comments"] = "Цвет шрифта для постов и комментариев"; -App::$strings["Set radius of corners"] = "Радиус скруглений"; -App::$strings["Set shadow depth of photos"] = ""; -App::$strings["Set maximum width of conversation regions"] = ""; -App::$strings["Center conversation regions"] = ""; -App::$strings["Set minimum opacity of nav bar - to hide it"] = "Панель навигации, прозрачность"; -App::$strings["Set size of conversation author photo"] = ""; -App::$strings["Set size of followup author photos"] = ""; -App::$strings["Sloppy photo albums"] = ""; -App::$strings["Are you a clean desk or a messy desk person?"] = ""; -App::$strings["Type"] = "Тип"; -App::$strings["Size"] = "Размер"; -App::$strings["Last modified"] = "Последнее изменение"; -App::$strings["Are you sure you want to delete this item?"] = "Вы уверены, что хотите удалить этот элемент?"; +App::$strings["Set your current mood and tell your friends"] = "Установить текущее настроение и рассказать друзьям"; +App::$strings["Warning: Database versions differ by %1\$d updates."] = "Предупреждение: Версия базы данных отличается от %1\$d обновления."; +App::$strings["Import completed"] = "Импорт завершён."; +App::$strings["Import Items"] = "Импортировать объекты"; +App::$strings["Use this form to import existing posts and content from an export file."] = "Используйте эту форму для импорта существующих публикаций и содержимого из файла."; +App::$strings["toggle full screen mode"] = "переключение полноэкранного режима"; +App::$strings["parent"] = "источник"; +App::$strings["Principal"] = "Субъект"; +App::$strings["Addressbook"] = "Адресная книга"; +App::$strings["Schedule Inbox"] = "План занятий входящий"; +App::$strings["Schedule Outbox"] = "План занятий исходящий"; App::$strings["Total"] = "Всего"; -App::$strings["Update %s failed. See error logs."] = ""; -App::$strings["Update Error at %s"] = "Ошибка обновления на %s"; -App::$strings["Create an account to access services and applications within the Hubzilla"] = ""; -App::$strings["Password"] = "Пароль"; -App::$strings["Remember me"] = "Запомнить"; -App::$strings["Forgot your password?"] = "Забыли пароль или логин?"; -App::$strings["permission denied"] = "доступ запрещен"; -App::$strings["Got Zot?"] = "Got Zot?"; -App::$strings["toggle mobile"] = "мобильное подключение"; +App::$strings["Shared"] = "Общие"; +App::$strings["Add Files"] = "Добавить файлы"; +App::$strings["You are using %1\$s of your available file storage."] = "Вы используете %1\$s из доступного вам хранилища файлов."; +App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s%)"] = "Вы используете %1\$s из %2\$s доступного хранилища файлов (%3\$s%)."; +App::$strings["WARNING:"] = "Предупреждение:"; +App::$strings["Create new folder"] = "Создать новую папку"; +App::$strings["Upload file"] = "Загрузить файл"; +App::$strings["Drop files here to immediately upload"] = "Поместите файлы сюда для немедленной загрузки"; -- cgit v1.2.3 From 429e3ce30a44d4c25dcc66653f9bdbb46ab92c1d Mon Sep 17 00:00:00 2001 From: kostikov Date: Fri, 20 Jul 2018 19:21:58 +0200 Subject: Add new file (cherry picked from commit a65c23546bafa081a37b239045c6e38d5c2b2fdd) --- view/ru/hubzilla_update_fail_eml.tpl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 view/ru/hubzilla_update_fail_eml.tpl diff --git a/view/ru/hubzilla_update_fail_eml.tpl b/view/ru/hubzilla_update_fail_eml.tpl new file mode 100644 index 000000000..c2042e13c --- /dev/null +++ b/view/ru/hubzilla_update_fail_eml.tpl @@ -0,0 +1,14 @@ + +Привет, +Я веб-сервер {{$sitename}}; + +Разработчики Hubzilla только что выпустили обновление {{$update}}  +но когда я попыталась/ся установить его, что-то пошло не так. +Это должно быть исправлено в ближайшее время и требует вмешательства человека. +Пожалуйста, обратитесь к разработчикам Hubzilla, если вы не можете понять, как +исправьте это по своему усмотрению. Моя база данных может быть недействительной. + +Сообщение ошибки является следующим '{{$}}'. + +Приносим извинения за неудобства, + Ваш веб-сервер {{$siteurl}} -- cgit v1.2.3 From 21ecf54b73b916ce455aa98f49b45242b3f0ffb8 Mon Sep 17 00:00:00 2001 From: kostikov Date: Fri, 20 Jul 2018 19:25:46 +0200 Subject: Update lostpass_eml.tpl (cherry picked from commit 3713aa210f88bc56289917ed66a853e5eb68652e) --- view/ru/lostpass_eml.tpl | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/view/ru/lostpass_eml.tpl b/view/ru/lostpass_eml.tpl index 3b79d2791..76ccb0f01 100644 --- a/view/ru/lostpass_eml.tpl +++ b/view/ru/lostpass_eml.tpl @@ -1,32 +1,35 @@ -Dear {{$username}}, - A request was recently received at {{$sitename}} to reset your account -password. In order to confirm this request, please select the verification link -below or paste it into your web browser address bar. +Уважаемый {{$username}}, + Недавно {{$sitename}} был получен запрос на сброс пароля вашей +учётной записи. Для подтверждения этого запроса, пожалуйста перейдите по ссылке +проверки ниже или вставьте его в адресную строку вашего браузера. -If you did NOT request this change, please DO NOT follow the link -provided and ignore and/or delete this email. +Если вы НЕ запрашивали это измнение, пожалуйста НЕ используйте предоставленную +ссылку и игнорируйте и / или удалите это письмо. -Your password will not be changed unless we can verify that you -issued this request. +Ваш пароль не будет изменён до тех пор, пока мы не сможем убедиться что именно +вами создан запрос. -Follow this link to verify your identity: +Проследуйте по ссылке для подтверждения вашей личности: {{$reset_link}} -You will then receive a follow-up message containing the new password. +После этого вы получите email содержащий новый пароль. -You may change that password from your account settings page after logging in. +Вы можете изменить этот пароль в вашей учётной записи после входа. -The login details are as follows: +Подробности логина: -Site Location: {{$siteurl}} -Login Name: {{$email}} +Расположение сайта: {{$siteurl}} +Имя для входа: {{$email}} -Sincerely, - {{$sitename}} Administrator +С уважением, + администрация {{$sitename}} - +-- +Условия использования сервиса: +{{$siteurl}}/help/TermsOfService + \ No newline at end of file -- cgit v1.2.3 From 9bfb63fd98ab43d87979f863bd96acc7292beac5 Mon Sep 17 00:00:00 2001 From: kostikov Date: Fri, 20 Jul 2018 19:26:24 +0200 Subject: Update passchanged_eml.tpl (cherry picked from commit 8e2e09bb167de47b2171f4698afff3cc472c0fbb) --- view/ru/passchanged_eml.tpl | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/view/ru/passchanged_eml.tpl b/view/ru/passchanged_eml.tpl index 0d94be3c2..86a0ea3f2 100644 --- a/view/ru/passchanged_eml.tpl +++ b/view/ru/passchanged_eml.tpl @@ -1,20 +1,24 @@ -Dear {{$username}}, - Your password has been changed as requested. Please retain this -information for your records (or change your password immediately to -something that you will remember). +Дорогой {{$username}}, + Ваш пароль был изменен, как вы и просили. Пожалуйста, сохраните эту +информацию в ваших записях (или смените свой пароль на такой +который вы точно не забудете). -Your login details are as follows: +Детали учетной записи: -Site Location: {{$siteurl}} -Login Name: {{$email}} -Password: {{$new_password}} +Адрес сайта: {{$siteurl}} +Имя Пользователя: {{$email}} +Пароль: {{$new_password}} -You may change that password from your account settings page after logging in. +Вы можете сменить этот пароль в настройках учетной записи после того, как войдете в систему. -Sincerely, - {{$sitename}} Administrator +С уважением, + администрация {{$sitename}} + +-- +Условия предоставления услуг: +{{$siteurl}}/help/TermsOfService -- cgit v1.2.3 From c9e272a78dce6779a97af90f004e5f9e6dadf5e5 Mon Sep 17 00:00:00 2001 From: kostikov Date: Fri, 20 Jul 2018 19:26:54 +0200 Subject: Update register_open_eml.tpl (cherry picked from commit 86a42aad16ddc6654c0781847c0e69a71c62a2e4) --- view/ru/register_open_eml.tpl | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/view/ru/register_open_eml.tpl b/view/ru/register_open_eml.tpl index 4b397201c..0b148fd61 100644 --- a/view/ru/register_open_eml.tpl +++ b/view/ru/register_open_eml.tpl @@ -1,19 +1,17 @@ -An account has been created at {{$sitename}} for this email address. -The login details are as follows: +Учётная запись была создана на {{$sitename}} для этого адреса электронной почты. +Детали учётной записи: -Site Location: {{$siteurl}} -Login: {{$email}} -Password: (the password which was provided during registration) +Адрес сайта: {{$siteurl}} +Имя для входа: {{$email}} +Пароль: (указанный вами при регистрации) -If this account was created without your knowledge and is not desired, you may -visit this site and reset the password. This will allow you to remove the -account from the links on the Settings page, and we -apologise for any inconvenience. +Если эта учётная запись была создана без вашего ведома или нежелательна, вы +можете посетить сайт и сбросить пароль. Это позволит вам удалить учётную запись +по ссылке на странице "Настройки". +Приносим извинения за любые неудобства. -Thank you and welcome to {{$sitename}}. +Спасибо и добро пожаловать на {{$sitename}}! -Sincerely, - {{$sitename}} Administrator - - +С уважением, + администрация {{$sitename}} -- cgit v1.2.3 From b625b5f645a43b7b8f3c26901939399b1637f3bb Mon Sep 17 00:00:00 2001 From: kostikov Date: Fri, 20 Jul 2018 19:27:29 +0200 Subject: Update register_verify_eml.tpl (cherry picked from commit b6c2c8117e4bb778d2dad325398b348969557836) --- view/ru/register_verify_eml.tpl | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/view/ru/register_verify_eml.tpl b/view/ru/register_verify_eml.tpl index 85d9a12d3..2b2912fd4 100644 --- a/view/ru/register_verify_eml.tpl +++ b/view/ru/register_verify_eml.tpl @@ -1,25 +1,24 @@ -A new user registration request was received at {{$sitename}} which requires -your approval. +Был получен запрос на регистрацию нового пользователя на {{$sitename}} +что требует вашего подтверждения. -The login details are as follows: +Детали учётной записи: -Site Location: {{$siteurl}} -Login Name: {{$email}} -IP Address: {{$details}} +Адрес сайта: {{$siteurl}} +Имя для входа: {{$email}} +IP-адрес: {{$details}} -To approve this request please visit the following link: +Для подтверждения этого запроса пожалуйса перейдите по ссылке: {{$siteurl}}/regmod/allow/{{$hash}} -To deny the request and remove the account, please visit: +Для отказа и удаления учётной записи перейдите по ссылке: {{$siteurl}}/regmod/deny/{{$hash}} -Thank you. - +Спасибо. -- cgit v1.2.3 From ddd77ee6eed99852b6456bac7b84f737604e8483 Mon Sep 17 00:00:00 2001 From: kostikov Date: Fri, 20 Jul 2018 19:28:45 +0200 Subject: Update update_fail_eml.tpl (cherry picked from commit 8fc7f2aca178b170cf23504abdf60dfd6083e2eb) --- view/ru/update_fail_eml.tpl | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/view/ru/update_fail_eml.tpl b/view/ru/update_fail_eml.tpl index 61f44b1e6..8bcba334f 100644 --- a/view/ru/update_fail_eml.tpl +++ b/view/ru/update_fail_eml.tpl @@ -1,13 +1,14 @@ -Hey, -I'm the web server at {{$sitename}}; - -The Hubzilla developers released update {{$update}} recently, -but when I tried to install it, something went terribly wrong. -This needs to be fixed soon and it requires human intervention. -Please contact a Red developer if you can not figure out how to -fix it on your own. My database might be invalid. - -The error message is '{{$error}}'. - -Apologies for the inconvenience, - your web server at {{$siteurl}} \ No newline at end of file + +Привет, +Я веб-сервер {{$sitename}}; + +Разработчики Hubzilla только что выпустили обновление {{$update}}  +но когда я попыталась/ся установить его, что-то пошло не так. +Это должно быть исправлено в ближайшее время и требует вмешательства человека. +Пожалуйста, обратитесь к разработчикам Hubzilla, если вы не можете понять, как +исправьте это по своему усмотрению. Моя база данных может быть недействительной. + +Сообщение ошибки является следующим '{{$}}. + +Приносим извинения за неудобства, + Ваш веб-сервер {{$siteurl}} -- cgit v1.2.3 From b7778ca1f959ebea9405fc1faf084b56ad78c7e4 Mon Sep 17 00:00:00 2001 From: kostikov Date: Fri, 20 Jul 2018 00:22:04 +0200 Subject: Update php2po.php (cherry picked from commit f9b18aa62f30527880377d2c1dd391af4be04a6c) --- util/php2po.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/util/php2po.php b/util/php2po.php index ff41e6d1e..352ed41f6 100644 --- a/util/php2po.php +++ b/util/php2po.php @@ -1,11 +1,11 @@ \n\n"; -- cgit v1.2.3 From 740015339df9db52299cb195bce0f523d4d7894a Mon Sep 17 00:00:00 2001 From: kostikov Date: Fri, 20 Jul 2018 16:40:35 +0200 Subject: Add var to respect current hstrings.php format (cherry picked from commit 062633d312b4d595e21ac09029f73ca8768508b0) --- util/php2po.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/php2po.php b/util/php2po.php index 352ed41f6..c47dcac1b 100644 --- a/util/php2po.php +++ b/util/php2po.php @@ -2,9 +2,9 @@ if(! class_exists('App')) { class App { - static public $strings = Array(); + static public $rtl; + static public $strings = Array(); } - //$a = new App(); } if ($argc!=2) { -- cgit v1.2.3 From aa01c2f4dbf45d9caeb7c110a9609c33d863968d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 21 Jul 2018 22:01:59 +0200 Subject: update changelog (cherry picked from commit 6be66d6df9c35adb48148b791730ec9c6c533988) --- CHANGELOG | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b2b1fc81f..a1a68fd64 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,97 @@ +Hubzilla 3.6 (????-??-??) + - Update jquery.timeago library + - Implement Hookable CSP + - ActivityStreams: accept header changes to support plume + - Streamline inconsistencies in addon naming + - SECURITY: hash the session_id in logs + - Update justified gallery library + - Hide channel in /cloud root if channel is hidden in directory + - Add resend option to channel sources tp discard original author. + - Provide flag to exclude privacy groups for federation plugin use in collect_recipients() + - Upgrading from redmatrix is no longer supported + - Deal with htmlentity encoding during authentication workflow + - Rework mod group + - Make droping posts of removed connections more memory efficient + - Refactor getOutainfo() for DAV storage + - Optionally report total available space when uploading + - SECURITY: provide option to disable the cloud 'root' directory and make the cloud module require a target channel nickname + - Add plink and llink to viewsource + - Add new 'filter by name' feature + - Remove network tabs + - New activity filter widget + - New activity order widget + - Make menus editable by visitors with webpage write permissions + - Move forum notifications to notifications + - Move manage privacy groups to the panel channel menu + - Don't remove items that are starred, filed, or that you replied to when removing a connection + - Don't deliver local items more than once + - Make navbar search use the module search function in /network and /channel + - Paint the locks on private activitypub items red. Their privacy model is "slightly" different from hubzillas + - Improve new channel creation workflow + - Add hook 'get_system_apps' + - Implement reset button for jot + - Adjust accept header to make pleroma happy + - Provide a general purpose GDPR document + - Provide function to fetch photo contents from url + - Make get_default_profile_photo() pluggable + - Refactor tags/mentions + - Refactor autocomplete mechanism + - Display pubsites link in info area if invite only + - Add cancel button to editor + - Implement MessageFilter for pubstream and sourced messages + - Add supported protocols to siteinfo + - Allow pdf embeds + - Allow uninstall of plugins which no longer exists via cmdline tool + - Improve the homeinstall script + - Provide easy access to the autoperms setting for forum and repository channels + - Implement admin delete of files, photos and posts + - Allow a different username to be used when importing a channel + - Provide warnings about profile photo and cover photo permissions + - Set the 'force' flag on attach_mkdir when initiated from a DAV operation + + Bugfixes + - Fix double file uploads when dropping files into jot + - Fix jot collapsing when drag and drop to open jot + - Fix wrong album name when moving photos + - Fix wrong timestamp localization before first update in mod mail + - Fix post exiration not propagated to other networks (which support it) + - Fix sys channels visible in dirsearch + - Fix remote_self not working correctly + - Fix photos not syncing properly if destination is a postgres site + - Fix wrong hubloc_url for activitypub hublocs + - Fix z_check_dns() for BSD + - Fix not null violation in oauth1 + - Fix DB issues with oauth2 on postgresql + - Fix 'anybody authenticated' not correctly handled in can_comment_on_post() + - Fix postgres issue if register mode is set to yes - with approval + - Fix tag search not finding articles + - Fix issue with mentions when markdown post addon is enabled + - Fix duplicate addressbook entries on repeated channel imports + + Addons + - Cart: various display improvements + - Cart: make cart work with postgresql DB backend + - Cart: add new hzservice for service_classes + - Cart: add storewide currency settings + - Cart: provide channel app 'Shop' for cart addon + - Cart: implement order updating + - Cart: use CSP hook for paypals checkout.js + - Cart: provide a cancel mechanism for orders + - Cart: add paypal button + - Gallery: new addon to display photo albums with the photoswipe library + - Ldapauth: optionally auto create channel + - Pubcrawl: new setting to ignore ActivityPub recipients in privacy groups + - Diaspora: fix issue with displaying multiple photos + - Pubcrawl: provide plink + - Pubcrawl: hubloc_url should be baseurl, not actor url + - Pubcrawl: deliver restricted posts from hubzilla as direct messages (there is no other way to address only a subset of followers in mastodon) + - Pubcrawl: address comments to a restricted mastodon post to /followers + + +Hubzilla 3.4.2 (2018-07-19) + - Compatibility fix for future versions + + Hubzilla 3.4.1 (2018-06-08) - Say bye, bye to GitHub and move sourcecode repositories to #^https://framagit.org/hubzilla - When removing a connection, don't remove items that are starred, filed or replied to -- cgit v1.2.3 From 091ef33f18e4c9af8980ef1e8a4513c40e58b4b3 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 23 Jul 2018 19:55:00 +0200 Subject: Merge branch 'patch-2' into 'dev' Escape internal quotes in translation on export See merge request hubzilla/core!1237 (cherry picked from commit 84e57d040b6b7df4b7673d3f6f4974225117e3a4) 64efd07f Escape internal quotes in translation on export 87857fe5 Update hmessages.po 3342fc22 Update hstrings.php --- util/php2po.php | 6 +- view/ru/hmessages.po | 354 +++++++++++++++++++++++++-------------------------- view/ru/hstrings.php | 169 +++++++++++++----------- 3 files changed, 268 insertions(+), 261 deletions(-) diff --git a/util/php2po.php b/util/php2po.php index c47dcac1b..c165006a1 100644 --- a/util/php2po.php +++ b/util/php2po.php @@ -32,17 +32,17 @@ if ($k!="" && substr($l,0,7)=="msgstr "){ $ink = False; - $v = '""'; + $v = ''; //echo "DBG: k:'$k'\n"; if (isset(App::$strings[$k])) { - $v= '"'.App::$strings[$k].'"'; + $v= App::$strings[$k]; //echo "DBG\n"; //var_dump($k, $v, App::$strings[$k], $v); //echo "/DBG\n"; } //echo "DBG: v:'$v'\n"; - $l = "msgstr ".$v."\n"; + $l = "msgstr \"".str_replace('"','\"',$v)."\"\n"; } if (substr($l,0,6)=="msgid_" || substr($l,0,7)=="msgstr[" )$ink = False;; diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index 365251f15..f7ea3df15 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-23 11:34+0200\n" -"PO-Revision-Date: 2018-06-13 19:32+0000\n" -"Last-Translator: Max Kostikov \n" +"PO-Revision-Date: 2018-07-22 19:32+0000\n" +"Last-Translator: Max Kostikov \n" "Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -173,7 +173,7 @@ msgstr "Включить плагин публикаций Dreamwidth" #: ../../extend/addon/hzaddons/redred/redred.php:99 #: ../../extend/addon/hzaddons/wppost/wppost.php:82 #: ../../extend/addon/hzaddons/wppost/wppost.php:105 -#: ../../extend/addon/hzaddons/wppost/wppost.php:109 ../../boot.php:1618 +#: ../../extend/addon/hzaddons/wppost/wppost.php:109 ../../boot.php:1621 #: ../../view/theme/redbasic/php/config.php:98 ../../include/dir_fns.php:143 #: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 #: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Events.php:470 @@ -249,7 +249,7 @@ msgstr "Нет" #: ../../extend/addon/hzaddons/redred/redred.php:99 #: ../../extend/addon/hzaddons/wppost/wppost.php:82 #: ../../extend/addon/hzaddons/wppost/wppost.php:105 -#: ../../extend/addon/hzaddons/wppost/wppost.php:109 ../../boot.php:1618 +#: ../../extend/addon/hzaddons/wppost/wppost.php:109 ../../boot.php:1621 #: ../../view/theme/redbasic/php/config.php:98 ../../include/dir_fns.php:143 #: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 #: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Events.php:470 @@ -579,8 +579,9 @@ msgid "" "to be installed on this machine with synchronized credentials via the " "\"auth_ejabberd.php\" script." msgstr "" -"Если включено, участники автоматически войдут на сервер ejabberd, который должен быть установлен на этом компьютере с синхронизированными учетными данными через скрипт" -"\"auth_ejabberd.php\"." +"Если включено, участники автоматически войдут на сервер ejabberd, который должен " +"быть установлен на этом компьютере с синхронизированными учетными данными через " +"скрипт \"auth_ejabberd.php\"." #: ../../extend/addon/hzaddons/xmpp/xmpp.php:102 #: ../../extend/addon/hzaddons/logrot/logrot.php:54 @@ -607,7 +608,7 @@ msgstr "администратор %s" #: ../../extend/addon/hzaddons/hubwall/hubwall.php:73 #, php-format msgid "%1$d of %2$d messages sent." -msgstr "%1$dиз %2$d сообщений отправлено." +msgstr "%1$d из %2$d сообщений отправлено." #: ../../extend/addon/hzaddons/hubwall/hubwall.php:81 msgid "Send email to all hub members." @@ -711,10 +712,7 @@ msgid "" "Please note Diaspora and Friendica statistics are merely those **this " "directory** is aware of, and not all those known in the network. This also " "applies to chatrooms," -msgstr "" -"Обратите внимание, что статистика Diaspora и Friendica это только те, " -"о которых **этот каталог** знает, а не все известные в сети. Это также " -"относится и к чатам." +msgstr "Обратите внимание, что статистика Diaspora и Friendica это только те, о которых ** этот каталог ** знает, а не все известные в сети. Это также относится и к чатам." #: ../../extend/addon/hzaddons/chess/chess.php:353 #: ../../extend/addon/hzaddons/chess/chess.php:542 @@ -1274,9 +1272,9 @@ msgid "" "press the \"New identity\" button or refresh the page to register a new " "identity. You may use the same name." msgstr "" -"Этот идентификатор был удалён другим участником из-за неактивности. " -"Пожалуйста нажмите кнопку \"Новый идентификатор\" для обновления страницы и " -"получения нового идентификатора. Вы можете использовать то же имя." +"Этот идентификатор был удалён другим участником из-за неактивности. Пожалуйста " +"нажмите кнопку \"Новый идентификатор\" для обновления страницы и получения " +"нового идентификатора. Вы можете использовать то же имя." #: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:168 msgid "Welcome to Rendezvous!" @@ -1410,8 +1408,7 @@ msgstr "URL сервера Tile" msgid "" "A list of public tile servers" -msgstr "" -"Список общедоступных серверов" +msgstr "Список общедоступных серверов" #: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:170 msgid "Nominatim (reverse geocoding) Server URL" @@ -1421,8 +1418,7 @@ msgstr "URL сервера Nominatim (обратное геокодирован msgid "" "A list of Nominatim servers" -msgstr "" -"Список серверов Nominatim" +msgstr "Список серверов Nominatim" #: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:171 msgid "Default zoom" @@ -1758,7 +1754,7 @@ msgstr "статус" #: ../../include/conversation.php:160 ../../Zotlabs/Module/Like.php:438 #, php-format msgid "%1$s likes %2$s's %3$s" -msgstr "%1$s нравится %2$s %3$s" +msgstr "%1$s нравится %3$s %2$s" #: ../../extend/addon/hzaddons/pubcrawl/as.php:1546 #: ../../include/conversation.php:163 ../../Zotlabs/Module/Like.php:440 @@ -1789,9 +1785,7 @@ msgstr "Доставить получателям ActivityPub в группах msgid "" "May result in a large number of mentions and expose all the members of your " "privacy group" -msgstr "" -"Может привести к большому количеству упоминаний и раскрытию участников " -"группы безопасности" +msgstr "Может привести к большому количеству упоминаний и раскрытию участников группы безопасности" #: ../../extend/addon/hzaddons/pubcrawl/pubcrawl.php:1155 msgid "Send multi-media HTML articles" @@ -1994,8 +1988,7 @@ msgstr "Неизвестная ошибка. Пожалуйста, повтор msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." -msgstr "" -"Если новая фотография не отображается немедленно то нажмите Shift + \"Обновить\" для очистки кэша браузера" +msgstr "Если новая фотография не отображается немедленно то нажмите Shift + \"Обновить\" для очистки кэша браузера" #: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:308 msgid "Profile photo updated successfully." @@ -2114,7 +2107,7 @@ msgstr "Показывать только публикации из опреде #: ../../extend/addon/hzaddons/tour/tour.php:110 msgid "" "Easily find posts containing tags (keywords preceded by the \"#\" symbol)." -msgstr "Лёгкий поиск сообщения, содержащего теги (ключевые слова, которым предшествует символ \"#\")." +msgstr "Лёгкий поиск сообщения, содержащего теги (ключевые слова, которым предшествует символ #)." #: ../../extend/addon/hzaddons/tour/tour.php:111 msgid "Easily find posts in given category." @@ -2157,7 +2150,10 @@ msgid "" "pause it at any time and continue where you left off by reloading the page, " "or navigting to another page.

      You can also advance by pressing the " "return key" -msgstr "Добро пожаловать в Hubzilla! Желаете получить обзор пользовательского интерфейса?

      Вы можете его приостановаить и в любое время перезагрузив страницу или перейдя на другую.

      Также вы можете нажать клавишу \"Назад\"" +msgstr "" +"Добро пожаловать в Hubzilla! Желаете получить обзор пользовательского интерфейса?

      " +"

      Вы можете его приостановаить и в любое время перезагрузив страницу или перейдя на другую.

      " +"

      Также вы можете нажать клавишу \"Назад\"" #: ../../extend/addon/hzaddons/skeleton/skeleton.php:59 msgid "Some setting" @@ -2792,9 +2788,7 @@ msgstr "Кнопка Paypal для платежей не включена." msgid "" "Paypal button payments are not properly configured. Please choose another " "payment option." -msgstr "" -"Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте " -"другой вариант оплаты." +msgstr "Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте другой вариант оплаты." #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:71 msgid "Enable Hubzilla Services Module" @@ -2805,7 +2799,7 @@ msgid "Cart - Hubzilla Services Addon" msgstr "Корзина - плагин сервиса Hubzilla" #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:169 -msgid "New SKU" +msgid "New Sku" msgstr "Новый код" #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:204 @@ -3185,11 +3179,11 @@ msgstr "искушённый" #: ../../extend/addon/hzaddons/morepokes/morepokes.php:27 msgid "raise eyebrows at" -msgstr "" +msgstr "поднять брови" #: ../../extend/addon/hzaddons/morepokes/morepokes.php:27 msgid "raised their eyebrows at" -msgstr "" +msgstr "поднял брови" #: ../../extend/addon/hzaddons/morepokes/morepokes.php:28 msgid "insult" @@ -3265,11 +3259,11 @@ msgstr "" #: ../../extend/addon/hzaddons/morepokes/morepokes.php:37 msgid "declare undying love for" -msgstr "" +msgstr "признаться в любви к" #: ../../extend/addon/hzaddons/morepokes/morepokes.php:37 msgid "declared undying love for" -msgstr "" +msgstr "признался в любви к" #: ../../extend/addon/hzaddons/wppost/wppost.php:45 msgid "Post to WordPress" @@ -3330,71 +3324,71 @@ msgstr "Ваш аккаунт на %s перестанет работать че #: ../../extend/addon/hzaddons/testdrive/testdrive.php:105 msgid "Your $Productname test account is about to expire." -msgstr "Тестовый период вашей учётной записи в $Productname истёк." +msgstr "Срок действия пробного аккаунта в $Productname близок к окончанию." -#: ../../boot.php:1592 +#: ../../boot.php:1595 msgid "Create an account to access services and applications" msgstr "Создайте аккаунт для доступа к службам и приложениям" -#: ../../boot.php:1593 ../../include/nav.php:158 +#: ../../boot.php:1596 ../../include/nav.php:158 #: ../../Zotlabs/Module/Register.php:294 msgid "Register" msgstr "Регистрация" -#: ../../boot.php:1612 ../../include/nav.php:105 ../../include/nav.php:134 +#: ../../boot.php:1615 ../../include/nav.php:105 ../../include/nav.php:134 #: ../../include/nav.php:153 msgid "Logout" msgstr "Выход" -#: ../../boot.php:1613 ../../include/nav.php:120 ../../include/nav.php:124 +#: ../../boot.php:1616 ../../include/nav.php:120 ../../include/nav.php:124 #: ../../Zotlabs/Lib/Apps.php:301 msgid "Login" msgstr "Войти" -#: ../../boot.php:1614 ../../include/channel.php:2334 +#: ../../boot.php:1617 ../../include/channel.php:2334 #: ../../Zotlabs/Module/Rmagic.php:75 msgid "Remote Authentication" msgstr "Удаленная аутентификация" -#: ../../boot.php:1616 +#: ../../boot.php:1619 msgid "Login/Email" msgstr "Пользователь / email" -#: ../../boot.php:1617 +#: ../../boot.php:1620 msgid "Password" msgstr "Пароль" -#: ../../boot.php:1618 +#: ../../boot.php:1621 msgid "Remember me" msgstr "Запомнить меня" -#: ../../boot.php:1621 +#: ../../boot.php:1624 msgid "Forgot your password?" msgstr "Забыли пароль или логин?" -#: ../../boot.php:1622 ../../Zotlabs/Module/Lostpass.php:91 +#: ../../boot.php:1625 ../../Zotlabs/Module/Lostpass.php:91 msgid "Password Reset" msgstr "Сбросить пароль" -#: ../../boot.php:2405 +#: ../../boot.php:2408 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "[$Projectname] Ошибка SSL/TLS веб-сайта для %s" -#: ../../boot.php:2410 +#: ../../boot.php:2413 msgid "Website SSL certificate is not valid. Please correct." msgstr "SSL/TLS сертификат веб-сайт недействителен. Исправьте это." -#: ../../boot.php:2526 +#: ../../boot.php:2529 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "[$Projectname] Задания Cron не запущены на %s" -#: ../../boot.php:2531 +#: ../../boot.php:2534 msgid "Cron/Scheduled tasks not running." msgstr "Задания Cron / планировщика не запущены." -#: ../../boot.php:2532 ../../include/datetime.php:238 +#: ../../boot.php:2535 ../../include/datetime.php:238 msgid "never" msgstr "никогд" @@ -3724,7 +3718,7 @@ msgstr "Не нравится" #: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1143 msgctxt "title" msgid "Agree" -msgstr "За" +msgstr "Согласен" #: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1143 msgctxt "title" @@ -3734,22 +3728,22 @@ msgstr "Против" #: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1143 msgctxt "title" msgid "Abstain" -msgstr "Воздерживается" +msgstr "Воздерживаюсь" #: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1144 msgctxt "title" msgid "Attending" -msgstr "Посещает" +msgstr "Присоединившиеся" #: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1144 msgctxt "title" msgid "Not attending" -msgstr "Не посещает" +msgstr "Не присоединившиеся" #: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1144 msgctxt "title" msgid "Might attend" -msgstr "Может присутствовать" +msgstr "Могут присоединиться" #: ../../include/conversation.php:690 ../../Zotlabs/Lib/ThreadItem.php:158 msgid "Select" @@ -3902,15 +3896,17 @@ msgstr "%s не нравится это." #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%2$d человеку это нравится." +msgstr[1] "%2$d человекам это нравится." +msgstr[2] "%2$d человекам это нравится." #: ../../include/conversation.php:1217 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%2$d человеку это не нравится." +msgstr[1] "%2$d человекам это не нравится." +msgstr[2] "%2$d человекам это не нравится." #: ../../include/conversation.php:1223 msgid "and" @@ -3920,8 +3916,9 @@ msgstr "и" #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" +msgstr[0] ", и ещё %d человеку" +msgstr[1] ", и ещё %d человекам" +msgstr[2] ", и ещё %d человекам" #: ../../include/conversation.php:1227 #, php-format @@ -4281,58 +4278,66 @@ msgstr "" msgctxt "noun" msgid "Like" msgid_plural "Likes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Нравится" +msgstr[1] "Нравится" +msgstr[2] "Нравится" #: ../../include/conversation.php:1993 ../../Zotlabs/Lib/ThreadItem.php:221 #: ../../Zotlabs/Module/Photos.php:1170 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Не нравится" +msgstr[1] "Не нравится" +msgstr[2] "Не нравится" #: ../../include/conversation.php:1996 msgctxt "noun" msgid "Attending" msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Посетит" +msgstr[1] "Посетят" +msgstr[2] "Посетят" #: ../../include/conversation.php:1999 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Не посетит" +msgstr[1] "Не посетят" +msgstr[2] "Не посетят" #: ../../include/conversation.php:2002 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Не решил" +msgstr[1] "Не решили" +msgstr[2] "Не решили" #: ../../include/conversation.php:2005 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Согласен" +msgstr[1] "Согласны" +msgstr[2] "Согласны" #: ../../include/conversation.php:2008 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Не согласен" +msgstr[1] "Не согласны" +msgstr[2] "Не согласны" #: ../../include/conversation.php:2011 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Воздержался" +msgstr[1] "Воздержались" +msgstr[2] "Воздержались" #: ../../include/zot.php:772 msgid "Invalid data packet" @@ -4366,7 +4371,7 @@ msgstr "Окончание:" #: ../../include/event.php:54 ../../include/event.php:86 #: ../../include/channel.php:1391 ../../Zotlabs/Module/Directory.php:324 msgid "Location:" -msgstr "Откуда:" +msgstr "Местоположение:" #: ../../include/event.php:1011 msgid "This event has been added to your calendar." @@ -4935,7 +4940,9 @@ msgstr "Настраиваемый выбор" msgid "" "Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " "the scope of \"Show\"." -msgstr "Нажмите \"Показать\" чтобы разрешить просмотр. \"Не показывать\" позволит вам переопределить и ограничить область показа." +msgstr "" +"Нажмите \"Показать\" чтобы разрешить просмотр. \"Не показывать\" позволит вам " +"переопределить и ограничить область показа." #: ../../include/acl_selectors.php:116 msgid "Show" @@ -4997,7 +5004,7 @@ msgstr "менее чем одну секунду" #, php-format msgctxt "e.g. 22 hours ago, 1 minute ago" msgid "%1$d %2$s ago" -msgstr "%1$d %2$s тому назад" +msgstr "%1$d %2$s назад" #: ../../include/datetime.php:273 msgctxt "relative_date" @@ -5621,8 +5628,9 @@ msgstr "Комментарий" #, php-format msgid "%d invitation available" msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "доступно %d приглашение" +msgstr[1] "доступны %d приглашения" +msgstr[2] "доступны %d приглашений" #: ../../include/contact_widgets.php:16 ../../Zotlabs/Module/Admin/Site.php:313 msgid "Advanced" @@ -6220,9 +6228,7 @@ msgstr "Отображение потока" msgid "" "Ability to order the stream by last post date, last comment date or " "unthreaded activities" -msgstr "" -"Возможность показывать поток по дате последнего сообщения, последнего комментария или " -"по дате публикации" +msgstr "Возможность показывать поток по дате последнего сообщения, последнего комментария или в порядке поступления" #: ../../include/features.php:399 msgid "Contact Filter" @@ -6685,9 +6691,7 @@ msgstr "отлично" msgid "" "Your chosen nickname was either already taken or not valid. Please use our " "suggestion (" -msgstr "" -"Выбранный вами псевдоним уже используется или недействителен. Попробуйте использовать " -"наше предложение (" +msgstr "Выбранный вами псевдоним уже используется или недействителен. Попробуйте использовать наше предложение (" #: ../../include/js_strings.php:31 msgid ") or enter a new one." @@ -6935,7 +6939,7 @@ msgstr "новая фотография" #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" -msgstr "%1$s опубликовал %2$s к %3$s" +msgstr "%1$s опубликовал %2$s в %3$s" #: ../../include/photos.php:668 ../../Zotlabs/Module/Photos.php:1370 #: ../../Zotlabs/Module/Photos.php:1383 ../../Zotlabs/Module/Photos.php:1384 @@ -7104,8 +7108,9 @@ msgstr "Отчёт о доставке" #, php-format msgid "%d comment" msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d комментарий" +msgstr[1] "%d комментария" +msgstr[2] "%d комментариев" #: ../../Zotlabs/Lib/ThreadItem.php:347 ../../Zotlabs/Lib/ThreadItem.php:348 #, php-format @@ -7322,7 +7327,7 @@ msgstr "Чтобы прекратить получать эти сообщени #: ../../Zotlabs/Lib/Enotify.php:68 #, php-format msgid "To stop receiving these messages, please adjust your %s." -msgstr "Чтобы прекратить получать эти сообщения, пожалуйста настройте ваш %s." +msgstr "Чтобы прекратить получать эти сообщения, пожалуйста измените %s." #: ../../Zotlabs/Lib/Enotify.php:68 #: ../../Zotlabs/Module/Settings/Channel.php:570 @@ -7540,7 +7545,7 @@ msgstr "Пожалуйста, посетите %s, чтобы одобрить #: ../../Zotlabs/Lib/Enotify.php:640 msgid "[$Projectname:Notify]" -msgstr "" +msgstr "[$Projectname:Уведомление]" #: ../../Zotlabs/Lib/Enotify.php:808 msgid "created a new post" @@ -7700,7 +7705,7 @@ msgstr "Сортировка в порядке поступления" #: ../../Zotlabs/Widget/Activity_order.php:119 msgid "Activity Order" -msgstr "Сортировка по активности" +msgstr "Сортировка активности" #: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:308 msgid "Site" @@ -8472,7 +8477,7 @@ msgstr "Может редактировать мои вики-страницы" #: ../../Zotlabs/Access/Permissions.php:66 msgid "Can post on my channel (wall) page" -msgstr "Может публиковать на моей странице канала (\"стена\")" +msgstr "Может публиковать на моей странице канала" #: ../../Zotlabs/Access/Permissions.php:67 msgid "Can comment on or like my posts" @@ -8488,7 +8493,7 @@ msgstr "Может комментировать или отмечать как #: ../../Zotlabs/Access/Permissions.php:70 msgid "Can forward to all my channel connections via ! mentions in posts" -msgstr "Может отправлять всем подписчикам моего канала через использование ! в публикациях" +msgstr "Может пересылать всем подписчикам моего канала используя ! в публикациях" #: ../../Zotlabs/Access/Permissions.php:71 msgid "Can chat with me" @@ -9766,16 +9771,14 @@ msgstr "Вы также можете экспортировать ваши пу msgid "" "To select all posts for a given year, such as this year, visit %2$s" -msgstr "" -"Для выбора всех публикаций заданного года, например текущего, посетите %2$s" +msgstr "Для выбора всех публикаций заданного года, например текущего, посетите %2$s" #: ../../Zotlabs/Module/Uexport.php:67 #, php-format msgid "" "To select all posts for a given month, such as January of this year, visit " "%2$s" -msgstr "" -"Для выбора всех публикаций заданного месяца, например за январь сего года, посетите %2$s" +msgstr "Для выбора всех публикаций заданного месяца, например за январь сего года, посетите %2$s" #: ../../Zotlabs/Module/Uexport.php:68 #, php-format @@ -9784,9 +9787,10 @@ msgid "" "%2$s on any site containing your channel. For best results please import " "or restore these in date order (oldest first)." msgstr "" -"Данные файлы с содержимым могут быть импортированы и восстановлены на любом содержащем " -"ваш канал сайте. Посетите %2$s. Для лучших результатов пожалуйста " -"производите импорт и восстановление в порядке датировки (старые сначала)." +"Данные файлы с содержимым могут быть импортированы и восстановлены на любом " +"содержащем ваш канал сайте. Посетите %2$s. Для лучших " +"результатов пожалуйста производите импорт и восстановление в порядке датировки " +"(старые сначала)." #: ../../Zotlabs/Module/Chatsvc.php:131 msgid "Away" @@ -10000,17 +10004,13 @@ msgstr "Фотография недоступна." msgid "" "Your default profile photo is visible to anybody on the internet. Profile " "photos for alternate profiles will inherit the permissions of the profile" -msgstr "" -"Фотография вашего профиля по умолчанию видна всем в Интернете. Фотография" -"профиля для альтернативных профилей наследуют разрешения текущего профиля" +msgstr "Фотография вашего профиля по умолчанию видна всем в Интернете. Фотографияпрофиля для альтернативных профилей наследуют разрешения текущего профиля" #: ../../Zotlabs/Module/Profile_photo.php:454 msgid "" "Your profile photo is visible to anybody on the internet and may be " "distributed to other websites." -msgstr "" -"Фотография вашего профиля видна всем в Интернете и может быть отправлена " -"на другие сайты." +msgstr "Фотография вашего профиля видна всем в Интернете и может быть отправлена на другие сайты." #: ../../Zotlabs/Module/Profile_photo.php:456 #: ../../Zotlabs/Module/Cover_photo.php:392 @@ -10594,8 +10594,8 @@ msgid "" "\">privacy settings, which have higher priority than " "individual settings. You can not change those settings here." msgstr "" -"Некоторые разрешения могут наследовать из " -"настроек приватности ваших каналов которые могут иметь более высокий приоритет " +"Некоторые разрешения могут наследовать из настроек " +"приватности ваших каналов которые могут иметь более высокий приоритет " "чем индивидуальные. Вы не можете менять эти настройки здесь." #: ../../Zotlabs/Module/Connedit.php:895 @@ -10605,10 +10605,10 @@ msgid "" "individual settings. You can change those settings here but they wont have " "any impact unless the inherited setting changes." msgstr "" -"Некоторые разрешения могут быть унаследованы из " -"настроек приватности вашего канала, которые могут иметь более высокий приоритет " -"чем индивидуальные. Вы можете изменить эти настройки, однако они не будут применены до изменения " -"переданных по наследству настроек." +"Некоторые разрешения могут быть унаследованы из настроек " +"приватности вашего канала, которые могут иметь более высокий приоритет " +"чем индивидуальные. Вы можете изменить эти настройки, однако они не будут применены до " +"изменения переданных по наследству настроек." #: ../../Zotlabs/Module/Connedit.php:896 msgid "Last update:" @@ -10805,9 +10805,7 @@ msgstr "Ваша база данных установлена." msgid "" "You may need to import the file \"install/schema_xxx.sql\" manually using a " "database client." -msgstr "" -"Вам может понадобится импортировать файл \"install/schema_xxx.sql\" " -"вручную используя клиент базы данных." +msgstr "Вам может понадобится импортировать файл \"install/schema_xxx.sql\" вручную используя клиент базы данных." #: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262 #: ../../Zotlabs/Module/Setup.php:749 @@ -10944,8 +10942,7 @@ msgstr "Невозможно проверить командную строку msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." -msgstr "" -"В консольной версии PHP в вашей системе отключена опция \"register_argc_argv\". " +msgstr "В консольной версии PHP в вашей системе отключена опция \"register_argc_argv\"." #: ../../Zotlabs/Module/Setup.php:425 msgid "This is required for message delivery to work." @@ -10974,15 +10971,13 @@ msgstr "Максимальный размер загрузки в PHP" msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" -msgstr "" -"Ошибка: функция \"openssl_pkey_new\" не может сгенерировать ключи шифрования" +msgstr "Ошибка: функция \"openssl_pkey_new\" не может сгенерировать ключи шифрования" #: ../../Zotlabs/Module/Setup.php:477 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." -msgstr "" -"Если работаете под Windows, см. \"http://www.php.net/manual/en/openssl.installation.php\"." +msgstr "Если работаете под Windows, см. \"http://www.php.net/manual/en/openssl.installation.php\"." #: ../../Zotlabs/Module/Setup.php:480 msgid "Generate encryption keys" @@ -11517,8 +11512,7 @@ msgstr "Разрешения по умолчанию для новых акка #: ../../Zotlabs/Module/Admin/Site.php:299 msgid "" "This role will be used for the first channel created after registration." -msgstr "" -"Эта роль будет использоваться для первого канала, созданного после регистрации." +msgstr "Эта роль будет использоваться для первого канала, созданного после регистрации." #: ../../Zotlabs/Module/Admin/Site.php:310 #: ../../Zotlabs/Module/Register.php:278 @@ -11754,7 +11748,8 @@ msgstr "Включить контекстную помощь" #: ../../Zotlabs/Module/Admin/Site.php:352 msgid "" "Display contextual help for the current page when the help button is pressed." -msgstr "Показывать контекстную помощь для текущей странице при нажатии на кнопку \"Помощь\"." +msgstr "" +"Показывать контекстную помощь для текущей странице при нажатии на кнопку \"Помощь\"." #: ../../Zotlabs/Module/Admin/Site.php:354 msgid "Reply-to email address for system generated email." @@ -11931,15 +11926,17 @@ msgstr "Уровень журнала" #, php-format msgid "%s account blocked/unblocked" msgid_plural "%s account blocked/unblocked" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s аккаунт блокирован/разблокирован" +msgstr[1] "%s аккаунта блокированы/разблокированы" +msgstr[2] "%s аккаунтов блокированы/разблокированы" #: ../../Zotlabs/Module/Admin/Accounts.php:44 #, php-format msgid "%s account deleted" msgid_plural "%s accounts deleted" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s аккаунт удалён" +msgstr[1] "%s аккаунта удалёны" +msgstr[2] "%s аккаунтов удалёны" #: ../../Zotlabs/Module/Admin/Accounts.php:80 msgid "Account not found" @@ -12001,28 +11998,30 @@ msgid "" "Selected accounts will be deleted!\\n\\nEverything these accounts had posted " "on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -"Выбранные учётные записи будут удалены!\\n\\nВсё что было ими опубликовано " -"на этом сайте будет удалено навсегда!\\n\\nВы уверены?" +"Выбранные учётные записи будут удалены!\n\nВсё что было ими опубликовано на " +"этом сайте будет удалено навсегда!\n\nВы уверены?" #: ../../Zotlabs/Module/Admin/Accounts.php:191 msgid "" "The account {0} will be deleted!\\n\\nEverything this account has posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -"Этот аккаунт {0} будет удалён!\\n\\nВсё что им было опубликовано на этом " -"сайте будет удалено навсегда!\\n\\nВы уверены?" +"Этот аккаунт {0} будет удалён!\n\nВсё что им было опубликовано на этом сайте " +"будет удалено навсегда!\n\nВы уверены?" #: ../../Zotlabs/Module/Admin/Security.php:83 msgid "" "By default, unfiltered HTML is allowed in embedded media. This is inherently " "insecure." -msgstr "По умолчанию, HTML без фильтрации доступен во встраиваемых медиа. Это небезопасно." +msgstr "" +"По умолчанию, HTML без фильтрации доступен во встраиваемых медиа. Это небезопасно." #: ../../Zotlabs/Module/Admin/Security.php:86 msgid "" "The recommended setting is to only allow unfiltered HTML from the following " "sites:" -msgstr "Рекомендуется настроить разрешения использовать HTML без фильтрации только для следующих сайтов:" +msgstr "" +"Рекомендуется настроить разрешения использовать HTML без фильтрации только для следующих сайтов:" #: ../../Zotlabs/Module/Admin/Security.php:87 msgid "" @@ -12053,8 +12052,7 @@ msgstr "Предоставить корневой каталог в облаке #: ../../Zotlabs/Module/Admin/Security.php:96 msgid "" "The cloud root directory lists all channel names which provide public files" -msgstr "" -"В корневом каталоге облака показываются все имена каналов, которые предоставляют общедоступные файлы" +msgstr "В корневом каталоге облака показываются все имена каналов, которые предоставляют общедоступные файлы" #: ../../Zotlabs/Module/Admin/Security.php:97 msgid "Show total disk space available to cloud uploads" @@ -12077,8 +12075,7 @@ msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" -msgstr "Список разделённых запятыми доменов для которых разрешена регистрация " -"на этом сайте. Wildcards разрешены. Если пусто то разрешены любые домены." +msgstr "Список разделённых запятыми доменов для которых разрешена регистрация на этом сайте. Wildcards разрешены. Если пусто то разрешены любые домены." #: ../../Zotlabs/Module/Admin/Security.php:101 msgid "Not allowed email domains" @@ -12089,9 +12086,7 @@ msgid "" "Comma separated list of domains which are not allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains, unless allowed domains have been defined." -msgstr "Список разделённых запятыми доменов для которых запрещена регистрация на этом сайте. " -"Wildcards разрешены. Если пусто то разрешены любые домены до тех пор, пока разрешённые " -"домены не будут указаны." +msgstr "Список разделённых запятыми доменов для которых запрещена регистрация на этом сайте. Wildcards разрешены. Если пусто то разрешены любые домены до тех пор, пока разрешённые домены не будут указаны." #: ../../Zotlabs/Module/Admin/Security.php:102 msgid "Allow communications only from these sites" @@ -12282,7 +12277,7 @@ msgstr "Вкл." #: ../../Zotlabs/Module/Admin/Features.php:56 #, php-format msgid "Lock feature %s" -msgstr "Функция блокировки \"%s\"" +msgstr "Заблокировать функцию \"%s\"" #: ../../Zotlabs/Module/Admin/Features.php:64 msgid "Manage Additional Features" @@ -12357,22 +12352,25 @@ msgstr "Класс обслуживания" #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channels censored/uncensored" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s канал цензурируется/нецензурируется" +msgstr[1] "%s канала цензурируются/нецензурируются" +msgstr[2] "%s каналов цензурируются/нецензурируются" #: ../../Zotlabs/Module/Admin/Channels.php:40 #, php-format msgid "%s channel code allowed/disallowed" msgid_plural "%s channels code allowed/disallowed" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "в %s канале код разрешён/запрещён" +msgstr[1] "в %s каналах код разрешён/запрещён" +msgstr[2] "в %s каналах код разрешён/запрещён" #: ../../Zotlabs/Module/Admin/Channels.php:46 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s канал удалён" +msgstr[1] "%s канала удалены" +msgstr[2] "%s каналов удалены" #: ../../Zotlabs/Module/Admin/Channels.php:65 msgid "Channel not found" @@ -12428,16 +12426,16 @@ msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -"Выбранные каналы будут удалены!\\n\\nВсё что было опубликовано в этих каналах " -"на этом сайте будет удалено навсегда!\\n\\nВы уверены?" +"Выбранные каналы будут удалены!\n\nВсё что было опубликовано в этих каналах на " +"этом сайте будет удалено навсегда!\n\nВы уверены?" #: ../../Zotlabs/Module/Admin/Channels.php:163 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -"Канал {0} будет удалён!\\n\\nВсё что было опубликовано в этом канале " -"на этом сайте будет удалено навсегда!\\n\\nВы уверены?" +"Канал {0} будет удалён!\n\nВсё что было опубликовано в этом канале на этом сайте " +"будет удалено навсегда!\n\nВы уверены?" #: ../../Zotlabs/Module/Email_validation.php:24 #: ../../Zotlabs/Module/Email_resend.php:12 @@ -12455,9 +12453,10 @@ msgid "" "here to complete the account verification step. Please allow a few minutes " "for delivery, and check your spam folder if you do not see the message." msgstr "" -"Проверочный токен был выслн на ваш адрес электронной почты {%s]. Введите этот токен " -"здесь для завершения этапа проверки учётной записи. Пожалуйста, подождите несколько минут " -"для завершения доставки и проверьте вашу папку \"Спам\" если вы не видите письма." +"Проверочный токен был выслн на ваш адрес электронной почты {%s]. Введите этот " +"токен здесь для завершения этапа проверки учётной записи. Пожалуйста, подождите " +"несколько минут для завершения доставки и проверьте вашу папку \"Спам\" если вы " +"не видите письма." #: ../../Zotlabs/Module/Email_validation.php:38 msgid "Resend Email" @@ -12488,8 +12487,9 @@ msgstr "Превышен лимит приглашений. Пожалуйста #, php-format msgid "%d message sent." msgid_plural "%d messages sent." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d сообщение отправлено." +msgstr[1] "%d сообщения отправлено." +msgstr[2] "%d сообщений отправлено." #: ../../Zotlabs/Module/Invite.php:107 msgid "You have no more invitations available" @@ -12538,7 +12538,7 @@ msgstr "Фотографии обложки" #: ../../Zotlabs/Module/Cover_photo.php:390 msgid "Your cover photo may be visible to anybody on the internet" -msgstr "Ваше фото обложки может быть видно кому угодно в Интернете" +msgstr "Фотография вашей обложки может быть видна всем в Интернете" #: ../../Zotlabs/Module/Cover_photo.php:394 msgid "Change Cover Photo" @@ -13125,9 +13125,7 @@ msgstr "Центр уведомлений по email (имя хоста)" msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" -msgstr "" -"Если ваш канал зеркалируется в нескольких местах, это ваше предпочтительное " -"местоположение. Это должно предотвратить дублировать уведомлений по email. Например: %s" +msgstr "Если ваш канал зеркалируется в нескольких местах, это ваше предпочтительное местоположение. Это должно предотвратить дублировать уведомлений по email. Например: %s" #: ../../Zotlabs/Module/Settings/Channel.php:606 msgid "Show new wall posts, private messages and connections under Notices" @@ -13757,9 +13755,7 @@ msgstr "Использовать псевдоним этого канала вм msgid "" "Leave blank to keep your existing channel nickname. You will be randomly " "assigned a similar nickname if either name is already allocated on this site." -msgstr "" -"Оставьте пустым для сохранения существующего псевдонима канала. Вам будет случайным " -"образом назначен похожий псевдоним если такое имя уже выделено на этом сайте." +msgstr "Оставьте пустым для сохранения существующего псевдонима канала. Вам будет случайным образом назначен похожий псевдоним если такое имя уже выделено на этом сайте." #: ../../Zotlabs/Module/Import.php:562 msgid "" @@ -13793,8 +13789,7 @@ msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" msgstr "" -"Примеры: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " -"Group\"" +"Примеры: \"Иван Иванов\", \"Оксана и Кони\", \"Футболист\", \"Тимур и его команда\"" #: ../../Zotlabs/Module/New_channel.php:162 msgid "" @@ -13819,9 +13814,7 @@ msgstr "Выберите короткий псевдоним" msgid "" "Select a channel permission role compatible with your usage needs and " "privacy requirements." -msgstr "" -"Выберите разрешения для канала в соответствии с вашими потребностями и " -"требованиями безопасности." +msgstr "Выберите разрешения для канала в соответствии с вашими потребностями и требованиями безопасности." #: ../../Zotlabs/Module/New_channel.php:177 #: ../../Zotlabs/Module/Register.php:266 @@ -13837,10 +13830,7 @@ msgid "" "A channel is a unique network identity. It can represent a person (social " "network profile), a forum (group), a business or celebrity page, a newsfeed, " "and many other things." -msgstr "" -"Канал это уникальная сетевая идентичность. Он может представлять человека (профиль " -"в социальной сети), форум или группу, бизнес или страницу знаменитости, новостную ленту " -"и многие другие вещи." +msgstr "Канал это уникальная сетевая идентичность. Он может представлять человека (профиль в социальной сети), форум или группу, бизнес или страницу знаменитости, новостную ленту и многие другие вещи." #: ../../Zotlabs/Module/New_channel.php:182 msgid "" @@ -14030,7 +14020,7 @@ msgstr "Группа безопасности пуста" #: ../../Zotlabs/Module/Network.php:253 msgid "Privacy group: " -msgstr "Группа безопасности:" +msgstr "Группа безопасности: " #: ../../Zotlabs/Module/Regmod.php:15 msgid "Please login." @@ -14069,7 +14059,8 @@ msgstr "Превышено максимальное количество рег #: ../../Zotlabs/Module/Register.php:55 msgid "" "Please indicate acceptance of the Terms of Service. Registration failed." -msgstr "Просьба подтвердить согласие с \"Условиями обслуживания\". Регистрация не удалась." +msgstr "" +"Пожалуйста, подтвердите согласие с \"Условиями обслуживания\". Регистрация не удалась." #: ../../Zotlabs/Module/Register.php:89 msgid "Passwords do not match." @@ -14159,9 +14150,7 @@ msgstr "Ваш псевдоним будет использован для со msgid "" "Select a channel permission role for your usage needs and privacy " "requirements." -msgstr "" -"Выберите разрешения для канала в зависимости от ваших потребностей и требований " -"приватности." +msgstr "Выберите разрешения для канала в зависимости от ваших потребностей и требований приватности." #: ../../Zotlabs/Module/Register.php:267 msgid "no" @@ -14383,7 +14372,7 @@ msgstr "Группа безопасности: %s" #: ../../Zotlabs/Module/Group.php:217 msgid "Privacy group name: " -msgstr "Название группы безопасности:" +msgstr "Название группы безопасности: " #: ../../Zotlabs/Module/Group.php:222 msgid "Delete Group" @@ -14895,4 +14884,3 @@ msgstr "Загрузить файл" #: ../../Zotlabs/Storage/Browser.php:404 msgid "Drop files here to immediately upload" msgstr "Поместите файлы сюда для немедленной загрузки" - diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index d97aa2c7f..45fc75773 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -78,11 +78,11 @@ App::$strings["XMPP Settings"] = "Настройки XMPP"; App::$strings["Save Settings"] = "Сохранить настройки"; App::$strings["Jabber BOSH host"] = "Узел Jabber BOSH"; App::$strings["Use central userbase"] = "Использовать центральную базу данных"; -App::$strings["If enabled, members will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Если включено, участники автоматически войдут на сервер ejabberd, который должен быть установлен на этом компьютере с синхронизированными учетными данными через скрипт\"auth_ejabberd.php\"."; +App::$strings["If enabled, members will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Если включено, участники автоматически войдут на сервер ejabberd, который должен быть установлен на этом компьютере с синхронизированными учетными данными через скрипт \"auth_ejabberd.php\"."; App::$strings["Settings updated."] = "Настройки обновлены."; App::$strings["Send email to all members"] = "Отправить email всем участникам"; App::$strings["%s Administrator"] = "администратор %s"; -App::$strings["%1\$d of %2\$d messages sent."] = "%1\$dиз %2\$d сообщений отправлено."; +App::$strings["%1\$d of %2\$d messages sent."] = "%1\$d из %2\$d сообщений отправлено."; App::$strings["Send email to all hub members."] = "Отправить email всем участникам узла."; App::$strings["Sender Email address"] = "Адрес электронной почты отправителя"; App::$strings["Test mode (only send to hub administrator)"] = "Тестовый режим (отправка только администратору узла)"; @@ -107,7 +107,7 @@ App::$strings["Aged 34 and under"] = "Возраст 34 и ниже"; App::$strings["Average Age"] = "Средний возраст"; App::$strings["Known Chatrooms"] = "Известные чаты"; App::$strings["Known Tags"] = "Известные теги"; -App::$strings["Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network. This also applies to chatrooms,"] = "166/500Обратите внимание, что статистика Diaspora и Friendica это только те, о которых ** этот каталог ** знает, а не все известные в сети. Это также относится и к чатам."; +App::$strings["Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network. This also applies to chatrooms,"] = "Обратите внимание, что статистика Diaspora и Friendica это только те, о которых ** этот каталог ** знает, а не все известные в сети. Это также относится и к чатам."; App::$strings["Invalid game."] = "Недействительная игра"; App::$strings["You are not a player in this game."] = "Вы не играете в эту игру."; App::$strings["You must be a local channel to create a game."] = "Ваш канал должен быть локальным чтобы создать игру."; @@ -312,7 +312,7 @@ App::$strings["Unknown"] = "Неизвестный"; App::$strings["ActivityPub"] = ""; App::$strings["photo"] = "фото"; App::$strings["status"] = "статус"; -App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s нравится %2\$s %3\$s"; +App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s нравится %3\$s %2\$s"; App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s не нравится %2\$s %3\$s"; App::$strings["ActivityPub Protocol Settings updated."] = "Настройки протокола ActivityPub обновлены."; App::$strings["The ActivityPub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Протокол ActivityPub не поддерживает независимость от расположения. Ваши контакты установленные в этой сети могут быть недоступны из альтернативных мест размещения канала. "; @@ -391,7 +391,7 @@ App::$strings["Choose who you share with."] = "Выбрать с кем поде App::$strings["Click here when you are done."] = "Нажмите здесь когда закончите."; App::$strings["Adjust from which channels posts should be displayed."] = "Настройте из каких каналов должны отображаться публикации."; App::$strings["Only show posts from channels in the specified privacy group."] = "Показывать только публикации из определённой группы безопасности."; -App::$strings["Easily find posts containing tags (keywords preceded by the \"#\" symbol)."] = "Лёгкий поиск сообщения, содержащего теги (ключевые слова, которым предшествует символ \"#\")."; +App::$strings["Easily find posts containing tags (keywords preceded by the \"#\" symbol)."] = "Лёгкий поиск сообщения, содержащего теги (ключевые слова, которым предшествует символ #)."; App::$strings["Easily find posts in given category."] = "Лёгкий поиск публикаций в данной категории."; App::$strings["Easily find posts by date."] = "Лёгкий поиск публикаций по дате."; App::$strings["Suggested users who have volounteered to be shown as suggestions, and who we think you might find interesting."] = "Рекомендуемые пользователи, которые были представлены в качестве предложений, и которые, по нашему мнению, могут оказаться интересными."; @@ -399,7 +399,7 @@ App::$strings["Here you see channels you have connected to."] = "Здесь вы App::$strings["Save your search so you can repeat it at a later date."] = "Сохраните ваш поиск с тем, чтобы повторить его позже."; App::$strings["If you see this icon you can be sure that the sender is who it say it is. It is normal that it is not always possible to verify the sender, so the icon will be missing sometimes. There is usually no need to worry about that."] = "Если вы видите этот значок, вы можете быть уверены, что отправитель - это тот, кто это говорит. Это нормально, что не всегда можно проверить отправителя, поэтому значок иногда будет отсутствовать. Обычно об этом не нужно беспокоиться."; App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "Опасность! Кажется, кто-то пытался подделать сообщение! Это сообщение не обязательно от того, от кого оно значится!"; -App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?

      You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.

      You can also advance by pressing the return key"] = "Добро пожаловать в Hubzilla! Желаете получить обзор пользовательского интерфейса?

      Вы можете его приостановаить и в любое время перезагрузив страницу или перейдя на другую.

      Также вы можете нажать клавишу \"Назад\""; +App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?

      You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.

      You can also advance by pressing the return key"] = "Добро пожаловать в Hubzilla! Желаете получить обзор пользовательского интерфейса?

      Вы можете его приостановаить и в любое время перезагрузив страницу или перейдя на другую.

      Также вы можете нажать клавишу \"Назад\""; App::$strings["Some setting"] = "Некоторые настройки"; App::$strings["A setting"] = "Настройка"; App::$strings["Skeleton Settings"] = "Настройки скелета"; @@ -544,7 +544,7 @@ App::$strings["Paypal button payments are not enabled."] = "Кнопка Paypal App::$strings["Paypal button payments are not properly configured. Please choose another payment option."] = "Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте другой вариант оплаты."; App::$strings["Enable Hubzilla Services Module"] = "Включить модуль сервиса Hubzilla"; App::$strings["Cart - Hubzilla Services Addon"] = "Корзина - плагин сервиса Hubzilla"; -App::$strings["New SKU"] = "Новый код"; +App::$strings["New Sku"] = "Новый код"; App::$strings["Cannot save edits to locked item."] = "Невозможно сохранить изменения заблокированной позиции."; App::$strings["SKU not found."] = "Код не найден."; App::$strings["Invalid Activation Directive."] = "Недействительная директива активации."; @@ -631,8 +631,8 @@ App::$strings["kiss"] = "целовать"; App::$strings["kissed"] = "поцелованный"; App::$strings["tempt"] = "искушать"; App::$strings["tempted"] = "искушённый"; -App::$strings["raise eyebrows at"] = ""; -App::$strings["raised their eyebrows at"] = ""; +App::$strings["raise eyebrows at"] = "поднять брови"; +App::$strings["raised their eyebrows at"] = "поднял брови"; App::$strings["insult"] = "оскорбить"; App::$strings["insulted"] = "оскорблённый"; App::$strings["praise"] = "хвалить"; @@ -651,8 +651,8 @@ App::$strings["fuck"] = "трахнуть"; App::$strings["fucked"] = "трахнул"; App::$strings["bonk"] = ""; App::$strings["bonked"] = ""; -App::$strings["declare undying love for"] = ""; -App::$strings["declared undying love for"] = ""; +App::$strings["declare undying love for"] = "признаться в любви к"; +App::$strings["declared undying love for"] = "признался в любви к"; App::$strings["Post to WordPress"] = "Опубликовать в WordPress"; App::$strings["Enable WordPress Post Plugin"] = "Включить плагин публикаций WordPress"; App::$strings["WordPress username"] = "Имя пользователя WordPress"; @@ -667,7 +667,7 @@ App::$strings["WordPress Post Settings"] = "Настройки публикац App::$strings["Wordpress Settings saved."] = "Настройки WordPress сохранены."; App::$strings["Who likes me?"] = "Кому я нравлюсь?"; App::$strings["Your account on %s will expire in a few days."] = "Ваш аккаунт на %s перестанет работать через несколько дней."; -App::$strings["Your $Productname test account is about to expire."] = "Тестовый период вашей учётной записи в $Productname истёк."; +App::$strings["Your $Productname test account is about to expire."] = "Срок действия пробного аккаунта в $Productname близок к окончанию."; App::$strings["Create an account to access services and applications"] = "Создайте аккаунт для доступа к службам и приложениям"; App::$strings["Register"] = "Регистрация"; App::$strings["Logout"] = "Выход"; @@ -756,12 +756,12 @@ App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s в %2\$s"; App::$strings["This is an unsaved preview"] = "Это несохранённый просмотр"; App::$strings["__ctx:title__ Likes"] = "Нравится"; App::$strings["__ctx:title__ Dislikes"] = "Не нравится"; -App::$strings["__ctx:title__ Agree"] = "За"; +App::$strings["__ctx:title__ Agree"] = "Согласен"; App::$strings["__ctx:title__ Disagree"] = "Против"; -App::$strings["__ctx:title__ Abstain"] = "Воздерживается"; -App::$strings["__ctx:title__ Attending"] = "Посещает"; -App::$strings["__ctx:title__ Not attending"] = "Не посещает"; -App::$strings["__ctx:title__ Might attend"] = "Может присутствовать"; +App::$strings["__ctx:title__ Abstain"] = "Воздерживаюсь"; +App::$strings["__ctx:title__ Attending"] = "Присоединившиеся"; +App::$strings["__ctx:title__ Not attending"] = "Не присоединившиеся"; +App::$strings["__ctx:title__ Might attend"] = "Могут присоединиться"; App::$strings["Select"] = "Выбрать"; App::$strings["Delete"] = "Удалить"; App::$strings["Toggle Star Status"] = "Переключить статус пометки"; @@ -792,17 +792,20 @@ App::$strings["Poke"] = "Ткнуть"; App::$strings["%s likes this."] = "%s нравится это."; App::$strings["%s doesn't like this."] = "%s не нравится это."; App::$strings["%2\$d people like this."] = array( - 0 => "", - 1 => "", + 0 => "%2\$d человеку это нравится.", + 1 => "%2\$d человекам это нравится.", + 2 => "%2\$d человекам это нравится.", ); App::$strings["%2\$d people don't like this."] = array( - 0 => "", - 1 => "", + 0 => "%2\$d человеку это не нравится.", + 1 => "%2\$d человекам это не нравится.", + 2 => "%2\$d человекам это не нравится.", ); App::$strings["and"] = "и"; App::$strings[", and %d other people"] = array( - 0 => "", - 1 => "", + 0 => ", и ещё %d человеку", + 1 => ", и ещё %d человекам", + 2 => ", и ещё %d человекам", ); App::$strings["%s like this."] = "%s нравится это."; App::$strings["%s don't like this."] = "%s не нравится это."; @@ -877,36 +880,44 @@ App::$strings["View Webpages"] = "Просмотр веб-страниц"; App::$strings["Wikis"] = ""; App::$strings["Wiki"] = ""; App::$strings["__ctx:noun__ Like"] = array( - 0 => "", - 1 => "", + 0 => "Нравится", + 1 => "Нравится", + 2 => "Нравится", ); App::$strings["__ctx:noun__ Dislike"] = array( - 0 => "", - 1 => "", + 0 => "Не нравится", + 1 => "Не нравится", + 2 => "Не нравится", ); App::$strings["__ctx:noun__ Attending"] = array( - 0 => "", - 1 => "", + 0 => "Посетит", + 1 => "Посетят", + 2 => "Посетят", ); App::$strings["__ctx:noun__ Not Attending"] = array( - 0 => "", - 1 => "", + 0 => "Не посетит", + 1 => "Не посетят", + 2 => "Не посетят", ); App::$strings["__ctx:noun__ Undecided"] = array( - 0 => "", - 1 => "", + 0 => "Не решил", + 1 => "Не решили", + 2 => "Не решили", ); App::$strings["__ctx:noun__ Agree"] = array( - 0 => "", - 1 => "", + 0 => "Согласен", + 1 => "Согласны", + 2 => "Согласны", ); App::$strings["__ctx:noun__ Disagree"] = array( - 0 => "", - 1 => "", + 0 => "Не согласен", + 1 => "Не согласны", + 2 => "Не согласны", ); App::$strings["__ctx:noun__ Abstain"] = array( - 0 => "", - 1 => "", + 0 => "Воздержался", + 1 => "Воздержались", + 2 => "Воздержались", ); App::$strings["Invalid data packet"] = "Неверный пакет данных"; App::$strings["Unable to verify channel signature"] = "Невозможно проверить подпись канала"; @@ -915,7 +926,7 @@ App::$strings["invalid target signature"] = "недопустимая целев App::$strings["l F d, Y \\@ g:i A"] = ""; App::$strings["Starts:"] = "Начало:"; App::$strings["Finishes:"] = "Окончание:"; -App::$strings["Location:"] = "Откуда:"; +App::$strings["Location:"] = "Местоположение:"; App::$strings["This event has been added to your calendar."] = "Это событие было добавлено в ваш календарь."; App::$strings["Not specified"] = "Не указано"; App::$strings["Needs Action"] = "Требует действия"; @@ -1054,7 +1065,7 @@ App::$strings["Age: "] = "Возраст:"; App::$strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD или MM-DD"; App::$strings["Required"] = "Требуется"; App::$strings["less than a second ago"] = "менее чем одну секунду"; -App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s тому назад"; +App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s назад"; App::$strings["__ctx:relative_date__ year"] = array( 0 => "год", 1 => "года", @@ -1220,8 +1231,9 @@ App::$strings["[Edited %s]"] = "[Отредактировано %s]"; App::$strings["__ctx:edit_activity__ Post"] = "Публикация"; App::$strings["__ctx:edit_activity__ Comment"] = "Комментарий"; App::$strings["%d invitation available"] = array( - 0 => "", - 1 => "", + 0 => "доступно %d приглашение", + 1 => "доступны %d приглашения", + 2 => "доступны %d приглашений", ); App::$strings["Advanced"] = "Дополнительно"; App::$strings["Find Channels"] = "Поиск каналов"; @@ -1360,7 +1372,7 @@ App::$strings["Ability to select posts by date ranges"] = "Возможност App::$strings["Saved Searches"] = "Сохранённые поиски"; App::$strings["Save search terms for re-use"] = "Сохранять результаты поиска для повторного использования"; App::$strings["Alternate Stream Order"] = "Отображение потока"; -App::$strings["Ability to order the stream by last post date, last comment date or unthreaded activities"] = "Возможность показывать поток по дате последнего сообщения, последнего комментария или по дате публикации"; +App::$strings["Ability to order the stream by last post date, last comment date or unthreaded activities"] = "Возможность показывать поток по дате последнего сообщения, последнего комментария или в порядке поступления"; App::$strings["Contact Filter"] = "Фильтр контактов"; App::$strings["Ability to display only posts of a selected contact"] = "Возможность показа публикаций только от выбранных контактов"; App::$strings["Forum Filter"] = "Фильтр по форумам"; @@ -1531,7 +1543,7 @@ App::$strings["Image file is empty."] = "Файл изображения пус App::$strings["Unable to process image"] = "Не удается обработать изображение"; App::$strings["Photo storage failed."] = "Ошибка хранилища фотографий."; App::$strings["a new photo"] = "новая фотография"; -App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s опубликовал %2\$s к %3\$s"; +App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s опубликовал %2\$s в %3\$s"; App::$strings["Recent Photos"] = "Последние фотографии"; App::$strings["Upload New Photos"] = "Загрузить новые фотографии"; App::$strings["New window"] = "Новое окно"; @@ -1572,8 +1584,9 @@ App::$strings["Share This"] = "Поделиться этим"; App::$strings["share"] = "поделиться"; App::$strings["Delivery Report"] = "Отчёт о доставке"; App::$strings["%d comment"] = array( - 0 => "", - 1 => "", + 0 => "%d комментарий", + 1 => "%d комментария", + 2 => "%d комментариев", ); App::$strings["View %s's profile - %s"] = "Просмотр %s профиля - %s"; App::$strings["to"] = "к"; @@ -1624,7 +1637,7 @@ App::$strings["\$Projectname Notification"] = "Оповещение \$Projectnam App::$strings["Thank You,"] = "Спасибо,"; App::$strings["This email was sent by %1\$s at %2\$s."] = "Это письмо было отправлено %1\$s на %2\$s."; App::$strings["To stop receiving these messages, please adjust your Notification Settings at %s"] = "Чтобы прекратить получать эти сообщения, настройте параметры уведомлений в %s"; -App::$strings["To stop receiving these messages, please adjust your %s."] = "Чтобы прекратить получать эти сообщения, пожалуйста настройте ваш %s."; +App::$strings["To stop receiving these messages, please adjust your %s."] = "Чтобы прекратить получать эти сообщения, пожалуйста измените %s."; App::$strings["Notification Settings"] = "Настройки уведомлений"; App::$strings["%s "] = ""; App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Notify] Получено новое сообщение в %s"; @@ -1669,7 +1682,7 @@ App::$strings["You've received [zrl=%1\$s]a friend suggestion[/zrl] for %2\$s fr App::$strings["Name:"] = "Имя:"; App::$strings["Photo:"] = "Фото:"; App::$strings["Please visit %s to approve or reject the suggestion."] = "Пожалуйста, посетите %s, чтобы одобрить или отклонить предложение."; -App::$strings["[\$Projectname:Notify]"] = ""; +App::$strings["[\$Projectname:Notify]"] = "[\$Projectname:Уведомление]"; App::$strings["created a new post"] = "создал новую публикацию"; App::$strings["commented on %s's post"] = "прокомментировал публикацию %s"; App::$strings["edited a post dated %s"] = "отредактировал публикацию датированную %s"; @@ -1705,7 +1718,7 @@ App::$strings["Posted Date"] = "По публикациям"; App::$strings["Order by last posted date"] = "Сортировка по дате последней публикации"; App::$strings["Date Unthreaded"] = "По порядку"; App::$strings["Order unthreaded by date"] = "Сортировка в порядке поступления"; -App::$strings["Activity Order"] = "Сортировка по активности"; +App::$strings["Activity Order"] = "Сортировка активности"; App::$strings["Site"] = "Сайт"; App::$strings["Accounts"] = "Учётные записи"; App::$strings["Member registrations waiting for confirmation"] = "Регистрации участников, ожидающие подверждения"; @@ -1887,11 +1900,11 @@ App::$strings["Can view my channel webpages"] = "Может просматрив App::$strings["Can view my wiki pages"] = "Может просматривать мои вики-страницы"; App::$strings["Can create/edit my channel webpages"] = "Может редактировать мои веб-страницы"; App::$strings["Can write to my wiki pages"] = "Может редактировать мои вики-страницы"; -App::$strings["Can post on my channel (wall) page"] = "Может публиковать на моей странице канала (\"стена\")"; +App::$strings["Can post on my channel (wall) page"] = "Может публиковать на моей странице канала"; App::$strings["Can comment on or like my posts"] = "Может прокомментировать или отмечать как понравившиеся мои посты"; App::$strings["Can send me private mail messages"] = "Может отправлять мне личные сообщения по эл. почте"; App::$strings["Can like/dislike profiles and profile things"] = "Может комментировать или отмечать как нравится/ненравится мой профиль"; -App::$strings["Can forward to all my channel connections via ! mentions in posts"] = "Может отправлять всем подписчикам моего канала через использование ! в публикациях"; +App::$strings["Can forward to all my channel connections via ! mentions in posts"] = "Может пересылать всем подписчикам моего канала используя ! в публикациях"; App::$strings["Can chat with me"] = "Может общаться со мной в чате"; App::$strings["Can source my public posts in derived channels"] = "Может использовать мои публичные сообщения в клонированных лентах сообщений"; App::$strings["Can administer my channel"] = "Может администрировать мой канал"; @@ -2443,7 +2456,7 @@ App::$strings["PHP executable path"] = "Пусть к исполняемому App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Введите полный путь к исполняемому модулю PHP. Вы можете оставить его пустым для продолжения установки."; App::$strings["Command line PHP"] = "Командная строка PHP"; App::$strings["Unable to check command line PHP, as shell_exec() is disabled. This is required."] = "Невозможно проверить командную строку PHP поскольку требуемая функция shell_exec() отключена."; -App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "В консольной версии PHP в вашей системе отключена опция \"register_argc_argv\". "; +App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "В консольной версии PHP в вашей системе отключена опция \"register_argc_argv\"."; App::$strings["This is required for message delivery to work."] = "Это необходимо для функционирования доставки сообщений."; App::$strings["PHP register_argc_argv"] = ""; App::$strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "Максимально разрешённый общий размер загрузок установлен в %s. Максимальный размер одной загрузки установлен в %s. Вам разрешено загружать до %d файлов за один приём."; @@ -2660,12 +2673,14 @@ App::$strings["Log file"] = "Файл журнала"; App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "Должен быть доступен для записи веб-сервером. Пусть относителен основного каталога веб-сайта."; App::$strings["Log level"] = "Уровень журнала"; App::$strings["%s account blocked/unblocked"] = array( - 0 => "", - 1 => "", + 0 => "%s аккаунт блокирован/разблокирован", + 1 => "%s аккаунта блокированы/разблокированы", + 2 => "%s аккаунтов блокированы/разблокированы", ); App::$strings["%s account deleted"] = array( - 0 => "", - 1 => "", + 0 => "%s аккаунт удалён", + 1 => "%s аккаунта удалёны", + 2 => "%s аккаунтов удалёны", ); App::$strings["Account not found"] = "Аккаунт не найден"; App::$strings["Account '%s' blocked"] = "Аккаунт '%s' заблокирован"; @@ -2680,8 +2695,8 @@ App::$strings["Register date"] = "Дата регистрации"; App::$strings["Last login"] = "Последний вход"; App::$strings["Expires"] = "Срок действия"; App::$strings["Service Class"] = "Класс обслуживания"; -App::$strings["Selected accounts will be deleted!\\n\\nEverything these accounts had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Выбранные учётные записи будут удалены!\\n\\nВсё что было ими опубликовано на этом сайте будет удалено навсегда!\\n\\nВы уверены?"; -App::$strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Этот аккаунт {0} будет удалён!\\n\\nВсё что им было опубликовано на этом сайте будет удалено навсегда!\\n\\nВы уверены?"; +App::$strings["Selected accounts will be deleted!\\n\\nEverything these accounts had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Выбранные учётные записи будут удалены!\n\nВсё что было ими опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?"; +App::$strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Этот аккаунт {0} будет удалён!\n\nВсё что им было опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?"; App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "По умолчанию, HTML без фильтрации доступен во встраиваемых медиа. Это небезопасно."; App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Рекомендуется настроить разрешения использовать HTML без фильтрации только для следующих сайтов:"; App::$strings["https://youtube.com/
      https://www.youtube.com/
      https://youtu.be/
      https://vimeo.com/
      https://soundcloud.com/
      "] = ""; @@ -2739,7 +2754,7 @@ App::$strings["[Experimental]"] = "[экспериментальный]"; App::$strings["[Unsupported]"] = "[неподдерживаемый]"; App::$strings["Off"] = "Выкл."; App::$strings["On"] = "Вкл."; -App::$strings["Lock feature %s"] = "Функция блокировки \"%s\""; +App::$strings["Lock feature %s"] = "Заблокировать функцию \"%s\""; App::$strings["Manage Additional Features"] = "Управлять дополнительными функциями"; App::$strings["Queue Statistics"] = "Статистика очереди"; App::$strings["Total Entries"] = "Всего записей"; @@ -2758,16 +2773,19 @@ App::$strings["Technical skill level"] = "Уровень технических App::$strings["Account language (for emails)"] = "Язык сообщения для email"; App::$strings["Service class"] = "Класс обслуживания"; App::$strings["%s channel censored/uncensored"] = array( - 0 => "", - 1 => "", + 0 => "%s канал цензурируется/нецензурируется", + 1 => "%s канала цензурируются/нецензурируются", + 2 => "%s каналов цензурируются/нецензурируются", ); App::$strings["%s channel code allowed/disallowed"] = array( - 0 => "", - 1 => "", + 0 => "в %s канале код разрешён/запрещён", + 1 => "в %s каналах код разрешён/запрещён", + 2 => "в %s каналах код разрешён/запрещён", ); App::$strings["%s channel deleted"] = array( - 0 => "", - 1 => "", + 0 => "%s канал удалён", + 1 => "%s канала удалены", + 2 => "%s каналов удалены", ); App::$strings["Channel not found"] = "Канал не найден"; App::$strings["Channel '%s' deleted"] = "Канал '%s' удалён"; @@ -2780,8 +2798,8 @@ App::$strings["Uncensor"] = "Нецензурировать"; App::$strings["Allow Code"] = "Разрешить код"; App::$strings["Disallow Code"] = "Запретить код"; App::$strings["UID"] = ""; -App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Выбранные каналы будут удалены!\\n\\nВсё что было опубликовано в этих каналах на этом сайте будет удалено навсегда!\\n\\nВы уверены?"; -App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Канал {0} будет удалён!\\n\\nВсё что было опубликовано в этом канале на этом сайте будет удалено навсегда!\\n\\nВы уверены?"; +App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Выбранные каналы будут удалены!\n\nВсё что было опубликовано в этих каналах на этом сайте будет удалено навсегда!\n\nВы уверены?"; +App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Канал {0} будет удалён!\n\nВсё что было опубликовано в этом канале на этом сайте будет удалено навсегда!\n\nВы уверены?"; App::$strings["Token verification failed."] = "Не удалось выполнить проверку токена."; App::$strings["Email Verification Required"] = "Требуется проверка адреса email"; App::$strings["A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message."] = "Проверочный токен был выслн на ваш адрес электронной почты {%s]. Введите этот токен здесь для завершения этапа проверки учётной записи. Пожалуйста, подождите несколько минут для завершения доставки и проверьте вашу папку \"Спам\" если вы не видите письма."; @@ -2792,8 +2810,9 @@ App::$strings["%s : Not a valid email address."] = "%s : Недействите App::$strings["Please join us on \$Projectname"] = "Присоединятесь к \$Projectname !"; App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Превышен лимит приглашений. Пожалуйста, свяжитесь с администрацией сайта."; App::$strings["%d message sent."] = array( - 0 => "", - 1 => "", + 0 => "%d сообщение отправлено.", + 1 => "%d сообщения отправлено.", + 2 => "%d сообщений отправлено.", ); App::$strings["You have no more invitations available"] = "У вас больше нет приглашений"; App::$strings["Send invitations"] = "Отправить приглашение"; @@ -2806,7 +2825,7 @@ App::$strings["or visit"] = "или посетите"; App::$strings["3. Click [Connect]"] = "Нажать [Подключиться]"; App::$strings["Block Title"] = "Заблокировать заголовок"; App::$strings["Cover Photos"] = "Фотографии обложки"; -App::$strings["Your cover photo may be visible to anybody on the internet"] = "Ваше фото обложки может быть видно кому угодно в Интернете"; +App::$strings["Your cover photo may be visible to anybody on the internet"] = "Фотография вашей обложки может быть видна всем в Интернете"; App::$strings["Change Cover Photo"] = "Изменить фотографию обложки"; App::$strings["Like/Dislike"] = "Нравится / не нравится"; App::$strings["This action is restricted to members."] = "Это действие доступно только участникам."; @@ -3094,7 +3113,7 @@ App::$strings["Visit %s's profile [%s]"] = "Посетить %s ​​профи App::$strings["View Connections"] = "Просмотр контактов"; App::$strings["Authentication failed."] = "Ошибка аутентификации."; App::$strings["Your real name is recommended."] = "Рекомендуется использовать ваше настоящее имя."; -App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Примеры: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""; +App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Примеры: \"Иван Иванов\", \"Оксана и Кони\", \"Футболист\", \"Тимур и его команда\""; App::$strings["This will be used to create a unique network address (like an email address)."] = "Это будет использовано для создания уникального сетевого адреса (наподобие email)."; App::$strings["Allowed characters are a-z 0-9, - and _"] = "Разрешённые символы a-z 0-9, - и _"; App::$strings["Channel name"] = "Название канала"; @@ -3152,7 +3171,7 @@ App::$strings["Redeliver"] = "Доставить повторно"; App::$strings["No such group"] = "Нет такой группы"; App::$strings["No such channel"] = "Нет такого канала"; App::$strings["Privacy group is empty"] = "Группа безопасности пуста"; -App::$strings["Privacy group: "] = "Группа безопасности:"; +App::$strings["Privacy group: "] = "Группа безопасности: "; App::$strings["Please login."] = "Пожалуйста, войдите."; App::$strings["No service class restrictions found."] = "Ограничений класса обслуживание не найдено."; App::$strings["Add Card"] = "Добавить карточку"; @@ -3161,7 +3180,7 @@ App::$strings["Change Order of App Tray Apps"] = "Изменить порядо App::$strings["Use arrows to move the corresponding app left (top) or right (bottom) in the navbar"] = "Используйте стрелки для перемещения приложения влево (вверх) или вправо (вниз) в панели навигации"; App::$strings["Use arrows to move the corresponding app up or down in the app tray"] = "Используйте стрелки для перемещения приложения вверх или вниз в лотке"; App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Превышено максимальное количество регистраций на сегодня. Пожалуйста, попробуйте снова завтра."; -App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Просьба подтвердить согласие с \"Условиями обслуживания\". Регистрация не удалась."; +App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Пожалуйста, подтвердите согласие с \"Условиями обслуживания\". Регистрация не удалась."; App::$strings["Passwords do not match."] = "Пароли не совпадают."; App::$strings["Registration successful. Continue to create your first channel..."] = "Регистрация завершена успешно. Для продолжения создайте свой первый канал..."; App::$strings["Registration successful. Please check your email for validation instructions."] = "Регистрация завершена успешно. Пожалуйста проверьте вашу электронную почту для подтверждения."; @@ -3235,7 +3254,7 @@ App::$strings["Members are visible to other channels"] = "Участники к App::$strings["Privacy group removed."] = "Группа безопасности удалена."; App::$strings["Unable to remove privacy group."] = "Ну удалось удалить группу безопасности."; App::$strings["Privacy Group: %s"] = "Группа безопасности: %s"; -App::$strings["Privacy group name: "] = "Название группы безопасности:"; +App::$strings["Privacy group name: "] = "Название группы безопасности: "; App::$strings["Delete Group"] = "Удалить группу"; App::$strings["Group members"] = "Члены группы"; App::$strings["Not in this group"] = "Не в этой группе"; -- cgit v1.2.3